From c660097d28d097bb4b5835072c9252d7e5637270 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 12 Dec 2017 18:51:13 +0630
Subject: [PATCH 001/651] no print for cloud

---
 app/assets/javascripts/OQS.js                 |  47 ++++---
 .../crm/dining_queues_controller.rb           |  10 +-
 app/controllers/crm/home_controller.rb        |   8 +-
 app/controllers/oqs/edit_controller.rb        |  14 +-
 app/controllers/oqs/print_controller.rb       |  84 ++++++------
 .../origami/payments_controller.rb            | 124 +++++++++---------
 app/controllers/origami/shifts_controller.rb  |  30 ++---
 app/controllers/origami/void_controller.rb    |  58 ++++----
 app/models/order_queue_station.rb             |  64 ++++-----
 app/models/printer/receipt_printer.rb         |   4 +-
 app/views/oqs/home/index.html.erb             |   5 +-
 app/views/origami/home/show.html.erb          |  34 ++---
 app/views/origami/rooms/show.html.erb         |   2 +-
 app/views/origami/sales/show.html.erb         |  12 +-
 14 files changed, 242 insertions(+), 254 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 64e207ab..572d94b3 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -217,30 +217,29 @@ $(document).on('turbolinks:load', function() {
   	});
 
   	// Print Order Item
-  	$(document).on('click', '#print_order_item', function(event){ 
-  		var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  		var options = $('.selected-item').children('.card-block').find('.item-options').text();
-  		var params = { 'options':options };
+  	// $(document).on('click', '#print_order_item', function(event){ 
+  	// 	var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
+  	// 	var options = $('.selected-item').children('.card-block').find('.item-options').text();
+  	// 	var params = { 'options':options };
 
-  		$.ajax({
-			type: 'GET',
-	     	url: '/oqs/print/print/'+assigned_item_id,
-	     	success: function(data){	}
-  		});
-  	});
+  	// 	$.ajax({
+			// type: 'GET',
+	  //    	url: '/oqs/print/print/'+assigned_item_id,
+	  //    	success: function(data){	}
+  	// 	});
+  	// });
 
-  	// Print Order Summary
-  	// $('#print_order_summary').on('click',function(){
-  	$(document).on('click', '#print_order_summary', function(event){
-  		var orderNo = $('.selected-item').attr('data-order-no');
-  		var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
-  		var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  		var params = { 'table_name':table_name };
-  		$.ajax({
-			type: 'GET',
-	     	url: '/oqs/print/print_order_summary/'+assigned_item_id,
-	     	data: params,
-	     	success: function(data){	}
-  		});
-  	});
+  	// Print Order Summary  	
+  	// $(document).on('click', '#print_order_summary', function(event){
+  	// 	var orderNo = $('.selected-item').attr('data-order-no');
+  	// 	var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
+  	// 	var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
+  	// 	var params = { 'table_name':table_name };
+  	// 	$.ajax({
+			// type: 'GET',
+	  //    	url: '/oqs/print/print_order_summary/'+assigned_item_id,
+	  //    	data: params,
+	  //    	success: function(data){	}
+  	// 	});
+  	// });
 });
diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb
index 20e58088..8184c660 100755
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -45,13 +45,13 @@ class Crm::DiningQueuesController < BaseCrmController
     respond_to do |format|
       if @dining_queue.save
 
-      unique_code = "QueueNoPdf"   
+      # unique_code = "QueueNoPdf"   
       
-      # get printer info
-      print_settings = PrintSetting.find_by_unique_code(unique_code)
+      # # get printer info
+      # print_settings = PrintSetting.find_by_unique_code(unique_code)
 
-      printer = Printer::ReceiptPrinter.new(print_settings)   
-      printer.print_queue_no(print_settings,@dining_queue)
+      # printer = Printer::ReceiptPrinter.new(print_settings)   
+      # printer.print_queue_no(print_settings,@dining_queue)
 
         format.html { redirect_to crm_dining_queues_path, notice: 'Queue was successfully created.' }
         format.json { render :show, status: :created, location: @dining_queue }
diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb
index 012f2bc6..13b4ede3 100755
--- a/app/controllers/crm/home_controller.rb
+++ b/app/controllers/crm/home_controller.rb
@@ -33,13 +33,13 @@ class Crm::HomeController < BaseCrmController
 
     end
     
-    unique_code="CrmOrderPdf"
+    # unique_code="CrmOrderPdf"
 
-    print_settings = PrintSetting.find_by_unique_code(unique_code)
+    # print_settings = PrintSetting.find_by_unique_code(unique_code)
 
-    printer = Printer::ReceiptPrinter.new(print_settings)
+    # printer = Printer::ReceiptPrinter.new(print_settings)
 
-    printer.print_crm_order(@booking,order_items,print_settings) 
+    # printer.print_crm_order(@booking,order_items,print_settings) 
 
   end
 
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 8ec0725e..368255e5 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -17,14 +17,14 @@ class Oqs::EditController < BaseOqsController
     order_item.save
 
     # print
-    assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
-    # order queue stations
-    oqs = assigned_item.order_queue_station
+    # assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
+    # # order queue stations
+    # oqs = assigned_item.order_queue_station
     
-    unique_code="OrderItemPdf"    
+    # unique_code="OrderItemPdf"    
 
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+    # print_settings=PrintSetting.find_by_unique_code(unique_code)
+    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    # order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
   end
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 0ff94403..cc5556e9 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -1,61 +1,61 @@
 class Oqs::PrintController < ApplicationController
   # Print Order Item
   def print
-  	unique_code="OrderItemPdf"
-  	assigned_item_id = params[:id]
-    options = params[:options]
-    assigned_item = AssignedOrderItem.find(assigned_item_id)  	
-    assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+  	# unique_code="OrderItemPdf"
+  	# assigned_item_id = params[:id]
+   #  options = params[:options]
+   #  assigned_item = AssignedOrderItem.find(assigned_item_id)  	
+   #  assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
-    # order queue stations
-    oqs = assigned_item.order_queue_station
-    order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
+   #  # order queue stations
+   #  oqs = assigned_item.order_queue_station
+   #  order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
 
-    # Check Printed
-    print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
+   #  # Check Printed
+   #  print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
 
-    # print when complete click 
-  	print_settings = PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-  	order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
+   #  # print when complete click 
+  	# print_settings = PrintSetting.find_by_unique_code(unique_code)
+   #  order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+  	# order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
   	
-    # update print status for completed same order items
-    assigned_items.each do |ai|
-      ai.print_status=true
-      ai.save       
-    end                 
+   #  # update print status for completed same order items
+   #  assigned_items.each do |ai|
+   #    ai.print_status=true
+   #    ai.save       
+   #  end                 
   end
 
   # Print Order Details with booking id
   def print_order_summary
-    unique_code="OrderSummaryPdf"
-    assigned_item_id = params[:id]
-    table_name = params[:table_name]
-    assigned_item = AssignedOrderItem.find(assigned_item_id)    
-    assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+    # unique_code="OrderSummaryPdf"
+    # assigned_item_id = params[:id]
+    # table_name = params[:table_name]
+    # assigned_item = AssignedOrderItem.find(assigned_item_id)    
+    # assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
-    # order queue stations
-    oqs = assigned_item.order_queue_station
+    # # order queue stations
+    # oqs = assigned_item.order_queue_station
 
-    # Check Printed
-    print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
+    # # Check Printed
+    # print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
 
-    # get dining
-    # dining = DiningFacility.find_by_name(table_name);
-    # booking = Booking.find_by_dining_facility_id(dining.id)
+    # # get dining
+    # # dining = DiningFacility.find_by_name(table_name);
+    # # booking = Booking.find_by_dining_facility_id(dining.id)
 
-    # Get Booking ID
-    booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0]
+    # # Get Booking ID
+    # booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0]
     
-    # print when complete click 
-    print_settings = PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status)
+    # # print when complete click 
+    # print_settings = PrintSetting.find_by_unique_code(unique_code)
+    # order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+    # order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status)
 
-     # update print status for completed same order items
-    assigned_items.each do |ai|
-      ai.print_status = true
-      ai.save       
-    end              
+    #  # update print status for completed same order items
+    # assigned_items.each do |ai|
+    #   ai.print_status = true
+    #   ai.save       
+    # end              
   end
 end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 5b0db19f..d9ea5ec3 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -22,29 +22,29 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
     # Print for First Bill to Customer
-    unique_code = "ReceiptBillPdf"
-     #shop detail
-    shop_details =  Shop::ShopDetail 
-    # customer= Customer.where('customer_id=' +.customer_id)
-    customer= Customer.find(sale_data.customer_id)
-    # get member information
-    rebate = MembershipSetting.find_by_rebate(1)
-    if customer.membership_id != nil && rebate
-      member_info = Customer.get_member_account(customer)
-    end
-    # get printer info
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    # unique_code = "ReceiptBillPdf"
+    #  #shop detail
+    # shop_details =  Shop::ShopDetail 
+    # # customer= Customer.where('customer_id=' +.customer_id)
+    # customer= Customer.find(sale_data.customer_id)
+    # # get member information
+    # rebate = MembershipSetting.find_by_rebate(1)
+    # if customer.membership_id != nil && rebate
+    #   member_info = Customer.get_member_account(customer)
+    # end
+    # # 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)
-    discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale_items)
+    # # 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 = Printer::ReceiptPrinter.new(print_settings)
 
-    printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt")    
+    # printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt")    
   end
 
   def create
@@ -83,24 +83,24 @@ class Origami::PaymentsController < BaseOrigamiController
       cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
       # For Print
-      unique_code = "ReceiptBillPdf"
-      customer= Customer.find(saleObj.customer_id)
+      # unique_code = "ReceiptBillPdf"
+      # customer= Customer.find(saleObj.customer_id)
        
-      # get member information
-      rebate = MembershipSetting.find_by_rebate(1)
-      if customer.membership_id != nil && rebate
-        member_info    = Customer.get_member_account(customer)
-        rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-      end
+      # # get member information
+      # rebate = MembershipSetting.find_by_rebate(1)
+      # if customer.membership_id != nil && rebate
+      #   member_info    = Customer.get_member_account(customer)
+      #   rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+      # end
 
-      # 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)
+      # # 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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid")   
+      # printer = Printer::ReceiptPrinter.new(print_settings)
+      # printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid")   
     end    
   end
 
@@ -202,26 +202,26 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    unique_code = "ReceiptBillPdf"
-    customer= Customer.find(saleObj.customer_id)
+    # unique_code = "ReceiptBillPdf"
+    # customer= Customer.find(saleObj.customer_id)
 
-    #shop detail
-    shop_details =  Shop::ShopDetail 
-    # get member information
-    rebate = MembershipSetting.find_by_rebate(1)
-    if customer.membership_id != nil && rebate
-      member_info = Customer.get_member_account(customer)
-      rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-    end
-    # get printer info
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    # #shop detail
+    # shop_details =  Shop::ShopDetail 
+    # # get member information
+    # rebate = MembershipSetting.find_by_rebate(1)
+    # if customer.membership_id != nil && rebate
+    #   member_info = Customer.get_member_account(customer)
+    #   rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+    # end
+    # # 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(saleObj.sale_items)
-    discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)
+    # # 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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print")
+    # printer = Printer::ReceiptPrinter.new(print_settings)
+    # printer.print_receipt_bill(print_settings,cashier_terminal,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    
@@ -251,20 +251,20 @@ class Origami::PaymentsController < BaseOrigamiController
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
 
-      unique_code = "ReceiptBillPdf"
-      customer= Customer.find(saleObj.customer_id)
+      # unique_code = "ReceiptBillPdf"
+      # customer= Customer.find(saleObj.customer_id)
       
-       #shop detail
-      shop_details =  Shop::ShopDetail 
+      #  #shop detail
+      # shop_details =  Shop::ShopDetail 
 
-      # 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)
+      # # 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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC")   
+      # printer = Printer::ReceiptPrinter.new(print_settings)
+      # printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC")   
     end    
   end
 
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 851be7e5..a1169ab1 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -46,24 +46,24 @@ class Origami::ShiftsController < BaseOrigamiController
       cashier_terminal.save
 
 
-      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='')
-      #other payment details for mpu or visa like card
-      @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
+      # 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='')
+      # #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)
+      # # 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)
 
-      printer = Printer::CashierStationPrinter.new(print_settings)
+      # printer = Printer::CashierStationPrinter.new(print_settings)
 
-      printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
+      # printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
 
       
     end
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 27faea25..5a0aa3b8 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -55,40 +55,40 @@ class Origami::VoidController < BaseOrigamiController
 
       # For Print 
 
-      member_info   = nil
-      rebate_amount = nil
+      # member_info   = nil
+      # rebate_amount = nil
 
-      # For Cashier by Zone
-      bookings = Booking.where("sale_id='#{sale_id}'")
-      if bookings.count > 1 
-        # for Multiple Booking
-        table = DiningFacility.find(bookings[0].dining_facility_id)
-      else
-        table = DiningFacility.find(bookings[0].dining_facility_id)        
-      end
+      # # For Cashier by Zone
+      # bookings = Booking.where("sale_id='#{sale_id}'")
+      # if bookings.count > 1 
+      #   # for Multiple Booking
+      #   table = DiningFacility.find(bookings[0].dining_facility_id)
+      # else
+      #   table = DiningFacility.find(bookings[0].dining_facility_id)        
+      # end
 
-      cashier_zone     = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-      cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      # cashier_zone     = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+      # cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-      unique_code = "ReceiptBillPdf"
-      customer= Customer.find(sale.customer_id)
+      # unique_code = "ReceiptBillPdf"
+      # customer= Customer.find(sale.customer_id)
       
-       #shop detail
-      shop_details = Shop.find(1)
-       # get member information
-      rebate = MembershipSetting.find_by_rebate(1)
-      if customer.membership_id != nil && rebate
-        member_info = Customer.get_member_account(customer)
-        rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-      end
-      # 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(sale.sale_items)
-      discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
+      #  #shop detail
+      # shop_details = Shop.find(1)
+      #  # get member information
+      # rebate = MembershipSetting.find_by_rebate(1)
+      # if customer.membership_id != nil && rebate
+      #   member_info = Customer.get_member_account(customer)
+      #   rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+      # end
+      # # 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(sale.sale_items)
+      # discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
-      printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID")   
+      # printer = Printer::ReceiptPrinter.new(print_settings)
+      # printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID")   
       
       #end print
 
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index c8a3a552..8b1d6d7d 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -78,22 +78,13 @@ class OrderQueueStation < ApplicationRecord
             end
           end
 
-          if oqs.auto_print 
-            if oqs_order_items.length > 0     
-              print_slip(oqs, order, oqs_order_items)
-              is_auto_printed = true
-            end
-          end 
-        end
-        # if oqs.id == oqpbz.order_queue_station_id          
-        #   # Auto Printing
-        #   if oqs.auto_print 
-        #     if oqs_order_items.length > 0     
-        #       print_slip(oqs, order, oqs_order_items)
-        #       is_auto_printed = true
-        #     end
-        #   end 
-        # end  
+          # if oqs.auto_print 
+          #   if oqs_order_items.length > 0     
+          #     print_slip(oqs, order, oqs_order_items)
+          #     is_auto_printed = true
+          #   end
+          # end 
+        end        
       end   
     # end
   end
@@ -101,33 +92,32 @@ class OrderQueueStation < ApplicationRecord
   private
   #Print order_items in 1 slip
   def print_slip(oqs, order, order_items)    
-    unique_code="OrderSummaryPdf"     
+    # unique_code="OrderSummaryPdf"     
     
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
+    # print_settings=PrintSetting.find_by_unique_code(unique_code)
+    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    # order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
 
-    AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
-    # update print status for order items
-      ai.print_status=true
-      ai.save       
-    end  
-    
+    # AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
+    # # update print status for order items
+    #   ai.print_status=true
+    #   ai.save       
+    # end      
   end
 
   #Print order_item in 1 slip per item
   def print_slip_item(oqs, assigned_item)
-    unique_code="OrderItemPdf"    
-    order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
-    # print when complete click 
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
+    # unique_code="OrderItemPdf"    
+    # order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
+    # # print when complete click 
+    # print_settings=PrintSetting.find_by_unique_code(unique_code)
+    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    # order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
     
-    # update print status for completed same order items
-    assigned_order_item.each do |ai|
-      ai.print_status=true
-      ai.save       
-    end
+    # # update print status for completed same order items
+    # assigned_order_item.each do |ai|
+    #   ai.print_status=true
+    #   ai.save       
+    # end
   end
 end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 40a60201..f628c7f2 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -94,7 +94,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    # stock check
    def print_stock_check_result(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
      pdf = StockResultPdf.new(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
-         pdf.render_file "tmp/print_stock_check_result.pdf"
+     pdf.render_file "tmp/print_stock_check_result.pdf"
      self.print("tmp/print_stock_check_result.pdf")
    end
 
@@ -114,7 +114,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
     pdf = CrmOrderPdf.new(booking,order_items,setting)
-        pdf.render_file "tmp/print_crm_order.pdf"
+    pdf.render_file "tmp/print_crm_order.pdf"
     self.print("tmp/print_crm_order.pdf")
   end
 end
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 7f7f2d24..ea118e9c 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -168,9 +168,8 @@
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
     <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
-    <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
-      <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
-      <!-- <button type="button" class="" id="print_order_summary">Print <br/>Order<br/>Summary</button> -->
+    <!-- <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
+    <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>   -->   
   </div>
 </div>
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0b98ac76..27c9e2c4 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -389,7 +389,7 @@
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
                   
-                  <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+                  <!-- <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button> -->
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
               <% end %>
@@ -472,12 +472,12 @@
 
         });
 
-        $('#re-print').click(function () {
-            var sale_id = $('#sale_id').val();
-            window.location.href = '/origami/' + sale_id + "/reprint"
+        // $('#re-print').click(function () {
+        //     var sale_id = $('#sale_id').val();
+        //     window.location.href = '/origami/' + sale_id + "/reprint"
 
-            return false;
-        });
+        //     return false;
+        // });
 
         // Add Other Charges
         $('#other-charges').click(function () {
@@ -519,18 +519,18 @@
     });
 
     // Print for first bill
-    $("#first_bill").on('click', function () {
-        var sale_id = $('#sale_id').val();
-        var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+    // $("#first_bill").on('click', function () {
+    //     var sale_id = $('#sale_id').val();
+    //     var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
 
-        $.ajax({
-            type: "GET",
-            url: ajax_url,
-            success: function (result) {
-                location.reload();
-            }
-        });
-    });
+    //     $.ajax({
+    //         type: "GET",
+    //         url: ajax_url,
+    //         success: function (result) {
+    //             location.reload();
+    //         }
+    //     });
+    // });
 
     // $('#pay').on('click', function () {
     //     var sale_id = $('#sale_id').val();
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 05f14c04..d50f9ae5 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -369,7 +369,7 @@
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
         <!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->
         <!-- <button type="button" id="request_bills" class="btn bg-blue btn-block" disabled> Req.Bill</button> -->
-        <button type="button" id="first_bill" class="btn bg-blue btn-block">First Bill</button>
+        <!-- <button type="button" id="first_bill" class="btn bg-blue btn-block">First Bill</button> -->
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
         <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
      <% end %>
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 7c008977..49395586 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -201,7 +201,7 @@
    <% if @sale.sale_status != 'void' %>
        <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
    <% end %>
-   <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
+   <!-- <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button> -->
  </div>
 </div>
 </div>
@@ -271,10 +271,10 @@ $('#back').on('click',function(){
         });
     });
 
-$('#re-print').click(function() {
-    var sale_id = $('#sale_id').val();
-    window.location.href = '/origami/'+ sale_id  + "/reprint"
+// $('#re-print').click(function() {
+//     var sale_id = $('#sale_id').val();
+//     window.location.href = '/origami/'+ sale_id  + "/reprint"
 
-    return false;
-  });
+//     return false;
+//   });
 </script>

From fef4d4caa19d182740f66ecc1f22174c117da69e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 12 Dec 2017 18:51:56 +0630
Subject: [PATCH 002/651] no print for cloud

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4f0ac524..8489e37c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ pickle-email-*.html
 .rbenv-version
 config/deploy/config/*
 config/puma.rb
-config/shops.json
+#config/shops.json
 !/log/.keep
 !/tmp/.keep
 .ruby-version

From 9def0756b336ac1aab11d1e47c7330189be8a3e5 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 14 Dec 2017 10:25:31 +0630
Subject: [PATCH 003/651] add cipher type

---
 config/secrets.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/secrets.yml b/config/secrets.yml
index 23c287ba..d81ab339 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -28,6 +28,7 @@ production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: provision.zsai.ws/api  #192.168.1.94:3002
   server_mode: cloud
+  cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
   aes_key: <%= ENV['AES_KEY'] %>
   aes_iv: <%= ENV['AES_IV'] %>

From b9296c68f3d93199cb9ebe48b3b3c564327106c2 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 14 Dec 2017 12:18:09 +0630
Subject: [PATCH 004/651] nothing

---
 config/secrets.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index d81ab339..bcb6d0a6 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: 192.168.1.147:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
@@ -26,7 +26,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: provision.zsai.ws/api  #192.168.1.94:3002
+  sx_provision_url: provision.zsai.ws/api  #192.168.1.147:3002/api
   server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From a735f66c3314f6cf3703c19e5dd30115be1b97a4 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 14 Dec 2017 12:18:23 +0630
Subject: [PATCH 005/651] nothing

---
 config/shops.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 config/shops.json

diff --git a/config/shops.json b/config/shops.json
new file mode 100644
index 00000000..e218eb9e
--- /dev/null
+++ b/config/shops.json
@@ -0,0 +1,11 @@
+{
+  "data": [
+    {
+      "lookup": "osaka1-7.zsai.ws",
+      "value": {
+        "key": "wwF9Zx9q/LfxSDqSNHYXvfu1eGsBqFEFXoXqGWrEirA=\n",
+        "iv": "GIAdRW/8tlyDRTI4w5D3ZA==\n"
+      }
+    }
+  ]
+}

From 14d102f4fe46e82ad75eb1c4653c15ae50779b7a Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 14 Dec 2017 12:20:07 +0630
Subject: [PATCH 006/651] shops json

---
 config/shops.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/shops.json b/config/shops.json
index e218eb9e..f48d28c5 100644
--- a/config/shops.json
+++ b/config/shops.json
@@ -4,7 +4,7 @@
       "lookup": "osaka1-7.zsai.ws",
       "value": {
         "key": "wwF9Zx9q/LfxSDqSNHYXvfu1eGsBqFEFXoXqGWrEirA=\n",
-        "iv": "GIAdRW/8tlyDRTI4w5D3ZA==\n"
+        "iv": "l1rUEZFcPNHrTHWgaODkYQ==\n"
       }
     }
   ]

From 3fb3fdfe3fd430a05d1c69ed6e37e06938351997 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 14 Dec 2017 13:46:48 +0630
Subject: [PATCH 007/651] update secrets

---
 config/secrets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index bcb6d0a6..a53c9f76 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -26,7 +26,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: provision.zsai.ws/api  #192.168.1.147:3002/api
+  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
   server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From d8738dbf5ab4e4fe8c07d99bb6917f9181431e7d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 27 Dec 2017 18:16:31 +0630
Subject: [PATCH 008/651] update print add item code and addorder js for set
 item create in print

---
 app/assets/javascripts/addorder.js | 31 ++++++++++++++++++++++++++++++
 app/pdf/order_item_pdf.rb          |  4 ++--
 app/pdf/order_summary_pdf.rb       |  4 ++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index d8608481..ff899c13 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -206,6 +206,7 @@ $(function() {
       $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
 
       value = item_sets[field]["instances"];
+
       $(value).each(function(i){
         $.ajax({
           type: "GET",
@@ -241,6 +242,11 @@ $(function() {
       });
     }
 
+     $('.set-item').attr('data-code',instances[0]['code']);
+     $('.set-item').attr('data-name',instances[0]['name']);
+     $('.set-item').attr('data-price',instances[0]['price']);
+     $('.set-item').attr('data-options','[]');
+
     $('#set_change_qty').val(1);
     $('#set_item_instances').text(instances);
     $('#set_name').text(data.attr('data-name'));
@@ -313,6 +319,8 @@ $(function() {
     item_name     = $('#set_name').text();
     min_qty       = $(this).data('min-qty');
 
+    default_instance = $('.set-item');
+
     var items  = $('.selected-instance');
 
     if (items.length >= min_qty) {
@@ -342,6 +350,29 @@ $(function() {
           $(".summary-items tbody").append(row);
         rowCount = rowCount + 1;
       });
+
+      var rowCount = $('.summary-items tbody tr').length+1;
+      option_arr = []
+        code          = $('.set-item').attr('data-code');
+        name          = $('.set-item').attr('data-name');
+        price         = $('.set-item').attr('data-price');
+        option        = $('.set-item').attr('data-options');
+        total         = qty * price ;
+        option_arr.push(option);
+        row ="<tr class='item_box' data-price ='"
+              +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+              +name+ "' data-code='"+item_code+"' data-instance-code='"
+              +code+"' data-attributes='"
+              +attribute_arr+"' data-options ='"
+              +option_arr+"' data-row ='"+rowCount+ "'>"
+          +'<td class="item-cell-no">'+rowCount+'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
+          +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+          +'<td class="item-cell-price" id="item_price">' 
+          + parseFloat(total).toFixed(2)
+          +'</td>' 
+          +'</tr>';
+          $(".summary-items tbody").append(row);
       calculate_sub_total();
       $(".sx_item_set_detailModal").css({ 'display': "none" });
     }else{
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index e9887c62..9483b847 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -92,7 +92,7 @@ class OrderItemPdf < Prawn::Document
     move_down 5
 
     bounding_box([0,y_position], :width => self.item_width) do
-        text "#{order_item.item_name}", :size => self.item_font_size,:align => :left
+        text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
     end
 
     bounding_box([self.item_width,y_position], :width => self.qty_width) do
@@ -100,7 +100,7 @@ class OrderItemPdf < Prawn::Document
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
-      text "#{order_item.item_name}", :size => self.item_font_size,:align => :left
+      text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
 
     end
 
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index f48564a9..9e9873d2 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -108,7 +108,7 @@ class OrderSummaryPdf < Prawn::Document
         y_position = cursor
 
         bounding_box([0,y_position], :width => self.item_width) do
-          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
 
         end
 
@@ -117,7 +117,7 @@ class OrderSummaryPdf < Prawn::Document
         end
 
         bounding_box([0,y_position], :width => self.item_width) do
-          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
 
         end
         

From 722ee6982c8d92a0a751de74a254d34962dcff7c Mon Sep 17 00:00:00 2001
From: Ye Min <yeminphyo@code2lab.com>
Date: Thu, 28 Dec 2017 09:46:48 +0630
Subject: [PATCH 009/651] Ruby 2.4.1

---
 Capfile                     | 31 +++++++++++++++++++++++++++++++
 Gemfile                     |  2 +-
 config/deploy.rb            |  2 +-
 config/deploy/production.rb |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 Capfile

diff --git a/Capfile b/Capfile
new file mode 100644
index 00000000..9cfa1807
--- /dev/null
+++ b/Capfile
@@ -0,0 +1,31 @@
+# Load DSL and set up stages
+require "capistrano/setup"
+
+# Include default deployment tasks
+require "capistrano/deploy"
+
+# Include tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#   https://github.com/capistrano/passenger
+#
+# require "capistrano/rvm"
+require "capistrano/rbenv"
+# require "capistrano/chruby"
+require "capistrano/bundler"
+require "capistrano/rails"
+require "capistrano/rails/assets"
+require "capistrano/rails/migrations"
+# require "capistrano/passenger"
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
+Dir.glob('lib/capistrano/**/*.rb').each { |r| import r }
+
diff --git a/Gemfile b/Gemfile
index de22a68c..0fb5f323 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.4.0'
+ruby '2.4.1'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
diff --git a/config/deploy.rb b/config/deploy.rb
index a2144cd1..82cbb71e 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 lock "3.10.1"
 
-set :application, "sxrestaurant"
+set :application, "zsai"
 set :repo_url, 'git@bitbucket.org:code2lab/sxrestaurant.git'
 
 set :deploy_user, 'deploy'
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 9a498da8..7fed1a97 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -5,5 +5,5 @@ set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
 server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true
 
 set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
-set :rbenv_ruby, '2.4.0'
+set :rbenv_ruby, '2.4.1'
 set :rails_env, :production

From 23e7c8db97a6afb122e6cd5ec35773b336663d5a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 10:59:23 +0630
Subject: [PATCH 010/651] update payment control with first bill

---
 .../origami/others_payments_controller.rb        |  2 +-
 app/views/origami/home/show.html.erb             |  1 +
 app/views/origami/others_payments/index.html.erb | 16 +++++++++++++++-
 app/views/origami/payments/show.html.erb         |  8 +++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index fa88afb7..16c7edae 100755
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -5,7 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   	@payment_method_setting = PaymentMethodSetting.all
 
   	@rebate = MembershipSetting.find_by_rebate(1)
-
+  	@sale_data = Sale.find_by_sale_id(@sale_id)
   	# @sale_id = params[:sale_id]
   	# sale_data = Sale.find_by_sale_id(@sale_id)
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b77e3b96..6ca70e71 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -416,6 +416,7 @@
                         <div class="modal-body">
                            <select class="form-control show-tick payment_method"  id="payment_method" >
                              <option value="Cash">Cash</option>
+                             <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">
                                 <%= pay.payment_method %>
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 2f847134..c0185182 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -14,8 +14,9 @@
 		<div class="col-lg-11col-md-11 col-sm-11">
 			<div >
 				<div >
+				<span id="receipt_no" class="hidden"><%=@sale_data.receipt_no rescue ' '%></span>
 					<% @payment_method_setting.where("is_active = true").each do |payment_method|%>
-					<div class="purple others-payment bottom left m-l-30" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
+					<div class="purple others-payment bottom left m-l-30 <%= payment_method.payment_method %>" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
 					<% end %>
 				</div>
 			</div>
@@ -26,6 +27,19 @@
 	</div>
 </div>
 <script type="text/javascript">
+	/* start check first bill or not*/
+        var receipt_no = "";
+        if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+          receipt_no = ($("#receipt_no").html()).trim();
+        }
+
+        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
+	    if(payment_type) {
+	        $(".others-payment").hide();
+	        $("."+payment_type).show();
+	    }
+      
+     /* end check first bill or not*/
 
 	$('.others-payment').on('click',function(){
 		var input_type = $(this).attr("data-type");
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index b9d2cf8b..1010101d 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -302,9 +302,12 @@
            $("#credit_payment").hide();
         }else if(payment_type=="Credit"){
            $("#card_payment").hide();
+           $("#others_payment").hide();
+        }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master"){
+           $("#credit_payment").hide();
         }
-    
       /* end check first bill or not*/
+
     var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
 
     $("#back").on('click', function() {
@@ -408,6 +411,9 @@
       }
       else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
           swal("Opps","Please Pay with Master Payment","warning");
+      }
+      else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Credit Payment","warning");
       }else{
 
         $( "#loading_wrapper").show();

From 06acf3acb99018aaa2b4eb69a7325e2c3b356642 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 13:21:23 +0630
Subject: [PATCH 011/651] update ruby version

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index de22a68c..0fb5f323 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.4.0'
+ruby '2.4.1'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"

From d58f7d1605793efd3df74d298d8fee5d17b23a5a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 16:21:49 +0630
Subject: [PATCH 012/651] update addord for extra time

---
 .../origami/addorders_controller.rb           | 67 ++++++++++++-------
 app/models/order.rb                           |  2 +-
 db/seeds.rb                                   | 21 ++++--
 3 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index d283b06e..ece423c7 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -62,9 +62,25 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
-    puts params[:order_items]
+    extra_time = false
+    time = ''
+
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
+       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+         extra_time = true
+         if i["item_instance_code"] == 'Exti30'
+          t = Time.now
+           time = 30*i["quantity"]
+           puts time
+           puts "timmmmmmmmmmmmmmmmmmm"
+         else
+          t = Time.now
+           time = 1*i["quantity"]
+           puts time
+           puts "timmmmmmmmmmmmmmmmmmm"
+         end
+       end
        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
        items_arr.push(items)
      }
@@ -78,35 +94,38 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
+    @order.extra_time = true
     @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
-        # check booking id is already completed.
-        booking = Booking.find(params[:booking_id])
-        if booking
-          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 return_json_status_with_code(400, "bill requested")
+          # check booking id is already completed.
+          booking = Booking.find(params[:booking_id])
+          puts "ssssssssssssssssssss"
+          if booking
+              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 return_json_status_with_code(400, "bill requested")
+                  end
+                else
+                  @order.new_booking = false
+                  @order.booking_id = params[:booking_id]
+                end
+              else
+                  sale_status = check_order_with_table(params[:table_id])
+                    puts "OOOOOOOOO"
+                    puts sale_status
+                  if sale_status
+                    return return_json_status_with_code(400, "bill requested")
+                  end
               end
-            else
-              @order.new_booking = false
-              @order.booking_id = params[:booking_id]
-            end
-          else
-              sale_status = check_order_with_table(params[:table_id])
-               # puts "OOOOOOOOO"
-               # puts sale_status
-              if sale_status
-                return return_json_status_with_code(400, "bill requested")
-              end
-          end
-        end #booking exists
+          end #booking exists
       else
+        puts "seeeeeeeeeeeeeeeeee"
         sale_status = check_order_with_table(params[:table_id])
          # puts "MMMMMMMM"
          # puts sale_status
diff --git a/app/models/order.rb b/app/models/order.rb
index ba8adc8f..676c129f 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -10,7 +10,7 @@ class Order < ApplicationRecord
   has_many :assigned_order_items
 
   #internal references attributes for business logic control
-  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id
+  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id, :extra_time
   scope :active, -> { where("date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
   #Main Controller method to create new order - validate all inputs and generate new order
   # order_item : {
diff --git a/db/seeds.rb b/db/seeds.rb
index 79aab88f..78321b72 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -140,10 +140,11 @@ menu_options = MenuItemOption.create([{option_type: "Oil", name: "Less Oil", val
 menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle", value: "Bottle"},{option_type: "Package", name: "Can", value: "can"}])
 
 # #Default Menu Category
- # menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Person", alt_name: "Person", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
+# menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Person", alt_name: "Person", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
 # menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 2,created_by: "SYSTEM DEFAULT"})
 # menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Pork", alt_name: "Pork", order_by: 3,created_by: "SYSTEM DEFAULT"})
 # menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Chicken", alt_name: "Chicken", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"})
+# menu_category5 = MenuCategory.create({menu: menu, code:"C001", name: "Extra Time", alt_name: "Extra Time", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
 #
 # #Default Menu items
 # menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
@@ -162,11 +163,21 @@ menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle
 # menu_item_attribute_adult = MenuItemAttribute.create({attribute_type:"person", name: "Adult", value: "adult"})
 # menu_item_attribute_child = MenuItemAttribute.create({attribute_type:"person", name: "Child", value: "child"})
 
- # menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
- # menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+
+# menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
+
+# menu_item_attribute_30_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "30 min", value: "30_min"})
+# menu_item_attribute_60_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "1 hrs", value: "60_min"})
+
+# menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"Ext30", name: "30 minutes", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['1']", created_by: "System" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti30", menu_item: menu_category1_menu_item2, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+
+# menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"Ext60", name: "1 hour", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['2']", created_by: "System" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti60", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
 
- # menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
- # menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
 # END
 
 menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size", name: "Small", value: "small"})

From 90525b9391977cf2fad51d770b0974855880013f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 28 Dec 2017 17:48:56 +0630
Subject: [PATCH 013/651] add extra minutes in api/check_in

---
 app/controllers/api/check_in_process_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 488684e7..cf34700e 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -11,6 +11,8 @@ class Api::CheckInProcessController < Api::ApiController
 				check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 				check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 
+				extra_minutes = (booking.checkout_at - booking.reserved_at) / 1.minutes
+
 				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
 				alert_time_min = 0
 				if !lookup_checkout_time.nil?
@@ -21,7 +23,7 @@ class Api::CheckInProcessController < Api::ApiController
 					end
 				end
 
-				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min }
+				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min, :extra_minutes => extra_minutes }
 			else 
 				render :json => { :status => false, :error_message => "No current booking!" }
 			end

From ecb9a5f010cfa8c8bfb7db13bbb5c50ed7089900 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 18:02:25 +0630
Subject: [PATCH 014/651] update void foc and credit for member discount

---
 app/controllers/origami/payments_controller.rb |  5 +++++
 app/controllers/origami/void_controller.rb     |  8 ++++++--
 app/models/sale.rb                             |  1 +
 app/views/origami/home/show.html.erb           |  6 +++---
 app/views/origami/payments/show.html.erb       | 14 +++++++-------
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 02e0c4ef..3ab55be8 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -261,6 +261,11 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
+         
+      if saleObj.discount_type == "member_discount"
+        saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
+      end
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, @user, cash, "foc")
 
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 242a1c2e..ffb2bde4 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -6,7 +6,11 @@ class Origami::VoidController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
-      
+      if sale.discount_type == "member_discount"
+        sale.update_attributes(total_discount: 0)
+        sale.compute_by_sale_items(sale_id, sale.sale_items,0)
+      end
+
       # update count for shift sale
       if(sale.sale_status == "completed")
         if sale.shift_sale_id != nil
@@ -21,7 +25,7 @@ class Origami::VoidController < BaseOrigamiController
           shift.save
         end
       end
-
+            
       sale.payment_status = 'void'
       sale.sale_status = 'void'
       sale.save
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b97c529e..969deb5c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -247,6 +247,7 @@ class Sale < ApplicationRecord
 
   #compute - invoice total
   def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil)
+
     sale = Sale.find(sale_id)
     sales_items = sale_itemss
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6827d8e8..bd9022d9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -587,9 +587,9 @@
 
         var sale_id = $('#sale_id').val();
           type = $('.payment_method').val();
-
-          calculate_member_discount(sale_id,type);
-
+          if (type != "Credit") {
+            calculate_member_discount(sale_id,type);
+          }
           var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
           $.ajax({
               type: "GET",
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1010101d..c076b81b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -425,14 +425,14 @@
           var sale_id   = $('#sale_id').text();
           // var item_row  = $('.is_card');
 
-          // if (item_row.length < 1) {
-            calculate_member_discount(sale_id);
-          // }
-         
-            //  payment
-            var cash = $('#cash').text();
+          //  payment
+            var cash   = $('#cash').text();
             var credit = $('#credit').text();
-            var card = $('#card').text();
+            var card   = $('#card').text();
+
+           if (credit <= 0) {
+            calculate_member_discount(sale_id);
+           }
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",

From ad690c562be5f0a4ce39ac960e38eba8b8f1728b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 09:22:22 +0630
Subject: [PATCH 015/651] update rounding 0 for foc and memberdiscount

---
 app/controllers/origami/payments_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 3ab55be8..7b4bedff 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -263,6 +263,7 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj      = Sale.find(sale_id)
          
       if saleObj.discount_type == "member_discount"
+        sale.update_attributes(rounding_adj: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       

From 9f04fae6922760efd92a6934cb3e8913de19b575 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 10:00:36 +0630
Subject: [PATCH 016/651] update rouding adj

---
 Gemfile.lock                                   | 2 +-
 app/controllers/origami/payments_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b7804803..05be67ea 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 2.4.0p0
+   ruby 2.4.1p111
 
 BUNDLED WITH
    1.16.1
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 7b4bedff..96b044f5 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -263,7 +263,7 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj      = Sale.find(sale_id)
          
       if saleObj.discount_type == "member_discount"
-        sale.update_attributes(rounding_adj: 0)
+        sale.update_attributes(rounding_adjustment: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       

From 86d7eabfc6527c29512f5878e540c4c5ef69aa05 Mon Sep 17 00:00:00 2001
From: Ye Min <yeminphyo@code2lab.com>
Date: Fri, 29 Dec 2017 11:17:36 +0630
Subject: [PATCH 017/651] cap shop.json

---
 Gemfile.lock     | 2 +-
 config/deploy.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b7804803..05be67ea 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 2.4.0p0
+   ruby 2.4.1p111
 
 BUNDLED WITH
    1.16.1
diff --git a/config/deploy.rb b/config/deploy.rb
index 82cbb71e..3020554f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -12,7 +12,7 @@ set :rbenv_map_bins, %w{rake gem bundle ruby rails}
 
 set :keep_releases, 5
 
-set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml}
+set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml config/shops.json}
 
 set :linked_dirs, %w{bin log tmp/puma tmp/pids tmp/cache tmp/sockets vendor/bundle public/system pids sockets}
 

From 30dac06c8a43853f931d506b1a9d1f5b70a7ab15 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 29 Dec 2017 12:02:40 +0630
Subject: [PATCH 018/651] add membership type in customer

---
 app/controllers/crm/customers_controller.rb     |  2 ++
 app/controllers/origami/customers_controller.rb |  3 ++-
 app/views/crm/customers/index.html.erb          | 10 ++++++++++
 app/views/origami/customers/index.html.erb      | 12 +++++++++++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 51ddc9eb..f917538e 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -37,6 +37,8 @@ class Crm::CustomersController < BaseCrmController
     @crm_customer   = Customer.new
     @count_customer = Customer.count_customer
 
+    @membership_types = Lookup.collection_of("member_group_type")
+
     @taxes = TaxProfile.all.order("order_by asc")
 
     @filter = filter
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 58f70faa..d84dac92 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -75,7 +75,8 @@ class Origami::CustomersController < BaseOrigamiController
     # if flash["errors"]
     #   @crm_customer.valid?
     # end
-  
+    @membership_types = Lookup.collection_of("member_group_type")
+
     respond_to do |format|
       # format.html { render :template => "crm/customers/index" }
       format.html { render action: "index"}
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 2682f203..d05af387 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -52,6 +52,7 @@
                       <th><%= t("views.right_panel.detail.sr_no") %></th>
                       <th><%= t("views.right_panel.detail.name") %></th>
                       <th><%= t("views.right_panel.detail.card_no") %></th>
+                      <th><%= t("views.right_panel.detail.membership_type") %></th>
                       <th style="width:20%"><%= t("views.right_panel.detail.contact_no") %></th>
                       <th style="width:20%"><%= t("views.right_panel.detail.email") %></th>
                       <th><%= t("views.right_panel.detail.action") %></th>
@@ -75,6 +76,15 @@
                           </td>
                           <td><%= crm_customer.name %></td>
                           <td><%= crm_customer.card_no rescue '-' %></td>
+                          <td>
+                            <% if !@membership_types.nil? %>
+                              <% @membership_types.each do |member_type| %>
+                                <% if member_type[1] == crm_customer.membership_type %>
+                                  <%= member_type[0] %>
+                                <% end %>
+                              <% end %>
+                            <% end %>
+                          </td>
                           <td style="width:20px%;word-break: break-all;"><%= crm_customer.contact_no %></td>
                           <td style="width:20px%;word-break: break-all;"><%= crm_customer.email %></td>
                           <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 03c73fea..80f90a2d 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -54,6 +54,7 @@
                     <th><%= t("views.right_panel.detail.sr_no") %></th>
                     <th><%= t("views.right_panel.detail.name") %></th>
                     <th><%= t("views.right_panel.detail.card_no") %></th>
+                    <th><%= t("views.right_panel.detail.membership_type") %></th>
                     <th style="width:20%"><%= t("views.right_panel.detail.contact_no") %></th>
                     <th style="width:20%"><%= t("views.right_panel.detail.email") %></th>
                     <!-- <th>Paypar No</th> -->
@@ -76,7 +77,16 @@
                       <% end %>
                     </td>
                     <td><%= crm_customer.name %></td>
-                    <td><%= crm_customer.company rescue '-' %></td>
+                    <td><%= crm_customer.card_no rescue '-' %></td>
+                    <td>
+                      <% if !@membership_types.nil? %>
+                        <% @membership_types.each do |member_type| %>
+                          <% if member_type[1] == crm_customer.membership_type %>
+                            <%= member_type[0] %>
+                          <% end %>
+                        <% end %>
+                      <% end %>
+                    </td>
                     <td style="width:20%;word-break: break-all;"><%= crm_customer.contact_no %></td>
                     <td style="width:20%;word-break: break-all;"><%= crm_customer.email %></td>
                     <!-- <td><%= crm_customer.paypar_account_no %></td> -->

From 26a11ebecd04de0558ce655e2836eb50585435cd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 14:39:47 +0630
Subject: [PATCH 019/651] add extra charge in oroder

---
 .../origami/addorders_controller.rb           | 25 ++++++++-----------
 app/models/order.rb                           | 19 +++++++++++++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index ece423c7..f72bc2ec 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -62,21 +62,23 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
-    extra_time = false
-    time = ''
+    is_extra_time = false
+    extra_time = ''
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
        if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
-         extra_time = true
+         is_extra_time = true
          if i["item_instance_code"] == 'Exti30'
           t = Time.now
-           time = 30*i["quantity"]
+           time = 30*60*i["quantity"].to_i
+           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
            puts time
            puts "timmmmmmmmmmmmmmmmmmm"
          else
           t = Time.now
-           time = 1*i["quantity"]
+           time = 60*60*i["quantity"].to_i
+           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
            puts time
            puts "timmmmmmmmmmmmmmmmmmm"
          end
@@ -94,20 +96,20 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
-    @order.extra_time = true
     @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
           # check booking id is already completed.
           booking = Booking.find(params[:booking_id])
-          puts "ssssssssssssssssssss"
+
           if booking
               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 return_json_status_with_code(400, "bill requested")
                   end
@@ -117,18 +119,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
                 end
               else
                   sale_status = check_order_with_table(params[:table_id])
-                    puts "OOOOOOOOO"
-                    puts sale_status
                   if sale_status
                     return return_json_status_with_code(400, "bill requested")
                   end
               end
           end #booking exists
       else
-        puts "seeeeeeeeeeeeeeeeee"
         sale_status = check_order_with_table(params[:table_id])
-         # puts "MMMMMMMM"
-         # puts sale_status
         if sale_status
           # return false , @message = "bill requested"
           return return_json_status_with_code(400, "bill requested")
diff --git a/app/models/order.rb b/app/models/order.rb
index 676c129f..e4d58051 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -10,7 +10,7 @@ class Order < ApplicationRecord
   has_many :assigned_order_items
 
   #internal references attributes for business logic control
-  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id, :extra_time
+  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id, :extra_time, :is_extra_time
   scope :active, -> { where("date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
   #Main Controller method to create new order - validate all inputs and generate new order
   # order_item : {
@@ -28,11 +28,28 @@ class Order < ApplicationRecord
       booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
+      
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"
       table.save
     else
       booking = Booking.find(self.booking_id)
+      if self.is_extra_time
+        if !booking.checkout_at.nil?
+          puts "sssssssssss"
+          date = booking.checkout_at.strftime("%Y-%m-%d")
+          time = Time.at(booking.checkout_at).utc.strftime("%H:%M:%S")
+          extra_time = self.extra_time
+          new_time = time.strftime("%H") + extra_time.strftime("%H")
+
+          puts time
+          puts extra_time
+          puts new_time
+
+          # booking.update_attributes(checkout_at: )
+        end
+        
+      end
     end
 
     booking.save!

From bbd708e91d35d0d5da7b27d54b78f5c6497bd2ef Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 14:44:01 +0630
Subject: [PATCH 020/651] update foc error for name error

---
 app/controllers/origami/payments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 96b044f5..0bc77fc3 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -263,7 +263,7 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj      = Sale.find(sale_id)
          
       if saleObj.discount_type == "member_discount"
-        sale.update_attributes(rounding_adjustment: 0)
+        saleObj.update_attributes(rounding_adjustment: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       

From 23422aa5a7fccdabbef30cb06ea793b90e59a6dc Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 29 Dec 2017 15:08:48 +0630
Subject: [PATCH 021/651] fix for void and float cal: error

---
 app/controllers/origami/void_controller.rb | 8 +++++---
 app/views/origami/payments/show.html.erb   | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index ffb2bde4..0ac9df9f 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -42,12 +42,14 @@ class Origami::VoidController < BaseOrigamiController
       table_avaliable = true
       table = sale.bookings[0].dining_facility
       table.bookings.each do |booking|
-        if booking.sale.sale_status == 'new'
-          table_avaliable = false
+        if !booking.sale.nil? 
+          if booking.sale.sale_status == 'new'
+            table_avaliable = false
+          end
         end
       end
 
-      if table_avaliable == true
+      if table_avaliable
         table.status = 'available'
         table.save
       end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c076b81b..98fd4385 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -369,7 +369,7 @@
         var master1 = $('#mastercount').text();
         var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
         var total = $('#amount_due').text();
-        var amt = parseFloat(total) - othertotal;
+        var amt = parseFloat(total) - parseFloat(othertotal);
         $('#cash').text(amt);
         update_balance();
         break;
@@ -517,7 +517,7 @@
     var master = $('#mastercount').text();
     var amount_due = $('#amount_due').text();
     var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
-    var result = amount_due - total;
+    var result = parseFloat(amount_due) - parseFloat(total);
     $('#balance').text(result.toFixed(2));
   }
 

From f7c4cb0733c07020f72e038d515b87b09c52412c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 29 Dec 2017 17:35:01 +0630
Subject: [PATCH 022/651] remove per_spent amt in view_orders

---
 app/views/api/orders/view_orders.json.jbuilder | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder
index 0ac1b92f..9f0b14b3 100755
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -60,16 +60,16 @@ if (@booking)
   end
 
   # For YGN BBQ
-  if adult_count > 0
-    json.per_adult_spent (adult_spent/adult_count) * 0.05
-  else
+  # if adult_count > 0
+  #   json.per_adult_spent (adult_spent/adult_count) * 0.05
+  # else
     json.per_adult_spent 0
-  end
-  if child_count > 0
-    json.per_child_spent (child_spent/child_count) * 0.05
-  else
+  # end
+  # if child_count > 0
+  #   json.per_child_spent (child_spent/child_count) * 0.05
+  # else
     json.per_child_spent 0
-  end
+  # end
   # End YGN BBQ
 
   json.sub_total @total_amount

From b1fa5f15181e504709683d62ba9cdfc6e4ccf961 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 12:30:57 +0630
Subject: [PATCH 023/651] update add extra time

---
 app/controllers/api/orders_controller.rb      | 21 +++++++++++++
 .../origami/addorders_controller.rb           | 10 ++-----
 app/controllers/origami/sales_controller.rb   |  7 ++++-
 app/models/order.rb                           | 30 ++++++++++---------
 app/models/sale.rb                            |  7 +++--
 app/views/origami/home/show.html.erb          |  6 +++-
 6 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index db6dd039..dd27197c 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -49,7 +49,25 @@ class Api::OrdersController <  Api::ApiController
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
+#for extratime
+    is_extra_time = false
+    extra_time = ''
 
+    params[:order_items].each { |i| 
+       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+         is_extra_time = true
+         if i["item_instance_code"] == 'Exti30'
+          t = Time.now
+           time = 30*60*i["quantity"].to_i
+           extra_time = Time.at(time)
+         else
+          t = Time.now
+           time = 60*60*i["quantity"].to_i
+           extra_time = Time.at(time)
+         end
+       end
+     }
+#end extra time
     # begin
     @order = Order.new
     @order.source = params[:order_source]
@@ -61,6 +79,9 @@ class Api::OrdersController <  Api::ApiController
     @order.new_booking = true
     @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
         # check booking id is already completed.
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index f72bc2ec..5aedca8c 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -70,17 +70,11 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
        if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
          is_extra_time = true
          if i["item_instance_code"] == 'Exti30'
-          t = Time.now
            time = 30*60*i["quantity"].to_i
-           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
-           puts time
-           puts "timmmmmmmmmmmmmmmmmmm"
+           extra_time = Time.at(time)
          else
-          t = Time.now
            time = 60*60*i["quantity"].to_i
-           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
-           puts time
-           puts "timmmmmmmmmmmmmmmmmmm"
+           extra_time = Time.at(time)
          end
        end
        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index e5350706..bdf481c2 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -15,9 +15,14 @@ class Origami::SalesController < BaseOrigamiController
     dining = params[:dining_id]
     sale_id = params[:sale_id]
     table = DiningFacility.find(dining)
+    existing_booking = Booking.find_by_sale_id(sale_id)
       table.bookings.each do |booking|
+        # if !booking.checkout_at.nil?
+        #     existing_booking.update_attributes(checkout_at: checkout_at)
+        # end
        if booking.sale_id.nil?
          booking.booking_orders.each do |booking_order|
+          
              booking.booking_status = 'moved'
              order = Order.find(booking_order.order_id)
              order.status = 'billed'
@@ -36,7 +41,7 @@ class Origami::SalesController < BaseOrigamiController
              order.save
              booking.save
          end
-         existing_booking = Booking.find_by_sale_id(sale_id)
+         
          booking_order = BookingOrder.where('booking_id=?',booking)
          booking_order.each do |bo|
            bo.booking_id = existing_booking.booking_id
diff --git a/app/models/order.rb b/app/models/order.rb
index e4d58051..318e8e91 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -25,31 +25,33 @@ class Order < ApplicationRecord
     booking = nil
 
     if self.new_booking
-      booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
+      #add extra time
+      if self.is_extra_time && self.extra_time
+        booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
+                                :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
+                                 :checkin_by =>  self.employee_name,
+                                :booking_status => "assign" })
+      else
+        booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
+      end
+      #end extra time
+     
       
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"
       table.save
     else
       booking = Booking.find(self.booking_id)
+      #add extra time
       if self.is_extra_time
         if !booking.checkout_at.nil?
-          puts "sssssssssss"
-          date = booking.checkout_at.strftime("%Y-%m-%d")
-          time = Time.at(booking.checkout_at).utc.strftime("%H:%M:%S")
-          extra_time = self.extra_time
-          new_time = time.strftime("%H") + extra_time.strftime("%H")
-
-          puts time
-          puts extra_time
-          puts new_time
-
-          # booking.update_attributes(checkout_at: )
-        end
-        
+          new_time = booking.checkout_at + self.extra_time.to_i
+          booking.update_attributes(checkout_at: new_time)
+        end 
       end
+      #end extra time
     end
 
     booking.save!
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 969deb5c..6d17db0c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -114,7 +114,10 @@ class Sale < ApplicationRecord
       order.save
 
       booking.sale_id = self.id
-      booking.checkout_at = Time.now.utc.getlocal
+      if booking.checkout_at < Time.now.utc.getlocal
+        booking.checkout_at = Time.now.utc.getlocal
+      end
+      
       booking.checkout_by = requested_by.name
       booking.save      
 
@@ -222,8 +225,6 @@ class Sale < ApplicationRecord
 
     sales_items.each do |item|
       #compute each item and added to total
-      puts "item.sales_item_id ddd"
-      puts item.sale_item_id
       subtotal_price = subtotal_price + item.price
 
       # only calc tax when true
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index bd9022d9..29903480 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -143,7 +143,11 @@
                   </div>
               <% elsif @status_sale == 'sale' %>
                   <div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @dining.name rescue "" %>
-                  <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                   <% if !@booking.reserved_by.nil? && %>
+                      <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% else %>
+                      <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% end %>
                   </div>
               <% else %>
                     <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>

From e27b468db18ea687252322569fb27d1ffaf7ba3d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 15:36:03 +0630
Subject: [PATCH 024/651] update request bill with booking.checkout_at nil4

---
 app/models/sale.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 6d17db0c..4b918aab 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -114,8 +114,10 @@ class Sale < ApplicationRecord
       order.save
 
       booking.sale_id = self.id
-      if booking.checkout_at < Time.now.utc.getlocal
-        booking.checkout_at = Time.now.utc.getlocal
+      if !booking.checkout_at.nil?
+        if booking.checkout_at < Time.now.utc.getlocal
+          booking.checkout_at = Time.now.utc.getlocal
+        end
       end
       
       booking.checkout_by = requested_by.name

From 490f651b7fc24e196a2bde17e1be6026491d125c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 16:07:22 +0630
Subject: [PATCH 025/651] update sale model

---
 app/models/sale.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 4b918aab..507fd2da 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -118,6 +118,8 @@ class Sale < ApplicationRecord
         if booking.checkout_at < Time.now.utc.getlocal
           booking.checkout_at = Time.now.utc.getlocal
         end
+      else
+        booking.checkout_at = Time.now.utc.getlocal
       end
       
       booking.checkout_by = requested_by.name

From e91e15d6292eb8de5fc613dabed60fc3b3a14a62 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 16:28:38 +0630
Subject: [PATCH 026/651] update call waiter

---
 app/controllers/api/call_waiters_controller.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index a778af12..bfb1023a 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -8,12 +8,11 @@ class Api::CallWaitersController < ActionController::API
     CallWaiterJob.perform_later(@table,@time)
 
     # get printer info
-    # @shop          = Shop::ShopDetail 
-    # unique_code    = "CallWaiterPdf" 
-    # print_settings = PrintSetting.find_by_unique_code(unique_code)
-    # printer        = Printer::ReceiptPrinter.new(print_settings)   
-    # printer.print_call_waiter(print_settings,@table,@time,@shop)
-  
+    @shop          = Shop::ShopDetail 
+    unique_code    = "CallWaiterPdf" 
+    print_settings = PrintSetting.find_by_unique_code(unique_code)
+    printer        = Printer::ReceiptPrinter.new(print_settings)   
+    printer.print_call_waiter(print_settings,@table,@time,@shop)
   end
 
   

From 955b9a806f356fb49427046aee731a2e72cae6a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 17:44:18 +0630
Subject: [PATCH 027/651] update extim and extie

---
 README.md                                     |  7 +++++++
 .../origami/addorders_controller.rb           |  4 ++--
 app/views/origami/addorders/detail.html.erb   | 19 ++++++++++---------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 5ff1aeda..0032cc78 100755
--- a/README.md
+++ b/README.md
@@ -33,6 +33,13 @@ ruby 2.4.1p111
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
+Extra Time 
+
+  category_code = Ext001
+  category_code = Ext002
+  instance_code = Extim30, Extim60 //for morning menu
+  instance_code = Extie30, Extie60 //for evening menu
+
 * ToDo list
 
 1. Cloud Sync
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 5aedca8c..1a9aaa9a 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -67,9 +67,9 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
-       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30'
          is_extra_time = true
-         if i["item_instance_code"] == 'Exti30'
+         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
            time = 30*60*i["quantity"].to_i
            extra_time = Time.at(time)
          else
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index d8909915..050a4a18 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -7,16 +7,17 @@
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
-            <% @menu.each do |menu|  %>
+            <% @menu.each do |menu| %>
                 <%   if menu.menu_category_id.nil?%>
-                  <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
-                    <p class="hidden menu-id"><%= menu.id  %></p> 
-                    <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                       <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                      </ul>
-                    </a>
-                     
-                  </li>
+                
+                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                          </ul>
+                        </a>
+                      </li>
+                   
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From c5eeb9acb7001c204b48171c4f24a039aaa9dbaf Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 18:08:28 +0630
Subject: [PATCH 028/651] update extim and extie

---
 app/controllers/api/orders_controller.rb    |  4 ++--
 app/views/origami/addorders/detail.html.erb | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index dd27197c..cd8c7ca2 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -54,9 +54,9 @@ class Api::OrdersController <  Api::ApiController
     extra_time = ''
 
     params[:order_items].each { |i| 
-       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30'
          is_extra_time = true
-         if i["item_instance_code"] == 'Exti30'
+         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
           t = Time.now
            time = 30*60*i["quantity"].to_i
            extra_time = Time.at(time)
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 050a4a18..c8916e44 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -9,7 +9,7 @@
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
                 <%   if menu.menu_category_id.nil?%>
-                
+                    <% if menu.code != "Ext001" %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -17,7 +17,16 @@
                           </ul>
                         </a>
                       </li>
-                   
+                    <% end%>
+                    <% if @table.get_checkout_booking.nil? && (menu.code == "Ext001" || menu.code == "Ext002") %>
+                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                          </ul>
+                        </a>
+                      </li>
+                    <% end%>
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From a9d593a531046c9e09aa06cd052c344b11d4d994 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 18:12:49 +0630
Subject: [PATCH 029/651] update extim and extie

---
 app/views/origami/addorders/detail.html.erb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index c8916e44..677897b0 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -18,15 +18,7 @@
                         </a>
                       </li>
                     <% end%>
-                    <% if @table.get_checkout_booking.nil? && (menu.code == "Ext001" || menu.code == "Ext002") %>
-                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
-                        <p class="hidden menu-id"><%= menu.id  %></p> 
-                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                          </ul>
-                        </a>
-                      </li>
-                    <% end%>
+                   
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From 84be783d1250032826d5a698a196362ce9ec1fee Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 18:13:56 +0630
Subject: [PATCH 030/651] update extim and extie

---
 app/views/origami/addorders/detail.html.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 677897b0..1d29c3c8 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -9,7 +9,6 @@
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
                 <%   if menu.menu_category_id.nil?%>
-                    <% if menu.code != "Ext001" %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -17,8 +16,6 @@
                           </ul>
                         </a>
                       </li>
-                    <% end%>
-                   
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From 7ece8cbb470883b2ed806ed5367a8edbd10aaa16 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 3 Jan 2018 10:01:43 +0630
Subject: [PATCH 031/651] update add extra time after request

---
 app/controllers/origami/sales_controller.rb | 13 +++++++------
 app/models/order.rb                         |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index bdf481c2..4c00566c 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -16,12 +16,13 @@ class Origami::SalesController < BaseOrigamiController
     sale_id = params[:sale_id]
     table = DiningFacility.find(dining)
     existing_booking = Booking.find_by_sale_id(sale_id)
+
       table.bookings.each do |booking|
-        # if !booking.checkout_at.nil?
-        #     existing_booking.update_attributes(checkout_at: checkout_at)
-        # end
-       if booking.sale_id.nil?
-         booking.booking_orders.each do |booking_order|
+         if !booking.checkout_at.nil? && !booking.sale_id.nil?
+             existing_booking.update_attributes(checkout_at: booking.checkout_at)
+         end
+        if booking.sale_id.nil?
+          booking.booking_orders.each do |booking_order|
           
              booking.booking_status = 'moved'
              order = Order.find(booking_order.order_id)
@@ -40,7 +41,7 @@ class Origami::SalesController < BaseOrigamiController
              saleobj.save
              order.save
              booking.save
-         end
+          end
          
          booking_order = BookingOrder.where('booking_id=?',booking)
          booking_order.each do |bo|
diff --git a/app/models/order.rb b/app/models/order.rb
index 318e8e91..6b6bd158 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -27,8 +27,10 @@ class Order < ApplicationRecord
     if self.new_booking
       #add extra time
       if self.is_extra_time && self.extra_time
+        old_booking = Booking.where("booking_id = #{self.booking_id} and sale_id NOT NULL").first
+        new_time = old_booking.checkout_at + self.extra_time.to_i
         booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
-                                :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
+                                :checkin_at => Time.now.utc,:checkout_at => new_time,
                                  :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
       else
@@ -37,7 +39,6 @@ class Order < ApplicationRecord
                                 :booking_status => "assign" })
       end
       #end extra time
-     
       
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"

From c8b7417f6a9b11526fad132dab4a80e404f5f067 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 3 Jan 2018 10:12:22 +0630
Subject: [PATCH 032/651] update extra time

---
 app/controllers/origami/sales_controller.rb | 13 ++++++-------
 app/models/order.rb                         |  5 ++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 4c00566c..bdf481c2 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -16,13 +16,12 @@ class Origami::SalesController < BaseOrigamiController
     sale_id = params[:sale_id]
     table = DiningFacility.find(dining)
     existing_booking = Booking.find_by_sale_id(sale_id)
-
       table.bookings.each do |booking|
-         if !booking.checkout_at.nil? && !booking.sale_id.nil?
-             existing_booking.update_attributes(checkout_at: booking.checkout_at)
-         end
-        if booking.sale_id.nil?
-          booking.booking_orders.each do |booking_order|
+        # if !booking.checkout_at.nil?
+        #     existing_booking.update_attributes(checkout_at: checkout_at)
+        # end
+       if booking.sale_id.nil?
+         booking.booking_orders.each do |booking_order|
           
              booking.booking_status = 'moved'
              order = Order.find(booking_order.order_id)
@@ -41,7 +40,7 @@ class Origami::SalesController < BaseOrigamiController
              saleobj.save
              order.save
              booking.save
-          end
+         end
          
          booking_order = BookingOrder.where('booking_id=?',booking)
          booking_order.each do |bo|
diff --git a/app/models/order.rb b/app/models/order.rb
index 6b6bd158..318e8e91 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -27,10 +27,8 @@ class Order < ApplicationRecord
     if self.new_booking
       #add extra time
       if self.is_extra_time && self.extra_time
-        old_booking = Booking.where("booking_id = #{self.booking_id} and sale_id NOT NULL").first
-        new_time = old_booking.checkout_at + self.extra_time.to_i
         booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
-                                :checkin_at => Time.now.utc,:checkout_at => new_time,
+                                :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
                                  :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
       else
@@ -39,6 +37,7 @@ class Order < ApplicationRecord
                                 :booking_status => "assign" })
       end
       #end extra time
+     
       
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"

From 09db9656c58d912a881bd4f3307313b4ee66fe7f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 3 Jan 2018 12:22:09 +0630
Subject: [PATCH 033/651] update sale item desc

---
 app/models/sale.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 507fd2da..7adb1324 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -665,7 +665,7 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("i.product_name").order("mi.account_id desc")
+  query = query.group("i.product_name").order("acc.title desc")
 end
 
 def self.get_other_charges()

From ae6caefaa06c3daa504754e9d45a7f209b302923 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 13:33:23 +0630
Subject: [PATCH 034/651] change query in sale item report

---
 app/controllers/reports/saleitem_controller.rb | 5 ++++-
 app/models/sale.rb                             | 2 +-
 app/views/reports/saleitem/index.html.erb      | 9 ++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 7e7469f9..4a6a4440 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -25,7 +25,7 @@ class Reports::SaleitemController < BaseReportController
     @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1}
 
     @menu_cate_count = Hash.new {|hash, key| hash[key] = 0}
-    @sale_data.each {|cate| @menu_cate_count[cate.menu_category_id] += 1}
+    @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1}
 
 
     @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
@@ -64,6 +64,9 @@ class Reports::SaleitemController < BaseReportController
         date_arr.push(str)
       end
 
+      @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+      @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+
       out = {:status => 'ok', :message => date_arr}
       
       respond_to do |format|
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 7adb1324..69aa930a 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -665,7 +665,7 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("i.product_name").order("acc.title desc")
+  query = query.group("acc.title,mi.account_id,i.product_name").order("acc.title desc, mi.account_id desc")
 end
 
 def self.get_other_charges()
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index d0def563..f780acdb 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -110,9 +110,8 @@
 								</tr>
 								<!-- sub total -->
 
-								<% @menu_cate_count.each do |key,value| %>
-								<% if sale.menu_category_id == key %>
-
+							<% @menu_cate_count.each do |key,value| %>
+								<% if sale.account_id == key %>
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
 								    <% sub_qty += sale.total_item %>
@@ -128,10 +127,10 @@
 										<% sub_qty = 0 %>
 										<% count = 0%>
 									<% end %>
-							      <% end %>
 							    <% end %>
-							<!-- end sub total -->
 							<% end %>
+							<!-- end sub total -->
+						<% end %>
 							<!--Other Charges -->
 							<% if @other_charges.present? %>
 							   <tr>

From b6134e22cabeafc5e8db001a5d5fcdccff5b5d01 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 14:14:15 +0630
Subject: [PATCH 035/651] add slim OrderItemPdf and OrderSummaryPdf , how to?

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 0032cc78..af0a9252 100755
--- a/README.md
+++ b/README.md
@@ -40,6 +40,15 @@ Extra Time
   instance_code = Extim30, Extim60 //for morning menu
   instance_code = Extie30, Extie60 //for evening menu
 
+Order Item & Order Summary Slim
+	*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
+	1) settings/print_settings
+	2) app/controllers/oqs/edit_controller.rb
+	3) app/controllers/oqs/print_controller.rb
+	4) app/models/order_queue_station.rb
+	5) app/models/printer/order_queue_printer.rb
+	6) app/models/printer/receipt_printer.rb
+
 * ToDo list
 
 1. Cloud Sync

From 854d3785756d271c712cee1e22f8d6b45fd93312 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 16:32:34 +0630
Subject: [PATCH 036/651] check extra cat: ; is it checked in or not?

---
 README.md                                   |  4 ++--
 app/views/origami/addorders/detail.html.erb | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index af0a9252..46af5ba1 100755
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
 Extra Time 
 
-  category_code = Ext001
-  category_code = Ext002
+  category_code = ExtC001 //for morning menu cat:
+  category_code = ExtC002 //for evening menu cat:
   instance_code = Extim30, Extim60 //for morning menu
   instance_code = Extie30, Extie60 //for evening menu
 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 1d29c3c8..2e160a7f 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -8,7 +8,9 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
-                <%   if menu.menu_category_id.nil?%>
+                <% if menu.menu_category_id.nil? %>
+                  <% if @table.get_current_checkout_booking.nil? %>
+                    <% if menu.code != 'ExtC001' && menu.code != 'ExtC002' %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -16,7 +18,17 @@
                           </ul>
                         </a>
                       </li>
+                    <% end%>
+                  <% else %>
+                    <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                      <p class="hidden menu-id"><%= menu.id  %></p> 
+                      <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                         <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                        </ul>
+                      </a>
+                    </li>
                   <% end%>
+              <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>

From 4a9030d441cf6c3103c38f2fbd58cab32dd4f167 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 18:12:13 +0630
Subject: [PATCH 037/651] check menu cat: for person

---
 app/views/origami/addorders/detail.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 2e160a7f..bebf18cc 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -10,7 +10,7 @@
             <% @menu.each do |menu| %>
                 <% if menu.menu_category_id.nil? %>
                   <% if @table.get_current_checkout_booking.nil? %>
-                    <% if menu.code != 'ExtC001' && menu.code != 'ExtC002' %>
+                    <% if !menu.code.include? "SPL" %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>

From 014a07163768673e36cbf8b0eaa2804bfcd8a758 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 8 Jan 2018 09:53:49 +0630
Subject: [PATCH 038/651] add menu categories code for person and extra time

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 46af5ba1..3412e2ed 100755
--- a/README.md
+++ b/README.md
@@ -33,10 +33,10 @@ ruby 2.4.1p111
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
+Person and Extra Time
+  category_code = SPL... //for menu categories
+  
 Extra Time 
-
-  category_code = ExtC001 //for morning menu cat:
-  category_code = ExtC002 //for evening menu cat:
   instance_code = Extim30, Extim60 //for morning menu
   instance_code = Extie30, Extie60 //for evening menu
 

From cd2f9fdcb0df433115af96e5edf4c844d2c15f6b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 8 Jan 2018 17:00:00 +0630
Subject: [PATCH 039/651] update precision and delimetor all

---
 .../reports/commission_controller.rb          |   3 +-
 .../reports/credit_payment_controller.rb      |   3 +-
 .../reports/dailysale_controller.rb           |   2 +
 .../reports/payment_method_controller.rb      |   3 +-
 .../reports/receipt_no_controller.rb          |   3 +-
 .../reports/saleitem_controller.rb            |   3 +
 .../reports/shiftsale_controller.rb           |   3 +-
 .../reports/stock_check_controller.rb         |   3 +-
 .../reports/void_sale_controller.rb           |   3 +-
 app/models/customer.rb                        | 145 +++++++++++++-----
 app/models/print_setting.rb                   |   4 +
 app/models/sale_payment.rb                    |   2 +-
 app/pdf/close_cashier_pdf.rb                  |  62 +++++---
 app/views/reports/commission/index.html.erb   |  24 ++-
 .../reports/credit_payment/index.html.erb     |  14 +-
 app/views/reports/dailysale/index.html.erb    |  66 ++++----
 .../reports/payment_method/index.html.erb     |  36 +++--
 app/views/reports/receipt_no/index.html.erb   |  42 +++--
 app/views/reports/saleitem/index.html.erb     |  38 +++--
 app/views/reports/shiftsale/index.html.erb    |  32 ++--
 app/views/reports/void_sale/index.html.erb    |  28 +++-
 21 files changed, 360 insertions(+), 159 deletions(-)

diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb
index aeaa0a11..e97a1a77 100755
--- a/app/controllers/reports/commission_controller.rb
+++ b/app/controllers/reports/commission_controller.rb
@@ -19,7 +19,8 @@ class Reports::CommissionController < BaseReportController
   
     @from       = from_date
     @to         = to_date
-
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
     respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb
index dd9b3987..3b716cc2 100755
--- a/app/controllers/reports/credit_payment_controller.rb
+++ b/app/controllers/reports/credit_payment_controller.rb
@@ -21,7 +21,8 @@ authorize_resource :class => false
        
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb
index fc1f150f..e2102d87 100755
--- a/app/controllers/reports/dailysale_controller.rb
+++ b/app/controllers/reports/dailysale_controller.rb
@@ -8,6 +8,8 @@ class Reports::DailysaleController < BaseReportController
   @from       = from
   @to         = to
 
+  # get printer info
+  @print_settings = PrintSetting.get_precision_delimiter()
 	respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index bbff8900..01a904ae 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -23,7 +23,8 @@ class Reports::PaymentMethodController < BaseReportController
         @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type) 
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index 2bd5e813..faa12eae 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -23,7 +23,8 @@ authorize_resource :class => false
         @tax_profiles = TaxProfile.order('order_by asc')
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 4a6a4440..a9d23797 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -34,6 +34,9 @@ class Reports::SaleitemController < BaseReportController
     @from       = from
     @to         = to
 
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
+
     if shift.present?
       shift.each do |sh|
         @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index 5bc2020c..f9373374 100755
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -17,7 +17,8 @@ class Reports::ShiftsaleController < BaseReportController
           @shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
           @shift_data = @shift
     end
-
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
 	  respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index c9622999..a9188f5d 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -16,7 +16,8 @@ class Reports::StockCheckController < BaseReportController
     @transaction = StockCheckItem.get_transaction(from_date, to_date, @item_code)
     @from       = from_date
     @to         = to_date
-
+    # get printer info
+  @print_settings = PrintSetting.get_precision_delimiter()
     respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/void_sale_controller.rb b/app/controllers/reports/void_sale_controller.rb
index 80526ad0..6169dadc 100755
--- a/app/controllers/reports/void_sale_controller.rb
+++ b/app/controllers/reports/void_sale_controller.rb
@@ -20,7 +20,8 @@ authorize_resource :class => false
        
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 8865448f..c228e3e6 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -146,7 +146,7 @@ class Customer < ApplicationRecord
       if sale.customer.membership_id
           response = self.rebat(Sale.find(sale.sale_id))
            #record an payment in sale-audit
-            remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.received_amount} "
+            remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.amount_received} "
             sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1)   
 
            if response["status"] == true
@@ -157,66 +157,137 @@ class Customer < ApplicationRecord
   end
 
   def self.rebat(sObj)
-    rebate_prices = SaleItem.calculate_rebate_by_account(sObj.sale_items)
-
+    rebate_prices,campaign_method = SaleItem.calculate_rebate_by_account(sObj.sale_items)
     generic_customer_id = sObj.customer.membership_id
     if generic_customer_id.present?
-      paypar = sObj.sale_payments
+
+      paypar     = sObj.sale_payments
       payparcost = 0
-      credit = 0
+      credit     = 0
+
       paypar.each do |pp|
         if pp.payment_method == "paypar"
           payparcost = payparcost + pp.payment_amount
-        elsif pp.payment_method == "creditnote"
+        end
+        if pp.payment_method == "creditnote"
           credit = 1
         end
       end
-  
       # overall_dis = SaleItem.get_overall_discount(sObj.id)
-      overall_dis = sObj.total_discount
-
-      total_amount = rebate_prices - payparcost - overall_dis
-
-      if credit == 1
-        total_amount = 0
-      end
-      if total_amount >= 0
-        receipt_no = sObj.receipt_no
-        membership      = MembershipSetting.find_by_membership_type("paypar_url")
-        memberaction    = MembershipAction.find_by_membership_type("rebate")
-        merchant_uid    = memberaction.merchant_account_id.to_s
-        campaign_type_id = memberaction.additional_parameter["campaign_type_id"]
-        auth_token       = memberaction.auth_token.to_s
-        url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+      overall_dis   = sObj.total_discount
+      
+      if credit != 1
+        membership        = MembershipSetting.find_by_membership_type("paypar_url")
+        memberaction      = MembershipAction.find_by_membership_type("get_member_campaign")
+        merchant_uid      = memberaction.merchant_account_id.to_s
+        campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
+        auth_token        = memberaction.auth_token.to_s
+        url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         # Control for Paypar Cloud
         begin
-          response        = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,
-                             total_sale_transaction_amount: sObj.grand_total,
-                             merchant_uid:merchant_uid,
-                             total_amount: total_amount,
-                             campaign_type_id: campaign_type_id,
-                              receipt_no: receipt_no,
-                              auth_token:auth_token}.to_json,
-                         :headers => {
+          response = HTTParty.get(url, 
+                                :body => { 
+                                  member_group_id:sObj.customer.membership_type,
+                                  merchant_uid:merchant_uid,
+                                  campaign_type_id: campaign_type_id,
+                                  auth_token:auth_token
+                                }.to_json,
+                                :headers => {
                                   'Content-Type' => 'application/json',
-                                   'Accept'       => 'application/json; version=2'
-                          }, :timeout => 10)
+                                  'Accept'       => 'application/json; version=2'
+                                }, :timeout => 10)
         rescue Net::OpenTimeout
            response = { "status": false , "message": "Connect To" }
-        
-
         rescue OpenURI::HTTPError
            response = { "status": false, "message": "Can't connect server"}
           
         rescue SocketError
            response = { "status": false, "message": "Can't connect server"}
+        end
+
+        redeem_amount = payparcost + overall_dis
+
+        total_percentage = 0
+
+        type_arr = []
+        Rails.logger.debug "Get Member Campaign"
+        Rails.logger.debug response.to_json
+        # Check for present response fields
+        if response["membership_campaign_data"].present?
+          response["membership_campaign_data"].each do |a|
+            data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i}
+            total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i
           
+            type_arr.push(data)
+          end
         end
-        return response    
-        Rails.logger.debug "--------Update Rebate response -------"
-        Rails.logger.debug response.to_json  
+
+        rebate_arr =[]
+        campaign_method.each do |a|
+          data = {:type => a[:type], :amount => a[:amount]}
+          type_arr.each do |si|
+            if si[:type] == a[:type]
+              if credit == 1
+                 data[:amount] = 0
+              else
+                amount = (redeem_amount / total_percentage)*si[:percentage]
+                actual = a[:amount] - amount
+                data[:amount] = actual
+              end
+              
+            end
+          end
+          rebate_arr.push(data)
         end
+
+        total_amount = rebate_prices - payparcost - overall_dis
+
+        if credit == 1
+          total_amount = 0
+        end
+
+        if total_amount >= 0
+          receipt_no        = sObj.receipt_no
+          membership        = MembershipSetting.find_by_membership_type("paypar_url")
+          memberaction      = MembershipAction.find_by_membership_type("rebate")
+          merchant_uid      = memberaction.merchant_account_id.to_s
+          campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
+          auth_token        = memberaction.auth_token.to_s
+          url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+
+          # Control for Paypar Cloud
+          begin
+            response = HTTParty.post(url, 
+                                  :body => { 
+                                    generic_customer_id:generic_customer_id ,
+                                    total_sale_transaction_amount: sObj.grand_total,
+                                    merchant_uid:merchant_uid,
+                                    total_amount: total_amount,
+                                    campaign_type_id: campaign_type_id,
+                                    receipt_no: receipt_no,
+                                    campaign_method: rebate_arr.to_json,
+                                    auth_token:auth_token
+                                  }.to_json,
+                                  :headers => {
+                                    'Content-Type' => 'application/json',
+                                    'Accept'       => 'application/json; version=2'
+                                  }, :timeout => 10)
+          rescue Net::OpenTimeout
+             response = { "status": false , "message": "Connect To" }
+          rescue OpenURI::HTTPError
+             response = { "status": false, "message": "Can't connect server"}
+            
+          rescue SocketError
+             response = { "status": false, "message": "Can't connect server"}
+          end
+          Rails.logger.debug "Rebage Response"
+          Rails.logger.debug response.to_json
+          return response
+        end
+      end
+    else
+       response = { "status": "no_member", "message": "Not membership"}  
     end
   end
 
diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb
index a13229dc..b4f17a62 100755
--- a/app/models/print_setting.rb
+++ b/app/models/print_setting.rb
@@ -1,4 +1,8 @@
 class PrintSetting < ApplicationRecord
 	# validations
 	validates_presence_of :name, :unique_code, :printer_name, :page_width, :page_height, :print_copies
+
+	def self.get_precision_delimiter
+		PrintSetting.find_by_unique_code("CloseCashierPdf")
+	end
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index f9d16873..8cb33c80 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -450,7 +450,7 @@ class SalePayment < ApplicationRecord
                                   'Accept'       => 'application/json; version=2'
                                 }, :timeout => 10)
         rescue Net::OpenTimeout
-           response = { "status": false , "message": "Connect To" }
+           response = { "status": false , "message": " Connection timeout" }
         rescue OpenURI::HTTPError
            response = { "status": false, "message": "Can't connect server"}
           
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 93cd7ab9..d84b0366 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -1,4 +1,5 @@
 class CloseCashierPdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
   def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
@@ -38,11 +39,22 @@ class CloseCashierPdf < Prawn::Document
     self.header_font_size = 10
     self.item_font_size = 8
 
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+    #check delimiter
+    if printer_settings.delimiter
+        delimiter = ","
+    else
+        delimiter = ""
+    end
+
     header( shop_details)
 
     stroke_horizontal_rule
 
-    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) 
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter) 
   end
 
   def header (shop_details)
@@ -58,7 +70,7 @@ class CloseCashierPdf < Prawn::Document
     stroke_horizontal_rule
   end
 
-  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
+  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter)
         move_down 7
          y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
@@ -97,7 +109,7 @@ class CloseCashierPdf < Prawn::Document
             text "Opening Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ shift_sale.opening_balance}" , :size => self.item_font_size,:align => :left
+            text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
         end
 
         y_position = cursor
@@ -105,7 +117,8 @@ class CloseCashierPdf < Prawn::Document
             text "Closing Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ shift_sale.closing_balance}" , :size => self.item_font_size,:align => :left
+            text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            # text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
         end
 
 
@@ -122,7 +135,8 @@ class CloseCashierPdf < Prawn::Document
          text "Received Amount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.closing_balance}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+
         end
 
         y_position = cursor
@@ -130,7 +144,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash In:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.cash_in}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -138,7 +152,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Out:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.cash_out}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         move_down -5
@@ -151,7 +165,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.cash_sales}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -159,7 +173,7 @@ class CloseCashierPdf < Prawn::Document
          text "Credit Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.credit_sales}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
         end
         #start other payment details 
         if shift_sale.other_sales > 0
@@ -170,7 +184,7 @@ class CloseCashierPdf < Prawn::Document
                text "MPU Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.mpu_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -178,7 +192,7 @@ class CloseCashierPdf < Prawn::Document
                text "VISA Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.visa_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{number_with_precision(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -186,7 +200,7 @@ class CloseCashierPdf < Prawn::Document
                text "Master Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.master_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -194,7 +208,7 @@ class CloseCashierPdf < Prawn::Document
                text "JCB Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.jcb_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -202,7 +216,7 @@ class CloseCashierPdf < Prawn::Document
                text "Reedem Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.paypar_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
             end
         else
@@ -211,7 +225,7 @@ class CloseCashierPdf < Prawn::Document
              text "Other Payment :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{shift_sale.other_sales}", :size => self.item_font_size, :align => :right
+             text "#{ number_with_precision(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         end
 
@@ -220,7 +234,7 @@ class CloseCashierPdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_rounding.round(2)}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -228,7 +242,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.grand_total.round(2)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
 
         # end other payment details 
@@ -243,7 +257,7 @@ class CloseCashierPdf < Prawn::Document
            text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{tax.st_amount.round(2)}", :size => self.item_font_size, :align => :right
+           text "#{ number_with_precision(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
 
@@ -252,7 +266,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Taxes :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_taxes}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -260,7 +274,7 @@ class CloseCashierPdf < Prawn::Document
          text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.nett_sales}", :style => :bold , :size => self.header_font_size - 1, :align => :right
+         text "#{number_with_precision(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
         end
         #end for service charges and commercial tax
 #COMMENTED FOR NO NEED AND NOT CORRECT WHEN OTHER CHARGES
@@ -283,7 +297,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right
+           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
         #end total amount by Account 
@@ -297,7 +311,7 @@ class CloseCashierPdf < Prawn::Document
              text "Total Member Discount :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{@member_discount}", :size => self.item_font_size, :align => :right
+             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         else 
           @overall = shift_sale.total_discounts                   
@@ -308,7 +322,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Discount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{@overall}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end 
 
         y_position = cursor
@@ -316,7 +330,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total FOC :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{@total_foc})", :size => self.item_font_size, :align => :right
+         text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end     
 
         y_position = cursor
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 2586018d..80cf5727 100755
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -43,6 +43,18 @@
         </tr>
         </thead>
         <tbody>
+        <% if @print_settings.precision.to_i > 0
+              precision = @print_settings.precision
+              else
+                precision = 0
+              end
+               #check delimiter
+              if @print_settings.delimiter
+                delimiter = ","
+            else
+                delimiter = ""
+            end
+             %> 
         <% total_qty = 0 %>
         <% total_price = 0 %>
         <% total_amount = 0 %>
@@ -53,9 +65,9 @@
               <td><%= result.sale_item_id rescue '-' %></td>
               <td><%= result.commissioner.name rescue '-' %></td>
               <td><%= result.commission.menu_item.name rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %></td>
+              <td><%= number_with_precision(result.qty.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_with_precision(result.price.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_with_precision(result.amount.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
               <td><%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %></td>
             </tr>
             <% total_qty += result.qty.to_f %>
@@ -65,9 +77,9 @@
 
         <tr style="border-top: 3px solid grey;">
           <td colspan="4"></td>
-          <td><b><%= sprintf("%.2f", total_qty) rescue '-' %></b></td>
-          <td><b><%= sprintf("%.2f", total_price) rescue '-' %></b></td>
-          <td><b><%= sprintf("%.2f", total_amount) rescue '-' %></b></td>
+          <td><b><%= number_with_precision(total_qty, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
+          <td><b><%= number_with_precision(total_price, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
+          <td><b><%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
           <td></td>
         </tr>
         </tbody>
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 7c520fe3..0619d976 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -23,6 +23,18 @@
 
 <div class="margin-top-20">
 	<div class="card ">
+	<% if @print_settings.precision.to_i > 0
+			    precision = @print_settings.precision
+		    else
+			    precision = 0
+		    end
+		     #check delimiter
+		    if @print_settings.delimiter
+			    delimiter = ","
+			else
+			    delimiter = ""
+			end
+			     %>	
 		<% unless @sale_data.blank? %>
 
 			<table class="table table-striped" border="0">
@@ -52,7 +64,7 @@
 						<td><%= credit.receipt_no rescue '-' %></td>
 						<td><%= credit.cashier_name rescue '-' %></td>
 						<td><%= credit.sale.customer.name rescue '-' %></td>
-						<td><%= credit.payment_amount rescue '-' %></td>
+						<td><%= number_with_precision(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 				  </tr>
 				<% end %>
 			  </tbody>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index b8eded4f..76438060 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -44,6 +44,18 @@
 									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %></th>     	        
 								</tr>
 							</thead>
+							<% if @print_settings.precision.to_i > 0
+							      	 precision = @print_settings.precision
+								   else
+								   	precision = 0
+								   end
+								    #check delimiter
+								    if @print_settings.delimiter
+								        delimiter = ","
+								    else
+								        delimiter = ""
+								    end
+							    %>	
 							<% unless @sale_data.empty? %>
 
 							<tbody>
@@ -79,37 +91,37 @@
 								<tr>
 									<td style='text-align:right;'><%= count %></td>
 									<td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
-									<td style='color:red;text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
-									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%></td>	   	
+									<td style='color:red;text-align:right;'><%= number_with_precision(sale[:void_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:mpu_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:master_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:visa_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:jcb_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:paypar_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision, delimiter: delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:credit_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:foc_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision,delimiter:delimiter) rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_precision(sale[:rounding_adj].to_f, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total], precision:precision,delimiter:delimiter) rescue '-'%></td>	   	
 								</tr>
 								<% count = count + 1 %>
 								<% end %>
 
 								<tr style="font-weight:600;">
 									<td colspan="3" style='text-align:center;'>Total</td>	
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
-									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_precision(mpu ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(master, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(visa, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(jcb, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(paypar, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(cash, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(credit, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(foc, precision:precision,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_precision(discount, precision:precision,delimiter:delimiter) rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_precision(total, precision:precision,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision,delimiter:delimiter) rescue '-'%></td>   	
+									<td style='text-align:right;'><%= number_with_precision(grand_total, precision:precision,delimiter:delimiter) rescue '-'%></td>   
 								</tr>
 
 								<% total_tax = 0 %>
@@ -118,7 +130,7 @@
 								<% total_tax += tax.tax_amount.to_f %>
 								<tr style="font-weight:600;">
 									<td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(tax.tax_amount, precision:precision,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>
 								</tr>
 
@@ -126,7 +138,7 @@
 								<% net = total - total_tax %>
 								<tr style="font-weight:600;">
 									<td colspan="12" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(net, precision:precision,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>	
 								</tr>
 								<% end %>
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 0c48fe22..1fef1eab 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -50,18 +50,30 @@
 							<th><%= t("views.right_panel.detail.foc_sales") %></th>
 						</tr>
 					</thead>
+					<% if @print_settings.precision.to_i > 0
+					    precision = @print_settings.precision
+					    else
+						    precision = 0
+					    end
+					     #check delimiter
+					    if @print_settings.delimiter
+						    delimiter = ","
+						else
+						    delimiter = ""
+						end
+			    	 %>	
 					<% unless @sale_data.empty? %>
 						<tbody>
 							<% @sale_data.each do |sale| %>
 							<tr>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_precision(sale[:mpu_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:foc_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 							</tr>
 							<% end %>
 							
@@ -108,11 +120,11 @@
 								<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
 								<td><%= payment.payment_method rescue '-' %></td>
 								<% if payment.payment_method === 'cash' %>
-								<td><%= payment.payment_amount - payment.change_amount%> </td>
+								<td><%= number_with_precision(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%else%>
-								<td><%= payment.payment_amount%> </td>
+								<td><%= number_with_precision(payment.payment_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%end%>
-								<td><%= payment.sale.grand_total rescue '-' %></td>
+								<td><%= number_with_precision(payment.sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								
 							</tr>
 							
@@ -120,7 +132,7 @@
 						<%if total>0%>
 							<tr>
 							   <td colspan="4" style="text-align: right;"><strong >Total </strong></td>
-					    	 	<td colspan="2"><strong><%=total%></strong></td>
+					    	 	<td colspan="2"><strong><%=number_with_precision(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></strong></td>
 						    </tr>
 					    <%end%>
 					</tbody>
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index e82c3e3c..9eee6ab9 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -58,6 +58,22 @@
 						</tr>
 					</thead>
 					<tbody>
+					<% if @print_settings.precision.to_i > 0
+								precision = @print_settings.precision
+							else
+								precision = 0
+							end
+							#check delimiter
+							if @print_settings.delimiter
+								delimiter = ","
+						    else
+								delimiter = ""
+						    end
+							
+							puts precision
+							puts "predelidm"
+							puts delimiter %>	
+
 						<% grand_total = 0 %>
 						<% old_grand_total = 0 %>
 						<% total_tax = 0 %>
@@ -81,31 +97,31 @@
 
 							<td><%= result.receipt_no rescue '-' %> </td>
 							<td><%= result.cashier_name rescue '-' %></td>
-							<td><%= result.total_amount rescue '-' %></td>
-							<td><%= result.total_discount rescue '-' %></td>
+							<td><%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
+							<td><%= number_with_precision(result.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
 							<%if result.customer.customer_type == "Takeaway"%>
-							    <td>0.0</td>
+							    <td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
 							<%end%>
 							<% result.sale_taxes.each do |tax| %>
-							<td><%= tax.tax_payable_amount rescue '-' %></td>
+							<td><%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 							<%end%>
 
-							<td><%= result.grand_total %></td>			
-							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+							<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td>			
+							<td><%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>			
+							<td><%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 						</tr>
 
 						<% end %>
 						<tr style="border-top:4px double #666;">
 							<td colspan="2">&nbsp;</td>
-							<td><b><%= total_sum  rescue '-'%></b></td>
-							<td><b><%= discount_amt  rescue '-'%></b></td>
+							<td><b><%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<% @sale_taxes.each do |tax| %>
-							<td><b><%= tax.st_amount.round(2) %></b></td>
+							<td><b><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<% end %>
-							<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
-							<td><b><%= rounding_adj  rescue '-'%></b></td>		
-							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
+							<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>		
+							<td><b><%= number_with_precision(rounding_adj, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>		
+							<td><b><%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter)  %></b></td>				
 						</tr>
 						<tr>
 							<td colspan="2">&nbsp;</td>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index f780acdb..fbc518a6 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -45,6 +45,18 @@
 							</tr>	
 						</thead>
 						<tbody>
+							<% if @print_settings.precision.to_i > 0
+								precision = @print_settings.precision
+							else
+								precision = 0
+							end
+							#check delimiter
+							if @print_settings.delimiter
+								delimiter = ","
+						    else
+								delimiter = ""
+						    end
+							 %>	
 							<% unless @sale_data.blank? %>
 							<% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>	 
@@ -86,7 +98,7 @@
 										<td>
 											<% @totalByAccount.each do |account, total| %>
 											<% if sale.account_id == account %>
-											<b><%= total %></b>
+											<b><%= number_with_precision(total, precision:precision,delimiter:delimiter) %></b>
 											<% grand_total += total %>	  
 											<% end %>
 											<% end %>
@@ -105,8 +117,8 @@
 									<td><%= sale.item_code rescue '-' %></td>
 									<td><%= sale.product_name rescue '-' %></td>
 									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= sale.unit_price rescue '-' %></td>
-									<td><%= sale.grand_total rescue '-' %></td>
+									<td><%= number_with_precision(sale.unit_price ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_with_precision(sale.grand_total ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
 
@@ -121,7 +133,7 @@
 											<td><b>Total <%= sale.account_name %> Qty </b> </td>
 											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%= sub_total %></span></td>
+											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision,delimiter:delimiter)%> </span></td>
 										</tr>
 										<% sub_total = 0.0%>
 										<% sub_qty = 0 %>
@@ -149,8 +161,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td><%= other.unit_price rescue '-' %></td>
-										<td><%= other.grand_total rescue '-' %></td>
+										<td> <%= number_with_precision(other.unit_price ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.grand_total ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 									
@@ -160,7 +172,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%= other_sub_total %></span></td>
+									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 							<!-- End Other Charges -->
@@ -169,29 +181,29 @@
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= grand_total%></span></td> 
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision,delimiter:delimiter)%></span></td> 
 							</tr>
 							<% end %>
 
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_foc %></span></td>
+								<td><span><%= number_with_precision(total_item_foc ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= total_item_dis %></span></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(total_item_dis ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td><span><%= @foc_data %></span></td>
+								<td><span><%= number_with_precision(@foc_data ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= @discount_data %></span></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(@discount_data ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>	
 							
 								<% @sale_taxes.each do |tax| %>
@@ -207,7 +219,7 @@
 								<td colspan="5">&nbsp;</td>
 								<td style="border-top:2px solid grey;">Net Amount</td>
 								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= grand_total.to_f - @discount_data.to_f%></td> 
+								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision,delimiter:delimiter)%></td> 
 							</tr>
 							<!-- <tr>
 								<td colspan="5">&nbsp;</td>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 8138007d..9553e733 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -63,6 +63,18 @@
 				</tr>
 			</thead>
 			<tbody>
+			<% if @print_settings.precision.to_i > 0
+			    precision = @print_settings.precision
+		    else
+			    precision = 0
+		    end
+		     #check delimiter
+		    if @print_settings.delimiter
+			    delimiter = ","
+			else
+			    delimiter = ""
+			end
+			     %>	
 				<% void = 0%>	  
 				<% cash = 0%>	  
 				<% credit = 0%>	  
@@ -86,16 +98,16 @@
 							<%= result[:shift_closed_at].strftime("%e %b %I:%M%p") rescue '-'  %>
 						</td>
 						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-						<td><%= sprintf "%.2f",result[:cash_sales].to_f.to_d  rescue '-'%></td>
-						<td><%= sprintf "%.2f",result[:credit_sales].to_f.to_d  rescue '-'%></td>
+						<td><%= number_with_precision(result[:cash_sales].to_f,  precision:precision,delimiter:delimiter) %></td>
+						<td><%= number_with_precision(result[:credit_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>
 						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
 						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
 						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
-						<td><%= sprintf "%.2f",result[:other_sales].to_f.to_d  rescue '-'%></td>	  		  
+						<td><%= number_with_precision(result[:other_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>	  		  
 						<td>
-						 	<%= sprintf "%.2f",result[:foc_sales].to_f.to_d  rescue '-'%>
+						 	<%= number_with_precision(result[:foc_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%>
 						</td>	  		  
-						<td><%= sprintf "%.2f",result[:grand_total].to_f.to_d  rescue '-'%></td>	
+						<td><%= number_with_precision(result[:grand_total].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>	
 
 						<!--  <td><%= sprintf "%.2f",result[:rounding_adj].to_f.to_d  rescue '-'%></td>	 -->
 						<% grand_total = result[:grand_total].to_f %>	  
@@ -114,15 +126,15 @@
 					<tr style="border-top: 3px solid grey;">
 						<td colspan="3"></td>
 						<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
-						<td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
-						<td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
+						<td><b><%= number_with_precision(cash,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(credit,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
-						<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
-						<td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td>
+						<td><b><%= number_with_precision(card,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(foc,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
-						<td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>	 			
+						<td><b><%= number_with_precision(g_total,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>	 			
 					</tr>
 				</tbody>
 			</table>
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index 045df74d..d7b6ee10 100755
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -52,6 +52,18 @@
 						</tr>
 					</thead>
 					<tbody>
+					<% if @print_settings.precision.to_i > 0
+					    precision = @print_settings.precision
+					    else
+						    precision = 0
+					    end
+					     #check delimiter
+					    if @print_settings.delimiter
+						    delimiter = ","
+						else
+						    delimiter = ""
+						end
+			    	 %>	
 						<% total_amount = 0.0 %>
 						<% grand_total = 0.0 %>
 						<% rounding_adjustment = 0.0 %>
@@ -61,10 +73,10 @@
 						<tr>
 							<td><%= item.receipt_no rescue '-' %> </td>
 							<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
-							<td><%= item.total_amount.to_f  rescue '-'%> </td>
-							<td><%= item.grand_total.to_f  rescue '-'%> </td>
-							<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
-							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
+							<td><%= number_with_precision(item.total_amount.to_f, precision: precision.to_i ,delimiter: delimiter) %> </td>
+							<td><%= number_with_precision(item.grand_total.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>
+							<td><%= number_with_precision(item.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_with_precision(item.grand_total.to_f + item.rounding_adjustment.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>								
 							<!-- <td><%= result.sales_status rescue '-' %> </td> -->
 							<!-- <td><%= item.remarks rescue '-' %> </td> -->
 						</tr>
@@ -76,10 +88,10 @@
 						<% end %>
 						<tr style="border-top:4px double #666;font-weight:600;">
 							<td colspan="2" style="text-align:center;">Total Void Amount :</td>
-							<td><%= total_amount rescue '-' %></td>
-							<td><%= grand_total rescue '-' %></td>
-							<td><%= rounding_adjustment  rescue '-'%></td>
-							<td colspan="3"><%= grand_rounding_adjustment  rescue '-'%></td>
+							<td><%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_with_precision(grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_with_precision(rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
+							<td colspan="3"><%= number_with_precision(grand_rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
 						</tr>
 					</tbody>
 				</table>

From e55be61a5977e1d7f9a1f40ecd285d49a3c0a69b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 8 Jan 2018 17:33:27 +0630
Subject: [PATCH 040/651] first bill for manager role

---
 app/models/ability.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 4470fb4b..02b2618f 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -58,6 +58,7 @@ class Ability
         can :create, :discount
         can :remove_discount_items, :discount
         can :remove_all_discount, :discount
+        can :member_discount, :discount
 
         can :first_bill, :payment
         can :show, :payment

From 534b0659a97ee9937d1900fdbd60666b6a7fe3d6 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 8 Jan 2018 18:10:22 +0630
Subject: [PATCH 041/651] print bill for a5

---
 app/pdf/receipt_bill_a5_pdf.rb | 507 +++++++++++++++++++++++++++++++++
 1 file changed, 507 insertions(+)
 create mode 100644 app/pdf/receipt_bill_a5_pdf.rb

diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
new file mode 100644
index 00000000..4346759c
--- /dev/null
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -0,0 +1,507 @@
+class ReceiptBillA5Pdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance)
+    self.page_width = printer_settings.page_width
+    self.page_height = printer_settings.page_height
+    self.margin = 20
+    self.price_width = 120
+    self.qty_width = 50
+    self.total_width = 120
+    self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
+    self.item_height = 25
+    self.item_description_width = (self.page_width-20) / 2
+    self.label_width = 150
+
+    self.description_width = 500
+    self.price_num_width = 100
+    # @item_width = self.page_width.to_i / 2
+    # @qty_width = @item_width.to_i / 3
+    # @double = @qty_width * 1.3
+    # @half_qty = @qty_width / 2
+    #setting page margin and width
+    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+
+    # db font setup
+    if printer_settings.font != ""
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+    # font "public/fonts/Zawgyi-One.ttf"
+    # font "public/fonts/padauk.ttf"
+    self.header_font_size = 16
+    self.item_font_size = 14
+
+    if printer_settings.delimiter
+        delimiter = ","
+    else
+        delimiter = ""
+    end
+
+    header(shop_details)
+
+    stroke_horizontal_rule
+
+    cashier_info(sale_data, customer_name)
+    line_items(sale_items,printer_settings.precision,delimiter)
+    all_total(sale_data,printer_settings.precision,delimiter)
+
+
+    if member_info != nil
+        member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
+    end
+
+    customer(customer_name)
+
+    if discount_price_by_accounts.length > 0 && shop_details.show_account_info
+        discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
+    end
+
+    if shop_details.show_account_info
+       items_account(item_price_by_accounts,printer_settings.precision,delimiter)
+    end
+
+    sign(sale_data)
+
+    footer(printed_status)
+  end
+
+  def header (shop_details)
+    move_down 10
+    text "#{shop_details.name}", :size => self.header_font_size,:align => :center
+    move_down 10
+    text "#{shop_details.address}", :size => self.item_font_size,:align => :center
+    # move_down self.item_height
+    move_down 10
+    text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
+    move_down 10
+
+    stroke_horizontal_rule
+  end
+
+  def cashier_info(sale_data, customer_name)
+        move_down 12
+        # move_down 2
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.item_description_width, y_position], :width => self.item_description_width, :height => self.item_height) do
+            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
+        end
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0, y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
+        end    
+        bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
+              text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right
+        end
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.page_width - 20, :height => self.item_height) do
+                text "Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left
+        end
+
+
+        # bounding_box([self.item_description_width,y_position], :width =>self.label_width+5) do
+        #      text "(#{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } 
+        #         - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" ,
+        #          :size => self.item_font_size,:align => :right
+        # end
+
+        move_down 10
+        stroke_horizontal_rule
+  end
+
+    def line_items(sale_items,precision,delimiter)
+        if precision.to_i > 0
+            item_label_qty_front_width = (self.item_width+self.price_width) + 5
+            item_label_qty_end_width = self.qty_width + 4
+            item_label_total_front_width = (self.item_width+self.price_width) + 10
+            item_label_total_end_width = self.total_width + 9
+        else
+            self.item_width = self.item_width.to_i + 8
+            item_label_qty_front_width = (self.item_width+self.price_width) + 8
+            item_label_qty_end_width = self.qty_width + 7
+            item_label_total_front_width = (self.item_width+self.price_width) + 5
+            item_label_total_end_width = self.total_width + 4
+        end
+        move_down 10
+        y_position = cursor
+        move_down 10
+        pad_top(15) {
+            # @item_width.to_i + @half_qty.to_i
+            text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
+            text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+            text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        }
+        move_down -5
+        stroke_horizontal_rule
+        add_line_item_row(sale_items,precision,delimiter)
+    end
+
+    def add_line_item_row(sale_items,precision,delimiter)
+        if precision.to_i > 0
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = (self.item_width+self.price_width) + 5
+            item_qty_end_width = self.qty_width + 4
+            item_total_front_width = item_name_width + 10
+            item_total_end_width = self.total_width + 9
+        else
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = item_name_width + 8
+            item_qty_end_width = self.qty_width + 7
+            item_total_front_width = item_name_width + 5
+            item_total_end_width = self.total_width + 4
+        end
+        y_position = cursor
+        move_down 10
+        sub_total = 0.0
+        sale_items.each do |item|
+            # check for item not to show 
+          if item.price != 0
+                sub_total    += item.price  #(item.qty*item.unit_price) - comment for room charges
+                qty           = item.qty
+                total_price   = item.price #item.qty*item.unit_price - comment for room charges
+                price         = item.unit_price
+                product_name  = item.product_name
+
+
+                y_position = cursor
+
+                pad_top(15) {
+                  bounding_box([0,y_position], :width =>self.item_width) do
+                    text "#{product_name}", :size => self.item_font_size,:align => :left
+                  end
+                   # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size                
+                   text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                   text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
+                   text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                }
+                move_down 10
+            end
+        end
+
+        stroke_horizontal_rule
+
+        move_down 10
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+            text "Sub Total", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+            text "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}" ,:delimiter => ',', :size => self.item_font_size,:align => :right
+         end  
+        move_down 10      
+    end
+
+    def all_total(sale_data,precision,delimiter)
+        item_name_width = self.item_width
+        y_position = cursor
+        if sale_data.discount_type == 'member_discount'
+            dis_type = "Member Discount:"
+        else
+            dis_type = "Overall Discount:"
+        end
+
+        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+            text "#{ dis_type }", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+            text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
+        end
+
+        if sale_data.sale_taxes.length > 0
+            sale_data.sale_taxes.each do |st|
+                move_down 10
+                y_position = cursor
+
+                bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                    text "#{ st.tax_name } ( #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
+                end
+                bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                    text  "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                end
+            end
+        else
+
+        end
+
+        # move_down 10
+        # y_position = cursor
+
+        # bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+        #     text "Total Tax", :size => self.item_font_size,:align => :left
+        # end
+        # bounding_box([self.description_width,y_position], :width =>self.label_width) do
+        #     text  "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right
+        # end
+
+        if sale_data.rounding_adjustment != 0.0
+                move_down 10
+            y_position = cursor
+
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "Rounding Adjustment", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "#{sale_data.rounding_adjustment}", :size => self.item_font_size,:align => :right
+            end 
+        end
+
+        move_down 10
+        y_position = cursor
+        move_down 10
+        bounding_box([0,y_position], :width =>self.description_width) do
+             text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+            text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
+        end
+        move_down 10
+        
+        sale_payment(sale_data,precision,delimiter)
+       
+    end
+
+    def sale_payment(sale_data,precision,delimiter)        
+        stroke_horizontal_rule
+        move_down 10
+        sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method").where('sale_id = ?', sale_data.sale_id).group("payment_method")
+        sale_payments.each do |payment|
+            y_position = cursor
+            if payment.payment_method == "paypar"
+                bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "Redeem Payment", :size => self.item_font_size,:align => :left
+            end
+            else
+                bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "#{payment.payment_method.capitalize} Payment", :size => self.item_font_size,:align => :left
+            end
+            end
+            
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+            end
+            move_down 10
+        end
+        if sale_data.amount_received > 0   
+            y_position = cursor
+            move_down 10
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                 text "Change Amount", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+            end
+            move_down 10
+        end        
+    end
+
+    # show member information
+    def member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance)
+        if rebate_amount != nil        
+            if rebate_amount["status"] == true
+                stroke_horizontal_rule
+                total = 0
+                balance = 0
+                rebate_balance =0
+                redeem = 0
+                redeem_count = 0
+                rebate_amount["data"].each do |res|
+                    total = total + res["balance"]
+                #total redeem amount
+                    if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Redeem"
+                        redeem = redeem + res["withdraw"]
+                        balance = balance + res["balance"]
+                    end
+                #end Total redem
+                #total Rebate Earn
+                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateAccount" && res["status"]== "Rebate"
+
+                         rebate_balance = rebate_balance + res["deposit"]
+
+                        move_down 10
+                        y_position = cursor
+                        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                            text "Rebate Earn", :size => self.item_font_size,:align => :left
+                        end
+                        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                        end
+                        
+                    end 
+                # Total Rebate Amount if birthday
+                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate"
+                         rebate_balance = rebate_balance + res["deposit"]
+                        move_down 10
+                        y_position = cursor
+                        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                            text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left
+                        end
+                        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                        end
+                    end  
+                #end Total rebate if birthday
+                end
+
+                 move_down 10
+                    y_position = cursor
+                  bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                     text "Redeem Amount", :size => self.item_font_size,:align => :left
+                  end
+                  bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                    text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                  end
+
+                 if current_balance != nil
+                     move_down 10
+                    y_position = cursor
+                     bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                         text "Old Balance", :size => self.item_font_size,:align => :left
+                     end
+                      bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                        text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                     end
+                 end
+                
+            end
+        end
+
+        if member_info["status"] == true && member_info["data"].present?
+            total_balance = 0
+            member_info["data"].each do |res|
+
+                if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount"
+                    total_balance = total_balance + res["balance"]
+                    
+                end
+            end
+            move_down 10
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                 text "Total Balance", :size => self.item_font_size,:align => :left
+            end
+             bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                  text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+              end
+        end
+       
+    end
+
+    def customer(customer_name)
+        move_down 10
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "Customer Name", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+             text "#{ customer_name }" , :size => self.item_font_size,:align => :right
+        end
+    end
+
+
+    def discount_account(discount_price_by_accounts,precision,delimiter)
+        move_down 10
+        stroke_horizontal_rule
+        move_down 10
+        y_position = cursor
+        discount_price_by_accounts.each do |ipa|
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "#{ 'Total ' + ipa[:name] + ' Discounts' }", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
+            end  
+        end
+    end
+
+    def items_account(item_price_by_accounts,precision,delimiter)
+        move_down 10
+        stroke_horizontal_rule
+        move_down 10
+        y_position = cursor
+        item_price_by_accounts.each do |ipa|
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.label_width) do
+                text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+            end  
+        end
+    end
+
+    def sign(sale_data)
+        SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment|        
+            if payment.payment_method == "creditnote"
+
+                y_position = cursor
+                stroke_horizontal_rule
+                
+                bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                   move_down 70
+                   stroke_horizontal_rule
+                end
+                
+                bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                   move_down 73
+                   text "Approved By" , :size => self.item_font_size,:align => :center
+                end
+                break;
+            end
+        end
+        if sale_data.payment_status == "foc"
+
+            y_position = cursor
+            stroke_horizontal_rule
+
+            bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                 move_down 70
+                 stroke_horizontal_rule
+             end
+             
+             bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                 move_down 73
+                 text "Acknowledged By" , :size => self.item_font_size,:align => :center
+             end
+        end
+        
+        
+    end
+
+    def footer(printed_status)
+        move_down 10
+        stroke_horizontal_rule
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0, y_position], :width =>self.label_width) do
+            text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
+        end    
+        bounding_box([self.description_width,y_position], :width =>self.description_width, :height => self.item_height) do
+            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left
+        end        
+
+        move_down 10
+    end
+end
+

From 8e19b26fbcc695f681bf29972126a343c52a3aba Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Jan 2018 10:29:45 +0630
Subject: [PATCH 042/651] update sale item qty sum

---
 app/views/reports/saleitem/index.html.erb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index fbc518a6..4ad30d82 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -83,12 +83,12 @@
 								end %>
 
 								<% if sale.status_type == "foc" && sale.grand_total < 0
-											total_item_foc += sale.grand_total*(-1)
-										end %>	 
+									total_item_foc += sale.grand_total*(-1)
+								end %>	 
 
-										<% if sale.status_type == "Discount" &&  sale.grand_total < 0
-											total_item_dis += sale.grand_total*(-1)
-										end %>
+								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
+									total_item_dis += sale.grand_total*(-1)
+								end %>
 
 								<% if !acc_arr.include?(sale.account_id) %>
 									<tr>
@@ -126,7 +126,10 @@
 								<% if sale.account_id == key %>
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
-								    <% sub_qty += sale.total_item %>
+								    <% #sub_qty += sale.total_item %>
+								    <% if sale.status_type != "Discount" && sale.status_type != "foc"
+										sub_qty += sale.total_item
+									end %>
 									<% if count == value %>	
 										<tr>
 											<td colspan="3">&nbsp;</td>

From 674f6cd37d9e67e606875dd7ae2f06057dc40269 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Jan 2018 10:52:52 +0630
Subject: [PATCH 043/651] update decimal and delimeter for dashboard

---
 app/controllers/home_controller.rb |  3 +++
 app/views/home/dashboard.html.erb  | 21 ++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 1ee30bab..25fb0d70 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -113,6 +113,9 @@ class HomeController < ApplicationController
 
     @top_items         = Sale.top_items(today)
     @total_foc_items   = Sale.total_foc_items(today) 
+
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
   end
 
   def destroy
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 3ed5e068..eb1bdecd 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -2,7 +2,18 @@
   <div class="block-header">
     <h2><%= t :dashboard %></h2>
   </div>
-
+  <% if @print_settings.precision.to_i > 0
+      precision = @print_settings.precision
+    else
+      precision = 0
+    end
+    #check delimiter
+    if @print_settings.delimiter
+      delimiter = ","
+    else
+      delimiter = ""
+    end
+  %> 
   <!-- Widgets -->
   <div class="row clearfix">
     <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
@@ -125,19 +136,19 @@
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
-                  <td align="right"><%= @summ_sale.total_amount %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
-                  <td align="right"><%= @summ_sale.total_discount %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
-                  <td align="right"><%= @summ_sale.total_tax %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.grand_total") %> : </td>
-                  <td align="right"><%= @summ_sale.grand_total %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
                 </tr>
               </table>
               <table class="table">

From 66304cfccf9d2bff66b63ed2cbfcb74042f9ce18 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 9 Jan 2018 11:36:36 +0630
Subject: [PATCH 044/651] cups update

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0fb5f323..90182812 100755
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem 'carrierwave', '~> 1.0'
 gem 'mini_magick'
 
 #Report and Printing gems
-gem 'cups', '~> 0.0.7'
+gem 'cups'
 gem 'prawn'
 gem 'prawn-table'
 gem 'spreadsheet'
diff --git a/Gemfile.lock b/Gemfile.lock
index 05be67ea..48c34ea2 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     crass (1.0.2)
-    cups (0.0.7)
+    cups (0.1.10)
     database_cleaner (1.6.2)
     diff-lcs (1.3)
     erubi (1.7.0)
@@ -294,7 +294,7 @@ DEPENDENCIES
   carrierwave (~> 1.0)
   chartkick
   coffee-rails (~> 4.2)
-  cups (~> 0.0.7)
+  cups
   database_cleaner
   factory_girl_rails (~> 4.0)
   faker

From 6aab87a89d15024db3e3d214342a2e554135fd86 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Jan 2018 12:04:56 +0630
Subject: [PATCH 045/651] update sale item report qty sum

---
 app/models/sale.rb                        |  2 +-
 app/views/reports/saleitem/index.html.erb | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 69aa930a..0b68bf49 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -654,7 +654,7 @@ def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
                      "i.remark as status_type,"+
-                     " i.unit_price as unit_price,i.product_name as product_name, mc.name as" +
+                     " i.unit_price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 4ad30d82..a96b80f8 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -77,11 +77,14 @@
 							<% total_tax = 0 %>
 
 							<% @sale_data.each do |sale| %>
-
+							<!-- all total qty sum -->
 								<% if sale.status_type != "Discount" && sale.status_type != "foc"
 									total_qty += sale.total_item
 								end %>
-
+								<% if sale.status_type == "foc" && sale.price > 0
+									total_qty += sale.total_item
+								end %>
+							<!-- end all total qty -->
 								<% if sale.status_type == "foc" && sale.grand_total < 0
 									total_item_foc += sale.grand_total*(-1)
 								end %>	 
@@ -127,9 +130,13 @@
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
 								    <% #sub_qty += sale.total_item %>
-								    <% if sale.status_type != "Discount" && sale.status_type != "foc"
+								    <% if sale.status_type!="Discount" && sale.status_type!="foc"
 										sub_qty += sale.total_item
 									end %>
+									<% if sale.status_type == "foc" && sale.price > 0
+										sub_qty += sale.total_item
+									end %>
+
 									<% if count == value %>	
 										<tr>
 											<td colspan="3">&nbsp;</td>

From be6dd25a7012a37f193f33ad3d0a2fc54d8819f8 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 9 Jan 2018 15:58:37 +0630
Subject: [PATCH 046/651] a5 print format done

---
 app/controllers/origami/payments_controller.rb |  8 ++++----
 app/models/printer/receipt_printer.rb          |  2 +-
 app/pdf/receipt_bill_a5_pdf.rb                 | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 0bc77fc3..b14be800 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -22,7 +22,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
     # Print for First Bill to Customer
-    unique_code = "ReceiptBillPdf"
+    unique_code = "ReceiptBillA5Pdf"
      #shop detail
     shop_details =  Shop::ShopDetail 
     # customer= Customer.where('customer_id=' +.customer_id)
@@ -106,7 +106,7 @@ class Origami::PaymentsController < BaseOrigamiController
       cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
       # For Print
-      unique_code = "ReceiptBillPdf"
+      unique_code = "ReceiptBillA5Pdf"
       customer= Customer.find(saleObj.customer_id)
        
       # get member information
@@ -228,7 +228,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    unique_code = "ReceiptBillPdf"
+    unique_code = "ReceiptBillA5Pdf"
     customer= Customer.find(saleObj.customer_id)
 
     #shop detail
@@ -285,7 +285,7 @@ class Origami::PaymentsController < BaseOrigamiController
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
 
-      unique_code = "ReceiptBillPdf"
+      unique_code = "ReceiptBillA5Pdf"
       customer= Customer.find(saleObj.customer_id)
       
        #shop detail
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index adcb187e..7a1ef65a 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -70,7 +70,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
 
-    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
+    pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
 
     # print as print copies in printer setting
     count = printer_settings.print_copies
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 4346759c..0861c65a 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -4,13 +4,13 @@ class ReceiptBillA5Pdf < Prawn::Document
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.margin = 20
+    self.margin = 15
     self.price_width = 120
     self.qty_width = 50
     self.total_width = 120
     self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
     self.item_height = 25
-    self.item_description_width = (self.page_width-20) / 2
+    self.item_description_width = (self.page_width-40) / 2
     self.label_width = 150
 
     self.description_width = 500
@@ -494,11 +494,11 @@ class ReceiptBillA5Pdf < Prawn::Document
         move_down 10
 
         y_position = cursor
-        bounding_box([0, y_position], :width =>self.label_width) do
+        bounding_box([0, y_position], :width =>self.item_description_width) do
             text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
         end    
-        bounding_box([self.description_width,y_position], :width =>self.description_width, :height => self.item_height) do
-            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left
+        bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :right
         end        
 
         move_down 10

From 871683fdc052a87d2c0d1f948ca3dbbc6f75b552 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Jan 2018 16:00:24 +0630
Subject: [PATCH 047/651] update valid time from menu

---
 app/models/menu_category.rb                 | 19 +++++++++++++++++++
 app/views/origami/addorders/detail.html.erb | 18 ++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 9930d3cd..200c4469 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -37,6 +37,25 @@ class MenuCategory < ApplicationRecord
     end
   end
 
+  def valid_time
+
+    menu_category = MenuCategory.find(self.id)
+    menu          = Menu.find(menu_category.menu_id)
+    from          = menu.valid_time_from.strftime("%H:%m:%S")
+    to            = menu.valid_time_to.strftime("%H:%m:%S")
+    current       = Time.now.utc.getlocal.strftime("%H:%m:%S")
+ 
+    from          = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
+    to            = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
+    current       = current.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
+
+     if current.between?(from, to)
+       return true
+     else
+       return nil
+     end
+  end
+
   private
 
   # def generate_menu_category_code        
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index bebf18cc..ab813ec6 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -8,6 +8,7 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
+              <% if !menu.valid_time.nil? %>
                 <% if menu.menu_category_id.nil? %>
                   <% if @table.get_current_checkout_booking.nil? %>
                     <% if !menu.code.include? "SPL" %>
@@ -28,21 +29,10 @@
                       </a>
                     </li>
                   <% end%>
-              <% end%>
+                <% end%>
+              <% end %>
             <%end %>
-            <!-- <li class="nav-item menu_category">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>
-              <ul class="dropdown-menu multi-level">
-                <li><a href="#">Action</a></li>
-                <li><a href="#">Another action</a></li>
-                <li><a href="#">Something else here</a></li>
-                <li class="divider"></li>
-                <li><a href="#">Separated link</a></li>
-                <li class="divider"></li>
-                <li><a href="#">One more separated link</a></li>
-                
-              </ul>
-            </li> -->
+            
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
             </li>

From afd893d8319f56e18206ab93fa71a20edc708619 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 9 Jan 2018 16:33:10 +0630
Subject: [PATCH 048/651] remove a5

---
 app/controllers/origami/payments_controller.rb | 8 ++++----
 app/models/printer/receipt_printer.rb          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index b14be800..0bc77fc3 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -22,7 +22,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
     # Print for First Bill to Customer
-    unique_code = "ReceiptBillA5Pdf"
+    unique_code = "ReceiptBillPdf"
      #shop detail
     shop_details =  Shop::ShopDetail 
     # customer= Customer.where('customer_id=' +.customer_id)
@@ -106,7 +106,7 @@ class Origami::PaymentsController < BaseOrigamiController
       cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
       # For Print
-      unique_code = "ReceiptBillA5Pdf"
+      unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
        
       # get member information
@@ -228,7 +228,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    unique_code = "ReceiptBillA5Pdf"
+    unique_code = "ReceiptBillPdf"
     customer= Customer.find(saleObj.customer_id)
 
     #shop detail
@@ -285,7 +285,7 @@ class Origami::PaymentsController < BaseOrigamiController
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
 
-      unique_code = "ReceiptBillA5Pdf"
+      unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
       
        #shop detail
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 7a1ef65a..adcb187e 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -70,7 +70,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
 
-    pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
 
     # print as print copies in printer setting
     count = printer_settings.print_copies

From e3e32a0c10ac469587f80f071d1f1b0e1158819c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Jan 2018 16:40:42 +0630
Subject: [PATCH 049/651] update close cashier for Total food amount precision

---
 app/pdf/close_cashier_pdf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index d84b0366..35248b97 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -360,7 +360,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right
+           text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
         #end total amount by Account 

From bac1309f1fb0e6be864fba2bf019691313898945 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 9 Jan 2018 16:56:34 +0630
Subject: [PATCH 050/651] remove frt bill

---
 app/assets/javascripts/origami.js             |  2 +-
 .../origami/payments_controller.rb            | 48 -------------------
 app/views/origami/home/show.html.erb          | 10 ++--
 3 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 33252efa..3afb23c1 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -163,7 +163,7 @@ function checkReceiptNoInFirstBillData(receipt_no,payment) {
 		}
 	}
 	if (payment) {
-		return json_data[0]["payment"];
+		return status; //json_data[0]["payment"];
 	}else{
 		return status;
 	}
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index ebc10789..9d86c8ff 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -22,7 +22,6 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
     # Print for First Bill to Customer
-<<<<<<< HEAD
     # unique_code = "ReceiptBillPdf"
     #  #shop detail
     # shop_details =  Shop::ShopDetail 
@@ -46,48 +45,6 @@ class Origami::PaymentsController < BaseOrigamiController
     # printer = Printer::ReceiptPrinter.new(print_settings)
 
     # printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt")        
-=======
-    unique_code = "ReceiptBillPdf"
-     #shop detail
-    shop_details =  Shop::ShopDetail 
-    # customer= Customer.where('customer_id=' +.customer_id)
-    customer = Customer.find(sale_data.customer_id)
-
-    # rounding adjustment
-      if shop_details.is_rounding_adj
-        a = sale_data.grand_total % 25 # Modulus
-        b = sale_data.grand_total / 25 # Division
-        #not calculate rounding if modulus is 0 and division is even
-        #calculate rounding if modulus is zero or not zero and division are not even
-        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
-          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-          rounding_adj = new_total-sale_data.grand_total
-          sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj)        
-        end
-      end
-      #end rounding adjustment
-
-    # get member information
-    rebate = MembershipSetting.find_by_rebate(1)
-    if customer.membership_id != nil && rebate
-      member_info = Customer.get_member_account(customer)
-      # current_balance = SaleAudit.paymal_search(sale_id)
-      current_balance = 0
-    end
-    # 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,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance)    
->>>>>>> master
   end
 
   def create
@@ -319,13 +276,8 @@ class Origami::PaymentsController < BaseOrigamiController
       # 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)
 
-<<<<<<< HEAD
       # printer = Printer::ReceiptPrinter.new(print_settings)
       # printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC")   
-=======
-      printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil)   
->>>>>>> master
     end    
   end
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index a19f6b46..03897e1b 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -447,11 +447,11 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         // console.log(checkReceiptNoInFirstBillData(receipt_no));
-        if(checkReceiptNoInFirstBillData(receipt_no,"")){
-          $("#pay").show();
-        }else{
-          $("#pay").hide();
-        }
+        // if(checkReceiptNoInFirstBillData(receipt_no,"")){
+        //   $("#pay").show();
+        // }else{
+        //   $("#pay").hide();
+        // }
       /* end check first bill or not*/
 
         $('.invoicedetails').on('click', function () {

From 4146bc4fae880243740d6945cfae4bc7e48df2c2 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Jan 2018 17:22:32 +0630
Subject: [PATCH 051/651] update menu category valid time

---
 app/models/menu_category.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 200c4469..1f45b3ff 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -41,10 +41,10 @@ class MenuCategory < ApplicationRecord
 
     menu_category = MenuCategory.find(self.id)
     menu          = Menu.find(menu_category.menu_id)
-    from          = menu.valid_time_from.strftime("%H:%m:%S")
-    to            = menu.valid_time_to.strftime("%H:%m:%S")
-    current       = Time.now.utc.getlocal.strftime("%H:%m:%S")
- 
+    from          = menu.valid_time_from.strftime("%H:%M:%S")
+    to            = menu.valid_time_to.strftime("%H:%M:%S")
+    current       = Time.now.utc.getlocal.strftime("%H:%M:%S")
+
     from          = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
     to            = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
     current       = current.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}

From 410cacf279662b7238d77d3b6506bda36e1e1e82 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 10 Jan 2018 17:59:20 +0630
Subject: [PATCH 052/651] update limit tablet autorized

---
 app/controllers/api/authenticate_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/api/authenticate_controller.rb b/app/controllers/api/authenticate_controller.rb
index fcd00f1b..8fbfda5b 100755
--- a/app/controllers/api/authenticate_controller.rb
+++ b/app/controllers/api/authenticate_controller.rb
@@ -7,8 +7,7 @@ class Api::AuthenticateController < Api::ApiController
 
     if emp_id && password
       @employee = Employee.login(emp_id, password)
-
-      if @employee
+      if @employee && @employee.role == "waiter"
         render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role})
       else
         render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."})

From 903dddd8ccd8b243aa257c12566230c611673bdb Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 10 Jan 2018 18:08:28 +0630
Subject: [PATCH 053/651] CB ECR Integration

---
 .../origami/bank_integration.coffee           |   3 +
 app/assets/javascripts/origami.js             | 130 +++++++++++-
 .../origami/bank_integration.coffee           |   3 +
 .../controllers/origami/bank_integration.scss |   3 +
 .../stylesheets/origami/bank_integration.scss |   3 +
 .../origami/bank_integration_controller.rb    |  98 +++++++++
 app/controllers/origami/jcb_controller.rb     |   1 +
 app/controllers/origami/master_controller.rb  |   1 +
 app/controllers/origami/mpu_controller.rb     |   1 +
 .../origami/payments_controller.rb            |  32 ++-
 app/controllers/origami/shifts_controller.rb  |   9 +
 app/controllers/origami/visa_controller.rb    |   1 +
 app/controllers/origami/void_controller.rb    |   2 +-
 .../origami/bank_integration_helper.rb        |   2 +
 .../origami/bank_integration_helper.rb        |   2 +
 app/models/card_sale_tran.rb                  |   2 +
 app/models/card_settle_tran.rb                |   2 +
 app/models/printer/receipt_printer.rb         |   4 +-
 app/models/sale.rb                            |  10 +
 app/pdf/receipt_bill_pdf.rb                   |  29 ++-
 app/views/origami/jcb/index.html.erb          |  52 +++--
 app/views/origami/master/index.html.erb       |  56 +++--
 app/views/origami/mpu/index.html.erb          |  59 ++++--
 app/views/origami/payments/show.html.erb      |   2 +-
 app/views/origami/shifts/show.html.erb        | 196 +++++++++++++++++-
 app/views/origami/visa/index.html.erb         |  51 +++--
 config/locales/en.yml                         |   2 +
 config/locales/mm.yml                         |   3 +-
 config/routes.rb                              |   4 +
 ...20180108070325_create_card_settle_trans.rb |  34 +++
 .../20180109085256_create_card_sale_trans.rb  |  52 +++++
 .../bank_integration_controller_spec.rb       |   5 +
 .../bank_integration_controller_spec.rb       |   5 +
 .../origami/bank_integration_helper_spec.rb   |  15 ++
 .../origami/bank_integration_helper_spec.rb   |  15 ++
 spec/models/card_sale_tran_spec.rb            |   5 +
 spec/models/card_settle_tran_spec.rb          |   5 +
 37 files changed, 807 insertions(+), 92 deletions(-)
 create mode 100644 app/assets/javascripts/app/controllers/origami/bank_integration.coffee
 create mode 100644 app/assets/javascripts/origami/bank_integration.coffee
 create mode 100644 app/assets/stylesheets/app/controllers/origami/bank_integration.scss
 create mode 100644 app/assets/stylesheets/origami/bank_integration.scss
 create mode 100644 app/controllers/origami/bank_integration_controller.rb
 create mode 100644 app/helpers/app/controllers/origami/bank_integration_helper.rb
 create mode 100644 app/helpers/origami/bank_integration_helper.rb
 create mode 100644 app/models/card_sale_tran.rb
 create mode 100644 app/models/card_settle_tran.rb
 create mode 100644 db/migrate/20180108070325_create_card_settle_trans.rb
 create mode 100644 db/migrate/20180109085256_create_card_sale_trans.rb
 create mode 100644 spec/controllers/app/controllers/origami/bank_integration_controller_spec.rb
 create mode 100644 spec/controllers/origami/bank_integration_controller_spec.rb
 create mode 100644 spec/helpers/app/controllers/origami/bank_integration_helper_spec.rb
 create mode 100644 spec/helpers/origami/bank_integration_helper_spec.rb
 create mode 100644 spec/models/card_sale_tran_spec.rb
 create mode 100644 spec/models/card_settle_tran_spec.rb

diff --git a/app/assets/javascripts/app/controllers/origami/bank_integration.coffee b/app/assets/javascripts/app/controllers/origami/bank_integration.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/app/controllers/origami/bank_integration.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 33252efa..5bdbe861 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -194,4 +194,132 @@ function deleteReceiptNoInFirstBillData(receipt_no) {
 		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
 	}
 }
-/* end check first bill or not funs: */
\ No newline at end of file
+/* end check first bill or not funs: */
+
+//start CB ECR integration
+//set CB com port data
+function setCommPorts(comPortLists) {
+	var sale_id = "<%= @sale_id %>";
+    $('#com_port_name').html("");
+    var jsonPortLists = $.parseJSON(comPortLists);
+    // alert(jsonPortLists);
+    if((jsonPortLists!=undefined && jsonPortLists!='') && (jsonPortLists.length > 0)){
+        $.each(jsonPortLists,function(key,value){
+            $('#com_port_name').append("<option value='"+value+"'>"+value+"</option>");
+        });
+    }
+    else{
+    	swal({
+		  title: 'Oops',
+		  text: 'Payment device has been disconnected! Please plug it in.',
+		  type: 'error',
+		  html: true,
+		  closeOnConfirm: false,
+		  closeOnCancel: false,
+		  allowOutsideClick: false
+		}, function () {
+				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+		});
+    }
+}
+
+/** pay with CB bank **/
+function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no) {
+	$("#loading_wrapper").show();
+    var com_port = $("#com_port_name").val();
+    reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port);
+}
+
+//add req data to card_sale_trans table
+function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port) {
+  var jobj = {"cmd_type" : cmd_type, "payment_type" : "CARD", "amt" : bnk_bill_amount, "sale_id" : sale_id, "inv_no" : receipt_no, "com_port" : com_port};
+  $.ajax({
+      type: "POST",
+      url: "/origami/bank_integration/sale_trans",
+      data: {type:"request", data: jobj},
+      dataType: "json",
+      success: function(data) {
+          if (data.status == "success"){
+            card_sale_trans_id = data.card_sale_trans_id;
+            resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port);
+          }
+       }
+    });
+}
+
+//add res data to card_sale_trans table
+function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port) {
+
+  var resMsg = "";
+  var card_payment_type="";
+  if($("#loading_wrapper").is(":visible")){
+    if(payment_type=="mpu" || payment_type=="visa" || payment_type=="master" || payment_type=="jcb" || payment_type=="unionpay"){
+        card_payment_type = "CARD";
+    }
+    else if(payment_type == "alipay"){
+        card_payment_type = "EWALLET";
+    }
+
+    bnk_bill_amount = parseFloat(bnk_bill_amount);
+
+    resMsg = code2lab.reqBankPayment(cmd_type,card_payment_type,bnk_bill_amount,receipt_no,com_port);
+  }
+
+  if(resMsg.includes("STATUS")){
+    var jobj = $.parseJSON(resMsg);
+
+      $.ajax({
+          type: "POST",
+          url: "/origami/bank_integration/sale_trans",
+          data: {type:"response", card_sale_trans_id: card_sale_trans_id, data: jobj},
+          dataType: "json",
+          success: function(data) {
+            if(data.status == "success"){
+                resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port);
+            }
+          }
+        });
+  }else{
+  	$("#loading_wrapper").hide();
+    swal ( "Oops" ,  resMsg.toString() ,  "error" );
+  }
+}
+
+
+function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port) {
+	$("#loading_wrapper").hide();
+    var jobj = $.parseJSON(resMsg);
+    if(jobj.STATUS == "Approved"){
+        $.ajax({type: "POST",
+         	url: "/origami/payment/"+payment_type,
+         	data: "amount="+ bnk_bill_amount + "&sale_id="+ sale_id,
+         	success:function(result){
+         		if(result){
+         			swal({
+         				title: "Information!",
+         				text: "Payment Successfully",
+         				html: true,
+						closeOnConfirm: false,
+						closeOnCancel: false,
+						allowOutsideClick: false
+         			}, function () {
+         				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+         			});
+         		}
+         	}
+         });
+    }else{
+        swal({
+		  title: 'Oops',
+		  text: "Transaction is " + (jobj.STATUS).toLowerCase(),
+		  type: 'error',
+		  html: true,
+		  closeOnConfirm: false,
+		  closeOnCancel: false,
+		  allowOutsideClick: false
+		}, function () {
+				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/MPU";
+			});
+    }
+}
+//end CB ECR integration
\ No newline at end of file
diff --git a/app/assets/javascripts/origami/bank_integration.coffee b/app/assets/javascripts/origami/bank_integration.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/origami/bank_integration.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/app/controllers/origami/bank_integration.scss b/app/assets/stylesheets/app/controllers/origami/bank_integration.scss
new file mode 100644
index 00000000..784f21f7
--- /dev/null
+++ b/app/assets/stylesheets/app/controllers/origami/bank_integration.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the app/controllers/origami/BankIntegration controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/origami/bank_integration.scss b/app/assets/stylesheets/origami/bank_integration.scss
new file mode 100644
index 00000000..5f839960
--- /dev/null
+++ b/app/assets/stylesheets/origami/bank_integration.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the origami/BankIntegration controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/origami/bank_integration_controller.rb b/app/controllers/origami/bank_integration_controller.rb
new file mode 100644
index 00000000..a5e5d59f
--- /dev/null
+++ b/app/controllers/origami/bank_integration_controller.rb
@@ -0,0 +1,98 @@
+class Origami::BankIntegrationController < ApplicationController #BaseOrigamiController
+	
+	def settle_trans
+		if(params[:type] == 'request')
+			card_settle_trans = CardSettleTran.new()
+			card_settle_trans.req_date = Time.now.strftime("%Y-%m-%d")
+			card_settle_trans.req_time = Time.now.utc
+			card_settle_trans.req_cmd = params[:data][:cmd_type]
+			card_settle_trans.req_type = params[:data][:payment_type]
+			card_settle_trans.save()
+
+			card_settle_trans_id = card_settle_trans.id
+			response = {status: 'success', card_settle_trans_id: card_settle_trans_id}
+		else
+			card_settle_trans = CardSettleTran.find(params[:card_settle_trans_id])
+			card_settle_trans.res_date = Time.now.strftime("%Y-%m-%d")
+			card_settle_trans.res_time = Time.now.utc
+			card_settle_trans.res_cmd = params[:data][:CMD]
+			card_settle_trans.res_type = params[:data][:TYPE]
+			card_settle_trans.status = params[:data][:STATUS]
+			card_settle_trans.sale_cnt = params[:data][:SALECNT]
+			card_settle_trans.sale_amt = params[:data][:SALEAMT].to_f
+			card_settle_trans.void_cnt = params[:data][:VOIDCNT]
+			card_settle_trans.void_amt = params[:data][:VOIDAMT].to_f
+			card_settle_trans.refund_cnt = params[:data][:REFUNDCNT]
+			card_settle_trans.refund_amt = params[:data][:REFUNDAMT].to_f
+			card_settle_trans.print_text_part1_type = params[:data][:PRINTTEXTPART1TYPE]
+			card_settle_trans.print_text_part1_value = params[:data][:PRINTTEXTPART1VALUE]
+			card_settle_trans.print_text_part2_type = params[:data][:PRINTTEXTPART2TYPE]
+			card_settle_trans.print_text_part2_value = params[:data][:PRINTTEXTPART2VALUE]
+			card_settle_trans.print_text_part3_type = params[:data][:PRINTTEXTPART3TYPE]
+			card_settle_trans.print_text_part3_value = params[:data][:PRINTTEXTPART3VALUE]
+			card_settle_trans.print_text_part4_type = params[:data][:PRINTTEXTPART4TYPE]
+			card_settle_trans.print_text_part4_value = params[:data][:PRINTTEXTPART4VALUE]
+			card_settle_trans.save()
+			response = {status: 'success'}
+		end
+		render json: response 
+	end
+
+	def sale_trans
+		if(params[:type] == 'request')
+			card_sale_trans = CardSaleTran.new()
+			card_sale_trans.sale_id = params[:data][:sale_id]
+			card_sale_trans.req_date = Time.now.strftime("%Y-%m-%d")
+			card_sale_trans.req_time = Time.now.utc
+			card_sale_trans.req_amt = params[:data][:amt]
+			card_sale_trans.req_inv_no = params[:data][:inv_no]
+			card_sale_trans.req_cmd = params[:data][:cmd_type]
+			card_sale_trans.req_type = params[:data][:payment_type]
+			card_sale_trans.save()
+
+			card_sale_trans_id = card_sale_trans.id
+			response = {status: 'success', card_sale_trans_id: card_sale_trans_id}
+		else
+			card_sale_trans = CardSaleTran.find(params[:card_sale_trans_id])
+			card_sale_trans.res_date = params[:data][:DATE]
+			card_sale_trans.res_time = params[:data][:TIME]
+			card_sale_trans.res_amt = params[:data][:AMT].to_f / 100
+			card_sale_trans.res_inv_no = params[:data][:ECRREF]
+			card_sale_trans.res_cmd = params[:data][:CMD]
+			card_sale_trans.res_type = params[:data][:TYPE]
+			card_sale_trans.status = params[:data][:STATUS]
+			card_sale_trans.resp = params[:data][:RESP]
+			card_sale_trans.trace = params[:data][:TRACE]
+			card_sale_trans.app_code = params[:data][:APPCODE]
+			card_sale_trans.pan = params[:data][:PAN]
+			card_sale_trans.exp_date = params[:data][:EXPDATE]
+			card_sale_trans.tips = params[:data][:TIPS]
+			card_sale_trans.entry_mode = params[:data][:ENTRYMODE]
+			card_sale_trans.terminal_id = params[:data][:TERMINALID]
+			card_sale_trans.merchant_id = params[:data][:MERCHANTID]
+			card_sale_trans.card_holder = params[:data][:CARDHOLDERNAME]
+			card_sale_trans.batch_no = params[:data][:BATCHNO]
+			card_sale_trans.ref_no = params[:data][:REFNUM]
+			card_sale_trans.app = params[:data][:APP]
+			card_sale_trans.emv_app_id = params[:data][:AID]
+			card_sale_trans.emv_cyptrogram = params[:data][:TC]
+			card_sale_trans.curr_code = params[:data][:CURRCODE]
+			card_sale_trans.fx_rate = params[:data][:FXRATE]
+			card_sale_trans.foreign_amt = params[:data][:FOREIGNAMT]
+			card_sale_trans.dcc_msg = params[:data][:DCCMSG]
+			card_sale_trans.tender = params[:data][:TENDER]
+			card_sale_trans.print_text_part1_type = params[:data][:PRINTTEXTPART1TYPE]
+			card_sale_trans.print_text_part1_value = params[:data][:PRINTTEXTPART1VALUE]
+			card_sale_trans.print_text_part2_type = params[:data][:PRINTTEXTPART2TYPE]
+			card_sale_trans.print_text_part2_value = params[:data][:PRINTTEXTPART2VALUE]
+			card_sale_trans.print_text_part3_type = params[:data][:PRINTTEXTPART3TYPE]
+			card_sale_trans.print_text_part3_value = params[:data][:PRINTTEXTPART3VALUE]
+			card_sale_trans.print_text_part4_type = params[:data][:PRINTTEXTPART4TYPE]
+			card_sale_trans.print_text_part4_value = params[:data][:PRINTTEXTPART4VALUE]
+			card_sale_trans.save()
+
+			response = {status: 'success'}
+		end
+		render json: response 
+	end
+end
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index a3b93efd..be4cc94c 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -29,6 +29,7 @@ class Origami::JcbController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    @receipt_no      = sale_data.receipt_no
   end
 
   def create
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 8eb2e02b..068095ca 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -28,6 +28,7 @@ class Origami::MasterController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    @receipt_no      = sale_data.receipt_no
   end
 
   def create
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 6bd0778f..d1cb3c81 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -28,6 +28,7 @@ class Origami::MpuController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    @receipt_no      = sale_data.receipt_no
   end
 
   def create
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 0bc77fc3..88577ac4 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -61,7 +61,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
     printer = Printer::ReceiptPrinter.new(print_settings)
 
-    printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance)    
+    printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil)    
   end
 
   def create
@@ -119,6 +119,18 @@ class Origami::PaymentsController < BaseOrigamiController
         current_balance = SaleAudit.paymal_search(sale_id)
       end
       
+      #for card sale data
+      card_data = Array.new
+      card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
+      if !card_sale_trans_ref_no.nil? 
+          card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s
+          card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s
+          card_no = card_sale_trans_ref_no.pan.last(4)
+          card_no = card_no.rjust(19,"**** **** **** ")
+          card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id})
+      end
+      puts "card_data"
+      puts card_data.to_json
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       # Calculate Food and Beverage Total
@@ -126,7 +138,7 @@ class Origami::PaymentsController < BaseOrigamiController
       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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance)   
+      printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)   
     end    
   end
 
@@ -240,6 +252,18 @@ class Origami::PaymentsController < BaseOrigamiController
       rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
       current_balance = SaleAudit.paymal_search(sale_id)
     end
+
+    #for card sale data
+    card_data = Array.new
+    card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
+    if !card_sale_trans_ref_no.nil? 
+        card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s
+        card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s
+        card_no = card_sale_trans_ref_no.pan.last(4)
+        card_no = card_no.rjust(19,"**** **** **** ")
+        card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id})
+    end
+
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
 
@@ -248,7 +272,7 @@ class Origami::PaymentsController < BaseOrigamiController
     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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance)
+    printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data)
   end
 
   def foc    
@@ -298,7 +322,7 @@ class Origami::PaymentsController < BaseOrigamiController
       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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil)   
+      printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)   
     end    
   end
 
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 851be7e5..1c75d3bd 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -45,6 +45,15 @@ class Origami::ShiftsController < BaseOrigamiController
       cashier_terminal.is_currently_login = 0
       cashier_terminal.save
 
+      #add shift_sale_id to card_settle_trans
+      card_settle_trans = CardSettleTran.select('id').where(['shift_sale_id IS NULL and status IS NOT NULL'])
+      
+      card_settle_trans.each do |data|
+        card_sett_trans = CardSettleTran.find(data.id)
+        card_sett_trans.shift_sale_id = @shift.id
+        card_sett_trans.save()
+      end
+
 
       unique_code = "CloseCashierPdf"
       shop_details = Shop.find(1)
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 3e2e56a3..a664e327 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -27,6 +27,7 @@ class Origami::VisaController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    @receipt_no      = sale_data.receipt_no
   end
 
   def create
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 0ac9df9f..fe2ddca8 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -95,7 +95,7 @@ class Origami::VoidController < BaseOrigamiController
       discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
       printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance)   
+      printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
       
       #end print
 
diff --git a/app/helpers/app/controllers/origami/bank_integration_helper.rb b/app/helpers/app/controllers/origami/bank_integration_helper.rb
new file mode 100644
index 00000000..845cf827
--- /dev/null
+++ b/app/helpers/app/controllers/origami/bank_integration_helper.rb
@@ -0,0 +1,2 @@
+module App::Controllers::Origami::BankIntegrationHelper
+end
diff --git a/app/helpers/origami/bank_integration_helper.rb b/app/helpers/origami/bank_integration_helper.rb
new file mode 100644
index 00000000..dd301d75
--- /dev/null
+++ b/app/helpers/origami/bank_integration_helper.rb
@@ -0,0 +1,2 @@
+module Origami::BankIntegrationHelper
+end
diff --git a/app/models/card_sale_tran.rb b/app/models/card_sale_tran.rb
new file mode 100644
index 00000000..7c496b56
--- /dev/null
+++ b/app/models/card_sale_tran.rb
@@ -0,0 +1,2 @@
+class CardSaleTran < ApplicationRecord
+end
diff --git a/app/models/card_settle_tran.rb b/app/models/card_settle_tran.rb
new file mode 100644
index 00000000..29670946
--- /dev/null
+++ b/app/models/card_settle_tran.rb
@@ -0,0 +1,2 @@
+class CardSettleTran < ApplicationRecord
+end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index adcb187e..49502b3f 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -65,12 +65,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Bill Receipt Print
-  def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance)
+  def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data)
     #Use CUPS service
     #Generate PDF
     #Print
 
-    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
 
     # print as print copies in printer setting
     count = printer_settings.print_copies
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 69aa930a..35338665 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1125,6 +1125,16 @@ end
           .sum("a.qty")
   end
 
+  #card sale trans data
+  def self.getCardSaleTrans(sale_id)
+    query = Sale.select("cst.res_date,cst.res_time,cst.trace,cst.pan,cst.batch_no,cst.exp_date,cst.app,cst.res_type,cst.ref_no,cst.terminal_id,cst.merchant_id,cst.app_code")
+            .joins("JOIN card_sale_trans as cst on cst.sale_id = sales.sale_id")
+            .where("sales.sale_id=?",sale_id)
+            .first()
+    
+    return query
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index ae02b22d..ab33d6e4 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -1,7 +1,7 @@
 class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 0
@@ -65,6 +65,12 @@ class ReceiptBillPdf < Prawn::Document
 
     customer(customer_name)
 
+    #start card sale trans data
+    if card_data != nil
+        card_sale_data(card_data)
+    end
+    #end card sale trans data
+
     if discount_price_by_accounts.length > 0 && shop_details.show_account_info
         discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
     end
@@ -503,5 +509,26 @@ class ReceiptBillPdf < Prawn::Document
 
         move_down 5
     end
+
+    #start card sale trans data
+    def card_sale_data(card_data)
+        move_down 5
+        stroke_horizontal_rule
+        move_down 5
+
+        y_position = cursor
+        if !card_data[0].nil?
+            if card_data[0]['app'] == 'CUP'
+                card_data[0]['app'] = 'UNIONPAY'
+            elsif card_data[0]['app'] == 'MASTERCARD'
+                card_data[0]['app'] = 'MASTER'
+            end
+            text "DATE/TIME: #{card_data[0]['res_date']}    #{card_data[0]['res_time']} ", :size => @item_font_size, :align => :left
+            text "BATCH NUM: #{card_data[0]['batch_no']}                          TRACE#: #{card_data[0]['trace']}",:size => @item_font_size, :align => :left
+            text "RREF NUM: #{card_data[0]['ref_no']}             APPR CODE: #{card_data[0]['app_code']} ",:size => @item_font_size, :align => :left
+            text "TID: #{card_data[0]['tid']} ",:size => @item_font_size, :align => :left
+            text "#{card_data[0]['app']}    #{card_data[0]['pan']} ",:size => @item_font_size, :align => :left
+        end
+    end
 end
 
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index c7cc79f9..1d855ad2 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -1,4 +1,7 @@
 <div class="container-fluid">
+	<div id="loading_wrapper" style="display:none;">
+		<div id="loading"></div>
+	</div>
 	<!-- <div class="page-header">
 		<ol class="breadcrumb">
 			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -17,6 +20,16 @@
 			<span class="hidden" id="sub-total"><%= @sub_total%></span>
 			<div class="card m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
+					<div class="row">
+			          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+			            <label for="com_port_name">Select Device</label>
+			            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+			              
+			            </select>
+			          </div>
+			          <hr>
+			        </div>
+
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label>You can pay up to </label>
@@ -106,11 +119,28 @@
 </div>
 <script>
 	$(document).ready(function() {
+		var sale_id = "<%= @sale_id %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
 			}
-		});
+			
+		if(typeof code2lab != 'undefined'){
+			code2lab.getCommPorts(); //get comportlists from jade
+		}else{
+			swal({
+			  title: 'Oops',
+			  text: 'JCB is not available in here!',
+			  type: 'error',
+			  html: true,
+			  closeOnConfirm: false,
+			  closeOnCancel: false,
+			  allowOutsideClick: false
+			}, function () {
+				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+			});
+		}
+	});
 // number key pad
 $(document).on('click', '.cashier_number', function(event){
 	event.stopPropagation();
@@ -160,6 +190,7 @@ $(document).on('click', '.cashier_number', function(event){
 $('#jcb_pay').on('click',function(){
 	var amount = $('#amount').text();
 	var sale_id = "<%= @sale_id %>";
+	var receipt_no = "<%= @receipt_no %>";
 	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 		$(this).off("click");
 		  //start member discount 5% by pay card	
@@ -176,24 +207,7 @@ $('#jcb_pay').on('click',function(){
 	        //         });
 			// }
 	    //end member discount
-	    $.ajax({type: "POST",
-	    	url: "<%= origami_payment_jcb_path  %>",
-	    	data: "amount="+ amount + "&sale_id="+ sale_id,
-	    	success:function(result){
-	    		if(result){
-	    			swal({
-	    				title: "Information!",
-	    				text: "Payment Successfully",
-	    				html: true,
-						closeOnConfirm: false,
-						closeOnCancel: false,
-						allowOutsideClick: false
-	    			},function () {
-	    				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	    			});
-	    		}
-	    	}
-	    });
+	    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
 	}else{
 	  if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 94a9e7c8..9601f612 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -1,4 +1,7 @@
 <div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
   <!-- <div class="page-header">
     <ol class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -17,6 +20,16 @@
     <span class="hidden" id="sub-total"><%= @sub_total%></span>
     <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
       <div class="rebate-form">
+        <div class="row">
+          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+            <label for="com_port_name">Select Device</label>
+            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+              
+            </select>
+          </div>
+          <hr>
+        </div>
+
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
           <label>You can pay up to </label>
@@ -106,10 +119,27 @@
 </div>
 <script>
   $(document).ready(function() {
-    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-     else {
+      var sale_id = "<%= @sale_id %>";
+      if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+      else {
        $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
-     }
+      }
+      
+      if(typeof code2lab != 'undefined'){
+        code2lab.getCommPorts(); //get comportlists from jade
+      }else{
+        swal({
+          title: 'Oops',
+          text: 'MASTER is not available in here!',
+          type: 'error',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+        });
+      }
    });
   $(document).on('click', '.cashier_number', function(event){
     event.stopPropagation();
@@ -157,6 +187,7 @@
   $('#master_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
+    var receipt_no = "<%= @receipt_no %>";
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
       $(this).off("click");
       //start member discount 5% by pay card  
@@ -173,24 +204,7 @@
         //         });
         // }
       //end member discount
-      $.ajax({type: "POST",
-        url: "<%= origami_payment_master_path  %>",
-        data: "amount="+ amount + "&sale_id="+ sale_id,
-        success:function(result){
-          if(result){
-            swal({
-              title: "Information!",
-              text: "Payment Successfully",
-              html: true,
-              closeOnConfirm: false,
-              closeOnCancel: false,
-              allowOutsideClick: false
-            },function () {
-              window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-            });
-          }
-        }
-      });
+      pay_withBank("SALE", "master", amount, sale_id, receipt_no);
     }else{
       if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 722cd548..5393d9b2 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -1,4 +1,7 @@
 <div class="container-fluid">
+	<div id="loading_wrapper" style="display:none;">
+		<div id="loading"></div>
+	</div>
 	<!-- <div class="page-header">
 		<ol class="breadcrumb">
 			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -18,6 +21,16 @@
 			<div class="card" style="margin-top:10px;padding:20px;">
 				<div class="card-block">
 					<div class="rebate-form">
+						<div class="row">
+							<div class="form-group col-lg-12 col-md-12 col-sm-12">
+								<label for="com_port_name">Select Device</label>
+								<select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+									
+								</select>
+							</div>
+							<hr>
+						</div>
+
 						<div class="row">
 							<div class="form-group col-lg-12 col-md-12 col-sm-12">
 								<label>You can pay up to </label>
@@ -109,11 +122,30 @@
 </div>
 <script>
 	$(document).ready(function() {
+		var sale_id = "<%= @sale_id %>";
+
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
 			}
-		});
+			
+		if(typeof code2lab != 'undefined'){
+			code2lab.getCommPorts(); //get comportlists from jade
+		}else{
+			swal({
+			  title: 'Oops',
+			  text: 'MPU is not available in here!',
+			  type: 'error',
+			  html: true,
+			  closeOnConfirm: false,
+			  closeOnCancel: false,
+			  allowOutsideClick: false
+			}, function () {
+				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+			});
+		}
+	});
+		
 	$(document).on('click', '.cashier_number', function(event){
 		event.stopPropagation();
 		event.preventDefault();
@@ -157,9 +189,11 @@
 			return false;
 		}
 	});
+	
 	$('#mpu_pay').on('click',function(){
 		var amount = $('#amount').text();
 		var sale_id = "<%= @sale_id %>";
+		var receipt_no = "<%= @receipt_no %>";
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 		//start member discount 5% by pay card	
@@ -176,25 +210,8 @@
 		    //          });
 			// }
 	    //end member discount
-	         //Mpu Payment
-	         $.ajax({type: "POST",
-	         	url: "<%= origami_payment_mpu_path  %>",
-	         	data: "amount="+ amount + "&sale_id="+ sale_id,
-	         	success:function(result){
-	         		if(result){
-	         			swal({
-	         				title: "Information!",
-	         				text: "Payment Successfully",
-	         				html: true,
-							closeOnConfirm: false,
-							closeOnCancel: false,
-							allowOutsideClick: false
-	         			}, function () {
-	         				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	         			});
-	         		}
-	         	}
-	         });
+	      pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+
 	     }else{
 	     	if (amount>0) {
 		        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
@@ -203,5 +220,5 @@
 		    }
 	     }
 	 })
-	</script>
+</script>
 
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 98fd4385..77770247 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -370,7 +370,7 @@
         var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
         var total = $('#amount_due').text();
         var amt = parseFloat(total) - parseFloat(othertotal);
-        $('#cash').text(amt);
+        $('#cash').text(parseFloat(amt).toFixed(2));
         update_balance();
         break;
       }
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 0c09d635..0f9265e6 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -1,4 +1,8 @@
 <div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
+
   <div class='row clearfix'>
     <div class='col-md-10'>
       <h1><%= t :close_cashier %></h1>
@@ -27,6 +31,27 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
     <button type="button" class="btn bg-default btn-block" id='back'><i class="material-icons">reply</i> <%= t("views.btn.back") %> </button>
     <button type="button" class="btn bg-blue btn-block green" id='close_cashier'> <%= t("views.btn.close_cashier") %> </button>
+    <button type="button" class="btn bg-blue btn-block green" id="card_settlement"> <%= t("views.btn.card_settle") %> </button>
+    </div>
+  </div>
+
+  <div class="modal fade" id="cardSettleModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="cardSettleModal">Select Device: </h4>
+            </div>
+            <div class="modal-body">
+               <select class="form-control show-tick sel_com_port"  id="sel_com_port" >
+                 
+                </select>   
+            </div>
+            <div class="modal-footer  p-r-30">
+                <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                &nbsp;  &nbsp;
+               <button type="button" class="btn btn-link bg-blue waves-effect" id="card_settle">OK</button>
+            </div>
+        </div>
     </div>
   </div>
 </div>
@@ -42,8 +67,175 @@
         window.location.href = '/';
       }
     });
-  })
+  });
+
   $('#back').on('click',function(){
     window.location.href = '/origami';
-  })
+  });
+
+  /** start CB Card Settle process **/
+  $("#card_settlement").on('click', function(){
+    if(typeof code2lab != 'undefined'){
+      $('#cardSettleModal').modal({ keyboard: false, backdrop: false });
+      code2lab.getCommPorts();
+    }else{
+      swal({
+        title: 'Oops',
+        text: 'Settlement can not print out in browser!',
+        type: 'error',
+        html: true,
+        closeOnConfirm: false,
+        closeOnCancel: false,
+        allowOutsideClick: false
+      }, function () {
+        window.location.href = '/origami/shift/close';
+      });
+    }
+  });
+
+  //CB Bank payment settlement ECR integration
+  function setCommPorts(comPortLists) {
+      // alert(comPortLists);
+      $('#sel_com_port').html("");
+      var jsonPortLists = $.parseJSON(comPortLists);
+      if((jsonPortLists!=undefined && jsonPortLists!='') && (jsonPortLists.length > 0)){
+          $.each(jsonPortLists,function(key,value){
+              $('#sel_com_port').append("<option value='"+value+"'>"+value+"</option>");
+          });
+      }
+      else{
+        swal({
+          title: 'Oops',
+          text: 'Payment can not pay in browser!',
+          type: 'error',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/shift/close';
+        });
+      }
+  }
+
+  $("#card_settle").on('click', function () {
+      $("#loading_wrapper").show();
+      $('#cardSettleModal').modal('hide');
+      reqCBBankMPUSettlement();
+  });
+
+  //add req data to card_settle_trans table
+  function reqCardSettleTrans(cmd_type,payment_type,com_port) {
+    var jobj = {"cmd_type" : cmd_type, "payment_type" : payment_type};
+    $.ajax({
+        type: "POST",
+        url: "/origami/bank_integration/settle_trans",
+        data: {type:"request", data: jobj},
+        dataType: "json",
+        success: function(data) {
+            if (data.status == "success"){
+               resCardSettleTrans(data.card_settle_trans_id,cmd_type,payment_type,com_port);
+            }
+         }
+      });
+  }
+
+  //add res data to card_settle_trans table
+  function resCardSettleTrans(card_settle_trans_id,cmd_type,payment_type,com_port) {
+    var resMsg = "";
+    if($("#loading_wrapper").is(':visible')){
+      resMsg = code2lab.reqBankPayment(cmd_type, payment_type, 1, "", com_port);
+    }
+    
+    if(resMsg.includes("STATUS")){
+      var jobj = $.parseJSON(resMsg);
+
+      $.ajax({
+        type: "POST",
+        url: "/origami/bank_integration/settle_trans",
+        data: {type:"response", card_settle_trans_id: card_settle_trans_id, data: jobj},
+        dataType: "json",
+        success: function(data) {
+          if(data.status == "success"){
+            if(payment_type == "MPU"){
+              reqCBBankVMJSettlement();
+            }
+            else if(payment_type == "VMJ"){
+              reqCBBankJCBSettlement();
+            }
+            else if(payment_type == "JCB"){
+              reqCBBankCUPSettlement();
+            }
+            else if(payment_type == "CUP"){
+              $("#loading_wrapper").hide();
+              // reqCBBankAlipaySettlement();
+            }
+            // else if(payment_type == "Alipay"){
+            //   reqCBBankIPPSettlement();
+            //   $('#loading').hide();
+            // }
+          }
+        }
+      });
+    }
+    else{
+      $("#loading_wrapper").hide();
+      swal ( "Oops" ,  resMsg.toString() ,  "error" );
+    }
+  }
+
+  //settle for MPU / MPU-UPI
+  function reqCBBankMPUSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "MPU";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for VMJ (VISA, MASTER)
+  function reqCBBankVMJSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "VMJ"; //VISA,Master and JCB
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for JCB
+  function reqCBBankJCBSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "JCB";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for International Union Pay (CUP)
+  function reqCBBankCUPSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "CUP";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for Alipay
+  function reqCBBankAlipaySettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "Alipay";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for insert/direct swipe (now does not using this state - future one)
+  function reqCBBankIPPSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "IPP";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+  /** end CB Card Settle process **/
 </script>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index cf0bd605..4ec6731f 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -1,4 +1,7 @@
 <div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
   <!-- <div class="page-header">
     <ol class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -17,6 +20,16 @@
     <span class="hidden" id="sub-total"><%= @sub_total%></span>
     <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
       <div class="rebate-form">
+        <div class="row">
+          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+            <label for="com_port_name">Select Device</label>
+            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+              
+            </select>
+          </div>
+          <hr>
+        </div>
+
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
           <label>You can pay up to </label>
@@ -106,10 +119,28 @@
 </div>
 <script>
   $(document).ready(function() {
+    var sale_id = "<%= @sale_id %>";
+
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
      else {
        $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
      }
+     
+    if(typeof code2lab != 'undefined'){
+      code2lab.getCommPorts(); //get comportlists from jade
+    }else{
+      swal({
+        title: 'Oops',
+        text: 'VISA is not available in here!',
+        type: 'error',
+        html: true,
+        closeOnConfirm: false,
+        closeOnCancel: false,
+        allowOutsideClick: false
+      }, function () {
+        window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+      });
+    }
    });
   $(document).on('click', '.cashier_number', function(event){
     event.stopPropagation();
@@ -157,6 +188,7 @@
   $('#visa_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
+    var receipt_no = "<%= @receipt_no %>";
     console.log(amount);
     console.log($("#validamount").attr("value"));
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
@@ -175,24 +207,7 @@
         //         });
         // }
       //end member discount
-      $.ajax({type: "POST",
-        url: "<%= origami_payment_visa_path  %>",
-        data: "amount="+ amount + "&sale_id="+ sale_id,
-        success:function(result){
-          if(result){
-            swal({
-             title: "Information!",
-             text: "Payment Successfully",
-             html: true,
-             closeOnConfirm: false,
-             closeOnCancel: false,
-             allowOutsideClick: false
-           }, function () {
-             window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-           });
-          }
-        }
-      });
+      pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
     }else{
       if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f47f9aaf..19b49b9a 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,6 +130,8 @@ en:
       exp_to_excel: "EXPORT TO EXCEL"
       check_in: "Check In"
 
+      card_settle: "CARD SETTLE"
+
     pagination:
       first: "&laquo; First"
       last: "Last &raquo;"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 29121da8..e7d81712 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -123,7 +123,8 @@ mm:
       new_inventory_product: "ကုန်လှောင်ရုံရောက်ပစ္စည်းအသစ်များ"
       generate_report: "အစီရင်�ံစာများရှာဖွေရန်"
       exp_to_excel: "Excel သို့ ပို့ပြီးဆက်လက်လုပ်ဆောင်ရန်"
-
+      
+      card_settle: "ကဒ် စာရင်းရှင်း�မ်း"
     pagination:
       first: "&laquo; ပထမ"
       last: "အဆံုး &raquo;"
diff --git a/config/routes.rb b/config/routes.rb
index 9ffeb352..5f57f339 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -210,6 +210,10 @@ scope "(:locale)", locale: /en|mm/ do
     #check_in
     post '/check_in' => "check_in_process#check_in_process"
 
+    #CB ECR Trans
+    post "bank_integration/settle_trans", to: "bank_integration#settle_trans", as:"settle_trans"
+    post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
+
   end
 
   #--------- Waiter/Ordering Station ------------#
diff --git a/db/migrate/20180108070325_create_card_settle_trans.rb b/db/migrate/20180108070325_create_card_settle_trans.rb
new file mode 100644
index 00000000..d587ac41
--- /dev/null
+++ b/db/migrate/20180108070325_create_card_settle_trans.rb
@@ -0,0 +1,34 @@
+class CreateCardSettleTrans < ActiveRecord::Migration[5.1]
+  def change
+    create_table :card_settle_trans do |t|
+    	t.integer 	:shift_sale_id
+    	t.date 		:req_date
+		t.time 		:req_time
+		t.string 	:req_cmd 
+		t.string 	:req_type 
+		t.date 		:res_date 
+		t.time 		:res_time
+		t.string 	:res_cmd
+		t.string 	:res_type
+		t.string 	:status, :limit=>50
+		t.integer 	:sale_cnt
+		t.float 	:sale_amt, :limit=>50
+		t.integer 	:void_cnt
+		t.float 	:void_amt, :limit=>50
+		t.integer 	:refund_cnt
+		t.float 	:refund_amt, :limit=>50
+		t.string 	:print_text_part1_type
+		t.string 	:print_text_part1_value
+		t.string 	:print_text_part2_type
+		t.string 	:print_text_part2_value
+		t.string 	:print_text_part3_type
+		t.string 	:print_text_part3_value
+		t.string 	:print_text_part4_type
+		t.string 	:print_text_part4_value
+    end
+  end
+
+  def down
+  	drop_table :card_settle_trans
+  end
+end
diff --git a/db/migrate/20180109085256_create_card_sale_trans.rb b/db/migrate/20180109085256_create_card_sale_trans.rb
new file mode 100644
index 00000000..45702cb9
--- /dev/null
+++ b/db/migrate/20180109085256_create_card_sale_trans.rb
@@ -0,0 +1,52 @@
+class CreateCardSaleTrans < ActiveRecord::Migration[5.1]
+  def change
+    create_table :card_sale_trans do |t|
+    	t.string :sale_id
+    	t.date   :req_date
+		t.time   :req_time
+		t.float  :req_amt, :limit=>50 
+		t.string :req_inv_no
+		t.string :req_cmd 
+		t.string :req_type 
+		t.date   :res_date 
+		t.time   :res_time
+		t.float  :res_amt, :limit=>50
+		t.string :res_inv_no
+		t.string :res_cmd
+		t.string :res_type
+		t.string :status, :limit=>50
+		t.string :resp
+		t.string :trace
+		t.string :app_code
+		t.string :pan
+		t.string :exp_date
+		t.string :tips
+		t.string :entry_mode
+		t.string :terminal_id
+		t.string :merchant_id
+		t.string :card_holder
+		t.string :batch_no
+		t.string :ref_no
+		t.string :app
+		t.string :emv_app_id
+		t.string :emv_cyptrogram
+		t.string :curr_code
+		t.string :fx_rate
+		t.float  :foreign_amt, :limit=>50
+		t.string :dcc_msg
+		t.string :tender
+		t.string :print_text_part1_type
+		t.string :print_text_part1_value
+		t.string :print_text_part2_type
+		t.string :print_text_part2_value
+		t.string :print_text_part3_type
+		t.string :print_text_part3_value
+		t.string :print_text_part4_type
+		t.string :print_text_part4_value
+    end
+  end
+
+  def down
+  	drop_table :card_sale_trans
+  end
+end
diff --git a/spec/controllers/app/controllers/origami/bank_integration_controller_spec.rb b/spec/controllers/app/controllers/origami/bank_integration_controller_spec.rb
new file mode 100644
index 00000000..d6ff99e0
--- /dev/null
+++ b/spec/controllers/app/controllers/origami/bank_integration_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe App::Controllers::Origami::BankIntegrationController, type: :controller do
+
+end
diff --git a/spec/controllers/origami/bank_integration_controller_spec.rb b/spec/controllers/origami/bank_integration_controller_spec.rb
new file mode 100644
index 00000000..f82341e8
--- /dev/null
+++ b/spec/controllers/origami/bank_integration_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::BankIntegrationController, type: :controller do
+
+end
diff --git a/spec/helpers/app/controllers/origami/bank_integration_helper_spec.rb b/spec/helpers/app/controllers/origami/bank_integration_helper_spec.rb
new file mode 100644
index 00000000..05d25720
--- /dev/null
+++ b/spec/helpers/app/controllers/origami/bank_integration_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the App::Controllers::Origami::BankIntegrationHelper. For example:
+#
+# describe App::Controllers::Origami::BankIntegrationHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe App::Controllers::Origami::BankIntegrationHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/origami/bank_integration_helper_spec.rb b/spec/helpers/origami/bank_integration_helper_spec.rb
new file mode 100644
index 00000000..d3f5fe11
--- /dev/null
+++ b/spec/helpers/origami/bank_integration_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Origami::BankIntegrationHelper. For example:
+#
+# describe Origami::BankIntegrationHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Origami::BankIntegrationHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/card_sale_tran_spec.rb b/spec/models/card_sale_tran_spec.rb
new file mode 100644
index 00000000..ea612cf3
--- /dev/null
+++ b/spec/models/card_sale_tran_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CardSaleTran, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/card_settle_tran_spec.rb b/spec/models/card_settle_tran_spec.rb
new file mode 100644
index 00000000..68f1463f
--- /dev/null
+++ b/spec/models/card_settle_tran_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CardSettleTran, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 58e779862fd23c08821511d187001ae25552e857 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 10 Jan 2018 18:57:14 +0630
Subject: [PATCH 054/651] change process flow for cb with bank_integration in
 lookups

---
 app/controllers/origami/jcb_controller.rb    |  6 ++
 app/controllers/origami/master_controller.rb |  6 ++
 app/controllers/origami/mpu_controller.rb    |  6 ++
 app/controllers/origami/visa_controller.rb   |  6 ++
 app/views/origami/jcb/index.html.erb         | 60 +++++++++++++------
 app/views/origami/master/index.html.erb      | 57 +++++++++++++-----
 app/views/origami/mpu/index.html.erb         | 61 +++++++++++++------
 app/views/origami/visa/index.html.erb        | 62 +++++++++++++++-----
 8 files changed, 198 insertions(+), 66 deletions(-)

diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index be4cc94c..9c872325 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -29,7 +29,13 @@ class Origami::JcbController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 068095ca..0ad47913 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -28,7 +28,13 @@ class Origami::MasterController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index d1cb3c81..51bcabb1 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -28,7 +28,13 @@ class Origami::MpuController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index a664e327..af4d31f0 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -27,7 +27,13 @@ class Origami::VisaController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 1d855ad2..ada30a8b 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -20,6 +20,7 @@
 			<span class="hidden" id="sub-total"><%= @sub_total%></span>
 			<div class="card m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
+					<% if @bank_integration == '1' %>
 					<div class="row">
 			          <div class="form-group col-lg-12 col-md-12 col-sm-12">
 			            <label for="com_port_name">Select Device</label>
@@ -29,7 +30,7 @@
 			          </div>
 			          <hr>
 			        </div>
-
+			        <% end %>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label>You can pay up to </label>
@@ -120,25 +121,28 @@
 <script>
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
+		var bank_integration = "<%= @bank_integration %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
 			}
-			
-		if(typeof code2lab != 'undefined'){
-			code2lab.getCommPorts(); //get comportlists from jade
-		}else{
-			swal({
-			  title: 'Oops',
-			  text: 'JCB is not available in here!',
-			  type: 'error',
-			  html: true,
-			  closeOnConfirm: false,
-			  closeOnCancel: false,
-			  allowOutsideClick: false
-			}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
-			});
+		
+		if(bank_integration == '1'){
+			if(typeof code2lab != 'undefined'){
+				code2lab.getCommPorts(); //get comportlists from jade
+			}else{
+				swal({
+				  title: 'Oops',
+				  text: 'JCB is not available in here!',
+				  type: 'error',
+				  html: true,
+				  closeOnConfirm: false,
+				  closeOnCancel: false,
+				  allowOutsideClick: false
+				}, function () {
+					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+				});
+			}
 		}
 	});
 // number key pad
@@ -191,6 +195,7 @@ $('#jcb_pay').on('click',function(){
 	var amount = $('#amount').text();
 	var sale_id = "<%= @sale_id %>";
 	var receipt_no = "<%= @receipt_no %>";
+	var bank_integration = "<%= @bank_integration %>";
 	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 		$(this).off("click");
 		  //start member discount 5% by pay card	
@@ -207,7 +212,28 @@ $('#jcb_pay').on('click',function(){
 	        //         });
 			// }
 	    //end member discount
-	    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+	    if(bank_integration == '1'){
+		    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+		}else{
+			$.ajax({type: "POST",
+	          url: "<%= origami_payment_jcb_path %>",
+	          data: "amount="+ amount + "&sale_id="+ sale_id,
+	          success:function(result){
+	            if(result){
+	              swal({
+	                title: "Information!",
+	                text: "Payment Successfully",
+	                html: true,
+	            closeOnConfirm: false,
+	            closeOnCancel: false,
+	            allowOutsideClick: false
+	              }, function () {
+	                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+	              });
+	            }
+	          }
+	        });
+		}
 	}else{
 	  if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 9601f612..f2f3756c 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -20,6 +20,7 @@
     <span class="hidden" id="sub-total"><%= @sub_total%></span>
     <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
       <div class="rebate-form">
+        <% if @bank_integration == '1' %>
         <div class="row">
           <div class="form-group col-lg-12 col-md-12 col-sm-12">
             <label for="com_port_name">Select Device</label>
@@ -29,6 +30,7 @@
           </div>
           <hr>
         </div>
+        <% end %>
 
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -120,25 +122,28 @@
 <script>
   $(document).ready(function() {
       var sale_id = "<%= @sale_id %>";
+      var bank_integration = "<%= @bank_integration %>";
       if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
       else {
        $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
       }
       
-      if(typeof code2lab != 'undefined'){
-        code2lab.getCommPorts(); //get comportlists from jade
-      }else{
-        swal({
-          title: 'Oops',
-          text: 'MASTER is not available in here!',
-          type: 'error',
-          html: true,
-          closeOnConfirm: false,
-          closeOnCancel: false,
-          allowOutsideClick: false
-        }, function () {
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
-        });
+      if(bank_integration == '1'){
+        if(typeof code2lab != 'undefined'){
+          code2lab.getCommPorts(); //get comportlists from jade
+        }else{
+          swal({
+            title: 'Oops',
+            text: 'MASTER is not available in here!',
+            type: 'error',
+            html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+          }, function () {
+            window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+          });
+        }
       }
    });
   $(document).on('click', '.cashier_number', function(event){
@@ -188,6 +193,7 @@
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
     var receipt_no = "<%= @receipt_no %>";
+    var bank_integration = "<%= @bank_integration %>";
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
       $(this).off("click");
       //start member discount 5% by pay card  
@@ -204,7 +210,28 @@
         //         });
         // }
       //end member discount
-      pay_withBank("SALE", "master", amount, sale_id, receipt_no);
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "master", amount, sale_id, receipt_no);
+      }else{
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_master_path %>",
+          data: "amount="+ amount + "&sale_id="+ sale_id,
+          success:function(result){
+            if(result){
+              swal({
+                title: "Information!",
+                text: "Payment Successfully",
+                html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              });
+            }
+          }
+        });
+      }
     }else{
       if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 5393d9b2..747049b9 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -21,6 +21,7 @@
 			<div class="card" style="margin-top:10px;padding:20px;">
 				<div class="card-block">
 					<div class="rebate-form">
+						<% if @bank_integration == '1' %>
 						<div class="row">
 							<div class="form-group col-lg-12 col-md-12 col-sm-12">
 								<label for="com_port_name">Select Device</label>
@@ -30,7 +31,7 @@
 							</div>
 							<hr>
 						</div>
-
+						<% end %>
 						<div class="row">
 							<div class="form-group col-lg-12 col-md-12 col-sm-12">
 								<label>You can pay up to </label>
@@ -123,26 +124,28 @@
 <script>
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
-
+		var bank_integration = "<%= @bank_integration %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
 			}
-			
-		if(typeof code2lab != 'undefined'){
-			code2lab.getCommPorts(); //get comportlists from jade
-		}else{
-			swal({
-			  title: 'Oops',
-			  text: 'MPU is not available in here!',
-			  type: 'error',
-			  html: true,
-			  closeOnConfirm: false,
-			  closeOnCancel: false,
-			  allowOutsideClick: false
-			}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
-			});
+		
+		if(bank_integration == '1'){
+			if(typeof code2lab != 'undefined'){
+				code2lab.getCommPorts(); //get comportlists from jade
+			}else{
+				swal({
+				  title: 'Oops',
+				  text: 'MPU is not available in here!',
+				  type: 'error',
+				  html: true,
+				  closeOnConfirm: false,
+				  closeOnCancel: false,
+				  allowOutsideClick: false
+				}, function () {
+					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+				});
+			}
 		}
 	});
 		
@@ -194,6 +197,7 @@
 		var amount = $('#amount').text();
 		var sale_id = "<%= @sale_id %>";
 		var receipt_no = "<%= @receipt_no %>";
+		var bank_integration = "<%= @bank_integration %>";
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 		//start member discount 5% by pay card	
@@ -210,7 +214,28 @@
 		    //          });
 			// }
 	    //end member discount
-	      pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+	    	if(bank_integration == '1'){
+	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+	      	}else{
+	      		$.ajax({type: "POST",
+		          url: "<%= origami_payment_mpu_path %>",
+		          data: "amount="+ amount + "&sale_id="+ sale_id,
+		          success:function(result){
+		            if(result){
+		              swal({
+		                title: "Information!",
+		                text: "Payment Successfully",
+		                html: true,
+		            closeOnConfirm: false,
+		            closeOnCancel: false,
+		            allowOutsideClick: false
+		              }, function () {
+		                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		              });
+		            }
+		          }
+		        });
+	      	}
 
 	     }else{
 	     	if (amount>0) {
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 4ec6731f..f9a693c1 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -20,6 +20,7 @@
     <span class="hidden" id="sub-total"><%= @sub_total%></span>
     <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
       <div class="rebate-form">
+        <% if @bank_integration == '1' %>
         <div class="row">
           <div class="form-group col-lg-12 col-md-12 col-sm-12">
             <label for="com_port_name">Select Device</label>
@@ -29,6 +30,7 @@
           </div>
           <hr>
         </div>
+        <% end %>
 
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -120,27 +122,32 @@
 <script>
   $(document).ready(function() {
     var sale_id = "<%= @sale_id %>";
+    var bank_integration = "<%= @bank_integration %>";
 
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
      else {
        $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
      }
-     
-    if(typeof code2lab != 'undefined'){
-      code2lab.getCommPorts(); //get comportlists from jade
-    }else{
-      swal({
-        title: 'Oops',
-        text: 'VISA is not available in here!',
-        type: 'error',
-        html: true,
-        closeOnConfirm: false,
-        closeOnCancel: false,
-        allowOutsideClick: false
-      }, function () {
-        window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
-      });
+    
+    if(bank_integration == '1'){
+      if(typeof code2lab != 'undefined'){
+        code2lab.getCommPorts(); //get comportlists from jade
+      }
+      else{
+        swal({
+          title: 'Oops',
+          text: 'VISA is not available in here!',
+          type: 'error',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+        });
+      }
     }
+    
    });
   $(document).on('click', '.cashier_number', function(event){
     event.stopPropagation();
@@ -207,7 +214,30 @@
         //         });
         // }
       //end member discount
-      pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
+      var bank_integration = "<%= @bank_integration %>";
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
+      }
+      else{
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_visa_path %>",
+          data: "amount="+ amount + "&sale_id="+ sale_id,
+          success:function(result){
+            if(result){
+              swal({
+                title: "Information!",
+                text: "Payment Successfully",
+                html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              });
+            }
+          }
+         });
+      }
     }else{
       if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );

From 8160a435ec66c659146aec308f6a845aa72bde89 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 10 Jan 2018 19:00:10 +0630
Subject: [PATCH 055/651] bank integration settings in readme

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 3412e2ed..5be96143 100755
--- a/README.md
+++ b/README.md
@@ -49,6 +49,10 @@ Order Item & Order Summary Slim
 	5) app/models/printer/order_queue_printer.rb
 	6) app/models/printer/receipt_printer.rb
 
+For Bank Integration setting
+  1) rake db:migrate for card_sale_trans, card_settle_trans
+  2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
+
 * ToDo list
 
 1. Cloud Sync

From 2d2a154c17a69f640524ab27b9453ae7b919456d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 11 Jan 2018 11:46:05 +0630
Subject: [PATCH 056/651] check multiple other payments in receipt

---
 app/assets/javascripts/origami.js             |  2 +-
 .../origami/payments_controller.rb            | 24 ++++++++++---------
 app/models/sale.rb                            |  3 +--
 app/pdf/receipt_bill_pdf.rb                   | 22 +++++++++--------
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 5bdbe861..64ff62ab 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -318,7 +318,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 		  closeOnCancel: false,
 		  allowOutsideClick: false
 		}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/MPU";
+				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/"+payment_type.toUpperCase();
 			});
     }
 }
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 88577ac4..3c43ce0b 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -123,14 +123,15 @@ class Origami::PaymentsController < BaseOrigamiController
       card_data = Array.new
       card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
       if !card_sale_trans_ref_no.nil? 
-          card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s
-          card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s
-          card_no = card_sale_trans_ref_no.pan.last(4)
+        card_sale_trans_ref_no.each do |cash_sale_trans|
+          card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
+          card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
+          card_no = cash_sale_trans.pan.last(4)
           card_no = card_no.rjust(19,"**** **** **** ")
-          card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id})
+          card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+        end
       end
-      puts "card_data"
-      puts card_data.to_json
+      
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       # Calculate Food and Beverage Total
@@ -257,13 +258,14 @@ class Origami::PaymentsController < BaseOrigamiController
     card_data = Array.new
     card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
     if !card_sale_trans_ref_no.nil? 
-        card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s
-        card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s
-        card_no = card_sale_trans_ref_no.pan.last(4)
+      card_sale_trans_ref_no.each do |cash_sale_trans|
+        card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
+        card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
+        card_no = cash_sale_trans.pan.last(4)
         card_no = card_no.rjust(19,"**** **** **** ")
-        card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id})
+        card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+      end
     end
-
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index ee55159c..e0918d5f 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1129,8 +1129,7 @@ end
   def self.getCardSaleTrans(sale_id)
     query = Sale.select("cst.res_date,cst.res_time,cst.trace,cst.pan,cst.batch_no,cst.exp_date,cst.app,cst.res_type,cst.ref_no,cst.terminal_id,cst.merchant_id,cst.app_code")
             .joins("JOIN card_sale_trans as cst on cst.sale_id = sales.sale_id")
-            .where("sales.sale_id=?",sale_id)
-            .first()
+            .where("sales.sale_id=? and status = 'Approved'",sale_id)
     
     return query
   end
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index ab33d6e4..8c719825 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -517,17 +517,19 @@ class ReceiptBillPdf < Prawn::Document
         move_down 5
 
         y_position = cursor
-        if !card_data[0].nil?
-            if card_data[0]['app'] == 'CUP'
-                card_data[0]['app'] = 'UNIONPAY'
-            elsif card_data[0]['app'] == 'MASTERCARD'
-                card_data[0]['app'] = 'MASTER'
+        if !card_data.nil?
+            card_data.each do |data|
+                if data['app'] == 'CUP'
+                    data['app'] = 'UNIONPAY'
+                elsif data['app'] == 'MASTERCARD'
+                    data['app'] = 'MASTER'
+                end
+                text "DATE/TIME: #{data['res_date']}    #{data['res_time']} ", :size => @item_font_size, :align => :left
+                text "BATCH NUM: #{data['batch_no']}                          TRACE#: #{data['trace']}",:size => @item_font_size, :align => :left
+                text "RREF NUM: #{data['ref_no']}             APPR CODE: #{data['app_code']} ",:size => @item_font_size, :align => :left
+                text "TID: #{data['tid']} ",:size => @item_font_size, :align => :left
+                text "#{data['app']}    #{data['pan']} ",:size => @item_font_size, :align => :left
             end
-            text "DATE/TIME: #{card_data[0]['res_date']}    #{card_data[0]['res_time']} ", :size => @item_font_size, :align => :left
-            text "BATCH NUM: #{card_data[0]['batch_no']}                          TRACE#: #{card_data[0]['trace']}",:size => @item_font_size, :align => :left
-            text "RREF NUM: #{card_data[0]['ref_no']}             APPR CODE: #{card_data[0]['app_code']} ",:size => @item_font_size, :align => :left
-            text "TID: #{card_data[0]['tid']} ",:size => @item_font_size, :align => :left
-            text "#{card_data[0]['app']}    #{card_data[0]['pan']} ",:size => @item_font_size, :align => :left
         end
     end
 end

From bb2c8694a5e0559716a61650040a9be1fb6920d3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 11 Jan 2018 16:08:17 +0630
Subject: [PATCH 057/651] add unionpay process for payment

---
 .../javascripts/origami/unionpay.coffee       |   3 +
 app/assets/stylesheets/origami/unionpay.scss  |   3 +
 .../origami/payments_controller.rb            |   5 +-
 .../origami/unionpay_controller.rb            |  61 +++++
 app/helpers/origami/unionpay_helper.rb        |   2 +
 app/pdf/receipt_bill_pdf.rb                   |  10 +-
 app/views/origami/payments/show.html.erb      |  53 ++--
 .../origami/unionpay/create.json.jbuilder     |   5 +
 app/views/origami/unionpay/index.html.erb     | 247 ++++++++++++++++++
 config/routes.rb                              |   2 +
 .../origami/unionpay_controller_spec.rb       |   5 +
 spec/helpers/origami/unionpay_helper_spec.rb  |  15 ++
 12 files changed, 388 insertions(+), 23 deletions(-)
 create mode 100644 app/assets/javascripts/origami/unionpay.coffee
 create mode 100644 app/assets/stylesheets/origami/unionpay.scss
 create mode 100644 app/controllers/origami/unionpay_controller.rb
 create mode 100644 app/helpers/origami/unionpay_helper.rb
 create mode 100755 app/views/origami/unionpay/create.json.jbuilder
 create mode 100755 app/views/origami/unionpay/index.html.erb
 create mode 100644 spec/controllers/origami/unionpay_controller_spec.rb
 create mode 100644 spec/helpers/origami/unionpay_helper_spec.rb

diff --git a/app/assets/javascripts/origami/unionpay.coffee b/app/assets/javascripts/origami/unionpay.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/origami/unionpay.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/origami/unionpay.scss b/app/assets/stylesheets/origami/unionpay.scss
new file mode 100644
index 00000000..6daa3524
--- /dev/null
+++ b/app/assets/stylesheets/origami/unionpay.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the origami/unionpay controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 3c43ce0b..8e10b0e1 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -155,6 +155,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @visacount= 0.0
       @jcbcount= 0.0
       @mastercount = 0.0
+      @unionpaycount = 0.0
       @credit = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
       @balance = 0.00
@@ -216,6 +217,8 @@ class Origami::PaymentsController < BaseOrigamiController
            @jcbcount += spay.payment_amount
          elsif spay.payment_method == "master"
            @mastercount += spay.payment_amount
+         elsif spay.payment_method == "unionpay"
+          @unionpaycount += spay.payment_amount
          elsif spay.payment_method == "creditnote"
            @credit += spay.payment_amount
          end
@@ -272,7 +275,7 @@ 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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data)
   end
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
new file mode 100644
index 00000000..a3f7e6ed
--- /dev/null
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -0,0 +1,61 @@
+class Origami::UnionpayController < BaseOrigamiController
+	def index
+    @sale_id = params[:sale_id]
+
+    # limit unionpay_amount
+    sale_data = Sale.find_by_sale_id(@sale_id)
+    total = sale_data.grand_total
+    @unionpaycount = 0
+    others = 0
+
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+    
+    sale_data.sale_payments.each do |sale_payment|
+        if sale_payment.payment_method == "unionpay"
+          @unionpaycount = @unionpaycount + sale_payment.payment_amount
+        else
+          others = others + sale_payment.payment_amount
+        end
+    end
+    puts "unionpaycount"
+    puts @unionpaycount
+    @can_unionpay = total - @unionpaycount - others
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
+    #for bank integration
+    @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
+  end
+
+  def create
+    cash = params[:amount]
+    sale_id = params[:sale_id]
+    if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
+      saleObj = Sale.find(sale_id)
+      #end rounding adjustment
+      sale_payment = SalePayment.new
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay")
+    end
+  end
+end
diff --git a/app/helpers/origami/unionpay_helper.rb b/app/helpers/origami/unionpay_helper.rb
new file mode 100644
index 00000000..3911575e
--- /dev/null
+++ b/app/helpers/origami/unionpay_helper.rb
@@ -0,0 +1,2 @@
+module Origami::UnionpayHelper
+end
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 8c719825..16b1fd58 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -512,12 +512,12 @@ class ReceiptBillPdf < Prawn::Document
 
     #start card sale trans data
     def card_sale_data(card_data)
-        move_down 5
-        stroke_horizontal_rule
-        move_down 5
+        if card_data != nil && !card_data.empty?
+            move_down 5
+            stroke_horizontal_rule
+            move_down 5
 
-        y_position = cursor
-        if !card_data.nil?
+            y_position = cursor
             card_data.each do |data|
                 if data['app'] == 'CUP'
                     data['app'] = 'UNIONPAY'
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 77770247..dfff29cc 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -182,13 +182,13 @@
         <% if @visacount != 0.0 %>
         <div class="row payment others-color">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Visa</div>
+          <div class="col-md-3">VISA</div>
           <div class="col-md-4 visa is_card" id="visacount"><%= @visacount %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Visa</div>
+          <div class="col-md-3">VISA</div>
           <div class="col-md-4" id="visacount">0.0</div>
         </div>
         <% end %>
@@ -210,17 +210,31 @@
         <% if @mastercount != 0.0 %>
         <div class="row payment others-color">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Master</div>
+          <div class="col-md-3">MASTER</div>
           <div class="col-md-4 master is_card" id="mastercount"><%= @mastercount %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Master</div>
+          <div class="col-md-3">MASTER</div>
           <div class="col-md-4" id="mastercount">0.0</div>
         </div>
         <% end %>
         <!-- <br> -->
+        <!-- UNIONPAY -->
+        <% if @unionpaycount != 0.0 %>
+        <div class="row payment others-color">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">UNIONPAY</div>
+          <div class="col-md-4 master is_card" id="unionpaycount"><%= @unionpaycount %></div>
+        </div>
+        <% else %>
+        <div class="row hidden">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">UNIONPAY</div>
+          <div class="col-md-4" id="unionpaycount">0.0</div>
+        </div>
+        <% end %>
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
           <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total rescue 0 %></span></strong></div>
@@ -303,7 +317,7 @@
         }else if(payment_type=="Credit"){
            $("#card_payment").hide();
            $("#others_payment").hide();
-        }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master"){
+        }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master" || payment_type=="UNIONPAY"){
            $("#credit_payment").hide();
         }
       /* end check first bill or not*/
@@ -361,17 +375,18 @@
         update_balance();
         break;
         case 'nett':
-        var credit1 = $('#credit').text();
-        var card1 = $('#others').text();
-        var paypar1 = $('#ppamount').text();
-        var visa1 = $('#visacount').text();
-        var jcb1 = $('#jcbcount').text();
-        var master1 = $('#mastercount').text();
-        var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
-        var total = $('#amount_due').text();
-        var amt = parseFloat(total) - parseFloat(othertotal);
-        $('#cash').text(parseFloat(amt).toFixed(2));
-        update_balance();
+          var credit1 = $('#credit').text();
+          var card1 = $('#others').text();
+          var paypar1 = $('#ppamount').text();
+          var visa1 = $('#visacount').text();
+          var jcb1 = $('#jcbcount').text();
+          var master1 = $('#mastercount').text();
+          var unionpay1 = $('#unionpaycount').text();
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
+          var total = $('#amount_due').text();
+          var amt = parseFloat(total) - parseFloat(othertotal);
+          $('#cash').text(parseFloat(amt).toFixed(2));
+          update_balance();
         break;
       }
       event.handled = true;
@@ -412,6 +427,9 @@
       else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
           swal("Opps","Please Pay with Master Payment","warning");
       }
+      else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with UNIONPAY Payment","warning");
+      }
       else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
           swal("Opps","Please Pay with Credit Payment","warning");
       }else{
@@ -515,8 +533,9 @@
     var visa = $('#visacount').text();
     var jcb = $('#jcbcount').text();
     var master = $('#mastercount').text();
+    var unionpay = $('#unionpaycount').text();
     var amount_due = $('#amount_due').text();
-    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay)
     var result = parseFloat(amount_due) - parseFloat(total);
     $('#balance').text(result.toFixed(2));
   }
diff --git a/app/views/origami/unionpay/create.json.jbuilder b/app/views/origami/unionpay/create.json.jbuilder
new file mode 100755
index 00000000..9767a7d8
--- /dev/null
+++ b/app/views/origami/unionpay/create.json.jbuilder
@@ -0,0 +1,5 @@
+if(@status)
+  json.status @status
+else
+  json.status false
+end
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
new file mode 100755
index 00000000..37476be9
--- /dev/null
+++ b/app/views/origami/unionpay/index.html.erb
@@ -0,0 +1,247 @@
+<div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
+  <!-- <div class="page-header">
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+      <li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+      <li class="breadcrumb-item active"><%= t("views.btn.unionpay") %></li>
+      <span class="float-right">
+        <%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+      </span>
+    </ol>
+  </div> -->
+  <h5>UNIONPAY Payment</h5>
+  <div class="row">
+   <div class="col-lg-5 col-md-5 col-sm-5">
+    <span class="hidden" id="membership_id"><%= @membership_id%></span>
+    <span class="hidden" id="member_discount"><%= @member_discount%></span>
+    <span class="hidden" id="sub-total"><%= @sub_total%></span>
+    <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
+      <div class="rebate-form">
+        <% if @bank_integration == '1' %>
+        <div class="row">
+          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+            <label for="com_port_name">Select Device</label>
+            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+              
+            </select>
+          </div>
+          <hr>
+        </div>
+        <% end %>
+
+       <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label>You can pay up to </label>
+          <%@can_unionpay = @can_unionpay +@rounding_adj%>
+          <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_unionpay %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% if @unionpaycount != 0 %>
+      <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label>Recent Visa paid amount </label>
+          <input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@unionpaycount %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% end %>
+      <div class="row">
+       <div class="form-group col-lg-12 col-md-12 col-sm-12">
+        <label>Reference Number</label>
+        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+      </div>
+      <hr>
+    </div>
+    <div class="row">
+     <div class="form-group col-lg-12 col-md-12 col-sm-12">
+      <label>Amount</label>
+      <div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+    </div>
+    <hr>
+  </div>
+</div>
+</div>
+</div>
+
+<div class="col-lg-6 col-md-6 col-sm-6" style="">
+  <div class=" m-t-10 p-l-20">
+   <div class="row">
+     <div class="col-lg-6 col-md-6 col-sm-6">
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number " data-value="1" data-type="num">1</div>
+         <div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+         <div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number  border-left" data-value="4" data-type="num">4</div>
+         <div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+         <div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number  border-left" data-value="7" data-type="num">7</div>
+         <div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+         <div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number  border-left" data-value="0" data-type="num">0</div>
+         <div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+         <div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number green border-left" data-type="nett" >Nett</div>
+         <div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+         <div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+       </div>
+     </div>
+     <div class="col-lg-6 col-md-6 col-sm-6">
+       <div class="row bottom m-l-5">
+         <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+         <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+       </div>
+       <div class="row bottom m-l-5">
+         <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+         <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+       </div>
+       <div class="row bottom m-l-5">
+         <div class="pay purple left" id="unionpay_pay">Pay</div>
+       </div>
+     </div>
+   </div>
+ </div>
+</div>
+
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+</div>
+</div>
+</div>
+<script>
+  $(document).ready(function() {
+    var sale_id = "<%= @sale_id %>";
+    var bank_integration = "<%= @bank_integration %>";
+
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+     else {
+       $('#validamount').attr("value",parseFloat("<%= @can_unionpay %>") - parseFloat(localStorage.getItem("cash")));
+     }
+    
+    if(bank_integration == '1'){
+      if(typeof code2lab != 'undefined'){
+        code2lab.getCommPorts(); //get comportlists from jade
+      }
+      else{
+        swal({
+          title: 'Oops',
+          text: 'UNIONPAY is not available in here!',
+          type: 'error',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+        });
+      }
+    }
+    
+   });
+  $(document).on('click', '.cashier_number', function(event){
+    event.stopPropagation();
+    event.preventDefault();
+    if(event.handled !== true) {
+      var original_value;
+      original_value = $('#amount').text();
+
+      var input_value = $(this).attr("data-value");
+
+      var input_type = $(this).attr("data-type");
+      switch (input_type) {
+        case 'num':
+        if (original_value == "0.0"){
+         $('#amount').text(input_value);
+       }else{
+         $('#amount').append(input_value);
+       }
+       break;
+
+       case 'add':
+       var input_value = $(this).attr("data-value");
+       amount = parseInt(input_value) + parseInt(original_value);
+       $('#amount').html(amount);
+
+       break;
+       case 'clr':
+       $('#amount').html("0.0");
+       break;
+       case 'del' :
+       var cash=$('#amount').text();
+       $('#amount').text(cash.substr(0,cash.length-1));
+       break;
+       case 'nett':
+       var remain_amount = $('#validamount').val();
+       $('#amount').text(remain_amount);
+       break;
+
+     }
+     event.handled = true;
+   } else {
+    return false;
+  }
+});
+  $('#unionpay_pay').on('click',function(){
+    var amount = $('#amount').text();
+    var sale_id = "<%= @sale_id %>";
+    var receipt_no = "<%= @receipt_no %>";
+    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+      $(this).off("click");
+      //start member discount 5% by pay card  
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //            success:function(result){           
+        //            }
+        //         });
+        // }
+      //end member discount
+      var bank_integration = "<%= @bank_integration %>";
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
+      }
+      else{
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_unionpay_path %>",
+          data: "amount="+ amount + "&sale_id="+ sale_id,
+          success:function(result){
+            if(result){
+              swal({
+                title: "Information!",
+                text: "Payment Successfully",
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              });
+            }
+          }
+         });
+      }
+    }else{
+      if (amount>0) {
+        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+      }else{
+        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+      }
+    }
+  })
+</script>
diff --git a/config/routes.rb b/config/routes.rb
index 5f57f339..a31dcb5c 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,6 +156,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/jcb' => "jcb#create"
     post 'payment/master' => "master#create"
     post 'payment/visa' => "visa#create"
+    post 'payment/unionpay' => "unionpay#create"
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
@@ -166,6 +167,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/payment/others_payment/VISA' => "visa#index"
     get 'sale/:sale_id/payment/others_payment/Master' => "master#index"
     get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index"
+    get 'sale/:sale_id/payment/others_payment/UNIONPAY' => "unionpay#index"
     get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
     get 'sale/:sale_id/payment/others_payment/Voucher' => "voucher#index"
 
diff --git a/spec/controllers/origami/unionpay_controller_spec.rb b/spec/controllers/origami/unionpay_controller_spec.rb
new file mode 100644
index 00000000..059b5577
--- /dev/null
+++ b/spec/controllers/origami/unionpay_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::UnionpayController, type: :controller do
+
+end
diff --git a/spec/helpers/origami/unionpay_helper_spec.rb b/spec/helpers/origami/unionpay_helper_spec.rb
new file mode 100644
index 00000000..5fce324c
--- /dev/null
+++ b/spec/helpers/origami/unionpay_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Origami::UnionpayHelper. For example:
+#
+# describe Origami::UnionpayHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Origami::UnionpayHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 9f7ce6d4953c08cdc9f67bf4ee742448c093a7ab Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 11 Jan 2018 17:36:40 +0630
Subject: [PATCH 058/651] check payment type

---
 app/assets/javascripts/origami.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 64ff62ab..712ce8f7 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -309,6 +309,9 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
          	}
          });
     }else{
+    	if(payment_type!="master"){
+    		payment_type = payment_type.toUpperCase();
+    	}
         swal({
 		  title: 'Oops',
 		  text: "Transaction is " + (jobj.STATUS).toLowerCase(),
@@ -318,7 +321,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 		  closeOnCancel: false,
 		  allowOutsideClick: false
 		}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/"+payment_type.toUpperCase();
+				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/"+payment_type;
 			});
     }
 }

From 63991886964d8430a4a06b032b477808ffcf7e24 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 12 Jan 2018 09:23:41 +0630
Subject: [PATCH 059/651] update customer and ability

---
 app/models/ability.rb  | 10 +++++-----
 app/models/customer.rb |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 02b2618f..e6cdf9c3 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -104,11 +104,11 @@ class Ability
 
         can :index, :other_charge
         can :create, :other_charge
-        can :index, :discount
-        can :create, :discount
-        can :remove_discount_items, :discount
-        can :remove_all_discount, :discount
-        can :member_discount, :discount
+        # can :index, :discount
+        # can :create, :discount
+        # can :remove_discount_items, :discount
+        # can :remove_all_discount, :discount
+        # can :member_discount, :discount
 
         can :first_bill, :payment
         can :show, :payment
diff --git a/app/models/customer.rb b/app/models/customer.rb
index c228e3e6..949093ea 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -146,9 +146,10 @@ class Customer < ApplicationRecord
       if sale.customer.membership_id
           response = self.rebat(Sale.find(sale.sale_id))
            #record an payment in sale-audit
+           if !response.nil?
             remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.amount_received} "
             sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1)   
-
+          end
            if response["status"] == true
              status   = sale.update_attributes(rebate_status: "true")
            end
@@ -159,8 +160,9 @@ class Customer < ApplicationRecord
   def self.rebat(sObj)
     rebate_prices,campaign_method = SaleItem.calculate_rebate_by_account(sObj.sale_items)
     generic_customer_id = sObj.customer.membership_id
-    if generic_customer_id.present?
 
+        
+    if generic_customer_id.present?
       paypar     = sObj.sale_payments
       payparcost = 0
       credit     = 0
@@ -171,6 +173,7 @@ class Customer < ApplicationRecord
         end
         if pp.payment_method == "creditnote"
           credit = 1
+          sObj.update_attributes(rebate_status: nil)
         end
       end
       # overall_dis = SaleItem.get_overall_discount(sObj.id)
@@ -287,6 +290,7 @@ class Customer < ApplicationRecord
         end
       end
     else
+      puts "no Response"
        response = { "status": "no_member", "message": "Not membership"}  
     end
   end

From cc710a992f6571593be1c4db12afee06620ba141 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 12 Jan 2018 14:33:30 +0630
Subject: [PATCH 060/651] update other multiple payments

---
 app/models/ability.rb                         |  1 +
 app/views/origami/home/show.html.erb          | 10 ++++++---
 .../origami/others_payments/index.html.erb    | 11 +++++-----
 app/views/origami/payments/show.html.erb      | 22 +++++++++++--------
 app/views/origami/rooms/show.html.erb         |  2 +-
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index e6cdf9c3..560e0192 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -96,6 +96,7 @@ class Ability
         can :read, Order
         can :update, Order
         can :menage, Booking
+        can :manage, OrderQueueStation
         can :read, Sale  
         can :update, Sale      
         can :get_customer, Customer
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 29903480..f162be5d 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -390,7 +390,7 @@
               <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' active="<%= can? :edit, :sale_edit %>">Edit</button>
-                  <button type="button" id="discount" class="btn btn-block bg-blue waves-effect">Discount</button>
+                  <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" active="<%= can? :index, :discount %>">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
 
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
@@ -419,7 +419,7 @@
                             <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
                         </div>
                         <div class="modal-body">
-                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                           <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
                              <option value="Cash">Cash</option>
                              <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
@@ -552,6 +552,8 @@
 
         // Discount for Payment
         $('#discount').click(function () {
+
+          if ($(this).attr('active')=== "true") {
             var sale = $('#sale_id').val();
             if (sale != "") {
                 var sale_id = sale
@@ -565,7 +567,9 @@
             else {
               swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
-
+          }else{
+                  swal("Opps","You are not authorized for void","warning")
+          }
             return false;
         });
     });
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index c0185182..4e07274a 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -34,11 +34,12 @@
         }
 
         payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
-	    if(payment_type) {
-	        $(".others-payment").hide();
-	        $("."+payment_type).show();
-	    }
-      
+        if(payment_type) {
+        	$(".others-payment").hide();
+            $(payment_type).each(function(i){		        
+		        $("."+payment_type[i]).show();
+            });
+        }
      /* end check first bill or not*/
 
 	$('.others-payment').on('click',function(){
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index dfff29cc..5e99509f 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -310,16 +310,20 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
 
-      payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
-        if(payment_type=="Cash"){
+        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        // console.log(jQuery.inArray("Credit", payment_type))
+        // console.log(payment_type)
+          if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
+            $("#credit_payment").hide();             
+          } else{
+            $("#credit_payment").show();
+          }
+
+         if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
+           $("#card_payment").show();      
+         } else{
            $("#card_payment").hide();
-           $("#credit_payment").hide();
-        }else if(payment_type=="Credit"){
-           $("#card_payment").hide();
-           $("#others_payment").hide();
-        }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master" || payment_type=="UNIONPAY"){
-           $("#credit_payment").hide();
-        }
+         }
       /* end check first bill or not*/
 
     var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 3b7a5144..e01b2829 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -393,7 +393,7 @@
                             <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
                         </div>
                         <div class="modal-body">
-                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                           <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
                              <option value="Cash">Cash</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">

From 649711f72dc0ff6d83b291be8dfc291df1c03d60 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 12 Jan 2018 15:07:11 +0630
Subject: [PATCH 061/651] license key api for redis

---
 Gemfile                                   |  3 ++
 Gemfile.lock                              |  2 ++
 app/controllers/application_controller.rb | 10 +++---
 app/controllers/sym_control_controller.rb | 11 +++++++
 app/models/license.rb                     | 38 ++++++++++++++++++++---
 config/routes.rb                          |  1 +
 config/secrets.yml                        |  2 +-
 7 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 90182812..94ed4ef3 100755
--- a/Gemfile
+++ b/Gemfile
@@ -95,6 +95,9 @@ gem 'cancancan', '~> 1.10'
 #end
 
 group :development do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platform: :mri
+
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '~> 3.0.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 48c34ea2..1c7e6534 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,6 +53,7 @@ GEM
     bcrypt (3.1.11)
     bindex (0.5.0)
     builder (3.2.3)
+    byebug (9.1.0)
     cancancan (1.17.0)
     capistrano (3.10.1)
       airbrussh (>= 1.0.0)
@@ -286,6 +287,7 @@ PLATFORMS
 DEPENDENCIES
   aescrypt
   bcrypt (~> 3.1.7)
+  byebug
   cancancan (~> 1.10)
   capistrano
   capistrano-bundler
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7fafd6bd..3f789fc4 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else      
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end
   end
 
diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb
index 816b8f2c..92d9cedd 100644
--- a/app/controllers/sym_control_controller.rb
+++ b/app/controllers/sym_control_controller.rb
@@ -1,5 +1,6 @@
 class SymControlController < BaseController
   skip_before_action :verify_authenticity_token
+  http_basic_authenticate_with name: "vip", password: "!abcABC01"
 
   def run
   	sym_path = "/home/yan/symmetric/"
@@ -32,4 +33,14 @@ class SymControlController < BaseController
       end
   end
 
+  def get_key
+    license = License.new(ENV["SX_PROVISION_URL"])
+    status = license.get_key
+    if status
+      render :text => "<h1>Success!</h1>"
+    else
+      render :text => "<h1>Not Get!</h1>"
+    end 
+  end
+
 end
\ No newline at end of file
diff --git a/app/models/license.rb b/app/models/license.rb
index 36ce9b29..4af6059a 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -45,7 +45,7 @@ class License
       if (@license["status"] == true)
         assign(aes_key, aes_iv)
 
-        Rails.logger.info "License - " + response.parsed_response.to_s
+        # Rails.logger.info "License - " + response.parsed_response.to_s
         
         redis = Redis.new
         redis.set(cache_key, Marshal.dump(@license))
@@ -106,7 +106,7 @@ class License
       redis = Redis.new
       cache_license = redis.get(cache_key)    
 
-      Rails.logger.info "Cache key - " + cache_key.to_s
+      # Rails.logger.info "Cache key - " + cache_key.to_s
 
       if cache_license.nil?   
         cache = {"shop" => @activate["shop_name"], "key" => aes_key, "iv" => @activate["iv_key"], "renewable_date" => @activate["renewable_date"] }           
@@ -114,7 +114,7 @@ class License
         redis.set(cache_key, Marshal.dump(cache))
       end 
 
-      Rails.logger.info "License - " + response.parsed_response.to_s
+      # Rails.logger.info "License - " + response.parsed_response.to_s
 
       response =  create_license_file(@activate)
       if(response[:status])
@@ -136,7 +136,7 @@ class License
     response = self.class.get("/verify", @params)
     @varified = response.parsed_response
 
-    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+    # Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
     if (@varified["status"])
       if (!check_expired(@varified["plan_next_renewal_date"]))
         return true
@@ -227,6 +227,36 @@ class License
       #   f.put
       # end
     end
+  end
+
+  # Re-get keys
+  def get_key
+    api_token = read_license_no_decrypt("api_token")  
+    shop_name = read_license_no_decrypt("shop_name")    
+    @params = { query: {lookup_type: "application", api_token: api_token} }
+    response = self.class.get("/get_key", @params)
+    @data = response.parsed_response
+    
+    if (@data["status"])
+      ##Check from local redis - if available load local otherwise get from remote
+      cache_key = "shop:#{shop_name}"    
+
+      cache_license = nil    
+
+      ##Get redis connection from connection pool
+      redis = Redis.new
+      cache_license = redis.get(cache_key)    
+
+      # Rails.logger.info "Cache key - " + cache_key.to_s
+
+      if cache_license.nil?   
+        cache = {"shop" => shop_name, "key" => @data["secret_key"], "iv" => @data["iv_key"], "renewable_date" => @data["plan_next_renewable_date"] }           
+        redis = Redis.new
+        redis.set(cache_key, Marshal.dump(cache))
+      end 
+      return true
+    end 
+    return false
   end  
 
   private
diff --git a/config/routes.rb b/config/routes.rb
index 5f57f339..10df301d 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,6 +13,7 @@ scope "(:locale)", locale: /en|mm/ do
   get 'activate' => 'install#index'
   post 'activate' => 'install#activate'
   get 'run_sym' => 'sym_control#run'
+  get 'get_key' => 'sym_control#get_key'
 
   #--------- Login/Authentication ------------#
   get 'auth/:emp_id' => 'home#show', as: :emp_login
diff --git a/config/secrets.yml b/config/secrets.yml
index 37b1f0b0..04a808fc 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: 192.168.1.49:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: connect.smartsales.dev//api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From 999a46f41d84c03c9a1d3ff5e24441a1667156af Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 12 Jan 2018 15:07:22 +0630
Subject: [PATCH 062/651] license key api for redis

---
 app/views/sym_control/get_key.html.erb | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/views/sym_control/get_key.html.erb

diff --git a/app/views/sym_control/get_key.html.erb b/app/views/sym_control/get_key.html.erb
new file mode 100644
index 00000000..e69de29b

From 0b517807f9eb3328106f1c180b09a7ef99dcda12 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 12 Jan 2018 15:46:40 +0630
Subject: [PATCH 063/651] update check server mode

---
 .../origami/payments_controller.rb            |  3 ++-
 app/views/origami/home/show.html.erb          | 24 +++++++++----------
 app/views/origami/payments/show.html.erb      |  3 +--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 304b9396..1123351f 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -20,7 +20,8 @@ class Origami::PaymentsController < BaseOrigamiController
 
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
-
+puts ENV["SERVER_MODE"]
+puts "DDDDDDDDDDDDDDDDD"
     # Print for First Bill to Customer
     unique_code = "ReceiptBillPdf"
      #shop detail
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index a5e43a58..12491edf 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -396,7 +396,7 @@
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
                   
-                  <!-- <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button> -->
+                  <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
@@ -571,18 +571,18 @@
         });
     });
     // Print for first bill
-    // $("#first_bill").on('click', function () {
-    //     var sale_id = $('#sale_id').val();
-    //     var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+    $("#first_bill").on('click', function () {
+        var sale_id = $('#sale_id').val();
+        var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
 
-    //     $.ajax({
-    //         type: "GET",
-    //         url: ajax_url,
-    //         success: function (result) {
-    //             location.reload();
-    //         }
-    //     });
-    // });
+        $.ajax({
+            type: "GET",
+            url: ajax_url,
+            success: function (result) {
+                location.reload();
+            }
+        });
+    });
 
     // $('#pay').on('click', function () {
     //     var sale_id = $('#sale_id').val();
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 5e99509f..314c9b68 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -311,8 +311,7 @@
         }
 
         payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
-        // console.log(jQuery.inArray("Credit", payment_type))
-        // console.log(payment_type)
+
           if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
             $("#credit_payment").hide();             
           } else{

From 86d068ddd45a0e1537c803e0d51b548f64cb78ea Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 12 Jan 2018 16:29:17 +0630
Subject: [PATCH 064/651] check checkout_time is available ot not

---
 .../api/check_in_process_controller.rb        | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index cf34700e..ac43bfd9 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -35,31 +35,35 @@ class Api::CheckInProcessController < Api::ApiController
 			dining_facility = DiningFacility.find(params[:dining_id])
 			if dining_facility.status == "available"
 				lookup_checkout_time = Lookup.collection_of("checkout_time")
-
-				checkout_at = Time.now.utc
-
-				if !lookup_checkout_time.nil?
-					if lookup_checkout_time[0][0] == 'hr'
-						checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
-					else
-						checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
-					end
-				end
-
-				dining_facility.status = "occupied"
-				dining_facility.save!
-
-				if dining_facility.type == "Table"
-					type = "TableBooking"
-				else
-					type = "RoomBooking"
-				end
 				
-				booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-		                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
-				booking.save!
+				if !lookup_checkout_time.empty?
+					checkout_at = Time.now.utc
 
-				render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
+					if !lookup_checkout_time.nil?
+						if lookup_checkout_time[0][0] == 'hr'
+							checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
+						else
+							checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
+						end
+					end
+
+					dining_facility.status = "occupied"
+					dining_facility.save!
+
+					if dining_facility.type == "Table"
+						type = "TableBooking"
+					else
+						type = "RoomBooking"
+					end
+					
+					booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
+			                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
+					booking.save!
+
+					render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
+				else
+					render :json => { :status => true }
+				end
 			else
       			error_message = "#{dining_facility.type} is not available!"
       			render :json => { :status => false, :error_message => error_message }

From a8a86e3202acc7d82adcdae3e107cd48dd440ba0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 12 Jan 2018 16:36:59 +0630
Subject: [PATCH 065/651] show success message for settle

---
 app/views/origami/shifts/show.html.erb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 0f9265e6..f2ee019e 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -168,6 +168,17 @@
             }
             else if(payment_type == "CUP"){
               $("#loading_wrapper").hide();
+              swal({
+                title: 'Information!',
+                text: 'Settlement is successfully.',
+                type: 'success',
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/shift/close';
+              });
               // reqCBBankAlipaySettlement();
             }
             // else if(payment_type == "Alipay"){

From f214be884749823b4addc4783e5d6ad60f8057b7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 12 Jan 2018 16:41:28 +0630
Subject: [PATCH 066/651] update cloud for print and first bill

---
 .../origami/payments_controller.rb            | 236 +++++++++---------
 app/controllers/origami/void_controller.rb    |  39 +--
 app/views/origami/home/show.html.erb          |  21 +-
 .../origami/others_payments/index.html.erb    |  18 +-
 app/views/origami/payments/show.html.erb      |  14 +-
 app/views/origami/rooms/show.html.erb         |  19 +-
 6 files changed, 183 insertions(+), 164 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 1123351f..fecdbfc3 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -20,50 +20,52 @@ class Origami::PaymentsController < BaseOrigamiController
 
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
-puts ENV["SERVER_MODE"]
-puts "DDDDDDDDDDDDDDDDD"
-    # Print for First Bill to Customer
-    unique_code = "ReceiptBillPdf"
-     #shop detail
-    shop_details =  Shop::ShopDetail 
-    # customer= Customer.where('customer_id=' +.customer_id)
-    customer = Customer.find(sale_data.customer_id)
 
-    # rounding adjustment
-      if shop_details.is_rounding_adj
-        a = sale_data.grand_total % 25 # Modulus
-        b = sale_data.grand_total / 25 # Division
-        #not calculate rounding if modulus is 0 and division is even
-        #calculate rounding if modulus is zero or not zero and division are not even
-        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
-          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-          rounding_adj = new_total-sale_data.grand_total
-          sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj)        
+    Rails.logger.debug ENV["SERVER_MODE"]
+
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      # Print for First Bill to Customer
+      unique_code = "ReceiptBillPdf"
+       #shop detail
+      shop_details =  Shop::ShopDetail 
+      # customer= Customer.where('customer_id=' +.customer_id)
+      customer = Customer.find(sale_data.customer_id)
+
+      # rounding adjustment
+        if shop_details.is_rounding_adj
+          a = sale_data.grand_total % 25 # Modulus
+          b = sale_data.grand_total / 25 # Division
+          #not calculate rounding if modulus is 0 and division is even
+          #calculate rounding if modulus is zero or not zero and division are not even
+          if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+            rounding_adj = new_total-sale_data.grand_total
+            sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj)        
+          end
         end
+        #end rounding adjustment
+
+      # get member information
+      rebate = MembershipSetting.find_by_rebate(1)
+      if customer.membership_id != nil && rebate
+        member_info = Customer.get_member_account(customer)
+        # current_balance = SaleAudit.paymal_search(sale_id)
+        current_balance = 0
       end
-      #end rounding adjustment
+      # get printer info
+      print_settings=PrintSetting.find_by_unique_code(unique_code)
 
-    # get member information
-    rebate = MembershipSetting.find_by_rebate(1)
-    if customer.membership_id != nil && rebate
-      member_info = Customer.get_member_account(customer)
-      # current_balance = SaleAudit.paymal_search(sale_id)
-      current_balance = 0
+      # 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,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil)    
     end
-    # 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,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil)    
-
   end
 
   def create
@@ -108,40 +110,42 @@ puts "DDDDDDDDDDDDDDDDD"
       cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
       # For Print
-      # unique_code = "ReceiptBillPdf"
-      # customer= Customer.find(saleObj.customer_id)
+      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        unique_code = "ReceiptBillPdf"
+        customer= Customer.find(saleObj.customer_id)
 
-      # get member information
-      rebate = MembershipSetting.find_by_rebate(1)
-      credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote')
-      
-      if customer.membership_id != nil && rebate && credit_data.nil?
-        member_info    = Customer.get_member_account(customer)
-        rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-        current_balance = SaleAudit.paymal_search(sale_id)
-      end
-      
-      #for card sale data
-      card_data = Array.new
-      card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
-      if !card_sale_trans_ref_no.nil? 
-        card_sale_trans_ref_no.each do |cash_sale_trans|
-          card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
-          card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
-          card_no = cash_sale_trans.pan.last(4)
-          card_no = card_no.rjust(19,"**** **** **** ")
-          card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+        # get member information
+        rebate = MembershipSetting.find_by_rebate(1)
+        credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote')
+        
+        if customer.membership_id != nil && rebate && credit_data.nil?
+          member_info    = Customer.get_member_account(customer)
+          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          current_balance = SaleAudit.paymal_search(sale_id)
         end
-      end
-      
-      # 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)
+        
+        #for card sale data
+        card_data = Array.new
+        card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
+        if !card_sale_trans_ref_no.nil? 
+          card_sale_trans_ref_no.each do |cash_sale_trans|
+            card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
+            card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
+            card_no = cash_sale_trans.pan.last(4)
+            card_no = card_no.rjust(19,"**** **** **** ")
+            card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+          end
+        end
+        
+        # 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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)   
+        printer = Printer::ReceiptPrinter.new(print_settings)
+        printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+      end
     end    
   end
 
@@ -246,40 +250,42 @@ puts "DDDDDDDDDDDDDDDDD"
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    unique_code = "ReceiptBillPdf"
-    customer= Customer.find(saleObj.customer_id)
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      unique_code = "ReceiptBillPdf"
+      customer= Customer.find(saleObj.customer_id)
 
-    #shop detail
-    shop_details =  Shop::ShopDetail 
-    # get member information
-    rebate = MembershipSetting.find_by_rebate(1)
-    if customer.membership_id != nil && rebate
-      member_info = Customer.get_member_account(customer)
-      rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-      current_balance = SaleAudit.paymal_search(sale_id)
-    end
-
-    #for card sale data
-    card_data = Array.new
-    card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
-    if !card_sale_trans_ref_no.nil? 
-      card_sale_trans_ref_no.each do |cash_sale_trans|
-        card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
-        card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
-        card_no = cash_sale_trans.pan.last(4)
-        card_no = card_no.rjust(19,"**** **** **** ")
-        card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+      #shop detail
+      shop_details =  Shop::ShopDetail 
+      # get member information
+      rebate = MembershipSetting.find_by_rebate(1)
+      if customer.membership_id != nil && rebate
+        member_info = Customer.get_member_account(customer)
+        rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+        current_balance = SaleAudit.paymal_search(sale_id)
       end
-    end
-    # 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(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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data)
+      #for card sale data
+      card_data = Array.new
+      card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
+      if !card_sale_trans_ref_no.nil? 
+        card_sale_trans_ref_no.each do |cash_sale_trans|
+          card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
+          card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
+          card_no = cash_sale_trans.pan.last(4)
+          card_no = card_no.rjust(19,"**** **** **** ")
+          card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+        end
+      end
+      # 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(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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data)
+    end
   end
 
   def foc    
@@ -316,22 +322,22 @@ puts "DDDDDDDDDDDDDDDDD"
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
 
-      # unique_code = "ReceiptBillPdf"
-      # customer= Customer.find(saleObj.customer_id)
-      
-      #  #shop detail
-      # shop_details =  Shop::ShopDetail 
+      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        unique_code = "ReceiptBillPdf"
+        customer= Customer.find(saleObj.customer_id)
+        
+         #shop detail
+        shop_details =  Shop::ShopDetail 
 
-      # # 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)
+        # 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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC")   
-      printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)   
+        printer = Printer::ReceiptPrinter.new(print_settings)
+        printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)   
+      end
     end    
   end
 
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 1283fb2e..a0c4a23b 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -76,26 +76,27 @@ class Origami::VoidController < BaseOrigamiController
       cashier_zone     = CashierTerminalByZone.find_by_zone_id(table.zone_id)
       cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-      unique_code = "ReceiptBillPdf"
-      customer= Customer.find(sale.customer_id)
-      
-       #shop detail
-      shop_details = Shop.find(1)
-       # get member information
-      rebate = MembershipSetting.find_by_rebate(1)
-      if customer.membership_id != nil && rebate
-        member_info = Customer.get_member_account(customer)
-        rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        unique_code = "ReceiptBillPdf"
+        customer= Customer.find(sale.customer_id)
+        
+         #shop detail
+        shop_details = Shop.find(1)
+         # get member information
+        rebate = MembershipSetting.find_by_rebate(1)
+        if customer.membership_id != nil && rebate
+          member_info = Customer.get_member_account(customer)
+          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+        end
+        # 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(sale.sale_items)
+        discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
+
+        printer = Printer::ReceiptPrinter.new(print_settings)
+        printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
       end
-      # 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(sale.sale_items)
-      discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
-
-      printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
-
       
       #end print
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 12491edf..db9dbbb6 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -395,9 +395,10 @@
 
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-                  
-                  <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
-
+                   <!-- first bill not used in cloud -->
+                  <% if ENV["SERVER_MODE"] != "cloud" %>
+                    <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+                  <% end %>
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
               <% end %>
@@ -407,6 +408,7 @@
           <% else %>
             <button type="button" id="check_in" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.check_in") %></button>
           <% end %>
+           <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
            <span class="hidden" id="member_discount"><%= @membership.discount%></span>
            <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
           <div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
@@ -446,12 +448,15 @@
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
           receipt_no = ($("#receipt_no").html()).trim();
         }
+        
         // console.log(checkReceiptNoInFirstBillData(receipt_no));
-        // if(checkReceiptNoInFirstBillData(receipt_no,"")){
-        //   $("#pay").show();
-        // }else{
-        //   $("#pay").hide();
-        // }
+        if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+          if(checkReceiptNoInFirstBillData(receipt_no,"")){
+            $("#pay").show();
+          }else{
+            $("#pay").hide();
+          }
+        }
       /* end check first bill or not*/
 
         $('.invoicedetails').on('click', function () {
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 4e07274a..e8eebbac 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -26,20 +26,22 @@
 </div>
 	</div>
 </div>
+<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
 <script type="text/javascript">
 	/* start check first bill or not*/
         var receipt_no = "";
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
           receipt_no = ($("#receipt_no").html()).trim();
         }
-
-        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
-        if(payment_type) {
-        	$(".others-payment").hide();
-            $(payment_type).each(function(i){		        
-		        $("."+payment_type[i]).show();
-            });
-        }
+        if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+	        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
+	        if(payment_type) {
+	        	$(".others-payment").hide();
+	            $(payment_type).each(function(i){		        
+			        $("."+payment_type[i]).show();
+	            });
+	        }
+	    }
      /* end check first bill or not*/
 
 	$('.others-payment').on('click',function(){
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 314c9b68..84fea75f 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -298,7 +298,7 @@
   <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
   <!-- Waiter Buttons -->
 </div>
-
+<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
 </div>
 </div>
 
@@ -310,7 +310,8 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
 
-        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
 
           if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
             $("#credit_payment").hide();             
@@ -318,11 +319,12 @@
             $("#credit_payment").show();
           }
 
-         if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
-           $("#card_payment").show();      
-         } else{
+          if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
+            $("#card_payment").show();      
+          } else{
            $("#card_payment").hide();
-         }
+          }
+        }
       /* end check first bill or not*/
 
     var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index a0bee509..f8dc69f0 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -374,13 +374,14 @@
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
         <!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->
         <!-- <button type="button" id="request_bills" class="btn bg-blue btn-block" disabled> Req.Bill</button> -->
-
-        <!-- <button type="button" id="first_bill" class="btn bg-blue btn-block">First Bill</button> -->
+         <!-- first bill not used in cloud -->
+        <% if ENV["SERVER_MODE"] != "cloud" %>
+          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+        <% end %>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
         <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
      <% end %>
-
-
+            <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
            <span class="hidden" id="member_discount"><%= @membership.discount%></span>
            <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
           <div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
@@ -452,10 +453,12 @@ $(document).ready(function(){
       receipt_no = ($("#receipt_no").html()).trim();
     }
     // console.log(checkReceiptNoInFirstBillData(receipt_no));
-    if(checkReceiptNoInFirstBillData(receipt_no,"")){
-      $("#pay").show();
-    }else{
-      $("#pay").hide();
+    if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+      if(checkReceiptNoInFirstBillData(receipt_no,"")){
+        $("#pay").show();
+      }else{
+        $("#pay").hide();
+      }
     }
   /* end check first bill or not*/
 

From b1d6cca08d4de39eff79fcd787d20ae998c831df Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 12 Jan 2018 17:53:52 +0630
Subject: [PATCH 067/651] update ability member discount

---
 app/models/ability.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 560e0192..846b278a 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -109,7 +109,7 @@ class Ability
         # can :create, :discount
         # can :remove_discount_items, :discount
         # can :remove_all_discount, :discount
-        # can :member_discount, :discount
+         can :member_discount, :discount
 
         can :first_bill, :payment
         can :show, :payment

From ad4be54ef22c2560845ee826ca319a5e07626382 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 12 Jan 2018 18:11:52 +0630
Subject: [PATCH 068/651] request key

---
 app/controllers/application_controller.rb | 10 +++++-----
 app/models/license.rb                     |  4 ++--
 config/license.yml                        |  2 +-
 config/secrets.yml                        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3f789fc4..7fafd6bd 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else      
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 
diff --git a/app/models/license.rb b/app/models/license.rb
index 4af6059a..b8604b20 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -233,13 +233,13 @@ class License
   def get_key
     api_token = read_license_no_decrypt("api_token")  
     shop_name = read_license_no_decrypt("shop_name")    
-    @params = { query: {lookup_type: "application", api_token: api_token} }
+    @params = { query: {lookup_type: "application", api_token: api_token } }
     response = self.class.get("/get_key", @params)
     @data = response.parsed_response
     
     if (@data["status"])
       ##Check from local redis - if available load local otherwise get from remote
-      cache_key = "shop:#{shop_name}"    
+      cache_key = "shop:#{shop_name.chomp}"    
 
       cache_license = nil    
 
diff --git a/config/license.yml b/config/license.yml
index cc470a1d..bddfeafd 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -8,7 +8,7 @@ dbhost: nk57NaR38B2eSYyron3Nbw==
 dbschema: 3orxFaTi0uQhatBqZGiitQ==
 dbusername: EtMle9Gr0/PE3NFHHfwo5A==
 dbpassword: 86h61/O38GGo64nekz6oeA==
-api_token: FVAGMnjVdaScfydXMbMvPPRWnkEwCSuxs
+api_token: RZbpyAZlwOYFZfzbWmFhZgwCzRwJTBnPKIHrfM
 app_token: IoXPdqzbnQWbHsnxLAjMjimnjEJNySOeIo
 plan_sku: PyQJ2sk5NZTudqQ2YIU16A==
 renewable_date: d/Fk1deU/iPbZFDOdyKsjA==
diff --git a/config/secrets.yml b/config/secrets.yml
index 04a808fc..d04200ec 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.smartsales.dev//api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: 192.168.1.182:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From 51041bf0ae6e007e907e07791e500e8d7e342fa2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 15 Jan 2018 14:19:41 +0630
Subject: [PATCH 069/651] add extra hour 15 and 45 minutes

---
 app/controllers/api/orders_controller.rb        | 8 +++++++-
 app/controllers/origami/addorders_controller.rb | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index cd8c7ca2..1616be04 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -54,12 +54,18 @@ class Api::OrdersController <  Api::ApiController
     extra_time = ''
 
     params[:order_items].each { |i| 
-       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30'
+       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15'
          is_extra_time = true
          if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
           t = Time.now
            time = 30*60*i["quantity"].to_i
            extra_time = Time.at(time)
+         elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15'
+           time = 15*60*i["quantity"].to_i
+           extra_time = Time.at(time)
+         elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
+           time = 45*60*i["quantity"].to_i
+           extra_time = Time.at(time)
          else
           t = Time.now
            time = 60*60*i["quantity"].to_i
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 1a9aaa9a..9a06af0b 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -67,11 +67,17 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
-       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30'
+       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15'
          is_extra_time = true
          if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
            time = 30*60*i["quantity"].to_i
            extra_time = Time.at(time)
+         elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15'
+           time = 15*60*i["quantity"].to_i
+           extra_time = Time.at(time)
+         elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
+           time = 45*60*i["quantity"].to_i
+           extra_time = Time.at(time)
          else
            time = 60*60*i["quantity"].to_i
            extra_time = Time.at(time)

From 9095dd46d90792ce90f69abf7935a4d87ba4ce3a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 15 Jan 2018 15:04:17 +0630
Subject: [PATCH 070/651] change move table UI

---
 .../origami/movetable_controller.rb           |  16 +
 app/views/origami/home/show.html.erb          |   4 +-
 .../origami/movetable/move_dining.html.erb    | 375 ++++++++++--------
 3 files changed, 238 insertions(+), 157 deletions(-)

diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 4bec80a8..52780381 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -19,10 +19,18 @@ class Origami::MovetableController < BaseOrigamiController
 
               order = Order.find(booking_order.order_id)
               @obj_order = order
+              @customer = order.customer
               @date = order.created_at
+              @booking= booking
               order.order_items.each do |item|
                 @order_items.push(item)
               end
+              accounts = @customer.tax_profiles
+              @account_arr =[]
+              accounts.each do |acc|
+                account = TaxProfile.find(acc)
+                @account_arr.push(account)
+              end
            end
            @status_order = 'order'
          else
@@ -32,9 +40,17 @@ class Origami::MovetableController < BaseOrigamiController
              if @status_order == 'order'
                @status_order = 'sale'
              end
+             @booking= booking
              @date = sale.created_at
              @status_sale = 'sale'
              @obj_sale = sale
+             @customer = sale.customer
+             accounts = @customer.tax_profiles
+             @account_arr =[]
+             accounts.each do |acc|
+              account = TaxProfile.find(acc)
+              @account_arr.push(account)
+             end
            end
          end
     end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f162be5d..96e883ab 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -135,7 +135,7 @@
                   <div id="save_order_id" data-order="">
                   <% end %>
                     <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
-                    <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %>
+                    <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
                       <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
                     <% else %>
                       <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
@@ -152,7 +152,7 @@
               <% else %>
                     <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
               <% end %>
-            </div>
+            </div> 
             <div class="card-block">
               <div class="card-title">
                 <div class="row p-l-5 p-r-5">
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 3df91e14..01be4bb3 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -15,84 +15,152 @@
 
      </ul>
      <!-- Nav tabs - End -->
- <div id="custom-slimscroll">
-     <div class="tab-content" style="">
-       <!--- Panel 1 - Table Orders -->
-       <div class="tab-pane active" id="tables" role="tabpanel">
-         <div class="card-columns" style="padding-top:10px;" >
+     <div id="custom-slimscroll">
+       <div class="tab-content" style="">
+         <!--- Panel 1 - Table Orders -->
+         <div class="tab-pane active" id="tables" role="tabpanel">
+          <div class="card-columns" style="padding-top:10px;" >
            <% @tables.each do |table| %>
            <% if table.status == 'occupied' %>
+           <% if table.get_booking.nil? %>
+           <% if table.get_checkout_booking.nil? %>
            <div class="card tables red text-white" data-id="<%= table.id %>" data-name="<%= table.name %>">
-             <div class="card-block">
-              <%= table.name %>
+            <% else %>
+            <div class="card tables orange text-white" data-id="<%= table.id %>">
+              <% end %>
+              <div class="card-block">
+                <%= table.name %>
+              </div>
+            </div>
+            <% else %>
+            <% if table.get_checkout_booking.nil? %> 
+            <div class="card tables blue text-white" data-id="<%= table.id %>">
+              <% else %>
+              <div class="card tables orange text-white" data-id="<%= table.id %>">
+                <% end %>
+                <div class="card-block">
+                  <%= table.name %>
+                </div>
+              </div>
+              <% end %>
+              <% else %>
+              <div class="card tables green text-white" data-id="<%= table.id %>" data-name="<%= table.name %>">
+                <div class="card-block">
+                  <%= table.name %>
+                </div>
+              </div>
+              <% end %>
+              <% end %>
             </div>
           </div>
-          <% else %>
-          <div class="card tables green text-white" data-id="<%= table.id %>" data-name="<%= table.name %>">
-           <div class="card-block">
-            <%= table.name %>
+
+          <!--- Panel 2 - Room Orders -->
+          <div class="tab-pane" id="rooms" role="tabpanel">
+           <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" >
+             <% @rooms.each do |room| %>
+             <% if room.status == 'occupied' %>
+             <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+               <div class="card-block">
+                <%= room.name %>
+              </div>
+            </div>
+            <% else %>
+            <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+             <div class="card-block">
+              <%= room.name %>
+            </div>
           </div>
+          <% end %>
+          <% end %>
         </div>
-        <% end %>
-        <% end %>
-      </div>
       </div>
 
-      <!--- Panel 2 - Room Orders -->
-      <div class="tab-pane" id="rooms" role="tabpanel">
-       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" >
-         <% @rooms.each do |room| %>
-         <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-           <div class="card-block">
-            <%= room.name %>
-          </div>
-        </div>
-        <% else %>
-        <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-         <div class="card-block">
-          <%= room.name %>
-        </div>
-      </div>
-      <% end %>
-      <% end %>
+      <!--- Panel 3 - s -->
     </div>
-    </div>
-
-<!--- Panel 3 - s -->
-</div>
-</div>
-<!-- tabs - End -->
+  </div>
+  <!-- tabs - End -->
 </div>
 <!-- Column One -->
 
 <!-- Column Two -->
 <div class="col-lg-5 col-md-5 col-sm-5">
  <div class="card"  >
-   <div class="card-header">
-     <div><strong id="order-title"> MOVE  --> <span style='color:red'> ' <%= @dining.name %> ' </span> to <span style='color:blue' id="moved"> </span></strong></div>
+  <div class="card-header">
+    <div><strong id="order-title"> MOVE  --> <span style='color:red'> ' <%= @dining.name %> ' </span> to <span style='color:blue' id="moved"> </span></strong></div>
      <input type='hidden' id="change_table_value" value="" />
+  <% if @status_order == 'order' && @status_sale != 'sale' %>
+    <% if !@obj_order.nil? %>
+      <div id="save_order_id" data-order="<%= @obj_order.order_id %>">
+    <% else %>
+      <div id="save_order_id" data-order="">
+    <% end %>
+      <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
+      <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
+        <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+      <% else %>
+        <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+      <% end %>
+      </div>
+  <% elsif @status_sale == 'sale' %>
+    <div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @dining.name rescue "" %>
+     <% if !@booking.reserved_by.nil? && %>
+     <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+     <% else %>
+     <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+     <% end %>
    </div>
-   <div class="card-block">
-     <div class="card-title row">
-       <div class="col-lg-6 col-md-6 col-sm-6">
-         <p class="m-l-10"> Receipt No: <span id="receipt_no">
-           <% if @status_sale == 'sale' %>
-           <%= @sale_array[0].receipt_no rescue '' %>
-           <% end %>
-         </span></p>
-       </div>
-       <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-         <p class="m-r-10">Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
-       </div>
-     </div>
-     <div class="card-title row customer_detail hide">
-       <div class="col-lg-6 col-md-6 col-sm-6">
-         <p>Customer : <span id="customer_name"></span></p>
-       </div>
+  <% else %>
+    <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
+  <% end %>
+  </div> 
+ <div class="card-block">
+   <div class="card-title">
+     <div class="row p-l-5 p-r-5">
+      <% if (!@sale_array.empty?) && (!@date.nil?) %>
+        <div class="col-lg-6 col-md-6 col-sm-6">
+          &nbsp; Receipt No: <span id="receipt_no">
+             <% if @status_sale == 'sale' %>
+              <%= @sale_array[0].receipt_no rescue '' %>
+             <% end %>
+           </span>
+           <br>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+          Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %></span>
+          <br>
+        </div>
+      <% elsif !@date.nil? %>
+        <div class="col-lg-7 col-md-7 col-sm-7">
+          &nbsp; Order No: <span id="order_no">
+             <% if @status_order == 'order' %>
+               <%= @obj_order.order_id rescue '' %>
 
-     </div>
-     <div id="order-detail-slimscroll" data-height="130">
+             <% end %>
+           </span>
+           <br>
+        </div>
+        <div class="col-lg-5 col-md-5 col-sm-5 text-right">
+          Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %></span>
+          <br>
+        </div>
+      <% end %>
+    </div>
+   </div>
+   <div class="row p-l-5 p-r-5">
+        <div class="col-lg-6 col-md-6 col-sm-6">
+       
+          <% if @status_sale == 'sale' %>
+              <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
+              &nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
+          <% elsif @status_order == 'order'
+             %>
+              <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
+              &nbsp; Customer : <%= @customer.name rescue "" %>
+          <% end %>
+        
+    </div>
+    </div>
+   <div id="order-detail-slimscroll" data-height="130">
      <div class="card-text" style="" >
        <table class="table table-striped" id="order-items-table">
          <thead>
@@ -100,56 +168,53 @@
              <th>#</th>
              <th class="item-name">Items</th>
              <th class="item-attr">QTY</th>
-               <th class="item-attr">Price</th>
-               </tr>
-             </thead>
-             <tbody>
-               <%
-               count = 0
-               sub_total = 0
-               if @status_sale == "sale"
-                 puts @sale_array[0]
-                 @sale_array[0].sale_items.each do |sale_item|
-                  count += 1
-                  sub_total = sub_total + sale_item.price
-                  %>
-                  <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
-                  <% unless sale_item.price <= 0 %>
-                  <tr>
-                   <td><%= count %></td>
-                   <td class='item-name'><%= sale_item.product_name %></td>
-                   <td class='item-attr'><%= sale_item.qty %></td>
-                   <td class='item-attr'><%= sale_item.price %></td>
-                 </tr>
-                 <%
-               end
-             end
-           end
-
-           if @status_order == 'order' && @status_sale != 'sale'
-            unless @order_items.nil?
-             count = 0
-             @order_items.each do |order_item |
-              puts @order_items.size
-              puts "view"
+             <th class="item-attr">Price</th>
+           </tr>
+         </thead>
+         <tbody>
+           <%
+           count = 0
+           sub_total = 0
+           if @status_sale == "sale"
+             @sale_array[0].sale_items.each do |sale_item|
               count += 1
-              sub_total = sub_total + order_item.price
-
-              unless order_item.price <= 0 %>
+              sub_total = sub_total + sale_item.price
+              %>
+              <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
+              <% unless sale_item.price <= 0 %>
               <tr>
                <td><%= count %></td>
-               <td class='item-name'><%= order_item.item_name %></td>
-               <td class='item-attr'><%= order_item.qty %></td>
-               <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+               <td class='item-name'><%= sale_item.product_name %></td>
+               <td class='item-attr'><%= sale_item.qty %></td>
+               <td class='item-attr'><%= sale_item.price %></td>
              </tr>
              <%
            end
          end
        end
+
+       if @status_order == 'order' && @status_sale != 'sale'
+        unless @order_items.nil? || @order_items.empty?
+         count = 0
+         @order_items.each do |order_item |
+          count += 1
+          sub_total = sub_total + (order_item.price * order_item.qty)
+
+          #unless order_item.price <= 0 %>
+          <tr>
+           <td><%= count %></td>
+           <td class='item-name'><%= order_item.item_name %></td>
+           <td class='item-attr'><%= order_item.qty %></td>
+           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+         </tr>
+         <%
+         #end
+       end
      end
-     %>
-   </tbody>
- </table>
+   end
+   %>
+ </tbody>
+</table>
 </div>
 </div>
 <%
@@ -212,10 +277,10 @@ end
 </div>
 </div>
 <script>
-$(document).ready(function(){
-  $(".tables").on('click', function(){
+  $(document).ready(function(){
+    $(".tables").on('click', function(){
       $('.tables').removeClass('selected-item');
-	    $(this).addClass('selected-item');
+      $(this).addClass('selected-item');
       var dining_name = $(this).attr("data-name");
       var dining_id = $(this).attr("data-id");
       var change_from = "<%= @dining.id %>";
@@ -227,69 +292,69 @@ $(document).ready(function(){
           typeAnimated: true,
           btnClass: 'btn-danger',
         });*/
-          swal({
-             title: "Alert!!",
-             text: 'Please Select Another Table !',
-             type: 'warning',
-          });
-        }else{
-          $('#moved').text(" ' " + dining_name + " ' ")
-          $('#change_table_value').val(dining_id);
-        }
-     
-  })
-
-  $(".rooms").on('click', function(){
-    $('.rooms').removeClass('selected-item');
-    $(this).addClass('selected-item');
-    var dining_name = $(this).attr("data-name");
-    var dining_id = $(this).attr("data-id");
-    var change_from = "<%= @dining.id %>";
-    if (dining_id == change_from) {
         swal({
-             title: "Alert!!",
-             text: 'Please Select Another Table !',
-             type: 'warning',
-          });
+         title: "Alert!!",
+         text: 'Please Select Another Table !',
+         type: 'warning',
+       });
+      }else{
+        $('#moved').text(" ' " + dining_name + " ' ")
+        $('#change_table_value').val(dining_id);
+      }
+
+    })
+
+    $(".rooms").on('click', function(){
+      $('.rooms').removeClass('selected-item');
+      $(this).addClass('selected-item');
+      var dining_name = $(this).attr("data-name");
+      var dining_id = $(this).attr("data-id");
+      var change_from = "<%= @dining.id %>";
+      if (dining_id == change_from) {
+        swal({
+         title: "Alert!!",
+         text: 'Please Select Another Table !',
+         type: 'warning',
+       });
       }else{
         $('#moved').text(dining_name)
         $('#change_table_value').val(dining_id);
       }
-  })
+    })
 
-  $('#move_table').on('click',function(){
-    change_to = $('#change_table_value').val();
-    change_from = "<%= @dining.id %>";
-    if (change_to == ""){
-      swal({
-             title: "Alert!!",
-             text: 'Please Select Table !',
-             type: 'warning',
-          });
-    }else{
-      $.ajax({type: "POST",
-        url: "<%= origami_moving_path %>",
-        data: "change_from="+ change_from + "&change_to=" + change_to,
-        success:function(result){
-          
-          swal({
+    $('#move_table').on('click',function(){
+      change_to = $('#change_table_value').val();
+      change_from = "<%= @dining.id %>";
+      if (change_to == ""){
+        swal({
+         title: "Alert!!",
+         text: 'Please Select Table !',
+         type: 'warning',
+       });
+      }else{
+        $.ajax({type: "POST",
+          url: "<%= origami_moving_path %>",
+          data: "change_from="+ change_from + "&change_to=" + change_to,
+          success:function(result){
+
+            swal({
              title: "Information!",
              text: 'Moving Success',
              type: 'success',
-          }, function (){
+           }, function (){
              if (result.get_type == 'Table'){
               window.location.href = '/origami/table/' + change_to;
-              }else{
-                window.location.href = '/origami/room/' + change_to;
-              }
+            }else{
+              window.location.href = '/origami/room/' + change_to;
+            }
           });
-         
-        }
-      });
-    }
+
+          }
+        });
+      }
+    })
+  });
+  $('#back').on('click',function(){
+    window.location.href = '/origami/table/'+ "<%= @dining.id %>";
   })
-});
-$('#back').on('click',function(){
-  window.location.href = '/origami/table/'+ "<%= @dining.id %>";
-})
 </script>

From 9ab9f3b0020461a8bc62661ea3148318b5cfc3e6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 15:08:52 +0630
Subject: [PATCH 071/651] update cloud and master

---
 app/assets/javascripts/origami.js             |  2 +-
 .../origami/discounts_controller.rb           |  2 +
 app/views/origami/home/show.html.erb          | 74 +++++++++++++++----
 app/views/origami/payments/show.html.erb      | 28 ++++---
 4 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 18368f25..712ce8f7 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -163,7 +163,7 @@ function checkReceiptNoInFirstBillData(receipt_no,payment) {
 		}
 	}
 	if (payment) {
-		return status; //json_data[0]["payment"];
+		return json_data[0]["payment"];
 	}else{
 		return status;
 	}
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 1166a705..8ff155cd 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -225,6 +225,8 @@ class Origami::DiscountsController < BaseOrigamiController
       end
       Rails.logger.debug "-------------- Member Discount Osaka ---------"
       Rails.logger.debug response.to_json
+      puts "-------------- Member Discount Osaka ---------"
+      puts response.to_json
       # Re-calc All Amount in Sale
       if response["status"] == true
           discount_amount   = response["discount_earned"]
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index db9dbbb6..9a941df3 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -396,9 +396,15 @@
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
                    <!-- first bill not used in cloud -->
-                  <% if ENV["SERVER_MODE"] != "cloud" %>
+                  <% if ENV["SERVER_MODE"] == "cloud" %>
                     <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
-                  <% end %>
+                  <% else %>
+                    <%if @membership.discount && @obj_sale.customer.membership_id %>
+                      <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+                    <%else%>
+                      <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+                    <%end%> 
+                  <% end %> 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
               <% end %>
@@ -584,22 +590,60 @@
             type: "GET",
             url: ajax_url,
             success: function (result) {
-                location.reload();
+              receipt_no = ($("#receipt_no").html()).trim();
+              if((receipt_no!=undefined) && (receipt_no!=""))
+                createReceiptNoInFirstBillData(receipt_no,"");
+              
+              location.reload();
             }
-        });
+        });  
     });
 
-    // $('#pay').on('click', function () {
-    //     var sale_id = $('#sale_id').val();
-    //     var url = '/origami/sale/' + sale_id + "/rounding_adj";
-    //     $.ajax({
-    //         type: "POST",
-    //         url: '/origami/sale/' + sale_id + "/rounding_adj",
-    //         success: function (result) {
-    //             window.location.href = '/origami/sale/' + sale_id + "/payment";
-    //         }
-    //     });
-    // });
+    $(".choose_payment").on('click', function () {
+      $( "#loading_wrapper").show();
+
+        var sale_id = $('#sale_id').val();
+          type = $('.payment_method').val();
+          if(parseInt(jQuery.inArray("Credit", type)) == -1){
+            if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+               calculate_member_discount(sale_id,"Card");
+               
+            }else{
+              calculate_member_discount(sale_id,"Cash");
+            }         
+          }
+          var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+          $.ajax({
+              type: "GET",
+              url: ajax_url,
+              success: function (result) {
+                  $( "#loading_wrapper" ).hide();
+                  receipt_no = ($("#receipt_no").html()).trim();
+                  if((receipt_no!=undefined) && (receipt_no!=""))
+                    createReceiptNoInFirstBillData(receipt_no,type);
+                    location.reload();
+              }
+          });  
+    });
+
+    function calculate_member_discount(sale_id,type) {
+       var sub_total = $('#sub-total').text();
+         if (type == "Cash") {
+           is_card = false
+         }else{
+          is_card = true
+         }
+        $.ajax({
+          type: "POST",
+          url: "/origami/" + sale_id + "/member_discount",
+          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+          async: false,
+          success:function(result){ 
+          }
+        });
+      
+    }
+
     $('#pay').on('click', function () {
         var sale_id = $('#sale_id').val();
         window.location.href = '/origami/sale/' + sale_id + "/payment";
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 84fea75f..78660997 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -305,24 +305,28 @@
 <script>
   $(document).ready(function(){
     /* start check first bill or not*/
-        var receipt_no = "";
+        var member_id = $('#membership_id').text();
+        var member_discount = $('#member_discount').text();
+        var receipt_no = "";        
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
           receipt_no = ($("#receipt_no").html()).trim();
         }
 
+        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        console.log(payment_type)
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+          if (member_id && member_discount) {
+            if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
+              $("#credit_payment").hide();             
+            } else{
+              $("#credit_payment").show();
+            }
 
-          if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
-            $("#credit_payment").hide();             
-          } else{
-            $("#credit_payment").show();
-          }
-
-          if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
-            $("#card_payment").show();      
-          } else{
-           $("#card_payment").hide();
+            if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
+              $("#card_payment").show();      
+            } else{
+             $("#card_payment").hide();
+            }
           }
         }
       /* end check first bill or not*/

From 3d685f201f682bc41cb1682dd3cc8af4d4c6ba88 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 15:10:16 +0630
Subject: [PATCH 072/651] update cloud and master remove puts

---
 app/controllers/origami/discounts_controller.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 8ff155cd..1166a705 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -225,8 +225,6 @@ class Origami::DiscountsController < BaseOrigamiController
       end
       Rails.logger.debug "-------------- Member Discount Osaka ---------"
       Rails.logger.debug response.to_json
-      puts "-------------- Member Discount Osaka ---------"
-      puts response.to_json
       # Re-calc All Amount in Sale
       if response["status"] == true
           discount_amount   = response["discount_earned"]

From dc2637ed39b1761ed15b2e3c08343a022b3ac000 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 15 Jan 2018 16:32:20 +0630
Subject: [PATCH 073/651] change process flow for extra time

---
 app/controllers/api/orders_controller.rb      | 21 ++++++-------------
 .../origami/addorders_controller.rb           | 19 ++++++-----------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 1616be04..deb1039e 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -54,22 +54,13 @@ class Api::OrdersController <  Api::ApiController
     extra_time = ''
 
     params[:order_items].each { |i| 
-       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15'
+       i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
          is_extra_time = true
-         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
-          t = Time.now
-           time = 30*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15'
-           time = 15*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
-           time = 45*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         else
-          t = Time.now
-           time = 60*60*i["quantity"].to_i
-           extra_time = Time.at(time)
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
          end
        end
      }
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 9a06af0b..6b4200da 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -67,20 +67,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
-       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15'
+      i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
          is_extra_time = true
-         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
-           time = 30*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15'
-           time = 15*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
-           time = 45*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         else
-           time = 60*60*i["quantity"].to_i
-           extra_time = Time.at(time)
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
          end
        end
        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}

From b480f8cd61fea214a604771f8f5c0bc3ce93b57b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 16:47:41 +0630
Subject: [PATCH 074/651] update payment detail show

---
 app/views/origami/payments/show.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 78660997..97c4d216 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -313,8 +313,8 @@
         }
 
         payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
-        console.log(payment_type)
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+          
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
@@ -457,9 +457,9 @@
             var credit = $('#credit').text();
             var card   = $('#card').text();
 
-           if (credit <= 0) {
-            calculate_member_discount(sale_id);
-           }
+            if (credit <= 0) {
+              calculate_member_discount(sale_id);
+            }
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",

From fb989572b1c89bad7b3612df17898478af2e6372 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 17:48:35 +0630
Subject: [PATCH 075/651] update room for first bill

---
 app/controllers/origami/void_controller.rb |  3 ++
 app/views/origami/home/show.html.erb       |  2 +-
 app/views/origami/rooms/show.html.erb      | 60 +++++++++++++---------
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index a0c4a23b..0d368224 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -63,6 +63,7 @@ class Origami::VoidController < BaseOrigamiController
 
       member_info   = nil
       rebate_amount = nil
+      current_balance = nil
 
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")
@@ -87,7 +88,9 @@ class Origami::VoidController < BaseOrigamiController
         if customer.membership_id != nil && rebate
           member_info = Customer.get_member_account(customer)
           rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          current_balance = SaleAudit.paymal_search(sale_id)
         end
+
         # get printer info
         print_settings=PrintSetting.find_by_unique_code(unique_code)
         # Calculate Food and Beverage Total
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index fc1a5b20..372efa83 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -576,7 +576,7 @@
               swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
           }else{
-                  swal("Opps","You are not authorized for void","warning")
+                  swal("Opps","You are not authorized for Discount","warning")
           }
             return false;
         });
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index f8dc69f0..00350f1b 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -367,17 +367,21 @@
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
         <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>
-        <button type="button" id="discount" class="btn bg-blue btn-block" >Discount</button>
+        <button type="button" id="discount" class="btn bg-blue btn-block" active="<%= can? :index, :discount %>" >Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-        <!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->
-        <!-- <button type="button" id="request_bills" class="btn bg-blue btn-block" disabled> Req.Bill</button> -->
          <!-- first bill not used in cloud -->
-        <% if ENV["SERVER_MODE"] != "cloud" %>
-          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
-        <% end %>
+         <% if ENV["SERVER_MODE"] == "cloud" %>
+         <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+         <% else %>
+         <%if @membership.discount && @obj_sale.customer.membership_id %>
+            <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+         <%else%>
+            <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+         <%end%>
+         <%end%>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
         <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
      <% end %>
@@ -393,6 +397,7 @@
                         <div class="modal-body">
                            <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
                              <option value="Cash">Cash</option>
+                             <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">
                                 <%= pay.payment_method %>
@@ -535,25 +540,29 @@ $(document).ready(function(){
     return false;
   });
 
-  
   // Discount for Payment
-  $('#discount').click(function() {
-    var sale = $('#sale_id').val();
-    if (sale!="") {
-      var sale_id = sale
+  $('#discount').click(function () {
+
+    if ($(this).attr('active')=== "true") {
+      var sale = $('#sale_id').val();
+      if (sale != "") {
+        var sale_id = sale
+      } else {
+        var sale_id = $('#save_order_id').attr('data-order');
+      }
+
+      if (sale_id != "") {
+        window.location.href = '/origami/' + sale_id + '/discount'
+      }
+      else {
+        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+      }
     }else{
-      var sale_id = $('#save_order_id').attr('data-order');
+      swal("Opps","You are not authorized for Discount","warning")
     }
-
-    if(sale_id!=""){
-      window.location.href = '/origami/' + sale_id + '/discount'
-    }
-    else {
-      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
-    }
-
     return false;
   });
+  // Discount for Payment
 
   // Add Other Charges
   $('#other-charges').click(function() {
@@ -595,11 +604,17 @@ $("#first_bill").on('click', function(){
 
 $(".choose_payment").on('click', function () {
   $( "#loading_wrapper").show();
+
   var sale_id = $('#sale_id').val();
   type = $('.payment_method').val();
+  if(parseInt(jQuery.inArray("Credit", type)) == -1){
+    if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+      calculate_member_discount(sale_id,"Card");
 
-  calculate_member_discount(sale_id,type);
-
+    }else{
+      calculate_member_discount(sale_id,"Cash");
+    }         
+  }
   var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
   $.ajax({
     type: "GET",
@@ -609,7 +624,6 @@ $(".choose_payment").on('click', function () {
       receipt_no = ($("#receipt_no").html()).trim();
       if((receipt_no!=undefined) && (receipt_no!=""))
         createReceiptNoInFirstBillData(receipt_no,type);
-      
       location.reload();
     }
   });  

From fe846ea89a66a88236cc13fce97bfa4d643326cc Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 09:40:29 +0630
Subject: [PATCH 076/651] update secrets yml

---
 config/secrets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index 48ad8e2c..99360dad 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -25,7 +25,7 @@ test:
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From ca98efc756715e1925dd4af7cf920e8f837fc9b3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 10:15:28 +0630
Subject: [PATCH 077/651] change checkout time and checkout alert time process

---
 README.md                                     | 36 ++++++++++++++++---
 .../api/check_in_process_controller.rb        | 25 +++++++------
 .../origami/check_in_process_controller.rb    | 12 ++++---
 app/models/dining_facility.rb                 | 24 ++++++++-----
 4 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 5be96143..ec64ef45 100755
--- a/README.md
+++ b/README.md
@@ -36,11 +36,12 @@ java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 Person and Extra Time
   category_code = SPL... //for menu categories
   
-Extra Time 
-  instance_code = Extim30, Extim60 //for morning menu
-  instance_code = Extie30, Extie60 //for evening menu
+For Extra Time 
+  item_instance_code 
+  * must start with 'Ext'[a..z]'_'[1..100]
+  * note : don't add character after '_' 
 
-Order Item & Order Summary Slim
+For Order Item & Order Summary Slim
 	*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
 	1) settings/print_settings
 	2) app/controllers/oqs/edit_controller.rb
@@ -53,6 +54,33 @@ For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
   2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
 
+For checkout time and checkout alert time
+  1) checkout time => { type: checkout_time, name: 9:00AM - 12:00 PM, value: 120 }
+  2) checkout alert time => { type: checkout_alert_time, name: 8:00AM - 12:00 PM, value: 60 }
+  * you can add multiple record for checkout time and checkout alert time
+  * type must be 'checkout_time' and 'checkout_alert_time'
+  * you can change name and value
+  * name must be time range [8:30 AM - 1:45 PM]
+  * value must be minutes[60]
+
+For call waiter pdf
+  * Backend > Printer > Print Settings > New
+    i)  Name : Calling Waiter
+    ii) Unique Code: CallWaiterPdf
+    iii)Template: ...
+	iv) Font: Zawgyi-One 
+	v)	Printer: #printer name
+
+Membership Actions SQL
+	* update membership_actions set additional_parameter='{\"campaign_type_id\":5}' where id=10;
+
+SQL Update after rake clear:data runned
+	* update seed_generators 
+	 i) TableBooking, Order, OrderItem, sale, SaleOrder, SaleItem, SaleTax, SalePayment, SaleAudit, AssignedOrderItem => { current:0, next:0 }
+	** Note :: do not update Customer 
+
+
+
 * ToDo list
 
 1. Cloud Sync
diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index ac43bfd9..7ad00d67 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -16,11 +16,15 @@ class Api::CheckInProcessController < Api::ApiController
 				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
 				alert_time_min = 0
 				if !lookup_checkout_time.nil?
-					if lookup_checkout_time[0][0] == 'min'
-					  alert_time_min = (lookup_checkout_time[0][1]).to_i
-					else
-					  alert_time_min = 15
-					end
+					now = Time.now.utc
+			        lookup_checkout_time.each do |checkout_time|
+			          arr_time = checkout_time[0].split("-")
+			          start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+			          end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+			          if start_time <= now && now <= end_time
+			            alert_time_min = checkout_time[1].to_i
+			          end
+			        end
 				end
 
 				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min, :extra_minutes => extra_minutes }
@@ -39,11 +43,12 @@ class Api::CheckInProcessController < Api::ApiController
 				if !lookup_checkout_time.empty?
 					checkout_at = Time.now.utc
 
-					if !lookup_checkout_time.nil?
-						if lookup_checkout_time[0][0] == 'hr'
-							checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
-						else
-							checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
+					lookup_checkout_time.each do |checkout_time|
+						arr_time = checkout_time[0].split("-")
+						start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+						end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+						if start_time <= checkout_at && checkout_at <= end_time
+							checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 						end
 					end
 
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 37f58d8f..40a28398 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -3,12 +3,14 @@ class Origami::CheckInProcessController < BaseOrigamiController
 	def check_in_process
 		lookup_checkout_time = Lookup.collection_of("checkout_time")
 		checkout_at = Time.now.utc
-
 		if !lookup_checkout_time.nil?
-			if lookup_checkout_time[0][0] == 'hr'
-				checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
-			else
-				checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
+			lookup_checkout_time.each do |checkout_time|
+				arr_time = checkout_time[0].split("-")
+				start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+				end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+				if start_time <= checkout_at && checkout_at <= end_time
+					checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
+				end
 			end
 		end
 		@dining_facility = DiningFacility.find(params[:dining_id])
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index bd6f3436..1feab5d9 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -81,10 +81,14 @@ class DiningFacility < ApplicationRecord
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
       if !lookup_checkout_time.nil?
-        if lookup_checkout_time[0][0] == 'min'
-          free_time_min = (lookup_checkout_time[0][1]).to_i
-        else
-          free_time_min = 15
+        now = Time.now.utc
+        lookup_checkout_time.each do |checkout_time|
+          arr_time = checkout_time[0].split("-")
+          start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+          end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+          if start_time <= now && now <= end_time
+            free_time_min = checkout_time[1].to_i
+          end
         end
       end
 
@@ -116,10 +120,14 @@ class DiningFacility < ApplicationRecord
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
       if !lookup_checkout_time.nil?
-        if lookup_checkout_time[0][0] == 'min'
-          free_time_min = (lookup_checkout_time[0][1]).to_i
-        else
-          free_time_min = 15
+        now = Time.now.utc
+        lookup_checkout_time.each do |checkout_time|
+          arr_time = checkout_time[0].split("-")
+          start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+          end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+          if start_time <= now && now <= end_time
+            free_time_min = checkout_time[1].to_i
+          end
         end
       end
       

From eb29b206540219d464936b58ad1617e525c8d3b0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 10:57:20 +0630
Subject: [PATCH 078/651] update combine cloud and master bugs

---
 app/assets/javascripts/OQS.js                 | 48 ++++++++++---------
 app/controllers/origami/home_controller.rb    |  1 +
 .../origami/payments_controller.rb            |  2 -
 app/controllers/origami/shifts_controller.rb  | 35 +++++++-------
 app/models/ability.rb                         |  9 +++-
 app/views/layouts/_left_sidebar.html.erb      |  4 ++
 app/views/oqs/home/index.html.erb             |  6 ++-
 7 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index ffaae308..6068b53f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -217,29 +217,31 @@ $(document).on('turbolinks:load', function() {
   	});
 
   	// Print Order Item
-  	// $(document).on('click', '#print_order_item', function(event){ 
-  	// 	var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  	// 	var options = $('.selected-item').children('.card-block').find('.item-options').text();
-  	// 	var params = { 'options':options };
+  	$(document).on('click', '#print_order_item', function(event){ 
+  		var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
+  		var options = $('.selected-item').children('.card-block').find('.item-options').text();
+  		var params = { 'options':options };
 
-  	// 	$.ajax({
-			// type: 'GET',
-	  //    	url: '/oqs/print/print/'+assigned_item_id,
-	  //    	success: function(data){	}
-  	// 	});
-  	// });
+  		$.ajax({
+			type: 'POST',
+	     	url: '/oqs/print/print/'+assigned_item_id,
+	     	data: params,
+	     	success: function(data){	}
+  		});
+  	});
 
-  	// Print Order Summary  	
-  	// $(document).on('click', '#print_order_summary', function(event){
-  	// 	var orderNo = $('.selected-item').attr('data-order-no');
-  	// 	var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
-  	// 	var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  	// 	var params = { 'table_name':table_name };
-  	// 	$.ajax({
-			// type: 'GET',
-	  //    	url: '/oqs/print/print_order_summary/'+assigned_item_id,
-	  //    	data: params,
-	  //    	success: function(data){	}
-  	// 	});
-  	// });
+  	// Print Order Summary
+  	// $('#print_order_summary').on('click',function(){
+  	$(document).on('click', '#print_order_summary', function(event){
+  		var orderNo = $('.selected-item').attr('data-order-no');
+  		var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
+  		var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
+  		var params = { 'table_name':table_name };
+  		$.ajax({
+			type: 'GET',
+	     	url: '/oqs/print/print_order_summary/'+assigned_item_id,
+	     	data: params,
+	     	success: function(data){	}
+  		});
+  	});
 });
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index fdf00b29..7a98ec47 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -1,4 +1,5 @@
 class Origami::HomeController < BaseOrigamiController
+  authorize_resource :class => false
  before_action :set_dining, only: [:show]
 
   def index
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fecdbfc3..1c492338 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -21,8 +21,6 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    Rails.logger.debug ENV["SERVER_MODE"]
-
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       # Print for First Bill to Customer
       unique_code = "ReceiptBillPdf"
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index a6a2044d..6d0fbe02 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -54,27 +54,26 @@ class Origami::ShiftsController < BaseOrigamiController
         card_sett_trans.save()
       end
 
+      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        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='')
+        #other payment details for mpu or visa like card
+        @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
 
-      # 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='')
-      # #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)
 
-      # # 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)
+        printer = Printer::CashierStationPrinter.new(print_settings)
 
-      # printer = Printer::CashierStationPrinter.new(print_settings)
-
-      # printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
-
-      
+        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
+      end
     end
     Employee.logout(session[:session_token])
     session[:session_token] = nil  
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 846b278a..d3082a1b 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -89,10 +89,14 @@ class Ability
 
         can :manage, Inventory
 
+        can :index, :home
+        can :show, :home
+
     elsif user.role == "cashier"
         
         # can :overall_void, :void
-
+        can :index, :home
+        can :show, :home
         can :read, Order
         can :update, Order
         can :menage, Booking
@@ -176,6 +180,9 @@ class Ability
         can :manage, Promotion
         can :manage, Product
 
+        can :index, :home
+        can :show, :home
+
     end
   end
 end
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 80ea2fb1..c6b1356a 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -43,12 +43,14 @@
 				</a>
 			</li>
 			<% end %>
+			<% if can? :index, :home %> 
 			<li>
 				<a href="<%= origami_root_path %>">
 					<i class="material-icons">monetization_on</i>
 					<span><%= t :origami %></span>
 				</a>
 			</li>
+			<% end %>
 			<% if can? :menage, Customer %>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
@@ -106,6 +108,7 @@
 					<% end %>
 				</ul>
 			</li>
+			<% if can? :index, :dailysale %> 
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">assessment</i>
@@ -141,6 +144,7 @@
 					</li>
 				</ul>
 			</li>	
+			<%end%>
 			<li class="header"><%= t :settings %></li>
 			<% if can? :menage, Zone %>
 			<li>
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index e5196917..2fd7f45d 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -168,8 +168,10 @@
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
     <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
-    <!-- <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
-    <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>   -->   
+    <% if ENV["SERVER_MODE"] != "cloud" %>
+    <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
+      <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
+    <%end%>    
   </div>
 </div>
 

From 2703c3c37a8614afe840fe62780a637e17faf216 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 11:39:37 +0630
Subject: [PATCH 079/651] add printer lists of system

---
 app/models/printer/printer_worker.rb                | 4 ++--
 app/views/print_settings/_form.html.erb             | 2 +-
 app/views/settings/cashier_terminals/_form.html.erb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index ad844cfe..c0485187 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -24,11 +24,11 @@ class Printer::PrinterWorker
     end
   end
 
-  def printers()
+  def self.printers()
     Cups.show_destinations
   end
 
-  def default_printer()
+  def self.default_printer()
     Cups.default_printer
   end
 
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index 38e55330..b8804dcc 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -11,7 +11,7 @@
           <%= f.input :unique_code %>
           <%= f.input :template %>
           <%= f.input :font %>
-          <%= f.input :printer_name %>
+          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
           <%= f.input :api_settings %>
           <%= f.input :page_width %>
           <%= f.input :page_height %>
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index cb4014dd..d5693561 100755
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/app/views/settings/cashier_terminals/_form.html.erb
@@ -12,7 +12,7 @@
           <%= f.input :auto_print_receipt %>
           <%= f.label "Select Zones", :class => 'control-label' %>
           <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox form-group'%>
-          <%= f.input :printer_name %>
+          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
           <%= f.input :font %>
           <%= f.input :font_size %>
           <%= f.input :show_tax %>

From 468914fb3c4b3da8c6363b7be892b97ac26292df Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 11:44:21 +0630
Subject: [PATCH 080/651] add printer lists in settings/oqs

---
 app/views/settings/order_queue_stations/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index 86ca2237..0ffa8f9a 100755
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -16,7 +16,7 @@ div.form-inputs span{
           <%= f.input :station_name %>
           <%= f.input :is_active %>
 
-          <%= f.input :printer_name %>
+          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
       <!--     <%= f.input :font_size %> -->
           <%= f.input :print_copy %>
           <%= f.hidden_field :processing_items %>

From 2837e4dd405c3d1dd4ddb47b84a4e29952065aff Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 13:22:58 +0630
Subject: [PATCH 081/651] check booking in movetable

---
 app/views/origami/movetable/move_dining.html.erb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 01be4bb3..131407f0 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -94,11 +94,13 @@
     <% else %>
       <div id="save_order_id" data-order="">
     <% end %>
-      <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
-      <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
-        <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
-      <% else %>
-        <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+      <% if !@booking.nil? %>
+        <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
+        <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
+          <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+        <% else %>
+          <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+        <% end %>
       <% end %>
       </div>
   <% elsif @status_sale == 'sale' %>
@@ -149,10 +151,10 @@
    <div class="row p-l-5 p-r-5">
         <div class="col-lg-6 col-md-6 col-sm-6">
        
-          <% if @status_sale == 'sale' %>
+          <% if @status_sale == 'sale' && !@sale_array.empty? %>
               <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
               &nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
-          <% elsif @status_order == 'order'
+          <% elsif @status_order == 'order' && !@customer.nil?
              %>
               <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
               &nbsp; Customer : <%= @customer.name rescue "" %>

From 7c6fedebe9786f0e2b7d5e8cb0f13123e71aae24 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 13:33:29 +0630
Subject: [PATCH 082/651] update open print service

---
 app/controllers/oqs/edit_controller.rb  | 20 +++---
 app/controllers/oqs/print_controller.rb | 94 +++++++++++++------------
 app/models/order_queue_station.rb       | 68 ++++++++++--------
 3 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 368255e5..0130d823 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -16,15 +16,17 @@ class Oqs::EditController < BaseOqsController
     order_item.remark = remarks
     order_item.save
 
-    # print
-    # assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
-    # # order queue stations
-    # oqs = assigned_item.order_queue_station
-    
-    # unique_code="OrderItemPdf"    
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      # print
+      assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
+      # order queue stations
+      oqs = assigned_item.order_queue_station
+      
+      unique_code="OrderItemPdf"    
 
-    # print_settings=PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+      print_settings=PrintSetting.find_by_unique_code(unique_code)
+      order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+    end
   end
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index cc5556e9..1ae8ee04 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -1,61 +1,65 @@
 class Oqs::PrintController < ApplicationController
   # Print Order Item
   def print
-  	# unique_code="OrderItemPdf"
-  	# assigned_item_id = params[:id]
-   #  options = params[:options]
-   #  assigned_item = AssignedOrderItem.find(assigned_item_id)  	
-   #  assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      unique_code="OrderItemPdf"
+      assigned_item_id = params[:id]
+      options = params[:options]
+      assigned_item = AssignedOrderItem.find(assigned_item_id) 
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
-   #  # order queue stations
-   #  oqs = assigned_item.order_queue_station
-   #  order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
+      # order queue stations
+      oqs = assigned_item.order_queue_station
+      order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
 
-   #  # Check Printed
-   #  print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
+      # Check Printed
+      print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
 
-   #  # print when complete click 
-  	# print_settings = PrintSetting.find_by_unique_code(unique_code)
-   #  order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-  	# order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
-  	
-   #  # update print status for completed same order items
-   #  assigned_items.each do |ai|
-   #    ai.print_status=true
-   #    ai.save       
-   #  end                 
+      # print when complete click 
+      print_settings = PrintSetting.find_by_unique_code(unique_code)
+      order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
+      
+      # update print status for completed same order items
+      assigned_items.each do |ai|
+        ai.print_status=true
+        ai.save       
+      end  
+    end               
   end
 
   # Print Order Details with booking id
   def print_order_summary
-    # unique_code="OrderSummaryPdf"
-    # assigned_item_id = params[:id]
-    # table_name = params[:table_name]
-    # assigned_item = AssignedOrderItem.find(assigned_item_id)    
-    # assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      unique_code="OrderSummaryPdf"
+      assigned_item_id = params[:id]
+      table_name = params[:table_name]
+      assigned_item = AssignedOrderItem.find(assigned_item_id)    
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
-    # # order queue stations
-    # oqs = assigned_item.order_queue_station
+      # order queue stations
+      oqs = assigned_item.order_queue_station
 
-    # # Check Printed
-    # print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
+      # Check Printed
+      print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
 
-    # # get dining
-    # # dining = DiningFacility.find_by_name(table_name);
-    # # booking = Booking.find_by_dining_facility_id(dining.id)
+      # get dining
+      # dining = DiningFacility.find_by_name(table_name);
+      # booking = Booking.find_by_dining_facility_id(dining.id)
 
-    # # Get Booking ID
-    # booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0]
-    
-    # # print when complete click 
-    # print_settings = PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status)
+      # Get Booking ID
+      booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0]
+      
+      # print when complete click 
+      print_settings = PrintSetting.find_by_unique_code(unique_code)
+      order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status)
 
-    #  # update print status for completed same order items
-    # assigned_items.each do |ai|
-    #   ai.print_status = true
-    #   ai.save       
-    # end              
+       # update print status for completed same order items
+      assigned_items.each do |ai|
+        ai.print_status = true
+        ai.save       
+      end
+    end              
   end
-end
+end
\ No newline at end of file
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 8b1d6d7d..7b6b7eac 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -14,6 +14,7 @@ class OrderQueueStation < ApplicationRecord
   validates_presence_of :station_name, :printer_name
 
   def process_order (order, table_id)    
+
     oqs_stations = OrderQueueStation.active
     dining=DiningFacility.find(table_id)    
     # oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id)
@@ -77,14 +78,23 @@ class OrderQueueStation < ApplicationRecord
               end
             end
           end
-
-          # if oqs.auto_print 
-          #   if oqs_order_items.length > 0     
-          #     print_slip(oqs, order, oqs_order_items)
-          #     is_auto_printed = true
-          #   end
-          # end 
-        end        
+ 
+          if oqs.auto_print 
+            if oqs_order_items.length > 0     
+              print_slip(oqs, order, oqs_order_items)
+              is_auto_printed = true
+            end
+          end 
+        end
+        # if oqs.id == oqpbz.order_queue_station_id          
+        #   # Auto Printing
+        #   if oqs.auto_print 
+        #     if oqs_order_items.length > 0     
+        #       print_slip(oqs, order, oqs_order_items)
+        #       is_auto_printed = true
+        #     end
+        #   end 
+        # end  
       end   
     # end
   end
@@ -92,32 +102,32 @@ class OrderQueueStation < ApplicationRecord
   private
   #Print order_items in 1 slip
   def print_slip(oqs, order, order_items)    
-    # unique_code="OrderSummaryPdf"     
-    
-    # print_settings=PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
+    unique_code="OrderSummaryPdf"
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
 
-    # AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
-    # # update print status for order items
-    #   ai.print_status=true
-    #   ai.save       
-    # end      
+    AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
+    # update print status for order items
+      ai.print_status=true
+      ai.save       
+    end  
+    
   end
 
   #Print order_item in 1 slip per item
   def print_slip_item(oqs, assigned_item)
-    # unique_code="OrderItemPdf"    
-    # order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
-    # # print when complete click 
-    # print_settings=PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
+    unique_code="OrderItemPdf"    
+    order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
+    # print when complete click 
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
     
-    # # update print status for completed same order items
-    # assigned_order_item.each do |ai|
-    #   ai.print_status=true
-    #   ai.save       
-    # end
+    # update print status for completed same order items
+    assigned_order_item.each do |ai|
+      ai.print_status=true
+      ai.save       
+    end
   end
 end

From f2daaae8018c6d9c8511ac4b52a5d0634ec3289e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 14:13:01 +0630
Subject: [PATCH 083/651] update control payment multiple

---
 app/models/order_queue_station.rb        | 2 +-
 app/views/origami/payments/show.html.erb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 7b6b7eac..ae6c877e 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -78,7 +78,7 @@ class OrderQueueStation < ApplicationRecord
               end
             end
           end
- 
+          
           if oqs.auto_print 
             if oqs_order_items.length > 0     
               print_slip(oqs, order, oqs_order_items)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 97c4d216..ff155525 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -316,14 +316,15 @@
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           
           if (member_id && member_discount) {
+
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
             } else{
               $("#credit_payment").show();
             }
 
-            if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
-              $("#card_payment").show();      
+            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1){
+              $("#card_payment").show();   
             } else{
              $("#card_payment").hide();
             }

From 5a5f47c94679e37140f52991cb62c19cc6b43598 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 14:21:50 +0630
Subject: [PATCH 084/651] add order_slim_pdf in settings/lookups and change
 order_slim_pdf

---
 README.md                                 | 13 +++--
 app/controllers/oqs/edit_controller.rb    |  9 +++-
 app/controllers/oqs/print_controller.rb   | 14 ++++++
 app/models/order_queue_station.rb         | 18 ++++++-
 app/models/printer/order_queue_printer.rb | 58 ++++++++++++++++++++---
 app/models/printer/receipt_printer.rb     | 36 ++++++++++++++
 6 files changed, 134 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ec64ef45..ec82b44a 100755
--- a/README.md
+++ b/README.md
@@ -44,11 +44,14 @@ For Extra Time
 For Order Item & Order Summary Slim
 	*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
 	1) settings/print_settings
-	2) app/controllers/oqs/edit_controller.rb
-	3) app/controllers/oqs/print_controller.rb
-	4) app/models/order_queue_station.rb
-	5) app/models/printer/order_queue_printer.rb
-	6) app/models/printer/receipt_printer.rb
+	2) settings/lookups => { type:order_slim_pdf, name:OrderSlimPdf, value:1 }
+	* no need to change these page
+	{ app/controllers/oqs/edit_controller.rb
+	  app/controllers/oqs/print_controller.rb
+	  app/models/order_queue_station.rb
+	  app/models/printer/order_queue_printer.rb
+	  app/models/printer/receipt_printer.rb
+	}
 
 For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 0130d823..08ce6709 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -21,8 +21,15 @@ class Oqs::EditController < BaseOqsController
       assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
       # order queue stations
       oqs = assigned_item.order_queue_station
+
+      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       
-      unique_code="OrderItemPdf"    
+      unique_code="OrderItemPdf"
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          unique_code="OrderItemSlimPdf"
+        end
+      end
 
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 1ae8ee04..6f3afbd5 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -2,7 +2,14 @@ class Oqs::PrintController < ApplicationController
   # Print Order Item
   def print
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderItemPdf"
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          unique_code="OrderItemSlimPdf"
+        end
+      end
+      
       assigned_item_id = params[:id]
       options = params[:options]
       assigned_item = AssignedOrderItem.find(assigned_item_id) 
@@ -31,7 +38,14 @@ class Oqs::PrintController < ApplicationController
   # Print Order Details with booking id
   def print_order_summary
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderSummaryPdf"
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          unique_code="OrderSummarySlimPdf"
+        end
+      end
+
       assigned_item_id = params[:id]
       table_name = params[:table_name]
       assigned_item = AssignedOrderItem.find(assigned_item_id)    
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 7b6b7eac..fee3f9ea 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -101,8 +101,15 @@ class OrderQueueStation < ApplicationRecord
 
   private
   #Print order_items in 1 slip
-  def print_slip(oqs, order, order_items)    
+  def print_slip(oqs, order, order_items)
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf  
     unique_code="OrderSummaryPdf"
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[0][1] == '1'
+        unique_code="OrderSummarySlimPdf"
+      end
+    end  
+
     print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
     order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
@@ -117,7 +124,14 @@ class OrderQueueStation < ApplicationRecord
 
   #Print order_item in 1 slip per item
   def print_slip_item(oqs, assigned_item)
-    unique_code="OrderItemPdf"    
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    unique_code="OrderItemPdf"
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[0][1] == '1'
+        unique_code="OrderItemSlimPdf"
+      end
+    end  
+
     order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
     # print when complete click 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index cc08f9ba..4a6dd0ed 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -14,9 +14,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    
     # check for item not to show 
     # if order_item[0].price != 0 
-      pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+        else
+          pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+        end
+      else
+          pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+      end
       pdf.render_file filename    
 
       if oqs.print_copy
@@ -43,6 +53,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+
     order=print_query('order_summary', order_id)    
     # For Print Per Item
     if oqs.cut_per_item
@@ -55,7 +67,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          if !order_slim_pdf.nil?
+            if order_slim_pdf[0][1] == '1'
+              pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+            else
+              pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+            end
+          else
+            pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          end
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
           if oqs.print_copy               
@@ -71,7 +91,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+        else
+          pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+        end
+      else  
+        pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      end
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)        
@@ -94,6 +122,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+
     order=print_query('booking_summary', booking_id)
     # For Print Per Item
     if oqs.cut_per_item
@@ -104,7 +134,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          if !order_slim_pdf.nil?
+            if order_slim_pdf[0][1] == '1'
+              pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+            else
+              pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+            end
+          else
+              pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          end
           pdf.render_file filename               
 
           if oqs.print_copy
@@ -122,8 +160,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"      
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'   
+          pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+        else
+          pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+        end
+      else  
+        pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      end
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index ed4fad91..ec7ad601 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -4,7 +4,13 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderItemPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[0][1] == '1'
+        pdf = OrderItemSlimPdf.new
+      end
+    end
     pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf"
     self.print("tmp/receipt.pdf")
   end
@@ -14,7 +20,13 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -24,8 +36,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -35,8 +53,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -46,8 +70,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -57,8 +87,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)

From 7fadeeed2e57319a3844b7f975b44adafb37ad9b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 14:32:24 +0630
Subject: [PATCH 085/651] update suppervisor ability and room & table first
 bill

---
 app/models/ability.rb                 | 1 +
 app/views/origami/home/show.html.erb  | 2 +-
 app/views/origami/rooms/show.html.erb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index d3082a1b..8877fc61 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -165,6 +165,7 @@ class Ability
         can :create, :discount
         can :remove_discount_items, :discount
         can :remove_all_discount, :discount
+        can :member_discount, :discount
 
         can :manage, Customer
         can :manage, DiningQueue
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 372efa83..91f25ad2 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -605,7 +605,7 @@
         var sale_id = $('#sale_id').val();
           type = $('.payment_method').val();
           if(parseInt(jQuery.inArray("Credit", type)) == -1){
-            if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+            if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
                calculate_member_discount(sale_id,"Card");
                
             }else{
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 00350f1b..af581777 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -608,7 +608,7 @@ $(".choose_payment").on('click', function () {
   var sale_id = $('#sale_id').val();
   type = $('.payment_method').val();
   if(parseInt(jQuery.inArray("Credit", type)) == -1){
-    if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+    if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
       calculate_member_discount(sale_id,"Card");
 
     }else{

From d8c62b0d44bab8f954f570c6f30584f2caf1e285 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 14:55:33 +0630
Subject: [PATCH 086/651] change and check order_slim_pdf

---
 app/controllers/oqs/edit_controller.rb    |  2 +-
 app/controllers/oqs/print_controller.rb   |  5 +++--
 app/models/order_queue_station.rb         |  4 ++--
 app/models/printer/order_queue_printer.rb | 10 +++++-----
 app/models/printer/receipt_printer.rb     | 22 +++++++++++-----------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 08ce6709..53a6bf53 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -25,7 +25,7 @@ class Oqs::EditController < BaseOqsController
       order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       
       unique_code="OrderItemPdf"
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           unique_code="OrderItemSlimPdf"
         end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 6f3afbd5..2007934c 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -4,7 +4,8 @@ class Oqs::PrintController < ApplicationController
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderItemPdf"
-      if !order_slim_pdf.nil?
+      
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           unique_code="OrderItemSlimPdf"
         end
@@ -40,7 +41,7 @@ class Oqs::PrintController < ApplicationController
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderSummaryPdf"
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           unique_code="OrderSummarySlimPdf"
         end
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index fee3f9ea..6f2fb04c 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -104,7 +104,7 @@ class OrderQueueStation < ApplicationRecord
   def print_slip(oqs, order, order_items)
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf  
     unique_code="OrderSummaryPdf"
-    if !order_slim_pdf.nil?
+    if !order_slim_pdf.empty?
       if order_slim_pdf[0][1] == '1'
         unique_code="OrderSummarySlimPdf"
       end
@@ -126,7 +126,7 @@ class OrderQueueStation < ApplicationRecord
   def print_slip_item(oqs, assigned_item)
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     unique_code="OrderItemPdf"
-    if !order_slim_pdf.nil?
+    if !order_slim_pdf.empty?
       if order_slim_pdf[0][1] == '1'
         unique_code="OrderItemSlimPdf"
       end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 4a6dd0ed..3bd2df4c 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -18,7 +18,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     
     # check for item not to show 
     # if order_item[0].price != 0 
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
         else
@@ -67,7 +67,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          if !order_slim_pdf.nil?
+          if !order_slim_pdf.empty?
             if order_slim_pdf[0][1] == '1'
               pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
             else
@@ -91,7 +91,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
         else
@@ -134,7 +134,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          if !order_slim_pdf.nil?
+          if !order_slim_pdf.empty?
             if order_slim_pdf[0][1] == '1'
               pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
             else
@@ -161,7 +161,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'   
           pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
         else
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index ec7ad601..a1375204 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -6,7 +6,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderItemPdf.new
-    if !order_slim_pdf.nil?
+    if !order_slim_pdf.empty?
       if order_slim_pdf[0][1] == '1'
         pdf = OrderItemSlimPdf.new
       end
@@ -22,8 +22,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -39,8 +39,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -56,8 +56,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -73,8 +73,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -90,8 +90,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end

From bc2d6e07f10e676d867b1d663728f592801d52dd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 14:59:47 +0630
Subject: [PATCH 087/651] check empty for checkout time and checkout alert time

---
 app/controllers/api/check_in_process_controller.rb     | 2 +-
 app/controllers/origami/check_in_process_controller.rb | 2 +-
 app/models/dining_facility.rb                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 7ad00d67..883fb1ea 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -15,7 +15,7 @@ class Api::CheckInProcessController < Api::ApiController
 
 				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
 				alert_time_min = 0
-				if !lookup_checkout_time.nil?
+				if !lookup_checkout_time.empty?
 					now = Time.now.utc
 			        lookup_checkout_time.each do |checkout_time|
 			          arr_time = checkout_time[0].split("-")
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 40a28398..14d5c90c 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -3,7 +3,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
 	def check_in_process
 		lookup_checkout_time = Lookup.collection_of("checkout_time")
 		checkout_at = Time.now.utc
-		if !lookup_checkout_time.nil?
+		if !lookup_checkout_time.empty?
 			lookup_checkout_time.each do |checkout_time|
 				arr_time = checkout_time[0].split("-")
 				start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 1feab5d9..c4da3475 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -80,7 +80,7 @@ class DiningFacility < ApplicationRecord
     if booking
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
-      if !lookup_checkout_time.nil?
+      if !lookup_checkout_time.empty?
         now = Time.now.utc
         lookup_checkout_time.each do |checkout_time|
           arr_time = checkout_time[0].split("-")
@@ -119,7 +119,7 @@ class DiningFacility < ApplicationRecord
     if bookings
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
-      if !lookup_checkout_time.nil?
+      if !lookup_checkout_time.empty?
         now = Time.now.utc
         lookup_checkout_time.each do |checkout_time|
           arr_time = checkout_time[0].split("-")

From d5b42b0ff0c5ccde990c85e0a6c835cb665eb69b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 17:19:14 +0630
Subject: [PATCH 088/651] update cable for cloud

---
 app/views/origami/payments/show.html.erb | 5 +++--
 config/routes.rb                         | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index ff155525..96f69da9 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -312,9 +312,10 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
 
-        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        payment_type = '';
+        
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          
+          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
           if (member_id && member_discount) {
 
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
diff --git a/config/routes.rb b/config/routes.rb
index a31dcb5c..7fe033a0 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,10 @@ scope "(:locale)", locale: /en|mm/ do
   mount Sidekiq::Web => '/kiq'
 
   # Action Cable Creation
-   mount ActionCable.server => "/cable"
+  if ENV["SERVER_MODE"] !=  "cloud"
+    mount ActionCable.server => "/cable"
+  end
+   
 
   #--------- SmartSales Activation ------------#
   get 'activate' => 'install#index'

From 21a39dc390e86d51bbe353300dfec4c391a22322 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 17:39:46 +0630
Subject: [PATCH 089/651] update route cable

---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 7fe033a0..73f37207 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,9 +7,9 @@ scope "(:locale)", locale: /en|mm/ do
   mount Sidekiq::Web => '/kiq'
 
   # Action Cable Creation
-  if ENV["SERVER_MODE"] !=  "cloud"
+  # if ENV["SERVER_MODE"] !=  "cloud"
     mount ActionCable.server => "/cable"
-  end
+  # end
    
 
   #--------- SmartSales Activation ------------#

From 93969822619b8f3a857410337db48c5fbb6950dd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 17 Jan 2018 10:39:46 +0630
Subject: [PATCH 090/651] update sale item price 0

---
 app/models/sale.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index e0918d5f..33ef6149 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -665,7 +665,8 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,i.product_name").order("acc.title desc, mi.account_id desc")
+  query = query.group("acc.title,mi.account_id,i.product_name")
+               .order("acc.title desc, mi.account_id desc, i.unit_price asc")
 end
 
 def self.get_other_charges()

From 06686b06bb479a6f8af173ec5b42f4344aa6c001 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 17 Jan 2018 12:08:14 +0630
Subject: [PATCH 091/651] add settings for order item, order summary slim and
 receiptbillA5, receiptbillShowAltName

---
 README.md                                 | 12 ++-
 app/controllers/oqs/edit_controller.rb    | 12 ++-
 app/controllers/oqs/print_controller.rb   | 24 ++++--
 app/models/order_queue_station.rb         | 24 ++++--
 app/models/printer/order_queue_printer.rb | 66 +++++++++++------
 app/models/printer/receipt_printer.rb     | 90 +++++++++++++++++------
 app/pdf/receipt_bill_a5_pdf.rb            | 27 +++++++
 app/pdf/receipt_bill_pdf.rb               | 27 +++++++
 8 files changed, 221 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index ec82b44a..743c89c6 100755
--- a/README.md
+++ b/README.md
@@ -44,8 +44,8 @@ For Extra Time
 For Order Item & Order Summary Slim
 	*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
 	1) settings/print_settings
-	2) settings/lookups => { type:order_slim_pdf, name:OrderSlimPdf, value:1 }
-	* no need to change these page
+	2) settings/lookups => { type:print_settings, name:OrderSlimPdf, value:1 }
+	* no need to change these files
 	{ app/controllers/oqs/edit_controller.rb
 	  app/controllers/oqs/print_controller.rb
 	  app/models/order_queue_station.rb
@@ -53,6 +53,14 @@ For Order Item & Order Summary Slim
 	  app/models/printer/receipt_printer.rb
 	}
 
+For ReceiptBillA5Pdf
+	*** change ReceiptBillPdf to ReceiptBillA5Pdf
+	1) settings/print_settings , width:680, height:1450
+	2) settings/lookups => { type:print_settings, name:ReceiptBillA5Pdf, value:1 }
+
+For ReceiptBillAltName options
+	1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 }
+
 For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
   2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 53a6bf53..1fe8c561 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -22,12 +22,18 @@ class Oqs::EditController < BaseOqsController
       # order queue stations
       oqs = assigned_item.order_queue_station
 
-      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+      order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
       
       unique_code="OrderItemPdf"
       if !order_slim_pdf.empty?
-        if order_slim_pdf[0][1] == '1'
-          unique_code="OrderItemSlimPdf"
+        order_slim_pdf.each do |order_item_slim|
+          if order_item_slim[0] == 'OrderSlimPdf' 
+            if order_item_slim[1] == '1'
+              unique_code="OrderItemSlimPdf"
+            else
+              unique_code="OrderItemPdf"
+            end
+          end
         end
       end
 
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 2007934c..a25f2531 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -2,12 +2,18 @@ class Oqs::PrintController < ApplicationController
   # Print Order Item
   def print
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
-      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+      order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
       unique_code="OrderItemPdf"
       
       if !order_slim_pdf.empty?
-        if order_slim_pdf[0][1] == '1'
-          unique_code="OrderItemSlimPdf"
+        order_slim_pdf.each do |order_item_slim|
+          if order_item_slim[0] == 'OrderSlimPdf' 
+            if order_item_slim[1] == '1'
+              unique_code="OrderItemSlimPdf"
+            else
+              unique_code="OrderItemPdf"
+            end
+          end
         end
       end
       
@@ -39,11 +45,17 @@ class Oqs::PrintController < ApplicationController
   # Print Order Details with booking id
   def print_order_summary
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
-      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+      order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
       unique_code="OrderSummaryPdf"
       if !order_slim_pdf.empty?
-        if order_slim_pdf[0][1] == '1'
-          unique_code="OrderSummarySlimPdf"
+        order_slim_pdf.each do |order_summary_slim|
+          if order_summary_slim[0] == 'OrderSlimPdf' 
+            if order_summary_slim[1] == '1'
+              unique_code="OrderSummarySlimPdf"
+            else
+              unique_code="OrderSummaryPdf"
+            end
+          end
         end
       end
 
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 445ec0cc..b95377df 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -102,11 +102,17 @@ class OrderQueueStation < ApplicationRecord
   private
   #Print order_items in 1 slip
   def print_slip(oqs, order, order_items)
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf  
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     unique_code="OrderSummaryPdf"
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        unique_code="OrderSummarySlimPdf"
+      order_slim_pdf.each do |order_summary_slim|
+        if order_summary_slim[0] == 'OrderSlimPdf' 
+          if order_summary_slim[1] == '1'
+            unique_code="OrderSummarySlimPdf"
+          else
+            unique_code="OrderSummaryPdf"
+          end
+        end
       end
     end  
 
@@ -124,11 +130,17 @@ class OrderQueueStation < ApplicationRecord
 
   #Print order_item in 1 slip per item
   def print_slip_item(oqs, assigned_item)
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     unique_code="OrderItemPdf"
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        unique_code="OrderItemSlimPdf"
+      order_slim_pdf.each do |order_item_slim|
+        if order_item_slim[0] == 'OrderSlimPdf' 
+          if order_item_slim[1] == '1'
+            unique_code="OrderItemSlimPdf"
+          else
+            unique_code="OrderItemPdf"
+          end
+        end
       end
     end  
 
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 3bd2df4c..04ab220d 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -14,15 +14,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     
     # check for item not to show 
     # if order_item[0].price != 0 
       if !order_slim_pdf.empty?
-        if order_slim_pdf[0][1] == '1'
-          pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
-        else
-          pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+        order_slim_pdf.each do |order_item_slim|
+          if order_item_slim[0] == 'OrderSlimPdf' 
+            if order_item_slim[1] == '1'
+              pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+            else
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+            end
+          end
         end
       else
           pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
@@ -53,7 +57,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
 
     order=print_query('order_summary', order_id)    
     # For Print Per Item
@@ -68,10 +72,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         # check for item not to show 
         #if odi.price != 0
           if !order_slim_pdf.empty?
-            if order_slim_pdf[0][1] == '1'
-              pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
-            else
-              pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+            order_slim_pdf.each do |order_item_slim|
+              if order_item_slim[0] == 'OrderSlimPdf'
+                if order_item_slim[1] == '1'
+                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                else
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                end
+              end
             end
           else
             pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
@@ -92,10 +100,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
       if !order_slim_pdf.empty?
-        if order_slim_pdf[0][1] == '1'
-          pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
-        else
-          pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+        order_slim_pdf.each do |order_summary_slim|
+          if order_summary_slim[0] == 'OrderSlimPdf'
+            if order_summary_slim[1] == '1'
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+            else
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+            end
+          end
         end
       else  
         pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
@@ -122,7 +134,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
 
     order=print_query('booking_summary', booking_id)
     # For Print Per Item
@@ -135,10 +147,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         # check for item not to show 
         #if odi.price != 0
           if !order_slim_pdf.empty?
-            if order_slim_pdf[0][1] == '1'
-              pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
-            else
-              pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+            order_slim_pdf.each do |order_item_slim|
+              if order_item_slim[0] == 'OrderSlimPdf'
+                if order_item_slim[1] == '1'
+                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                else
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                end
+              end
             end
           else
               pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
@@ -162,10 +178,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
       if !order_slim_pdf.empty?
-        if order_slim_pdf[0][1] == '1'   
-          pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
-        else
-          pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+        order_slim_pdf.each do |order_summary_slim|
+          if order_summary_slim[0] == 'OrderSlimPdf'
+            if order_summary_slim[1] == '1'   
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+            else
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+            end
+          end
         end
       else  
         pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index a1375204..2b4fb9c3 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -4,11 +4,17 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     pdf = OrderItemPdf.new
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        pdf = OrderItemSlimPdf.new
+      order_slim_pdf.each do |order_item_slim|
+        if order_item_slim[0] == 'OrderSlimPdf' 
+          if order_item_slim[1] == '1'
+            pdf = OrderItemSlimPdf.new
+          else
+            pdf = OrderItemPdf.new
+          end
+        end
       end
     end
     pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf"
@@ -20,11 +26,17 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     pdf = OrderSummaryPdf.new
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        pdf = OrderSummarySlimPdf.new
+      order_slim_pdf.each do |order_summary_slim|
+        if order_summary_slim[0] == 'OrderSlimPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySlimPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
+        end
       end
     end
     pdf.render_file filename
@@ -36,12 +48,18 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        pdf = OrderSummarySlimPdf.new
+      order_slim_pdf.each do |order_summary_slim|
+        if order_summary_slim[0] == 'OrderSlimPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySlimPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
+        end
       end
     end
     pdf.render_file filename
@@ -53,12 +71,18 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        pdf = OrderSummarySlimPdf.new
+      order_slim_pdf.each do |order_summary_slim|
+        if order_summary_slim[0] == 'OrderSlimPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySlimPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
+        end
       end
     end
     pdf.render_file filename
@@ -70,12 +94,18 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        pdf = OrderSummarySlimPdf.new
+      order_slim_pdf.each do |order_summary_slim|
+        if order_summary_slim[0] == 'OrderSlimPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySlimPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
+        end
       end
     end
     pdf.render_file filename
@@ -87,12 +117,18 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
-    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
     if !order_slim_pdf.empty?
-      if order_slim_pdf[0][1] == '1'
-        pdf = OrderSummarySlimPdf.new
+      order_slim_pdf.each do |order_summary_slim|
+        if order_summary_slim[0] == 'OrderSlimPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySlimPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
+        end
       end
     end
     pdf.render_file filename
@@ -105,15 +141,27 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
-
-    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
-
+    receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
+    if !receipt_bill_a5_pdf.empty?
+      receipt_bill_a5_pdf.each do |receipt_bilA5|
+        if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+          if receipt_bilA5[1] == '1'
+            pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
+          else
+            pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
+          end
+        end
+      end
+    else
+      pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
+    end
     # print as print copies in printer setting
     count = printer_settings.print_copies
 
     # override print copies for print worker loop
     print_settings.print_copies = 1
     print_settings.save!
+    
     begin
       if count == 1
         pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf"
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 0861c65a..2dde9c93 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -193,6 +193,15 @@ class ReceiptBillA5Pdf < Prawn::Document
                    text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
                    text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
                    text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                    
+                    if show_alt_name
+                        if !(item.product_alt_name).empty?
+                            move_down 2
+                            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+                                text "(#{item.product_alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+                            end
+                        end
+                    end
                 }
                 move_down 10
             end
@@ -503,5 +512,23 @@ class ReceiptBillA5Pdf < Prawn::Document
 
         move_down 10
     end
+
+    #check ReceiptBillAltName included
+    def show_alt_name
+        bill_alt_name = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
+        status = false
+        if !bill_alt_name.empty?
+            bill_alt_name.each do |alt_name|
+                if alt_name[0] == 'ReceiptBillAltName'
+                    if alt_name[1] == '1'
+                        status = true
+                    else
+                        status = false
+                    end
+                end
+            end
+        end
+        return status
+    end
 end
 
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 16b1fd58..d2ad0260 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -199,6 +199,15 @@ class ReceiptBillPdf < Prawn::Document
                    text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
                    text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
                    text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                    
+                    if show_alt_name
+                        if !(item.product_alt_name).empty?
+                            move_down 2
+                            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+                                text "(#{item.product_alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+                            end
+                        end
+                    end
                 }
                 move_down 5
             end
@@ -532,5 +541,23 @@ class ReceiptBillPdf < Prawn::Document
             end
         end
     end
+
+    #check ReceiptBillAltName included
+    def show_alt_name
+        bill_alt_name = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
+        status = false
+        if !bill_alt_name.empty?
+            bill_alt_name.each do |alt_name|
+                if alt_name[0] == 'ReceiptBillAltName'
+                    if alt_name[1] == '1'
+                        status = true
+                    else
+                        status = false
+                    end
+                end
+            end
+        end
+        return status
+    end
 end
 

From 9f9ec7af408524f355d11c21515848252b877bc5 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 17 Jan 2018 14:35:35 +0630
Subject: [PATCH 092/651] change pdf func:

---
 app/models/printer/order_queue_printer.rb | 19 +++++++------------
 app/models/printer/receipt_printer.rb     |  5 ++---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 04ab220d..31e85c83 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -14,13 +14,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
+    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
     order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
-    
     # check for item not to show 
     # if order_item[0].price != 0 
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_item_slim|
-          if order_item_slim[0] == 'OrderSlimPdf' 
+          if order_item_slim[0] == 'OrderSlimPdf'
             if order_item_slim[1] == '1'
               pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
             else
@@ -28,9 +28,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             end
           end
         end
-      else
-          pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
       end
+
       pdf.render_file filename    
 
       if oqs.print_copy
@@ -71,6 +70,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
@@ -81,8 +81,6 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 end
               end
             end
-          else
-            pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
           end
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
@@ -99,6 +97,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
@@ -109,8 +108,6 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             end
           end
         end
-      else  
-        pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
       end
       pdf.render_file filename
       if oqs.print_copy
@@ -146,6 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
+          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
@@ -156,8 +154,6 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 end
               end
             end
-          else
-              pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
           end
           pdf.render_file filename               
 
@@ -177,6 +173,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
@@ -187,8 +184,6 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             end
           end
         end
-      else  
-        pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
       end
       pdf.render_file filename
       if oqs.print_copy
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 2b4fb9c3..d10dc025 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -141,6 +141,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
     receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
     if !receipt_bill_a5_pdf.empty?
       receipt_bill_a5_pdf.each do |receipt_bilA5|
@@ -152,8 +153,6 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           end
         end
       end
-    else
-      pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
     end
     # print as print copies in printer setting
     count = printer_settings.print_copies
@@ -161,7 +160,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     # override print copies for print worker loop
     print_settings.print_copies = 1
     print_settings.save!
-    
+
     begin
       if count == 1
         pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf"

From e2a138205ebeb3eb88bddfdc8d061e3c0080c934 Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Wed, 17 Jan 2018 09:47:34 +0000
Subject: [PATCH 093/651] deploy.rb edited online with Bitbucket

---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 3020554f..498e8284 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -12,7 +12,7 @@ set :rbenv_map_bins, %w{rake gem bundle ruby rails}
 
 set :keep_releases, 5
 
-set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml config/shops.json}
+set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml config/shops.json config/cable.yml}
 
 set :linked_dirs, %w{bin log tmp/puma tmp/pids tmp/cache tmp/sockets vendor/bundle public/system pids sockets}
 

From a9c9f4d750fd7cd3ba7409ec0833683bab36428e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 17 Jan 2018 17:59:48 +0630
Subject: [PATCH 094/651] set items in order

---
 app/models/order.rb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index 318e8e91..c71597bd 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -124,7 +124,7 @@ class Order < ApplicationRecord
       ordered_list = re_order_items(self.items)
 
       #loop to add all items to order
-      self.items.each do |item|
+      ordered_list.each do |item|
        
         menu_item = MenuItem.search_by_item_code(item[:item_instance_code])
         
@@ -135,10 +135,16 @@ class Order < ApplicationRecord
 
         #if (!menu_item.nil?)
           Rails.logger.debug menu_item
-          set_order_items = nil
+          set_order_items = Array.new
           ##If menu Item set item - must add child items to order as well, where price is only take from menu_item
-          if (menu_item[:type] == "SetMenuItem")
-            set_order_items
+          # if (menu_item[:type] == "SetMenuItem")
+          #   set_order_items = 
+          # end
+
+          if item.include? 'sub_items'
+            item[:sub_items].each do |si|
+              set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity]})
+            end
           end
 
           # not insert with price 0
@@ -151,7 +157,7 @@ class Order < ApplicationRecord
           # end
 
           OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
-                          item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
+                          item[:quantity],menu_item[:price], item[:options], set_order_items.to_json, self.id,
                           self.employee_name, menu_item[:taxable])
 
         #end

From b4fb8b2be65db8491b0e4d25000353585bde2fdb Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 18 Jan 2018 10:41:29 +0630
Subject: [PATCH 095/651] update menu valid date and limit time ,addorder for
 parent order item id

---
 app/assets/javascripts/addorder.js      | 73 +++++++++++++++----------
 app/models/menu.rb                      |  2 +-
 app/models/menu_category.rb             | 40 +++++++++++---
 app/views/settings/menus/_form.html.erb | 45 ++++++++++++++-
 4 files changed, 120 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index ff899c13..4b158946 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -221,6 +221,9 @@ $(function() {
                             +"' data-option='"+JSON.stringify(result["options"])
                             +"' data-min-qty='"+item_sets[field]["min_selectable_qty"]
                             +"' data-max-qty='"+item_sets[field]["max_selectable_qty"]
+                            +"' data-parent-code='"+instances[0]['code']
+                            +"' data-parent-id='"+instances[0]['id']
+                            +"' data-sub-item='true"
                             +"'>"
                           +'<div class="custom-card-head card-head" style="line-height:14px;">'
                              +'<span class="">'+result["name"]+'</span>'
@@ -246,6 +249,7 @@ $(function() {
      $('.set-item').attr('data-name',instances[0]['name']);
      $('.set-item').attr('data-price',instances[0]['price']);
      $('.set-item').attr('data-options','[]');
+     $('.set-item').attr('data-parent',true);
 
     $('#set_change_qty').val(1);
     $('#set_item_instances').text(instances);
@@ -326,12 +330,14 @@ $(function() {
     if (items.length >= min_qty) {
       attribute_arr = []
       option_arr = []
+
       var rowCount = $('.summary-items tbody tr').length+1;
-      $(items).each(function(i){
-        code          = $(items[i]).attr('data-code');
-        name          = $(items[i]).attr('data-name');
-        price         = $(items[i]).attr('data-price');
-        option        = $(items[i]).attr('data-options');
+      option_arr = []
+        code          = $('.set-item').attr('data-code');
+        name          = $('.set-item').attr('data-name');
+        price         = $('.set-item').attr('data-price');
+        option        = $('.set-item').attr('data-options');
+        parent        = $('.set-item').attr('data-parent');
         total         = qty * price ;
         option_arr.push(option);
         row ="<tr class='item_box' data-price ='"
@@ -339,7 +345,31 @@ $(function() {
               +name+ "' data-code='"+item_code+"' data-instance-code='"
               +code+"' data-attributes='"
               +attribute_arr+"' data-options ='"
-              +option_arr+"' data-row ='"+rowCount+ "'>"
+              +option_arr+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
+          +'<td class="item-cell-no">'+rowCount+'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
+          +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+          +'<td class="item-cell-price" id="item_price">' 
+          + parseFloat(total).toFixed(2)
+          +'</td>' 
+          +'</tr>';
+          $(".summary-items tbody").append(row);
+
+      var rowCount = $('.summary-items tbody tr').length+1;
+      $(items).each(function(i){
+        code          = $(items[i]).attr('data-code');
+        name          = $(items[i]).attr('data-name');
+        price         = $(items[i]).attr('data-price');
+        option        = $(items[i]).attr('data-options');
+        sub_item      = $(items[i]).attr('data-sub-item');
+        total         = qty * price ;
+        option_arr.push(option);
+        row ="<tr class='item_box' data-price ='"
+              +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+              +name+ "' data-code='"+item_code+"' data-instance-code='"
+              +code+"' data-attributes='"
+              +attribute_arr+"' data-options ='"
+              +option_arr+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
           +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
@@ -351,28 +381,6 @@ $(function() {
         rowCount = rowCount + 1;
       });
 
-      var rowCount = $('.summary-items tbody tr').length+1;
-      option_arr = []
-        code          = $('.set-item').attr('data-code');
-        name          = $('.set-item').attr('data-name');
-        price         = $('.set-item').attr('data-price');
-        option        = $('.set-item').attr('data-options');
-        total         = qty * price ;
-        option_arr.push(option);
-        row ="<tr class='item_box' data-price ='"
-              +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
-              +name+ "' data-code='"+item_code+"' data-instance-code='"
-              +code+"' data-attributes='"
-              +attribute_arr+"' data-options ='"
-              +option_arr+"' data-row ='"+rowCount+ "'>"
-          +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
-          +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
-          +'<td class="item-cell-price" id="item_price">' 
-          + parseFloat(total).toFixed(2)
-          +'</td>' 
-          +'</tr>';
-          $(".summary-items tbody").append(row);
       calculate_sub_total();
       $(".sx_item_set_detailModal").css({ 'display': "none" });
     }else{
@@ -711,7 +719,6 @@ $(function() {
     }
     var table_type = $('#table_type').text();
     var order_items = JSON.stringify(get_order_item_rows());
-
     var ajax_url = '../addorders/create'; 
     
     var params = {'order_source': "cashier", 'order_type': "dine_in",
@@ -827,6 +834,14 @@ $(function() {
       order_item.order_item_id      = $(item_row[i]).attr('data-row');
       order_item.item_instance_code = $(item_row[i]).attr('data-instance-code');
       order_item.quantity           = $(item_row[i]).children('#item_qty').text();
+//parent id
+      if ($(item_row[i]).attr('data-parent')=="true") {
+       parent_id = $(item_row[i]).attr('data-row'); 
+      }
+      if ($(item_row[i]).attr('data-sub-item')=="true") {
+        order_item.parent_order_item_id = parent_id
+      }
+//end parent id
       order_item.options            = $(item_row[i]).attr('data-options');
       order_items.push(order_item);
     }); 
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 05adfac4..65d00d90 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -2,7 +2,7 @@ class Menu < ApplicationRecord
   has_many :menu_categories, dependent: :destroy
 
   validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
-  validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
+  # validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
   #Default Scope to pull the active version only
   default_scope { where(is_active: true).order("created_at desc") }
 
diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 1f45b3ff..3c1a39ab 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -41,19 +41,41 @@ class MenuCategory < ApplicationRecord
 
     menu_category = MenuCategory.find(self.id)
     menu          = Menu.find(menu_category.menu_id)
-    from          = menu.valid_time_from.strftime("%H:%M:%S")
-    to            = menu.valid_time_to.strftime("%H:%M:%S")
-    current       = Time.now.utc.getlocal.strftime("%H:%M:%S")
 
-    from          = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
-    to            = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
-    current       = current.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
+    from_t        = Time.parse(menu.valid_time_from.strftime("%H:%M:%S"))
+    to_t          = Time.parse(menu.valid_time_to.strftime("%H:%M:%S"))
+    current_t     = Time.parse(Time.now.utc.getlocal.strftime("%H:%M:%S"))
+  
+    from          = from_t.hour * 3600 + from_t.min*60 + from_t.sec
+    to            = to_t.hour * 3600 + to_t.min* 60 + to_t.sec
+    current       = current_t.hour * 3600 + current_t.min*60+current_t.sec
+    if from > to
+      h = to_t.hour
+      if h < 12 # before noon
+        if h = 0
+          to = 24
+          to = to * 3600 + to_t.min* 60 + to_t.sec
+        end
+      else # (after) noon
+        if h > 12
+          to -= 12
+          to = to * 3600 + to_t.min* 60 + to_t.sec
+        end
+      end
+    end
 
-     if current.between?(from, to)
+    # from          = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
+    # to            = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
+    # current       = current.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
+
+    day = Date.today.wday
+    dayresult = menu.valid_days.include?(day.to_s)
+
+    if current.between?(from, to) && menu.valid_days.include?(day.to_s)
        return true
-     else
+    else
        return nil
-     end
+    end
   end
 
   private
diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb
index c8b5e41a..ffbee4ec 100755
--- a/app/views/settings/menus/_form.html.erb
+++ b/app/views/settings/menus/_form.html.erb
@@ -8,7 +8,21 @@
         <div class="form-inputs p-l-25">
           <%= f.input :name,:input_html=>{:class=>"col-md-9"} %>
           <%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %>
-          <%= f.input :valid_days,:input_html=>{:class=>"col-md-9"} %>
+          <div class="row checkboxes ">
+                 <div class="col-md-2">
+                  <label class="control-label"><abbr title="required">*</abbr> Valid Day</label>
+                </div>
+                <%= f.hidden_field :valid_days, :class => "form-control", :id => "valid_day" %>
+                <div class="col-md-9">
+                  <label><input class="selectDay" type="checkbox" name="Sunday" value="0" id="0"> Sun</label> &nbsp;&nbsp;
+                  <label><input class="selectDay" type="checkbox" name="Monday" value="1" id="1">Mon</label> &nbsp;&nbsp;
+                  <label><input class="selectDay" type="checkbox" name="Tuesday" value="2" id="2"> Tue</label> &nbsp;&nbsp;
+                  <label><input class="selectDay" type="checkbox" name="Wednesday" value="3" id="3"> Wed</label> &nbsp;&nbsp;
+                  <label><input class="selectDay" type="checkbox" name="Thursday" value="4" id="4"> Thu</label> &nbsp;&nbsp;
+                  <label><input class="selectDay" type="checkbox" name="Friday" value="5" id="5"> Fri</label> &nbsp;&nbsp;
+                  <label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label>
+                </div>
+              </div>
           <div class="col-md-9 form-group">
             <label>* Valid Time From</label>
             <div class="input-group">
@@ -69,5 +83,34 @@
     </div>  
   </div>
 </div>
+<script>
+  $(document).ready(function(){
 
+    var dayy = $("#valid_day").val().replace("[","").replace("]","");
+    $.each( dayy.split(","), function( i, d ) {
+      $("input.selectDay[value='"+d+"']").prop( "checked", true );
+    });
+
+
+  $(".selectDay").click(function() {
+      // debugger;
+      var item_row      = $('.selectDay');
+      console.log(item_row);
+      check = $(item_row).prop("checked");
+      var attribute_arr = [];
+      $(item_row).each(function(i){
+        if ($(item_row[i]).prop("checked")) {
+          value = $(item_row[i]).val();
+          str = value;
+          attribute_arr.push(str);
+        }
+      });
+        document.getElementById("valid_day").value = '';
+        document.getElementById("valid_day").value = attribute_arr;
+      });
+
+});
+
+
+</script>
  

From 45873672b63be8cb0c6d5df38585abb5aa3aa32e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 18 Jan 2018 11:23:10 +0630
Subject: [PATCH 096/651] add set menu items for template and code

---
 README.md                                 |   4 +
 app/controllers/oqs/edit_controller.rb    |   6 +
 app/controllers/oqs/print_controller.rb   |  14 +-
 app/models/order_queue_station.rb         |  12 ++
 app/models/printer/order_queue_printer.rb |  38 ++++-
 app/models/printer/receipt_printer.rb     |  36 +++++
 app/pdf/order_set_item_pdf.rb             | 146 ++++++++++++++++++
 app/pdf/order_summary_set_pdf.rb          | 172 ++++++++++++++++++++++
 8 files changed, 424 insertions(+), 4 deletions(-)
 create mode 100644 app/pdf/order_set_item_pdf.rb
 create mode 100644 app/pdf/order_summary_set_pdf.rb

diff --git a/README.md b/README.md
index 743c89c6..20e4bfc0 100755
--- a/README.md
+++ b/README.md
@@ -61,6 +61,10 @@ For ReceiptBillA5Pdf
 For ReceiptBillAltName options
 	1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 }
 
+For OrderSetPdf options
+	*** change OrderItemPdf to OrderSetItemPdf and OrderSummaryPdf to OrderSummarySetPdf
+	1) settings/lookups => { type:print_settings, name:OrderSetPdf, value:1 }
+
 For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
   2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 1fe8c561..01372dd3 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -33,6 +33,12 @@ class Oqs::EditController < BaseOqsController
             else
               unique_code="OrderItemPdf"
             end
+          elsif order_item_slim[0] == 'OrderSetPdf' 
+            if order_item_slim[1] == '1'
+              unique_code="OrderSetItemPdf"
+            else
+              unique_code="OrderItemPdf"
+            end
           end
         end
       end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index a25f2531..aaa6b262 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -13,6 +13,12 @@ class Oqs::PrintController < ApplicationController
             else
               unique_code="OrderItemPdf"
             end
+          elsif order_item_slim[0] == 'OrderSetPdf' 
+            if order_item_slim[1] == '1'
+              unique_code="OrderSetItemPdf"
+            else
+              unique_code="OrderItemPdf"
+            end
           end
         end
       end
@@ -55,10 +61,16 @@ class Oqs::PrintController < ApplicationController
             else
               unique_code="OrderSummaryPdf"
             end
+          elsif order_summary_slim[0] == 'OrderSetPdf'
+            if order_summary_slim[1] == '1'
+              unique_code="OrderSummarySetPdf"
+            else
+              unique_code="OrderSummaryPdf"
+            end
           end
         end
       end
-
+      
       assigned_item_id = params[:id]
       table_name = params[:table_name]
       assigned_item = AssignedOrderItem.find(assigned_item_id)    
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index b95377df..2be68fb3 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -112,6 +112,12 @@ class OrderQueueStation < ApplicationRecord
           else
             unique_code="OrderSummaryPdf"
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf'
+          if order_summary_slim[1] == '1'
+            unique_code="OrderSummarySetPdf"
+          else
+            unique_code="OrderSummaryPdf"
+          end
         end
       end
     end  
@@ -140,6 +146,12 @@ class OrderQueueStation < ApplicationRecord
           else
             unique_code="OrderItemPdf"
           end
+        elsif order_item_slim[0] == 'OrderSetPdf' 
+          if order_item_slim[1] == '1'
+            unique_code="OrderSetItemPdf"
+          else
+            unique_code="OrderItemPdf"
+          end
         end
       end
     end  
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 31e85c83..85264737 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -26,6 +26,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             else
               pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
             end
+          elsif order_item_slim[0] == 'OrderSetPdf'
+            if order_item_slim[1] == '1'
+              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+            else
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+            end
           end
         end
       end
@@ -79,6 +85,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 else
                   pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
                 end
+              elsif order_item_slim[0] == 'OrderSetPdf'
+                if order_item_slim[1] == '1'
+                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                else
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                end
               end
             end
           end
@@ -106,9 +118,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             else
               pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
             end
+          elsif order_summary_slim[0] == 'OrderSetPdf'
+            if order_summary_slim[1] == '1'
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+            else
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+            end
           end
         end
       end
+
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)        
@@ -152,6 +171,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 else
                   pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
                 end
+              elsif order_item_slim[0] == 'OrderSetPdf'
+                if order_item_slim[1] == '1'
+                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                else
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                end
               end
             end
           end
@@ -182,9 +207,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             else
               pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
             end
+          elsif order_summary_slim[0] == 'OrderSetPdf'
+            if order_summary_slim[1] == '1'
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+            else
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+            end
           end
         end
       end
+
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)
@@ -203,7 +235,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   # Query for OQS with status
   def print_query(type, id)
     if type == "order_item"
-      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
+      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
         .joins("left join orders ON orders.order_id = order_items.order_id                
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
@@ -213,7 +245,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         .where("order_items.order_items_id = '#{ id }'")
         .group("order_items.item_code")
     elsif type == "order_summary"                                
-      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
+      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
         .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
@@ -224,7 +256,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         .group("order_items.order_items_id")
     else 
       # order summary for booking
-      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
+      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
         .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index d10dc025..0cf6526f 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -14,6 +14,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderItemPdf.new
           end
+        elsif order_item_slim[0] == 'OrderSetPdf' 
+          if order_item_slim[1] == '1'
+            pdf = OrderSetItemPdf.new
+          else
+            pdf = OrderItemPdf.new
+          end
         end
       end
     end
@@ -36,6 +42,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -59,6 +71,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -82,6 +100,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -105,6 +129,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -128,6 +158,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
new file mode 100644
index 00000000..1851e93a
--- /dev/null
+++ b/app/pdf/order_set_item_pdf.rb
@@ -0,0 +1,146 @@
+class OrderSetItemPdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+  def initialize(print_settings,order_set_item, print_status, options, alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    self.margin = 0
+    self.price_width = 40 # No Need for item
+    self.qty_width = 40
+    self.total_width = 40  # No Need for item
+    self.item_width = self.page_width - (self.qty_width - self.margin)
+    self.item_height = 15   
+    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90   
+
+    super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
+
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]  
+
+        self.header_font_size = 11
+        self.item_font_size = 9
+    else
+        self.header_font_size = 12
+        self.item_font_size = 10       
+    end
+     # font "public/fonts/Zawgyi-One.ttf"
+     # font "public/fonts/padauk.ttf"  
+     #font "public/fonts/Chinese.ttf"     
+
+    text "#{ order_set_item.type + '-' + order_set_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 3
+
+    #order_info
+    order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
+
+    # order items
+    order_set_items(order_set_item, options, alt_name, print_settings.precision)
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)  
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 2
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 2
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 10
+  end
+
+  # Write Order items to PDF
+  def order_set_items(order_set_item, options, alt_name, precision)
+    y_position = cursor
+
+    #Add Order Item    
+    add_order_set_items(order_set_item, options, alt_name, precision)
+
+    dash(1, :space => 1, :phase => 1)
+    stroke_horizontal_line 0, (self.page_width - self.margin)
+    move_down 5
+  end
+
+  # Add order items under order info
+  def add_order_set_items(order_set_item, options, alt_name, precision)
+    y_position = cursor
+
+    move_down 5
+
+    bounding_box([0,y_position], :width => self.item_width) do
+        text "#{order_set_item.item_code} - #{order_set_item.item_name}", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width) do
+        text "[#{number_with_precision(order_set_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([0,y_position], :width => self.item_width) do
+      text "#{order_set_item.item_code} - #{order_set_item.item_name}", :size => self.item_font_size,:align => :left
+
+    end
+
+    if alt_name
+        if !(order_set_item.alt_name).empty?
+            move_down 4
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+                text "(#{order_set_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
+        end
+    end
+
+    #add set menu items
+    if !order_set_item.set_menu_items.empty?
+      set_menu_items = JSON.parse(order_set_item.set_menu_items)
+      if !set_menu_items.empty?
+        # json_item_instance_code = nil
+        set_menu_items.each do |set_item|
+            # if set_item["item_instance_code"] != json_item_instance_code
+                item_instance_name = MenuItemInstance.find_by_item_instance_code(set_item["item_instance_code"]).item_instance_name
+                move_down 2
+                text "#{item_instance_name}", :size => self.item_font_size,:align => :left, :inline_format => true
+            # end
+            # json_item_instance_code = set_item["item_instance_code"]
+        end
+      end
+    end
+
+    if !options.empty?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
+    end
+
+    move_down 5
+
+  end
+
+end
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
new file mode 100644
index 00000000..5a72901c
--- /dev/null
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -0,0 +1,172 @@
+class OrderSummarySetPdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    self.margin = 0
+    self.price_width = 40 # No Need for item
+    self.qty_width = 40
+    self.total_width = 40  # No Need for item
+    self.item_width = self.page_width - (self.qty_width - self.margin)
+    self.item_height = 15   
+    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90     
+
+    super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+
+        self.header_font_size = 11
+        self.item_font_size = 9 
+    else
+        self.header_font_size = 12
+        self.item_font_size = 10       
+    end
+
+    # font "public/fonts/Zawgyi-One.ttf"
+    # font "public/fonts/padauk.ttf"
+
+    text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 5
+
+    #order_info
+    order_info(order[0].order_id, order[0].order_by,order[0].order_at)
+
+    # order items
+    if order_items == nil
+      order_items(order, alt_name, print_settings.precision)
+    else
+      order_items(order_items, alt_name, print_settings.precision)
+    end
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)    
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 5
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 5
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 10
+  end
+
+  # Write Order items to PDF
+  def order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Item", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do
+        text "Qty", :size => self.item_font_size,:align => :left
+    end
+
+    stroke_horizontal_rule
+    move_down 5
+
+    #Add Order Item
+    add_order_items(order_item, alt_name, precision)
+    
+  end
+
+  # Add order items under order info
+  def add_order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    move_down 5
+
+    order_item.each do|odi|
+      # check for item not to show 
+      # if odi.price != 0
+        y_position = cursor
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+
+        bounding_box([self.item_width,y_position], :width => self.qty_width) do
+          text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+        end
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+        
+        if alt_name
+          if !(odi.alt_name).empty?
+            move_down 4
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+              text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
+          end
+              
+        end
+
+        #add set menu items
+        if !odi.set_menu_items.empty?
+          set_menu_items = JSON.parse(odi.set_menu_items)
+          if !set_menu_items.empty?
+            # json_item_instance_code = nil
+            set_menu_items.each do |set_item|
+              # if set_item["item_instance_code"] != json_item_instance_code
+                item_instance_name = MenuItemInstance.find_by_item_instance_code(set_item["item_instance_code"]).item_instance_name
+                move_down 2
+                text "#{item_instance_name}", :size => self.item_font_size,:align => :left, :inline_format => true
+              # end
+              # json_item_instance_code = set_item["item_instance_code"]
+            end
+          end
+        end
+
+        # add option
+        options = odi.options == "[]"? "" : odi.options
+        
+        if options != ""
+          move_down 5
+          
+          y_position = cursor
+          bounding_box([0,y_position], :width => self.item_width) do
+              text "#{options}", :size => self.item_font_size,:align => :left
+          end
+
+          move_down 5
+        end
+
+        move_down 5
+
+        dash(1, :space => 1, :phase => 1)
+        stroke_horizontal_line 0, (self.page_width - self.margin)
+        move_down 5
+      # end
+    end        
+  end
+end

From 721aebccdcd9307ca3959cc35fdacf9bb3319fed Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 18 Jan 2018 11:34:32 +0630
Subject: [PATCH 097/651] redis and sidekiq config

---
 config/initializers/sidekiq.rb | 10 ++++++++++
 config/redis.yml               | 13 +++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 config/initializers/sidekiq.rb
 create mode 100644 config/redis.yml

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
new file mode 100644
index 00000000..752f6d39
--- /dev/null
+++ b/config/initializers/sidekiq.rb
@@ -0,0 +1,10 @@
+redis = YAML::load(File.open("#{ Rails.root }/config/redis.yml"))[::Rails.env]
+
+Sidekiq.configure_server do |config|
+  config.redis = { url: "#{ redis['url'] }/#{ redis['db'] }" }
+end
+
+Sidekiq.configure_client do |config|
+  # config.redis = { url: "redis://#{ redis['host'] }:#{ redis['port'] }/0" }
+  config.redis = { url: "#{ redis['url'] }/#{ redis['db'] }" }
+end
\ No newline at end of file
diff --git a/config/redis.yml b/config/redis.yml
new file mode 100644
index 00000000..66b9db53
--- /dev/null
+++ b/config/redis.yml
@@ -0,0 +1,13 @@
+default: &default
+  url: redis://localhost:6379
+  db: 0
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+production:
+  <<: *default
+  url: redis://127.0.0.1:6379
\ No newline at end of file

From b3d6b9858b4ffa89dfeecf8bf6fd903286ca944d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 18 Jan 2018 11:43:21 +0630
Subject: [PATCH 098/651] update addorder controller for order items

---
 app/controllers/origami/addorders_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 6b4200da..af404d8b 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -76,7 +76,11 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
           extra_time = Time.at(time)
          end
        end
-       items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
+       if i["parent_order_item_id"]
+         items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"parent_order_item_id": i["parent_order_item_id"],"options": i["options"]}
+       else
+        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
+       end
        items_arr.push(items)
      }
 

From 44f1db307389f1829c4a2219e32ee1e82ac861b9 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 18 Jan 2018 12:20:20 +0630
Subject: [PATCH 099/651] check for order source emenu and cashier for set
 items

---
 app/models/order.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index c71597bd..ef21b7ff 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -141,7 +141,7 @@ class Order < ApplicationRecord
           #   set_order_items = 
           # end
 
-          if item.include? 'sub_items'
+          if (item.include? 'sub_items') || (item.include? :sub_items)
             item[:sub_items].each do |si|
               set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity]})
             end

From 09bbfa377255b0d0ed1a4801362c54256d225157 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 18 Jan 2018 16:08:22 +0630
Subject: [PATCH 100/651] update readme

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 20e4bfc0..d3eb086b 100755
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ For Bank Integration setting
   2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
 
 For checkout time and checkout alert time
-  1) checkout time => { type: checkout_time, name: 9:00AM - 12:00 PM, value: 120 }
-  2) checkout alert time => { type: checkout_alert_time, name: 8:00AM - 12:00 PM, value: 60 }
+  1) checkout time => { type: checkout_time, name: 9:00 AM - 12:00 PM, value: 120 }
+  2) checkout alert time => { type: checkout_alert_time, name: 8:00 AM - 12:00 PM, value: 60 }
   * you can add multiple record for checkout time and checkout alert time
   * type must be 'checkout_time' and 'checkout_alert_time'
   * you can change name and value
@@ -98,12 +98,12 @@ SQL Update after rake clear:data runned
 
 * ToDo list
 
-1. Cloud Sync
-2. Action Cable
-3. Shop Setup
-4. Payment Integation
+1. Migration
+2. Quick Service
+3. Order & Reservation
+
    
-* System dependencies
+* System Dependencies
 
 * Configuration
 

From 384923133b9cb57d3fa3333beb270a2bcf5131cb Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 19 Jan 2018 10:43:08 +0630
Subject: [PATCH 101/651] license flash msg and add set Item price

---
 app/controllers/application_controller.rb | 10 ++++----
 app/controllers/sym_control_controller.rb | 10 ++++----
 app/models/license.rb                     | 14 +++++------
 app/models/order.rb                       | 14 +++++------
 app/views/layouts/installation.html.erb   | 14 ++++++++++-
 config/license.yml                        | 30 +++++++++++------------
 config/secrets.yml                        |  2 +-
 7 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7fafd6bd..3f789fc4 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else      
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end
   end
 
diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb
index 92d9cedd..9b7a7a66 100644
--- a/app/controllers/sym_control_controller.rb
+++ b/app/controllers/sym_control_controller.rb
@@ -22,14 +22,14 @@ class SymControlController < BaseController
             stop_sym = system("service SymmetricDS stop")
             run_sym = system("service SymmetricDS start")
             if run_sym
-              render :text => "<h1>Success!</h1>"
+              flash[:notice] = 'Success!'
             end
           else
-            render :text => "<h1>Sym Sql file not found!</h1>"
+            flash[:notice] = 'Sym Sql file not found!'
           end
         end
       else      
-        render :text => "<h1>Sym not running!</h1>"
+        flash[:notice] = "Sym not running!"
       end
   end
 
@@ -37,9 +37,9 @@ class SymControlController < BaseController
     license = License.new(ENV["SX_PROVISION_URL"])
     status = license.get_key
     if status
-      render :text => "<h1>Success!</h1>"
+      flash[:notice] = "Success!"
     else
-      render :text => "<h1>Not Get!</h1>"
+      flash[:notice] = "Not Get!"
     end 
   end
 
diff --git a/app/models/license.rb b/app/models/license.rb
index b8604b20..869abe59 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -106,7 +106,7 @@ class License
       redis = Redis.new
       cache_license = redis.get(cache_key)    
 
-      # Rails.logger.info "Cache key - " + cache_key.to_s
+       Rails.logger.info "Cache key - " + cache_key.to_s
 
       if cache_license.nil?   
         cache = {"shop" => @activate["shop_name"], "key" => aes_key, "iv" => @activate["iv_key"], "renewable_date" => @activate["renewable_date"] }           
@@ -114,7 +114,7 @@ class License
         redis.set(cache_key, Marshal.dump(cache))
       end 
 
-      # Rails.logger.info "License - " + response.parsed_response.to_s
+      Rails.logger.info "License - " + response.parsed_response.to_s
 
       response =  create_license_file(@activate)
       if(response[:status])
@@ -136,9 +136,9 @@ class License
     response = self.class.get("/verify", @params)
     @varified = response.parsed_response
 
-    # Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
     if (@varified["status"])
-      if (!check_expired(@varified["plan_next_renewal_date"]))
+      if (!check_expired(@varified["renewable_date"]))
         return true
       end
     else
@@ -247,10 +247,10 @@ class License
       redis = Redis.new
       cache_license = redis.get(cache_key)    
 
-      # Rails.logger.info "Cache key - " + cache_key.to_s
+       Rails.logger.info "Cache key - " + cache_key.to_s
 
       if cache_license.nil?   
-        cache = {"shop" => shop_name, "key" => @data["secret_key"], "iv" => @data["iv_key"], "renewable_date" => @data["plan_next_renewable_date"] }           
+        cache = {"shop" => shop_name, "key" => @data["secret_key"], "iv" => @data["iv_key"], "renewable_date" => @data["renewable_date"] }           
         redis = Redis.new
         redis.set(cache_key, Marshal.dump(cache))
       end 
@@ -358,7 +358,7 @@ class License
         f.write("db.user=#{dbusername}\n")
         f.write("db.password=#{dbpassword}\n")
         f.write("registration.url=http://#{db_host}:31415/sync/sx\n")
-        f.write("group.id=store\n")
+        f.write("group.id=cloud\n")
         f.write("external.id=001\n")
         f.write("job.routing.period.time.ms=5000\n")  
         f.write("job.push.period.time.ms=10000\n")  
diff --git a/app/models/order.rb b/app/models/order.rb
index ef21b7ff..e0bee492 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -137,13 +137,13 @@ class Order < ApplicationRecord
           Rails.logger.debug menu_item
           set_order_items = Array.new
           ##If menu Item set item - must add child items to order as well, where price is only take from menu_item
-          # if (menu_item[:type] == "SetMenuItem")
-          #   set_order_items = 
-          # end
-
-          if (item.include? 'sub_items') || (item.include? :sub_items)
-            item[:sub_items].each do |si|
-              set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity]})
+          if (menu_item[:type] == "SetMenuItem")            
+            if (item.include? 'sub_items') || (item.include? :sub_items)
+              item[:sub_items].each do |si|
+                # Retrive instance's Price
+                set_item = MenuItem.search_by_item_code(si[:item_instance_code])
+                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity]}, "price"=>set_item[:price])
+              end
             end
           end
 
diff --git a/app/views/layouts/installation.html.erb b/app/views/layouts/installation.html.erb
index 35b99bd3..542b7d5a 100755
--- a/app/views/layouts/installation.html.erb
+++ b/app/views/layouts/installation.html.erb
@@ -29,9 +29,21 @@
   </head>
 
   <body class="page">
+    <% flash.each do |type, message| %>
+      <% if type == "notice" 
+           color = "alert-success"
+        elsif type == "error"
+            color = "alert-danger"
+        else
+            color = "bg-black"
+        end %>
+        
+        <p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+            data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
+        </p>
+    <% end %>
     <div class="box">
       <%= yield %>
-
     </div>
   </body>
 </html>
diff --git a/config/license.yml b/config/license.yml
index bddfeafd..5bfb4703 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -1,15 +1,15 @@
-iv_key: TP8dIx4nBGzr+tYyKn5+Xw==
-shop_name: Osaka
-email: wathonaun9@gmail.com
-telephone: 09979204288
-fax: 09979204288
-address: Yangon
-dbhost: nk57NaR38B2eSYyron3Nbw==
-dbschema: 3orxFaTi0uQhatBqZGiitQ==
-dbusername: EtMle9Gr0/PE3NFHHfwo5A==
-dbpassword: 86h61/O38GGo64nekz6oeA==
-api_token: RZbpyAZlwOYFZfzbWmFhZgwCzRwJTBnPKIHrfM
-app_token: IoXPdqzbnQWbHsnxLAjMjimnjEJNySOeIo
-plan_sku: PyQJ2sk5NZTudqQ2YIU16A==
-renewable_date: d/Fk1deU/iPbZFDOdyKsjA==
-plan_name: weWOqr1tZ61Av6YKth1lDw==
+iv_key: A8Uxeyvc6mY067XO/5Umjg==
+shop_name: bitp3
+email: devops@code2lab.com
+telephone: 9999999
+fax: 99999999
+address: Perl Condo
+dbhost: 1OfAgD6VvftELNwb/IXwKA==
+dbschema: DNhCHbEx6nj0Pq5YTjziSA==
+dbusername: 4+m9wVXQJauQ4Xxd3R6TIQ==
+dbpassword: r8oU0diSouVBz0XHb9FAFA==
+api_token: FcOPyXQiYTVEhFrYPelEDoarJEcRsTsllJmA
+app_token: ujxyNlgorGQDYjscjzRZEzkUnZqtJaYy
+plan_sku: GDlJuYljNJOxTynA7Fckgg==
+renewable_date: cTHhQxIkmFMWggtkJzI58Q==
+plan_name: RXtwhw7JUC1P0UZdoBuwYP4ECviwyfS7LL6cBHkSU2E=
diff --git a/config/secrets.yml b/config/secrets.yml
index e2697d03..a0220639 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: 192.168.1.182:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From 3e92becfb67cbb2c5231a1953a990d7e10bb4ba1 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 19 Jan 2018 11:34:53 +0630
Subject: [PATCH 102/651] update price in set item

---
 app/models/order.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index e0bee492..5b696e20 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -142,7 +142,7 @@ class Order < ApplicationRecord
               item[:sub_items].each do |si|
                 # Retrive instance's Price
                 set_item = MenuItem.search_by_item_code(si[:item_instance_code])
-                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity]}, "price"=>set_item[:price])
+                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
               end
             end
           end

From 57425a6bc971497665056b970777f3dbf8440ca6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 19 Jan 2018 11:44:30 +0630
Subject: [PATCH 103/651] update sale item for set menu

---
 app/models/sale.rb | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 33ef6149..c5b5fa8b 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -98,6 +98,9 @@ class Sale < ApplicationRecord
 
         order.order_items.each do |item|
           add_item(item)
+          if item.set_menu_items != "[]"
+            add_sub_item(item.set_menu_items)
+          end
         end
 
          link_order_sale(order.id)
@@ -144,7 +147,10 @@ class Sale < ApplicationRecord
 
     items.each do |item|
       add_item(item)
-
+      if item.set_menu_items != "[]"
+        add_sub_item(item.set_menu_items)
+      end
+      
       #this will result in multiple orders belonging in multiple invoices - because of spilt invoices.
       link_order_sale(item.order_id, taxable)
     end
@@ -181,6 +187,35 @@ class Sale < ApplicationRecord
     self.sale_items << sale_item
   end
 
+  def add_sub_item (item)
+    #check if the item is on promotion
+    JSON.parse(item).each do |item|
+      
+      #save sale item
+      sale_item = SaleItem.new
+
+      #pull
+      instance  = MenuItemInstance.find_by_item_instance_code(item["item_instance_code"])
+      menu_item = instance.menu_item
+
+      sale_item.product_code       = menu_item.item_code
+      sale_item.item_instance_code = item["item_instance_code"]
+      sale_item.product_name       = instance.item_instance_name
+      sale_item.product_alt_name   = menu_item.alt_name
+      sale_item.account_id         = menu_item.account_id
+      sale_item.remark             = nil
+
+      sale_item.qty                = item["quantity"]
+      sale_item.unit_price         = item["price"]
+      sale_item.taxable_price      = sale_item.qty * sale_item.unit_price
+      sale_item.is_taxable         = menu_item.taxable
+
+      sale_item.price              = sale_item.qty * sale_item.unit_price
+
+      self.sale_items << sale_item
+    end
+  end
+
   def create_saleitem_diningcharges(chargeObj, block_count, diningprice, dining_name, dining_time)
     sale_item = SaleItem.new
     sale_item.product_code = chargeObj.item_code

From 9de47cc5daf5e4e77f1fa015a975a857a9595f8a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 19 Jan 2018 11:47:46 +0630
Subject: [PATCH 104/651] update check for license file

---
 app/controllers/application_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3f789fc4..7fafd6bd 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else      
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 

From 705bff9ed7cc237b0ef1c40b0adf63a22c46a3aa Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 19 Jan 2018 15:39:36 +0630
Subject: [PATCH 105/651] update sym master for initial load

---
 db/sym_master.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sym_master.sql b/db/sym_master.sql
index 4330b41f..0e57b601 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -772,7 +772,7 @@ insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,sc
 
 
 insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) 
- values ('000','acd36ce830d1fda466eec921433f38',0,current_timestamp,0,current_timestamp,'000');
+ values ('000','acd36ce830d1fda466eec921433f38',0,current_timestamp,1,current_timestamp,'000');
 insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) 
  values ('001','acd36ce830d1fda466eec921433f38',1,null,1,null,'000');
 -- insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) 

From 3a21d85a4bc2eb81719e123770ca7ac23d8ddee4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 19 Jan 2018 16:06:58 +0630
Subject: [PATCH 106/651] add set_menu_item in origami and oqs

---
 app/assets/javascripts/OQS.js               | 19 ++++++++--
 app/controllers/oqs/home_controller.rb      | 40 +++++++++++++++++++--
 app/controllers/origami/home_controller.rb  |  9 +++++
 app/controllers/origami/rooms_controller.rb |  9 +++++
 app/views/oqs/home/index.html.erb           |  9 ++++-
 app/views/origami/home/show.html.erb        | 18 ++++++++--
 app/views/origami/rooms/show.html.erb       | 18 ++++++++--
 7 files changed, 112 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 6068b53f..3de713c7 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -66,7 +66,13 @@ $(document).on('turbolinks:load', function() {
 
 	            var date = new Date(data[field]["created_at"]); 
 	            var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
-	             
+	            var set_menu_items = data[field]["set_menu_items"];
+	            var set_instance_items = "";
+	            if(set_menu_items.length > 0){
+					$.each(set_menu_items, function(k,val){
+						set_instance_items += '<br><span class="font-12">'+val+'</span>';
+					});
+				}
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
 	                         +'<div class="row">'
@@ -78,6 +84,7 @@ $(document).on('turbolinks:load', function() {
 	                         +'<p class="m-b--10">'
 	                          +'<span class="order-item font-15">'+ data[field]["item_name"] +'- </span>'
 	                          +'<span class="order-qty"> [x'+ data[field]["qty"] +'] </span>'
+	                          +set_instance_items
 	                         +'</p>'
 
 	                        +'<br/><p class="card-text item-options">'+ options +'</p>'
@@ -137,9 +144,15 @@ $(document).on('turbolinks:load', function() {
 	    		for (i = 0; i < res.length; i++) {	    			
 	    			var data = JSON.stringify(res[i]);	
         			var parse_data = JSON.parse(data); 
-        			
+        			var set_menu_items = parse_data.set_menu_items;
+        			var set_instance_items = "";
+        			if(set_menu_items.length > 0){
+        				$.each(set_menu_items, function(k,val){
+							set_instance_items += '<br><span class="font-12">'+val+'</span>';
+						});
+        			}
 	    			var order_item_row = "<tr>" +
-							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + "</td>" +
+							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
 							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
               						 	 "</tr>";
               		$("#oqs-order-details-table").children("tbody").append(order_item_row);
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 656f3e85..07df2504 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -12,6 +12,20 @@ class Oqs::HomeController < BaseOqsController
     @filter = params[:filter]
 
     @queue_completed_item = completed_order(@filter)
+    if !@queue_completed_item.empty?
+      @queue_completed_item.each do |queue_item|
+        if !queue_item.set_menu_items.empty?
+          instance_item_sets = JSON.parse(queue_item.set_menu_items)
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+          end
+          queue_item.set_menu_items = arr_instance_item_sets
+        end
+      end
+    end
+
     if !@filter.nil?
       @count = queue_items_count_query(false,@filter)
       @count.each do |count|
@@ -70,6 +84,17 @@ class Oqs::HomeController < BaseOqsController
 
     OrderItem.where("order_id='#{ order_no }'").find_each do |oi|
       items.push(oi)
+      if !items.empty?
+        items.each do |item|
+          instance_item_sets = JSON.parse(item.set_menu_items)
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+          end
+          item.set_menu_items = arr_instance_item_sets
+        end
+      end
     end
 
     render :json => items.to_json
@@ -79,6 +104,17 @@ class Oqs::HomeController < BaseOqsController
     oqs_id = params[:id]
     filter = params[:filter]
     items  = queue_items_query(false,oqs_id,filter)
+    if !items.empty?
+      items.each do |item|
+        instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
+        arr_instance_item_sets = Array.new
+        instance_item_sets.each do |instance_item|
+          item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+          arr_instance_item_sets.push(item_instance_name)
+        end
+        item.set_menu_items = arr_instance_item_sets
+      end
+    end
     render :json => items.to_json
   end
 
@@ -115,7 +151,7 @@ class Oqs::HomeController < BaseOqsController
                               oqs.is_active, oqpz.zone_id, 
                               df.name as zone, df.type as table_type, 
                               odt.order_id, odt.item_code, odt.item_name, 
-                              odt.price, odt.qty, odt.item_order_by, odt.options, 
+                              odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items, 
                               cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
@@ -134,7 +170,7 @@ class Oqs::HomeController < BaseOqsController
 
   # Completed Order
   def completed_order(filter)
-   query =  AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
+   query =  AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items, cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
               left join orders as od ON od.order_id = assigned_order_items.order_id
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 7a98ec47..8af0759d 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -41,6 +41,15 @@ class Origami::HomeController < BaseOrigamiController
                 @date = order.created_at
                 @booking= booking
                 order.order_items.each do |item|
+                  if !item.set_menu_items.empty?
+                    instance_item_sets = JSON.parse(item.set_menu_items)
+                    arr_instance_item_sets = Array.new
+                    instance_item_sets.each do |instance_item|
+                      item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+                      arr_instance_item_sets.push(item_instance_name)
+                    end
+                    item.set_menu_items = arr_instance_item_sets
+                  end
                   @order_items.push(item)
                 end
                 accounts = @customer.tax_profiles
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 5e5b42cb..60f93d85 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -35,6 +35,15 @@ class Origami::RoomsController < BaseOrigamiController
                 @date = order.created_at
                 @booking = booking
                 order.order_items.each do |item|
+                  if !item.set_menu_items.empty?
+                    instance_item_sets = JSON.parse(item.set_menu_items)
+                    arr_instance_item_sets = Array.new
+                    instance_item_sets.each do |instance_item|
+                      item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+                      arr_instance_item_sets.push(item_instance_name)
+                    end
+                    item.set_menu_items = arr_instance_item_sets
+                  end
                   @order_items.push(item)
                 end
               end
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 2fd7f45d..2f851919 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -82,7 +82,14 @@
                   </span> [x
                   <span class="order-qty">
                     <%= qid.qty %>
-                  </span> ]   
+                  </span> ]  
+                  <% if !qid.set_menu_items.empty? 
+                      qid.set_menu_items.each do |item_instance|%>
+                    <br><span class="font-12">
+                      <%= item_instance %>
+                    </span>
+                  <% end 
+                  end %> 
                 </p>                  
                 
                 <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 91f25ad2..294b2bcf 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -251,7 +251,14 @@
                                   # unless order_item.price == 0 %>
                                   <tr>
                                     <td><%= count %></td>
-                                    <td class='item-name'><%= order_item.item_name %></td>
+                                    <td class='item-name'>
+                                      <%= order_item.item_name %>
+                                      <% if !order_item.set_menu_items.empty?  
+                                        order_item.set_menu_items.each do |item_instance| %> 
+                                        <br><span class="font-13"><%= item_instance %></span> 
+                                      <% end 
+                                      end %>
+                                    </td>
                                     <td class='item-attr'><%= order_item.qty %></td>
                                     <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                                   </tr>
@@ -324,7 +331,14 @@
 
                             <tr>
                               <td><%= count %>
-                              <td class='item-name'><%= order_item.item_name %></td>
+                              <td class='item-name'>
+                                <%= order_item.item_name %>
+                                <% if !order_item.set_menu_items.empty?  
+                                  order_item.set_menu_items.each do |item_instance| %> 
+                                  <br><span class="font-13"><%= item_instance %></span> 
+                                <% end 
+                                end %>
+                              </td>
                               <td class='item-attr'><%= order_item.qty %></td>
                               <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                             </tr>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index af581777..4dc92c53 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -244,7 +244,14 @@
                   # unless order_item.price == 0 %>
                  <tr>
                    <td><%= count %></td>
-                   <td class='item-name'><%= order_item.item_name %></td>
+                   <td class='item-name'>
+                    <%= order_item.item_name %>
+                    <% if !order_item.set_menu_items.empty?  
+                      order_item.set_menu_items.each do |item_instance| %> 
+                      <br><span class="font-13"><%= item_instance %></span> 
+                    <% end 
+                    end %>
+                    </td>
                    <td class='item-attr'><%= order_item.qty %></td>
                    <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                  </tr>
@@ -306,7 +313,14 @@
 
                   <tr>
                     <td><%= count %>
-                    <td class='item-name'><%= order_item.item_name %></td>
+                    <td class='item-name'>
+                      <%= order_item.item_name %>
+                      <% if !order_item.set_menu_items.empty?  
+                        order_item.set_menu_items.each do |item_instance| %> 
+                        <br><span class="font-13"><%= item_instance %></span> 
+                      <% end 
+                      end %>
+                    </td>
                     <td class='item-attr'><%= order_item.qty %></td>
                     <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                   </tr>

From 951d64d7618aabe0546886a99cff0e2c4c6ef28b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 19 Jan 2018 16:20:02 +0630
Subject: [PATCH 107/651] cahnge room ui

---
 app/views/origami/home/index.html.erb |  6 +++++-
 app/views/origami/home/show.html.erb  | 14 +++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 46132fff..a81c5bf9 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -80,8 +80,12 @@
        <div class="card-columns">
          <% @rooms.each do |room| %>
            <% if room.status == 'occupied' %>
+            <% if room.get_booking.nil? %>
              <div class="card rooms red text-white" data-id="<%= room.id %>">
-               <div class="card-block">
+            <% else %>
+              <div class="card rooms blue text-white" data-id="<%= room.id %>">
+            <% end %>
+              <div class="card-block">
                   <%= room.name %>
                </div>
              </div>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 294b2bcf..0bad6857 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -83,17 +83,21 @@
                 <div class="card-columns">
                   <% @rooms.each do |room| %>
                       <% if room.status == 'occupied' %>
-
+                        <% if room.get_booking.nil? %>
                           <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">
                               <%= room.name %>
-                              <% if room.get_booking.nil? %>
                                   <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
-                              <% else %>
-                                  <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
-                              <% end %>
                             </div>
                           </div>
+                          <% else %>
+                            <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                              <div class="card-block">
+                                <%= room.name %>
+                                    <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
+                              </div>
+                            </div>
+                          <% end %>
                       <% else %>
                           <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">

From efc32ec55a74ae6d131468f6b2e2d91d7f3907d8 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 19 Jan 2018 18:28:49 +0630
Subject: [PATCH 108/651] test license file

---
 config/license.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/license.yml b/config/license.yml
index 5bfb4703..8018a685 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -1,15 +1,15 @@
-iv_key: A8Uxeyvc6mY067XO/5Umjg==
-shop_name: bitp3
+iv_key: Te5NfpxT9IjB5ulefoRdoQ==
+shop_name: bitp7
 email: devops@code2lab.com
 telephone: 9999999
 fax: 99999999
 address: Perl Condo
-dbhost: 1OfAgD6VvftELNwb/IXwKA==
-dbschema: DNhCHbEx6nj0Pq5YTjziSA==
-dbusername: 4+m9wVXQJauQ4Xxd3R6TIQ==
-dbpassword: r8oU0diSouVBz0XHb9FAFA==
-api_token: FcOPyXQiYTVEhFrYPelEDoarJEcRsTsllJmA
-app_token: ujxyNlgorGQDYjscjzRZEzkUnZqtJaYy
-plan_sku: GDlJuYljNJOxTynA7Fckgg==
-renewable_date: cTHhQxIkmFMWggtkJzI58Q==
-plan_name: RXtwhw7JUC1P0UZdoBuwYP4ECviwyfS7LL6cBHkSU2E=
+dbhost: AAOoOhyuwUXWkBB7cev2vg==
+dbschema: nZtG9/bJ9BoQ3y8RvSsH1w==
+dbusername: Bahz/G6Xbn0kFw5vH/fS+Q==
+dbpassword: T45gSYq8IB2BL9o9spFmIg==
+api_token: DAJQdcHsSwXjxAbcvzWYjXTARdiAskWbw
+app_token: PsVJxxAhQHKjqLFGOnWdIIsBHoLsMdPBhZLpM
+plan_sku: W1evmpMVHjjXvXBLPW+jJA==
+renewable_date: 2bDU6cDr2LRMJpeeCM9ZvQ==
+plan_name: aaVvUh6fGhIbUDWoR3awq4qkDVk3rH2Fuydc0ZuKMqA=

From 7ef7657391d47073019aa61c58ecdf4e755e39ed Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 22 Jan 2018 09:52:26 +0630
Subject: [PATCH 109/651] add 24hr format for checkout time and checkout alert
 time

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d3eb086b..dd979330 100755
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ For checkout time and checkout alert time
   * you can add multiple record for checkout time and checkout alert time
   * type must be 'checkout_time' and 'checkout_alert_time'
   * you can change name and value
-  * name must be time range [8:30 AM - 1:45 PM]
+  * name must be time range [12hr => 8:30 AM - 1:45 PM, 24hr => 8:00 - 13:45]
   * value must be minutes[60]
 
 For call waiter pdf

From f28388ada1918a3a80e1fdbe7d9d2f1f0917fe07 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 22 Jan 2018 16:19:13 +0630
Subject: [PATCH 110/651] change menu category code error in sale item

---
 app/models/sale.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index c5b5fa8b..d9a94f79 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -700,8 +700,8 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,i.product_name")
-               .order("acc.title desc, mi.account_id desc, i.unit_price asc")
+  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name")
+               .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
 end
 
 def self.get_other_charges()

From c2e7e574eb3ef682fd83ebe54a6ab208d75f354e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 22 Jan 2018 17:45:25 +0630
Subject: [PATCH 111/651] add person process

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dd979330..aa292813 100755
--- a/README.md
+++ b/README.md
@@ -34,7 +34,11 @@ ruby 2.4.1p111
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
 Person and Extra Time
-  category_code = SPL... //for menu categories
+  category_code = SPL... //for menu categories special
+  1) must create Person in settings/accounts
+  2) must create Adult and Child in settings/item_attributes
+  3) must be P00001 for Adult and P00002 for Child in settings/menu_categories/[cat_id]/simple_menu_items
+  3) must be PI0001 for Adult and PI0002 for Child in settings/simple_menu_items/[item_id]/menu_item_instances
   
 For Extra Time 
   item_instance_code 

From 9a521ace7ce06d0bd5039b9457aee9edb3f8cb64 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 22 Jan 2018 18:21:09 +0630
Subject: [PATCH 112/651] change spent cal:

---
 app/views/api/orders/view_orders.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder
index 9f0b14b3..a7759514 100755
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -61,12 +61,12 @@ if (@booking)
 
   # For YGN BBQ
   # if adult_count > 0
-  #   json.per_adult_spent (adult_spent/adult_count) * 0.05
+  #   json.per_adult_spent adult_spent + ((adult_spent/adult_count) * 0.05)
   # else
     json.per_adult_spent 0
   # end
   # if child_count > 0
-  #   json.per_child_spent (child_spent/child_count) * 0.05
+  #   json.per_child_spent child_spent + ((child_spent/child_count) * 0.05)
   # else
     json.per_child_spent 0
   # end

From b5ad0598e9ff40a59cca4dd43a7cca34073e758a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 22 Jan 2018 19:16:15 +0630
Subject: [PATCH 113/651] update complete repritn

---
 app/views/origami/sales/show.html.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 827c906a..0eaabce1 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -201,7 +201,7 @@
    <% if @sale.sale_status != 'void' %>
        <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
    <% end %>
-   <!-- <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button> -->
+   <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
  </div>
 </div>
 </div>
@@ -271,10 +271,10 @@ $('#back').on('click',function(){
         });
     });
 
-// $('#re-print').click(function() {
-//     var sale_id = $('#sale_id').val();
-//     window.location.href = '/origami/'+ sale_id  + "/reprint"
+$('#re-print').click(function() {
+    var sale_id = $('#sale_id').val();
+    window.location.href = '/origami/'+ sale_id  + "/reprint"
 
-//     return false;
-//   });
+    return false;
+  });
 </script>

From 3f41987d34b8e0af08556ec5d0e226fe8b5943ed Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 22 Jan 2018 20:15:28 +0630
Subject: [PATCH 114/651] set_item_menus after OrderItem

---
 app/controllers/oqs/home_controller.rb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 07df2504..8217a9b8 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -84,16 +84,17 @@ class Oqs::HomeController < BaseOqsController
 
     OrderItem.where("order_id='#{ order_no }'").find_each do |oi|
       items.push(oi)
-      if !items.empty?
-        items.each do |item|
-          instance_item_sets = JSON.parse(item.set_menu_items)
-          arr_instance_item_sets = Array.new
-          instance_item_sets.each do |instance_item|
-            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-            arr_instance_item_sets.push(item_instance_name)
-          end
-          item.set_menu_items = arr_instance_item_sets
+    end
+
+    if !items.empty?
+      items.each do |item|
+        instance_item_sets = JSON.parse(item.set_menu_items)
+        arr_instance_item_sets = Array.new
+        instance_item_sets.each do |instance_item|
+          item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+          arr_instance_item_sets.push(item_instance_name)
         end
+        item.set_menu_items = arr_instance_item_sets
       end
     end
 

From 8b99c8bcc64e065c0b829dcc223863d36bd62811 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 22 Jan 2018 22:13:17 +0630
Subject: [PATCH 115/651] cahnge empty json to NIL

---
 app/controllers/oqs/home_controller.rb      | 30 ++++++++++++---------
 app/controllers/origami/home_controller.rb  |  2 +-
 app/controllers/origami/rooms_controller.rb |  2 +-
 app/models/order.rb                         |  5 +++-
 app/models/sale.rb                          |  4 +--
 app/pdf/order_set_item_pdf.rb               |  2 +-
 app/pdf/order_summary_set_pdf.rb            |  2 +-
 app/views/oqs/home/index.html.erb           |  2 +-
 app/views/origami/home/show.html.erb        |  4 +--
 app/views/origami/rooms/show.html.erb       |  4 +--
 10 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 8217a9b8..0d22d199 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -14,7 +14,7 @@ class Oqs::HomeController < BaseOqsController
     @queue_completed_item = completed_order(@filter)
     if !@queue_completed_item.empty?
       @queue_completed_item.each do |queue_item|
-        if !queue_item.set_menu_items.empty?
+        if !queue_item.set_menu_items.nil?
           instance_item_sets = JSON.parse(queue_item.set_menu_items)
           arr_instance_item_sets = Array.new
           instance_item_sets.each do |instance_item|
@@ -88,13 +88,15 @@ class Oqs::HomeController < BaseOqsController
 
     if !items.empty?
       items.each do |item|
-        instance_item_sets = JSON.parse(item.set_menu_items)
-        arr_instance_item_sets = Array.new
-        instance_item_sets.each do |instance_item|
-          item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-          arr_instance_item_sets.push(item_instance_name)
+        if !item.set_menu_items.nil?
+          instance_item_sets = JSON.parse(item.set_menu_items)
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+          end
+          item.set_menu_items = arr_instance_item_sets
         end
-        item.set_menu_items = arr_instance_item_sets
       end
     end
 
@@ -107,13 +109,15 @@ class Oqs::HomeController < BaseOqsController
     items  = queue_items_query(false,oqs_id,filter)
     if !items.empty?
       items.each do |item|
-        instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
-        arr_instance_item_sets = Array.new
-        instance_item_sets.each do |instance_item|
-          item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-          arr_instance_item_sets.push(item_instance_name)
+        if !item.set_menu_items.nil?
+          instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+          end
+          item.set_menu_items = arr_instance_item_sets
         end
-        item.set_menu_items = arr_instance_item_sets
       end
     end
     render :json => items.to_json
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 8af0759d..536defe7 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -41,7 +41,7 @@ class Origami::HomeController < BaseOrigamiController
                 @date = order.created_at
                 @booking= booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.empty?
+                  if !item.set_menu_items.nil?
                     instance_item_sets = JSON.parse(item.set_menu_items)
                     arr_instance_item_sets = Array.new
                     instance_item_sets.each do |instance_item|
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 60f93d85..bd375d63 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -35,7 +35,7 @@ class Origami::RoomsController < BaseOrigamiController
                 @date = order.created_at
                 @booking = booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.empty?
+                  if !item.set_menu_items.nil?
                     instance_item_sets = JSON.parse(item.set_menu_items)
                     arr_instance_item_sets = Array.new
                     instance_item_sets.each do |instance_item|
diff --git a/app/models/order.rb b/app/models/order.rb
index 5b696e20..13e0e62b 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -145,6 +145,9 @@ class Order < ApplicationRecord
                 set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
               end
             end
+            set_order_items = set_order_items.to_json
+          else
+            set_order_items = nil
           end
 
           # not insert with price 0
@@ -157,7 +160,7 @@ class Order < ApplicationRecord
           # end
 
           OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
-                          item[:quantity],menu_item[:price], item[:options], set_order_items.to_json, self.id,
+                          item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
                           self.employee_name, menu_item[:taxable])
 
         #end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index d9a94f79..b5026a9c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -98,7 +98,7 @@ class Sale < ApplicationRecord
 
         order.order_items.each do |item|
           add_item(item)
-          if item.set_menu_items != "[]"
+          if !item.set_menu_items.nil?
             add_sub_item(item.set_menu_items)
           end
         end
@@ -147,7 +147,7 @@ class Sale < ApplicationRecord
 
     items.each do |item|
       add_item(item)
-      if item.set_menu_items != "[]"
+      if !item.set_menu_items.nil?
         add_sub_item(item.set_menu_items)
       end
       
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 1851e93a..30a800b4 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -114,7 +114,7 @@ class OrderSetItemPdf < Prawn::Document
     end
 
     #add set menu items
-    if !order_set_item.set_menu_items.empty?
+    if !order_set_item.set_menu_items.nil?
       set_menu_items = JSON.parse(order_set_item.set_menu_items)
       if !set_menu_items.empty?
         # json_item_instance_code = nil
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index 5a72901c..baab15b8 100644
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -132,7 +132,7 @@ class OrderSummarySetPdf < Prawn::Document
         end
 
         #add set menu items
-        if !odi.set_menu_items.empty?
+        if !odi.set_menu_items.nil?
           set_menu_items = JSON.parse(odi.set_menu_items)
           if !set_menu_items.empty?
             # json_item_instance_code = nil
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 2f851919..1f25e275 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -83,7 +83,7 @@
                   <span class="order-qty">
                     <%= qid.qty %>
                   </span> ]  
-                  <% if !qid.set_menu_items.empty? 
+                  <% if !qid.set_menu_items.nil? 
                       qid.set_menu_items.each do |item_instance|%>
                     <br><span class="font-12">
                       <%= item_instance %>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0bad6857..1f387be9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -257,7 +257,7 @@
                                     <td><%= count %></td>
                                     <td class='item-name'>
                                       <%= order_item.item_name %>
-                                      <% if !order_item.set_menu_items.empty?  
+                                      <% if !order_item.set_menu_items.nil?  
                                         order_item.set_menu_items.each do |item_instance| %> 
                                         <br><span class="font-13"><%= item_instance %></span> 
                                       <% end 
@@ -337,7 +337,7 @@
                               <td><%= count %>
                               <td class='item-name'>
                                 <%= order_item.item_name %>
-                                <% if !order_item.set_menu_items.empty?  
+                                <% if !order_item.set_menu_items.nil?  
                                   order_item.set_menu_items.each do |item_instance| %> 
                                   <br><span class="font-13"><%= item_instance %></span> 
                                 <% end 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4dc92c53..c6c749cd 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -246,7 +246,7 @@
                    <td><%= count %></td>
                    <td class='item-name'>
                     <%= order_item.item_name %>
-                    <% if !order_item.set_menu_items.empty?  
+                    <% if !order_item.set_menu_items.nil?  
                       order_item.set_menu_items.each do |item_instance| %> 
                       <br><span class="font-13"><%= item_instance %></span> 
                     <% end 
@@ -315,7 +315,7 @@
                     <td><%= count %>
                     <td class='item-name'>
                       <%= order_item.item_name %>
-                      <% if !order_item.set_menu_items.empty?  
+                      <% if !order_item.set_menu_items.nil?  
                         order_item.set_menu_items.each do |item_instance| %> 
                         <br><span class="font-13"><%= item_instance %></span> 
                       <% end 

From 05eb068e383d3a2d5748d7c2590155186f3dc9b2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 22 Jan 2018 22:20:35 +0630
Subject: [PATCH 116/651] check oqs js

---
 app/assets/javascripts/OQS.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 3de713c7..da50ac34 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -68,11 +68,14 @@ $(document).on('turbolinks:load', function() {
 	            var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 	            var set_menu_items = data[field]["set_menu_items"];
 	            var set_instance_items = "";
-	            if(set_menu_items.length > 0){
-					$.each(set_menu_items, function(k,val){
-						set_instance_items += '<br><span class="font-12">'+val+'</span>';
-					});
-				}
+	            if(set_menu_items!=null){
+	            	if(set_menu_items.length > 0){
+						$.each(set_menu_items, function(k,val){
+							set_instance_items += '<br><span class="font-12">'+val+'</span>';
+						});
+					}
+	            }
+	            	
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
 	                         +'<div class="row">'
@@ -146,10 +149,12 @@ $(document).on('turbolinks:load', function() {
         			var parse_data = JSON.parse(data); 
         			var set_menu_items = parse_data.set_menu_items;
         			var set_instance_items = "";
-        			if(set_menu_items.length > 0){
-        				$.each(set_menu_items, function(k,val){
-							set_instance_items += '<br><span class="font-12">'+val+'</span>';
-						});
+        			if(set_menu_items!=null){
+        				if(set_menu_items.length > 0){
+	        				$.each(set_menu_items, function(k,val){
+								set_instance_items += '<br><span class="font-12">'+val+'</span>';
+							});
+	        			}
         			}
 	    			var order_item_row = "<tr>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +

From 65292af9cb87ec48be08752e5bb0c158cdad5d53 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 23 Jan 2018 13:12:42 +0630
Subject: [PATCH 117/651] update ablity for waiter

---
 app/models/ability.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 8877fc61..a72a47d2 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -183,7 +183,9 @@ class Ability
 
         can :index, :home
         can :show, :home
-
+     elsif user.role == "waiter"
+        can :index, :home
+        can :show, :home  
     end
   end
 end

From aa8c2621fc68b1a69612cf7ca3906b607a6a0285 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 23 Jan 2018 14:40:32 +0630
Subject: [PATCH 118/651] add response in license

---
 app/controllers/application_controller.rb | 12 ++++++------
 app/controllers/install_controller.rb     |  2 +-
 app/models/license.rb                     |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7fafd6bd..0966a573 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    else      
+    else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end
   end
 
diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index fac74926..353509c3 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -30,7 +30,7 @@ class InstallController < BaseController
     # end
 
     @license = License.new(ENV["SX_PROVISION_URL"])
-    response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password)
+    response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password)    
     if response[:status]
       redirect_to root_url, notice: response["message"]
     else
diff --git a/app/models/license.rb b/app/models/license.rb
index 869abe59..7732d764 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -405,6 +405,8 @@ class License
         else
           response = { "status": false, "message": "Activation is success but Symmetric Sql not found. \n Please contact code2lab call center!"}
         end
+      else
+        response = { "status": false, "message": "Activation is success but Cannot create Sym Tables. \n Please contact code2lab call center!"}
       end
     else      
       response = { "status": false, "message": "Activation is success but Symmetric not running. \n Please contact code2lab call center!"}

From f6b92ad111a6ad61807a711a1ddea74324ba37b1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 23 Jan 2018 15:02:50 +0630
Subject: [PATCH 119/651] change person item code process

---
 README.md                                      |  4 ++--
 app/views/api/orders/view_orders.json.jbuilder |  4 ++--
 db/seeds.rb                                    | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index aa292813..7add3b2c 100755
--- a/README.md
+++ b/README.md
@@ -37,8 +37,8 @@ Person and Extra Time
   category_code = SPL... //for menu categories special
   1) must create Person in settings/accounts
   2) must create Adult and Child in settings/item_attributes
-  3) must be P00001 for Adult and P00002 for Child in settings/menu_categories/[cat_id]/simple_menu_items
-  3) must be PI0001 for Adult and PI0002 for Child in settings/simple_menu_items/[item_id]/menu_item_instances
+  3) must be PSA_[a-z/0-9] for Adult and PSC_[a-z/0-9] for Child in settings/menu_categories/[cat_id]/simple_menu_items
+  3) must be PSAI_[a-z/0-9] for Adult and PSCI_[a-z/0-9] for Child in settings/simple_menu_items/[item_id]/menu_item_instances
   
 For Extra Time 
   item_instance_code 
diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder
index a7759514..ae3fea84 100755
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -37,11 +37,11 @@ if (@booking)
 
     json.order_items order_items do |item|
       # For YGN BBQ
-      if item.item_code == "P00001"
+      if item.item_code.include? ("PSA_")
         adult_count += item.qty 
         adult_spent += (item.price * item.qty)       
       end
-      if item.item_code == "P00002"
+      if item.item_code.include? ("PSC_")
         child_count += item.qty
         child_spent += (item.price * item.qty)  
       end
diff --git a/db/seeds.rb b/db/seeds.rb
index 78321b72..1de300a1 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -163,20 +163,20 @@ menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle
 # menu_item_attribute_adult = MenuItemAttribute.create({attribute_type:"person", name: "Adult", value: "adult"})
 # menu_item_attribute_child = MenuItemAttribute.create({attribute_type:"person", name: "Child", value: "child"})
 
-# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
-# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"PSA_00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PSAI_0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
 
-# menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
-# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
+# menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"PSC_00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PSCI_0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
 
 # menu_item_attribute_30_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "30 min", value: "30_min"})
 # menu_item_attribute_60_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "1 hrs", value: "60_min"})
 
 # menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"Ext30", name: "30 minutes", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['1']", created_by: "System" })
-# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti30", menu_item: menu_category1_menu_item2, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Extim_30", menu_item: menu_category1_menu_item2, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
 
 # menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"Ext60", name: "1 hour", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['2']", created_by: "System" })
-# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti60", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Extim_60", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
 
 # END
 

From 4248e535177f35bacfbee0cb9fda7a9af839c6ab Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 23 Jan 2018 15:14:07 +0630
Subject: [PATCH 120/651] add sudo for sym run

---
 app/controllers/sym_control_controller.rb | 10 +++++-----
 app/models/license.rb                     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb
index 9b7a7a66..bbd4a087 100644
--- a/app/controllers/sym_control_controller.rb
+++ b/app/controllers/sym_control_controller.rb
@@ -4,7 +4,7 @@ class SymControlController < BaseController
 
   def run
   	sym_path = "/home/yan/symmetric/"
-  	check_sym_proc_str = `#{"service SymmetricDS status"}`
+  	check_sym_proc_str = `#{"sudo service SymmetricDS status"}`
       # Check Sym Installed
       # if sym_install_status[1] == "false"
       #   response = { "status": false, "message": "Activation is success but Symmetric service not Installed. \n Please contact code2lab call center!"}
@@ -12,15 +12,15 @@ class SymControlController < BaseController
 
       if check_sym_proc_str.include? "Active: active (running)" || "Active: active (exited)"   #"Server is already running"
         # Create Sym Table
-        check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables")
+        check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables")
         if check_sym_table
           sym_sql = Rails.root + "db/sym_master.sql"
           
           if File.exist? (sym_sql)
             # Import Sym Sql to db and start sym
-            run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
-            stop_sym = system("service SymmetricDS stop")
-            run_sym = system("service SymmetricDS start")
+            run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+            stop_sym = system("sudo service SymmetricDS stop")
+            run_sym = system("sudo service SymmetricDS start")
             if run_sym
               flash[:notice] = 'Success!'
             end
diff --git a/app/models/license.rb b/app/models/license.rb
index 7732d764..8c22f478 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -379,7 +379,7 @@ class License
     # check_sym_proc_str = check_sym_proc_str.split("\n")
     # sym_install_status = check_sym_proc_str[0].split(": ")
     
-    check_sym_proc_str = `#{"service SymmetricDS status"}`
+    check_sym_proc_str = `#{"sudo service SymmetricDS status"}`
 
     # Check Sym Installed
     # if sym_install_status[1] == "false"
@@ -390,15 +390,15 @@ class License
     sym_run_status = check_sym_running(check_sym_proc_str, sym_path)
     if sym_run_status
       # Create Sym Table
-      check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables")
+      check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables")
       if check_sym_table
         sym_sql = Rails.root + "db/sym_master.sql"
         
         if File.exist? (sym_sql)
           # Import Sym Sql to db and start sym
-          run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
-          stop_sym = system("service SymmetricDS stop")
-          run_sym = system("service SymmetricDS start")
+          run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+          stop_sym = system("sudo service SymmetricDS stop")
+          run_sym = system("sudo service SymmetricDS start")
           if run_sym
             response = { "status": true, "message": "Activation is success and Configuration done..."}
           end

From e3fdc68f9a833013db5d4d85e6edff616abdf1b9 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 23 Jan 2018 15:15:12 +0630
Subject: [PATCH 121/651] comment licence check

---
 app/controllers/application_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0966a573..e66d7700 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 

From 73eb86ce9a5404457989d034df3c9c9d0a2a9754 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 23 Jan 2018 16:13:23 +0630
Subject: [PATCH 122/651] add localization for settings/lookups

---
 app/views/settings/accounts/index.html.erb |  2 +-
 app/views/settings/lookups/_form.html.erb  | 19 +++--
 app/views/settings/lookups/index.html.erb  | 81 +++++++++++++---------
 config/locales/en.yml                      |  2 +
 config/locales/mm.yml                      |  2 +
 5 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb
index 5ffcbff5..8d0df9b8 100755
--- a/app/views/settings/accounts/index.html.erb
+++ b/app/views/settings/accounts/index.html.erb
@@ -63,7 +63,7 @@
           <p>
           1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
           2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
-          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
           </p>
           <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
           <p>
diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb
index 8196a906..1c5e549d 100755
--- a/app/views/settings/lookups/_form.html.erb
+++ b/app/views/settings/lookups/_form.html.erb
@@ -19,10 +19,21 @@
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.lookup") + " " + t("views.right_panel.detail.type_txt") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.value_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb
index 85588d6a..174ff9d7 100755
--- a/app/views/settings/lookups/index.html.erb
+++ b/app/views/settings/lookups/index.html.erb
@@ -11,29 +11,29 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
-  <div class="m-b-10 clearfix">
-  <%= link_to t("views.btn.new"),new_settings_lookup_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
-</div>
+    <div class="m-b-10 clearfix">
+      <%= link_to t("views.btn.new"),new_settings_lookup_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+    </div>
     <div class="card"  id="custom-slimscroll">
-    <table class="table table-striped">
-      <thead>
-      <tr>
-        <th>Lookup type</th>
-        <th>Name</th>
-        <th>Value</th>
-        <th>Action</th>
-      </tr>
-    </thead>
+      <table class="table table-striped">
+        <thead>
+          <tr>
+            <th><%= t("views.right_panel.detail.lookup") +" "+ t("views.right_panel.detail.type_txt") %></th>
+            <th><%= t("views.right_panel.detail.name") %></th>
+            <th><%= t("views.right_panel.detail.value") %></th>
+            <th><%= t("views.right_panel.detail.actions") %></th>
+          </tr>
+        </thead>
 
-    <tbody>
-      <% @settings_lookups.each do |settings_lookup| %>
-        <tr>
-          <td><%= settings_lookup.lookup_type %></td>
-          <td><%= settings_lookup.name %></td>
-          <td><%= settings_lookup.value %></td>
-          <!-- <td><%= link_to t("views.btn.show"), settings_lookup_path(settings_lookup),:class => 'btn btn-info btn-sm waves-effect' %></td> -->
-          <td>
-          <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> 
+        <tbody>
+          <% @settings_lookups.each do |settings_lookup| %>
+          <tr>
+            <td><%= settings_lookup.lookup_type %></td>
+            <td><%= settings_lookup.name %></td>
+            <td><%= settings_lookup.value %></td>
+            <!-- <td><%= link_to t("views.btn.show"), settings_lookup_path(settings_lookup),:class => 'btn btn-info btn-sm waves-effect' %></td> -->
+            <td>
+              <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> 
           <!--   <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_lookup_path(settings_lookup)%>" data-method="delete">
               <%= t("views.btn.delete") %>
             </button>
@@ -45,20 +45,33 @@
 
           </td>
         </tr>
-      <% end %>
-    </tbody>
+        <% end %>
+      </tbody>
     </table>
   </div>
-  </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
-    <div class="card">
-      <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-      </div>
-    </div>  
-  </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="card">
+    <div class="body">
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) <%= t("views.right_panel.detail.lookup") + " " + t("views.right_panel.detail.type_txt") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+          2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+          3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.value_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+          4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.lookup_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+          </p>
+    </div>
+  </div>  
+</div>
 </div>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 19b49b9a..8a252563 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -446,6 +446,7 @@ en:
         gateway_communication_type: "Gateway communication type"
         gateway_url: "Gateway url"
         additional_parameter: "Additional parameter"
+        lookup: "Lookup"
         
         code_txt: "code "
         charge_txt: "charge"
@@ -611,6 +612,7 @@ en:
         gateway_communication_type_txt: "gateway communication type"
         gateway_url_txt: "gateway url"
         membership_setting_txt: "membership setting"
+        lookup_txt: "lookup"
 
         cancel_btn_txt: "to cancel "
         image_btn_txt: "to upload "
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index e7d81712..10ce5903 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -441,6 +441,7 @@ mm:
         gateway_url: "အဓိကလမ်းကြောင်းဆက်သွယ်မှုလိပ်စာ"
         additional_parameter: "ထပ်ဖြည့်အကြောင်းအရာ"
         survey: "�ြုံငုံလေ့လာ�ြင်း"
+        lookup: "သ�်မှ�်�ျက်များ"
         
         code_txt: "ကု�်ဒ် "
         charge_txt: "ကောက်�ံသည်"
@@ -606,6 +607,7 @@ mm:
         gateway_communication_type_txt: "အဓိကလမ်းကြောင်းဆက်သွယ်မှုအမျိုးအစား"
         gateway_url_txt: "အဓိကလမ်းကြောင်းဆက်သွယ်မှုလိပ်စာ"
         membership_setting_txt: "အဖွဲ့�င်မှုဆိုင်ရာပြင်ဆင်�ျက်များ"
+        lookup_txt: "သ�်မှ�်�ျက်"
         
         cancel_btn_txt: "ပြန်ဖျက်ရန်"
         image_btn_txt: "�င်သွင်းရန်"

From c6023729d348202c221d23260a6566214507f689 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 24 Jan 2018 09:31:29 +0630
Subject: [PATCH 123/651] add utf8 to utf8_unicode_ci sql script

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 7add3b2c..5f9c08f6 100755
--- a/README.md
+++ b/README.md
@@ -98,6 +98,9 @@ SQL Update after rake clear:data runned
 	 i) TableBooking, Order, OrderItem, sale, SaleOrder, SaleItem, SaleTax, SalePayment, SaleAudit, AssignedOrderItem => { current:0, next:0 }
 	** Note :: do not update Customer 
 
+Change type in mysql
+	*run if you got font error for Myanmar, Chinese, etc...
+	=> ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci  
 
 
 * ToDo list

From 89b89a319746f827efb57e8ad75a4c166bf89725 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 24 Jan 2018 17:32:23 +0630
Subject: [PATCH 124/651] check checkout time and server time when order from
 api

---
 app/controllers/api/orders_controller.rb | 142 +++++++++++++----------
 1 file changed, 81 insertions(+), 61 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index deb1039e..0c89c647 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -49,83 +49,89 @@ class Api::OrdersController <  Api::ApiController
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
-#for extratime
-    is_extra_time = false
-    extra_time = ''
 
-    params[:order_items].each { |i| 
-       i["item_instance_code"] = i["item_instance_code"].downcase.to_s
-       if i["item_instance_code"].include? "ext"
-         is_extra_time = true
-         arr_exts = i["item_instance_code"].split("_")
-         if arr_exts[1].match(/^(\d)+$/)
-          time = arr_exts[1].to_i*60*i["quantity"].to_i
-          extra_time = Time.at(time)
+    if checkin_checkout_time(params[:booking_id])
+      #for extratime
+      is_extra_time = false
+      extra_time = ''
+
+      params[:order_items].each { |i| 
+         i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+         if i["item_instance_code"].include? "ext"
+           is_extra_time = true
+           arr_exts = i["item_instance_code"].split("_")
+           if arr_exts[1].match(/^(\d)+$/)
+            time = arr_exts[1].to_i*60*i["quantity"].to_i
+            extra_time = Time.at(time)
+           end
          end
-       end
-     }
-#end extra time
-    # begin
-    @order = Order.new
-    @order.source = params[:order_source]
-    @order.order_type = params[:order_type]
-    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-    @order.items = params[:order_items]
-    @order.guest = params[:guest_info]
-    @order.table_id = params[:table_id]  # this is dining facilities's id
-    @order.new_booking = true
-    @order.waiters = current_login_employee.name
-    @order.employee_name = current_login_employee.name
+       }
+      #end extra time
 
-    @order.is_extra_time = is_extra_time
-    @order.extra_time    = extra_time
-      #Create Table Booking or Room Booking
-      if !params["booking_id"].nil?
-        # check booking id is already completed.
-        booking = Booking.find(params[:booking_id])
-        if booking
-          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)
+      # begin
+      @order = Order.new
+      @order.source = params[:order_source]
+      @order.order_type = params[:order_type]
+      @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+      @order.items = params[:order_items]
+      @order.guest = params[:guest_info]
+      @order.table_id = params[:table_id]  # this is dining facilities's id
+      @order.new_booking = true
+      @order.waiters = current_login_employee.name
+      @order.employee_name = current_login_employee.name
 
-              if sale_status
-                return return_json_status_with_code(400, "bill requested")
+      @order.is_extra_time = is_extra_time
+      @order.extra_time    = extra_time
+        #Create Table Booking or Room Booking
+        if !params["booking_id"].nil?
+          # check booking id is already completed.
+          booking = Booking.find(params[:booking_id])
+          if booking
+            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)
+
+                if sale_status
+                  return return_json_status_with_code(400, "bill requested")
+                end
+              else
+                @order.new_booking = false
+                @order.booking_id = params[:booking_id]
               end
             else
-              @order.new_booking = false
-              @order.booking_id = params[:booking_id]
+                sale_status = check_order_with_table(params[:table_id])
+
+                if sale_status
+                  return return_json_status_with_code(400, "bill requested")
+                end
             end
-          else
-              sale_status = check_order_with_table(params[:table_id])
+          end #booking exists
+        else
+          sale_status = check_order_with_table(params[:table_id])
 
-              if sale_status
-                return return_json_status_with_code(400, "bill requested")
-              end
+          if sale_status
+            # return false , @message = "bill requested"
+            return return_json_status_with_code(400, "bill requested")
           end
-        end #booking exists
-      else
-        sale_status = check_order_with_table(params[:table_id])
-
-        if sale_status
-          # return false , @message = "bill requested"
-          return return_json_status_with_code(400, "bill requested")
         end
-      end
 
-      @status, @booking = @order.generate
-     # # for parallel order     
-     #  remoteIP = ""
-     #  begin
-     #   @status, @booking = @order.generate
-     #   remoteIP = request.remote_ip
-     #  end while request.remote_ip != remoteIP
+        @status, @booking = @order.generate
+       # # for parallel order     
+       #  remoteIP = ""
+       #  begin
+       #   @status, @booking = @order.generate
+       #   remoteIP = request.remote_ip
+       #  end while request.remote_ip != remoteIP
+    else
+      return return_json_status_with_code(406, "Checkout time is over!")
+    end
   end
 
   # render json for http status code
   def return_json_status_with_code(code, msg)
     render status: code, json: {
-      message: msg,
-      booking_id: booking_id
+      message: msg
+      # booking_id: booking_id
     }.to_json
   end
 
@@ -174,4 +180,18 @@ class Api::OrdersController <  Api::ApiController
                     :customer_id,:guest_info, :table_id, :room_id,
                     order_items: [:item_code, :qty, :option, :remark])
   end
+
+  #checked checkin and checkout time
+  def checkin_checkout_time(booking_id)
+    status = true
+    today = Time.now.utc
+    booking = Booking.find(params[:booking_id])
+    if !booking.nil?
+      checkout_time = booking.checkout_at.utc
+      if checkout_time <= today
+        status = false
+      end
+    end
+    return status
+  end
 end

From 357c7c8682f5defe906112fa19110e882d863f7c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 24 Jan 2018 18:12:47 +0630
Subject: [PATCH 125/651] update table invoice

---
 app/assets/javascripts/origami.js              |  7 ++++++-
 app/views/origami/table_invoices/show.html.erb | 14 +++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 712ce8f7..d2359593 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -162,8 +162,13 @@ function checkReceiptNoInFirstBillData(receipt_no,payment) {
 			}
 		}
 	}
+
 	if (payment) {
-		return json_data[0]["payment"];
+		if (json_data.length>0) {
+		  return json_data[0]["payment"];
+	    }else{
+	    	return false;
+	    }
 	}else{
 		return status;
 	}
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index d8478468..5270202d 100755
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -25,22 +25,22 @@
        <div class="card-block">
          <div class="card-title row">
            <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
+             &nbsp; Receipt No: <span id="receipt_no">
                  <%= @sale.receipt_no rescue '' %>
-             </span></p>
+             </span>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+             Date:  <span id="receipt_date"><%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>&nbsp;
            </div>
          </div>
          <div class="card-title row customer_detail">
            <div class="col-lg-6 col-md-6 col-sm-6">
             <% if @status_sale == 'sale' %>
               <p class="hidden customer-id"><%= @sale.customer_id rescue '' %></p>
-               <p>Customer : <%= @sale.customer.name rescue '-' %></p>
+               &nbsp; Customer : <%= @sale.customer.name rescue '-' %>
              <%else%>
                <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
-               <p>Customer : <%= @customer.name rescue "-" %></p>
+               &nbsp; Customer : <%= @customer.name rescue "-" %>
              <%end%>
            </div>
 
@@ -68,7 +68,7 @@
                <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
                <%
                # Can't check for discount
-                unless sale_item.price == 0
+                # unless sale_item.price == 0
                 %>
                <tr>
                  <td><%= count %></td>
@@ -77,7 +77,7 @@
                  <td class='item-attr'><%= sale_item.price %></td>
                </tr>
                <%
-                     end
+                     # end
                    end
                  end
 

From 2f3ae2467e4ad44e9e9ee10d311d2814e69a8e00 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 25 Jan 2018 10:37:05 +0630
Subject: [PATCH 126/651] add interger checked for promotions

---
 app/views/settings/promotions/_form.html.erb | 21 +++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index e90c8ef5..dc018ce3 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -142,7 +142,7 @@
               <% end %>
               <div class="col-md-3 form-group"><%= f.input :original_product,collection: sample  %></div>
               <!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> -->
-              <div class="col-md-6 form-group"><%= f.input :min_qty ,label: "Qualified Qty", :input_html => {:style => 'height: 37px'} %></div>
+              <div class="col-md-6 form-group"><%= f.input :min_qty ,label: "Qualified Qty", :input_html => {:style => 'height: 37px', min: 1, step: '1', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this);"} %></div>
             </div>
             <br>
             <div class="card">
@@ -179,13 +179,13 @@
                     </div>
 
                     <div class="col-md-1">
-                      <%= pro.input :min_qty , label: false, :input_html => {:style => 'height: 37px'}%>
+                      <%= pro.input :min_qty , label: false, :input_html => {:style => 'height: 37px', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this);"}%>
                     </div>
                     <div class="col-md-1">
-                      <%= pro.input :net_off , label: false, :input_html => {:style => 'height: 37px'} %>
+                      <%= pro.input :net_off , label: false, :input_html => {:style => 'height: 37px', min: 1, step: '1', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this);"} %>
                     </div>
-                    <div class="col-md-1"><%= pro.input :net_price , label: false, :input_html => {:style => 'height: 37px'} %></div>
-                    <div class="col-md-2"><%= pro.input :percentage , label: false, :input_html => {:style => 'height: 37px'} %></div>
+                    <div class="col-md-1"><%= pro.input :net_price , label: false, :input_html => {:style => 'height: 37px', min: 1, step: '1', :onkeypress => "return isNumberKey(event);"} %></div>
+                    <div class="col-md-2"><%= pro.input :percentage , label: false, :input_html => {:style => 'height: 37px', min: 1, step: '1', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this);"} %></div>
                     <div class="col-md-1"><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-45", :style => 'width: 25px'%></div>
                   </div>
                   <% end %>
@@ -432,5 +432,16 @@ $(document).on('turbolinks:load', function() {
   $('body').bootstrapMaterialDesign();
 });
 
+function isNumberKey(evt) {
+    var charCode = (evt.which) ? evt.which : event.keyCode;
+    if (charCode > 31 && (charCode < 48 || charCode > 57)) {
+        return false;
+    } else {
+        return true;
+    }      
+}
 
+function greaterThanOne(obj){
+  if(parseInt(obj.value)<=0) $(obj).val(1);
+}
 </script>

From 3c378522502fe5e05563586d5828b9c59fc2a5e6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 25 Jan 2018 14:24:59 +0630
Subject: [PATCH 127/651] change query in sale

---
 README.md             |  3 ++-
 app/models/sale.rb    | 25 ++++++++++++++-----------
 config/locales/en.yml |  2 +-
 config/locales/mm.yml |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 5f9c08f6..8c5cf006 100755
--- a/README.md
+++ b/README.md
@@ -100,7 +100,8 @@ SQL Update after rake clear:data runned
 
 Change type in mysql
 	*run if you got font error for Myanmar, Chinese, etc...
-	=> ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci  
+	=> ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table 
+	=> ALTER DATABASE [database_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci  #for database
 
 
 * ToDo list
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b5026a9c..58dbfa50 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -567,6 +567,7 @@ def self.daily_sales_list(from,to)
      SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
      SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
      SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
+     SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,
      SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
      SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
      SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
@@ -603,6 +604,7 @@ def self.daily_sales_list(from,to)
                  :visa_amount => pay.visa_amount,
                  :jcb_amount => pay.jcb_amount,
                  :paypar_amount => pay.paypar_amount,
+                 :unionpay_amount => pay.unionpay_amount,
                  :cash_amount => pay.cash_amount,
                  :credit_amount => pay.credit_amount,
                  :foc_amount => pay.foc_amount,
@@ -733,12 +735,12 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
       other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
       discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)
       change_amount  = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
                                    .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.to_a)
+                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_status!='void' and sale_payments.payment_amount != 0 ", shift.to_a)
       sale_cash.each do |s_c|
         total_cash_amount += s_c.cash_amount.to_f
         total_card_amount += s_c.card_amount.to_f
@@ -753,12 +755,12 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
       other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
       discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
       change_amount  = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
                                    .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a)
+                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_status!='void' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a)
       sale_cash.each do |s_c|
         total_cash_amount += s_c.cash_amount.to_f
         total_card_amount += s_c.card_amount.to_f
@@ -773,12 +775,12 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
       other_charges  = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
       discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount)
       change_amount  = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
                                    .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                   .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", from,to)
+                                   .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_status!='void' and sale_payments.payment_amount != 0 ", from,to)
       sale_cash.each do |s_c|
         total_cash_amount += s_c.cash_amount.to_f
         total_card_amount += s_c.card_amount.to_f
@@ -798,7 +800,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
       payment_type = ''
     else
       if payment_type == 'card'
-        payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar'"
+        payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay'"
       else
         payment_type = " and sale_payments.payment_method = '#{payment_type}'"
       end
@@ -902,6 +904,7 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type
                        SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
                        SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
                        SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
+                       SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,
                        SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
                        SUM(case when (sale_payments.payment_method='cash') then sales.amount_changed else 0 end) as total_change_amount,
                       SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
@@ -1029,7 +1032,7 @@ end
     query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
   end
 
@@ -1043,13 +1046,13 @@ end
   end
 
   def self.total_card_sale(today)
-    payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' "
+    payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' or payment_method = 'unionpay' "
     # query        = Sale.select("SUM(tax_payable_amount) AS st_amount,tax_name")
     #                 .where('sale_status = "completed" #{payment_type} and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
     #                 .joins("join sale_payments on sale_id = sales.sale_id")
     #                 .group("sales.sale_id")
 
-    query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb")',today)
+    query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
             .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
             .sum("sp.payment_amount")
 
@@ -1076,7 +1079,7 @@ end
   def self.payment_sale(payment_method, today)
     query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
           if payment_method == 'card'
-            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb")',today)
+            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
           else
             query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8a252563..6bc0271e 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,7 +130,7 @@ en:
       exp_to_excel: "EXPORT TO EXCEL"
       check_in: "Check In"
 
-      card_settle: "CARD SETTLE"
+      card_settle: "CB CARD SETTLEMENT"
 
     pagination:
       first: "&laquo; First"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 10ce5903..6bdb1768 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -124,7 +124,7 @@ mm:
       generate_report: "အစီရင်�ံစာများရှာဖွေရန်"
       exp_to_excel: "Excel သို့ ပို့ပြီးဆက်လက်လုပ်ဆောင်ရန်"
       
-      card_settle: "ကဒ် စာရင်းရှင်း�မ်း"
+      card_settle: "CB ကဒ် စာရင်းရှင်း�မ်း"
     pagination:
       first: "&laquo; ပထမ"
       last: "အဆံုး &raquo;"

From 142bac74a894acef3d67707fae4ed6bc461420a9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 25 Jan 2018 15:33:52 +0630
Subject: [PATCH 128/651] update payment action cable

---
 app/assets/javascripts/channels/bill.js  |  1 +
 app/assets/javascripts/channels/order.js | 15 +++++++++++----
 app/jobs/order_broadcast_job.rb          |  4 ++--
 app/models/order.rb                      |  3 ++-
 app/models/sale_payment.rb               | 12 ++++++++----
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/channels/bill.js b/app/assets/javascripts/channels/bill.js
index b4016b1c..97666e32 100755
--- a/app/assets/javascripts/channels/bill.js
+++ b/app/assets/javascripts/channels/bill.js
@@ -14,6 +14,7 @@ App.order = App.cable.subscriptions.create('BillChannel', {
      	$('.table_'+data.table.id).addClass('red');
   	} 
     $('.new_text_'+data.table.id).removeClass('hide');
+    $('.new_text_'+data.table.id).text('billed');
  }
 });
 
diff --git a/app/assets/javascripts/channels/order.js b/app/assets/javascripts/channels/order.js
index dccb86d7..9598ed6f 100755
--- a/app/assets/javascripts/channels/order.js
+++ b/app/assets/javascripts/channels/order.js
@@ -5,10 +5,17 @@ App.order = App.cable.subscriptions.create('OrderChannel', {
 
   disconnected: function() {},
 
-  received: function(data) {                 
-     $('.table_'+data.table.id).removeClass('green');
-     $('.table_'+data.table.id).addClass('blue');
-     $('.new_text_'+data.table.id).removeClass('hide')
+  received: function(data) {           
+     if (data.type == 'order') {
+     	$('.table_'+data.table.id).removeClass('green');
+	    $('.table_'+data.table.id).addClass('blue');
+	    $('.new_text_'+data.table.id).removeClass('hide')
+     }else{
+     	$('.table_'+data.table.id).removeClass('red');
+	    $('.table_'+data.table.id).addClass('green');
+	    $('.new_text_'+data.table.id).html('');
+	    $('.new_text_'+data.table.id).removeClass('hide')
+     }
  }
 });
 
diff --git a/app/jobs/order_broadcast_job.rb b/app/jobs/order_broadcast_job.rb
index 55ba2f21..6d7f6bca 100755
--- a/app/jobs/order_broadcast_job.rb
+++ b/app/jobs/order_broadcast_job.rb
@@ -1,7 +1,7 @@
 class OrderBroadcastJob < ApplicationJob
   queue_as :default
 
-  def perform(table)
-     ActionCable.server.broadcast "order_channel",table: table
+  def perform(table,type)
+     ActionCable.server.broadcast "order_channel",table: table,type:type
   end
 end
diff --git a/app/models/order.rb b/app/models/order.rb
index 13e0e62b..6c22cb92 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -285,8 +285,9 @@ class Order < ApplicationRecord
   #send order items and send to order queue
   def send_order_broadcast(booking)
     table = DiningFacility.find(booking.dining_facility_id)
+    type  = 'order'
     #Send to background job for processing
-    OrderBroadcastJob.perform_later(table)
+    OrderBroadcastJob.perform_later(table,type)
   end
 
   #Origami: Cashier : to view order Table
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 8cb33c80..ed1b9170 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -382,16 +382,17 @@ class SalePayment < ApplicationRecord
 
   def table_update_status(sale_obj)
     status = true
+    sale_count = 0
     booking = Booking.find_by_sale_id(sale_obj.id)
-
     if booking
       table = DiningFacility.find(booking.dining_facility_id)
       bookings = table.bookings
       bookings.each do |tablebooking|
         if tablebooking.booking_status != 'moved'
           if tablebooking.sale_id
-            if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void'
+            if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' 
               status = false
+              sale_count += 1
             else
               status = true
             end
@@ -400,11 +401,14 @@ class SalePayment < ApplicationRecord
           end
         end
       end
-
-      if status
+      if status && sale_count == 0
          table.status = "available"
          table.save
       end
+
+      type  = 'payment'
+      #Send to background job for processing
+      OrderBroadcastJob.perform_later(table,type)
     end
   end
 

From 61142b7244de3a3c889bbdd432354311f3efe139 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 25 Jan 2018 17:34:13 +0630
Subject: [PATCH 129/651] add void in sale item again

---
 app/models/sale.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 58dbfa50..aa28344e 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -740,7 +740,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
                                    .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_status!='void' and sale_payments.payment_amount != 0 ", shift.to_a)
+                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.to_a)
       sale_cash.each do |s_c|
         total_cash_amount += s_c.cash_amount.to_f
         total_card_amount += s_c.card_amount.to_f
@@ -760,7 +760,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
                                    .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_status!='void' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a)
+                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a)
       sale_cash.each do |s_c|
         total_cash_amount += s_c.cash_amount.to_f
         total_card_amount += s_c.card_amount.to_f
@@ -780,7 +780,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
                                    .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                   .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_status!='void' and sale_payments.payment_amount != 0 ", from,to)
+                                   .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", from,to)
       sale_cash.each do |s_c|
         total_cash_amount += s_c.cash_amount.to_f
         total_card_amount += s_c.card_amount.to_f

From d4e2d5be2585993f6d31710fdb6e27f3fb17430e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 25 Jan 2018 18:06:24 +0630
Subject: [PATCH 130/651] change sale item 'foc'

---
 app/views/reports/saleitem/index.html.erb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index a96b80f8..387a97a5 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -130,10 +130,7 @@
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
 								    <% #sub_qty += sale.total_item %>
-								    <% if sale.status_type!="Discount" && sale.status_type!="foc"
-										sub_qty += sale.total_item
-									end %>
-									<% if sale.status_type == "foc" && sale.price > 0
+								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
 										sub_qty += sale.total_item
 									end %>
 

From f4effe8ddef3233fd29e65dcd3bfce134dfc26a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sat, 27 Jan 2018 13:16:42 +0630
Subject: [PATCH 131/651] update rom and table show

---
 app/models/customer.rb                | 2 +-
 app/views/origami/home/show.html.erb  | 7 ++++---
 app/views/origami/rooms/show.html.erb | 7 ++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/models/customer.rb b/app/models/customer.rb
index 949093ea..fcdd7f31 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -143,7 +143,7 @@ class Customer < ApplicationRecord
   def self.update_rebate
     sales    = Sale.where("rebate_status = 'false'")
     sales.each do |sale|
-      if sale.customer.membership_id
+      if sale.customer.membership_id        
           response = self.rebat(Sale.find(sale.sale_id))
            #record an payment in sale-audit
            if !response.nil?
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 1f387be9..8440f354 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -407,8 +407,9 @@
               <% end %>
               <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
-                  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' active="<%= can? :edit, :sale_edit %>">Edit</button>
-                  <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" active="<%= can? :index, :discount %>">Discount</button>
+                  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
+                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true"> Void</button>
+                  <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
 
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
@@ -424,7 +425,7 @@
                     <%end%> 
                   <% end %> 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
-                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
+                  
               <% end %>
               <!-- Cashier Buttons -->
 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index c6c749cd..385129bf 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -380,8 +380,9 @@
     <% if @status_sale == 'sale' %>
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
-        <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>
-        <button type="button" id="discount" class="btn bg-blue btn-block" active="<%= can? :index, :discount %>" >Discount</button>
+        <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
+        <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
+        <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
@@ -397,7 +398,7 @@
          <%end%>
          <%end%>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
-        <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
+       <!--  <button type="button" id="void" class="btn bg-blue btn-block" > Void </button> -->
      <% end %>
             <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
            <span class="hidden" id="member_discount"><%= @membership.discount%></span>

From aa129ad469982099d2c75b8079cf05b93ab557a6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Sun, 28 Jan 2018 16:12:59 +0630
Subject: [PATCH 132/651] heck rounding adjustment error

---
 app/controllers/api/orders_controller.rb      | 16 +++++++++------
 app/controllers/origami/jcb_controller.rb     | 12 +++++------
 app/controllers/origami/master_controller.rb  | 12 +++++------
 app/controllers/origami/mpu_controller.rb     | 12 +++++------
 .../origami/payments_controller.rb            | 10 +---------
 .../origami/redeem_payments_controller.rb     | 13 ++++++------
 .../origami/unionpay_controller.rb            | 12 +++++------
 app/controllers/origami/visa_controller.rb    | 12 +++++------
 app/models/sale.rb                            | 20 +++++++++++++++++--
 9 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 0c89c647..cab929bd 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -184,12 +184,16 @@ class Api::OrdersController <  Api::ApiController
   #checked checkin and checkout time
   def checkin_checkout_time(booking_id)
     status = true
-    today = Time.now.utc
-    booking = Booking.find(params[:booking_id])
-    if !booking.nil?
-      checkout_time = booking.checkout_at.utc
-      if checkout_time <= today
-        status = false
+    if !params[:booking_id].nil?
+      today = Time.now.utc
+      booking = Booking.find(params[:booking_id])
+      if !booking.nil?
+        if !booking.checkout_at.nil?
+          checkout_time = booking.checkout_at.utc
+          if checkout_time <= today
+            status = false
+          end
+        end
       end
     end
     return status
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index 9c872325..b8c7e7e0 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -46,13 +46,13 @@ class Origami::JcbController < BaseOrigamiController
       shop_details =  Shop::ShopDetail 
       
       # rounding adjustment
-      if shop_details.is_rounding_adj
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-        rounding_adj = new_total-saleObj.grand_total
-        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-      end
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
 
-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb")
     end
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 0ad47913..b3813577 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -45,13 +45,13 @@ class Origami::MasterController < BaseOrigamiController
       shop_details =  Shop::ShopDetail 
       
       # rounding adjustment
-      if shop_details.is_rounding_adj
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-        rounding_adj = new_total-saleObj.grand_total
-        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-      end
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
 
-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master")
     end
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 51bcabb1..7b7ef5a0 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -45,13 +45,13 @@ class Origami::MpuController < BaseOrigamiController
       shop_details =  Shop::ShopDetail 
       
       # rounding adjustment
-      if shop_details.is_rounding_adj
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-        rounding_adj = new_total-saleObj.grand_total
-        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-      end
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
 
-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu")
     end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 1c492338..1023bf68 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -28,7 +28,6 @@ class Origami::PaymentsController < BaseOrigamiController
       shop_details =  Shop::ShopDetail 
       # customer= Customer.where('customer_id=' +.customer_id)
       customer = Customer.find(sale_data.customer_id)
-
       # rounding adjustment
         if shop_details.is_rounding_adj
           a = sale_data.grand_total % 25 # Modulus
@@ -42,7 +41,6 @@ class Origami::PaymentsController < BaseOrigamiController
           end
         end
         #end rounding adjustment
-
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
@@ -74,7 +72,6 @@ class Origami::PaymentsController < BaseOrigamiController
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
-      
       # rounding adjustment
       if shop_details.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
@@ -167,12 +164,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @table_no = ''
 
       @shop        =  Shop::ShopDetail  
-      if @shop.is_rounding_adj
-          new_total    = Sale.get_rounding_adjustment(@sale_data.grand_total)
-      else
-          new_total    = @sale_data.grand_total
-      end
-      @rounding_adj = new_total-@sale_data.grand_total
+      @rounding_adj = @sale_data.rounding_adjustment
 
       #get customer amount
       @customer = Customer.find(@sale_data.customer_id)
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index b0f40d34..2fdedf32 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,12 +6,13 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
         @shop        = Shop::ShopDetail 
-        if @shop.is_rounding_adj
-             new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-        else
-            new_total    = sale_data.grand_total
-        end
-        @rounding_adj = new_total-sale_data.grand_total  
+        # if @shop.is_rounding_adj
+        #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+        # else
+        #     new_total    = sale_data.grand_total
+        # end
+        # @rounding_adj = new_total-sale_data.grand_total  
+        @rounding_adj = sale_data.rounding_adjustment  
 
         @payparcount = 0
         others = 0
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index a3f7e6ed..fc15b7f5 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -46,13 +46,13 @@ class Origami::UnionpayController < BaseOrigamiController
       shop_details =  Shop::ShopDetail 
       
       # rounding adjustment
-      if shop_details.is_rounding_adj
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-        rounding_adj = new_total-saleObj.grand_total
-        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-      end
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
       
-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
       #end rounding adjustment
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay")
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index af4d31f0..b872aec3 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -44,13 +44,13 @@ class Origami::VisaController < BaseOrigamiController
       shop_details =  Shop::ShopDetail 
       
       # rounding adjustment
-      if shop_details.is_rounding_adj
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-        rounding_adj = new_total-saleObj.grand_total
-        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-      end
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
       
-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
       #end rounding adjustment
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa")
diff --git a/app/models/sale.rb b/app/models/sale.rb
index aa28344e..e41fb458 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -470,8 +470,24 @@ class Sale < ApplicationRecord
   end
 
   def adjust_rounding
-    self.grand_total
-    self.rounding_adjustment = 0.00
+    saleObj = Sale.find(self.sale_id)
+    shop_details =  Shop::ShopDetail 
+      # rounding adjustment
+    if shop_details.is_rounding_adj
+      a = saleObj.grand_total % 25 # Modulus
+      b = saleObj.grand_total / 25 # Division
+      #not calculate rounding if modulus is 0 and division is even
+      #calculate rounding if modulus is zero or not zero and division are not even
+      if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        self.rounding_adjustment = new_total-saleObj.grand_total
+      else
+        self.rounding_adjustment = 0.00
+      end
+    else
+      self.rounding_adjustment = 0.00
+    end
+    
   end
 
   #Generate new Receipt No when it is not assigned

From 2a09945d36d7a19867b39a85dc3e3ec58afed4d6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Sun, 28 Jan 2018 16:29:59 +0630
Subject: [PATCH 133/651] check add to existing invoice

---
 .../origami/payments_controller.rb            | 20 ++++++++++++++++++-
 app/models/sale.rb                            |  9 ++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 1023bf68..6fa61bc7 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -164,7 +164,25 @@ class Origami::PaymentsController < BaseOrigamiController
       @table_no = ''
 
       @shop        =  Shop::ShopDetail  
-      @rounding_adj = @sale_data.rounding_adjustment
+
+      saleObj = Sale.find(sale_id)
+      # rounding adjustment
+      if @shop.is_rounding_adj
+        a = saleObj.grand_total % 25 # Modulus
+        b = saleObj.grand_total / 25 # Division
+        #not calculate rounding if modulus is 0 and division is even
+        #calculate rounding if modulus is zero or not zero and division are not even
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+          new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+          @rounding_adj = new_total-saleObj.grand_total
+        else
+          @rounding_adj = @sale_data.rounding_adjustment
+        end
+      else
+        @rounding_adj = @sale_data.rounding_adjustment
+      end
+      #end rounding adjustment
+      
 
       #get customer amount
       @customer = Customer.find(@sale_data.customer_id)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index e41fb458..f6aed95e 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -470,17 +470,16 @@ class Sale < ApplicationRecord
   end
 
   def adjust_rounding
-    saleObj = Sale.find(self.sale_id)
     shop_details =  Shop::ShopDetail 
       # rounding adjustment
     if shop_details.is_rounding_adj
-      a = saleObj.grand_total % 25 # Modulus
-      b = saleObj.grand_total / 25 # Division
+      a = self.grand_total % 25 # Modulus
+      b = self.grand_total / 25 # Division
       #not calculate rounding if modulus is 0 and division is even
       #calculate rounding if modulus is zero or not zero and division are not even
       if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-        self.rounding_adjustment = new_total-saleObj.grand_total
+        new_total    = Sale.get_rounding_adjustment(self.grand_total)
+        self.rounding_adjustment = new_total - self.grand_total
       else
         self.rounding_adjustment = 0.00
       end

From a96091decb411b620d11b05e83ce41ffdfafbf3e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sat, 27 Jan 2018 14:11:34 +0630
Subject: [PATCH 134/651] update oqs home

---
 app/controllers/oqs/home_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 0d22d199..3ee71e8d 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -15,7 +15,7 @@ class Oqs::HomeController < BaseOqsController
     if !@queue_completed_item.empty?
       @queue_completed_item.each do |queue_item|
         if !queue_item.set_menu_items.nil?
-          instance_item_sets = JSON.parse(queue_item.set_menu_items)
+          instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
           arr_instance_item_sets = Array.new
           instance_item_sets.each do |instance_item|
             item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name

From ee17ddac92bd6e0a0a0ef298905da4f0c350fac2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 31 Jan 2018 17:47:06 +0630
Subject: [PATCH 135/651] add rounding adj for table invoices

---
 .../origami/table_invoices_controller.rb      | 30 +++++++++++++++++--
 .../origami/table_invoices/index.html.erb     |  4 +--
 .../origami/table_invoices/show.html.erb      |  4 +--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index 4571ba87..655083df 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -1,6 +1,7 @@
 class Origami::TableInvoicesController < BaseOrigamiController
  	def index
     @table = DiningFacility.find(params[:table_id])
+    shop        =  Shop::ShopDetail  
     puts "table bookig lenght"
     @sale_array = Array.new
     @table.bookings.each do |booking|
@@ -9,7 +10,18 @@ class Origami::TableInvoicesController < BaseOrigamiController
          if booking.sale_id.nil?
          else
            sale = Sale.find(booking.sale_id)
-
+            # rounding adjustment
+            if shop.is_rounding_adj
+              a = sale.grand_total % 25 # Modulus
+              b = sale.grand_total / 25 # Division
+              #not calculate rounding if modulus is 0 and division is even
+              #calculate rounding if modulus is zero or not zero and division are not even
+              if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+                new_total    = Sale.get_rounding_adjustment(sale.grand_total)
+                sale.rounding_adjustment = new_total-sale.grand_total
+              end
+            end
+            #end rounding adjustment
             if sale.sale_status != "completed"
               @sale_array.push(sale)
             end
@@ -19,12 +31,24 @@ class Origami::TableInvoicesController < BaseOrigamiController
 
   def show
     @table = DiningFacility.find(params[:table_id])
+    shop        =  Shop::ShopDetail  
     @sale_array = Array.new
     @table.bookings.each do |booking|
          if booking.sale_id.nil?
          else
-           sale = Sale.find(booking.sale_id)
-
+            sale = Sale.find(booking.sale_id)
+            # rounding adjustment
+            if shop.is_rounding_adj
+              a = sale.grand_total % 25 # Modulus
+              b = sale.grand_total / 25 # Division
+              #not calculate rounding if modulus is 0 and division is even
+              #calculate rounding if modulus is zero or not zero and division are not even
+              if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+                new_total    = Sale.get_rounding_adjustment(sale.grand_total)
+                sale.rounding_adjustment = new_total-sale.grand_total
+              end
+            end
+            #end rounding adjustment
             if sale.sale_status != "completed" && sale.sale_status != 'void'
               @sale_array.push(sale)
             end
diff --git a/app/views/origami/table_invoices/index.html.erb b/app/views/origami/table_invoices/index.html.erb
index eb98b9c0..b0c328be 100755
--- a/app/views/origami/table_invoices/index.html.erb
+++ b/app/views/origami/table_invoices/index.html.erb
@@ -75,8 +75,8 @@
 
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
-   <button type="button" class="btn btn-default btn-block" id='back'>Back</button>
-   <button type="button" id="pay" class="btn bg-blue btn-block" disabled>Pay</button>
+  <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
+   <button type="button" id="pay" class="btn bg-blue btn-block btn-lg bg-default" disabled>Pay</button>
  </div>
 </div>
 </div>
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 5270202d..b70c2ffc 100755
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -125,7 +125,7 @@
              </tr>
               <tr>
                <td class="charges-name"><strong>Rounding Adj:</strong></td>
-               <td class="item-attr"><strong id="order-round-adj"><%= @obj_sale.rounding_adjustment rescue 0%></strong></td>
+               <td class="item-attr"><strong id="order-round-adj"><%= @sale.rounding_adjustment rescue 0%></strong></td>
              </tr>
              <tr>
                <td class="charges-name"><strong>Grand Total:</strong></td>
@@ -140,7 +140,7 @@
 
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
-   <button type="button" class="btn btn-default btn-block" id='back'>Back</button>
+   <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
    <button type="button" id="void" class="btn bg-danger btn-block"> Void </button>
  </div>

From 2f024e86915b6f8324c4c6e1b7b7ac47bcf4c03d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 1 Feb 2018 10:29:24 +0630
Subject: [PATCH 136/651] update qurick raw

---
 app/assets/javascripts/addorder.js            | 124 +++++++--
 app/assets/stylesheets/addorder.scss          |   9 +-
 app/controllers/api/bill_controller.rb        |   3 +-
 .../api/call_waiters_controller.rb            |   3 +-
 app/controllers/base_origami_controller.rb    |   3 +-
 app/controllers/home_controller.rb            |   3 +-
 .../origami/addorders_controller.rb           |   9 +
 .../origami/dashboard_controller.rb           |  59 +++++
 .../origami/quick_service_controller.rb       |  42 +++
 app/models/order.rb                           |   2 -
 app/models/sale.rb                            |  35 +++
 app/models/sale_payment.rb                    |   2 +-
 app/views/origami/addorders/detail.html.erb   |  92 +++++--
 app/views/origami/dashboard/index.html.erb    | 245 ++++++++++++++++++
 app/views/origami/home/index.html.erb         |   6 +-
 .../origami/quick_service/index.html.erb      |   0
 app/views/origami/shifts/new.html.erb         |   2 +-
 config/routes.rb                              |   6 +-
 18 files changed, 585 insertions(+), 60 deletions(-)
 create mode 100644 app/controllers/origami/dashboard_controller.rb
 create mode 100644 app/controllers/origami/quick_service_controller.rb
 create mode 100644 app/views/origami/dashboard/index.html.erb
 create mode 100644 app/views/origami/quick_service/index.html.erb

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 4b158946..60bcbcc3 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -83,9 +83,12 @@ $(function() {
 
   //show menu item list when click menu category
   function show_menu_item_list(url_item){ 
-
     var menu_list = $('.menu_items_list');
     menu_list.empty();
+    if ($('#type').val() == 'true') {
+      url_item = 'addorders/'+url_item
+    }
+
     //Start Ajax
     $.ajax({      
       type: "GET",         
@@ -702,26 +705,41 @@ $(function() {
     }
   }
 
-  // Pay Discount for Payment
+  // Create Order
   $("#create_order").on('click', function(e){
+
     $(this).attr('disabled', 'disabled');
     e.preventDefault();
     $("#oqs_loading_wrapper").show();
-    var table_id   = $('#table_id').text();
-    var customer_id   = $('#customer_id').text();
-    var booking_id = $('#booking_id').text();
+    
+    type = $('#type').val();
+    if (type == 'true') {
+      type = 'cashier'
+
+      var table_type = $('#table_id').find("option:selected").data('type');
+      var table_id    = $('#table_id').val();
+      var customer_id = $('#customer_id').val();
+      var booking_id  = $('#booking_id').text();
+      var ajax_url = 'addorders/create';
+    }else{
+      type = 'cashier'
+      var table_type = $('#table_type').text();
+      var table_id    = $('#table_id').text();
+      var customer_id = $('#customer_id').text();
+      var booking_id  = $('#booking_id').text();
+      var ajax_url = '../addorders/create';
+    }
     if (!booking_id.length > 0) {
       
-      var params = {'order_source': "cashier", 'order_type': "dine_in",
+      var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
                   'table_id': table_id, 
                   'order_items': order_items };
     }
-    var table_type = $('#table_type').text();
+   
     var order_items = JSON.stringify(get_order_item_rows());
-    var ajax_url = '../addorders/create'; 
     
-    var params = {'order_source': "cashier", 'order_type': "dine_in",
+    var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
                   'order_items': order_items };
@@ -731,27 +749,61 @@ $(function() {
       data: params,
       dataType: "json",
        success:function(result){         
-      //   $("#oqs_loading_wrapper").hide(); 
-      //   swal({
-      //     title: "Information !",
-      //     text: 'Order has been successfully created',
-      //     confirmButtonColor: "green",
-      //     confirmButtonText: "Yes!",
-      //     closeOnConfirm: false,
-      //   }, function (isConfirm) {
-      //     if (isConfirm) {
+          
             if(table_type == "Table"){
               window.location.href = "/origami/table/" + table_id
             }
             else {
               window.location.href = "/origami/room/" + table_id
-            }  
-      //     }  
-      //   });                 
+            }                
        }
     });
   });
 
+
+  // Pay Discount for Payment
+  $("#create_pay_order").on('click', function(e){
+
+    $(this).attr('disabled', 'disabled');
+    e.preventDefault();
+    $("#oqs_loading_wrapper").show();
+    
+    type = $('#type').val();
+      type = 'quick_service'
+      var table_type = $('#table_id').find("option:selected").data('type');
+      var table_id    = $('#table_id').val();
+      var customer_id = $('#customer_id').val();
+      var booking_id  = $('#booking_id').text();
+      var ajax_url = 'addorders/create';
+    
+    if (!booking_id.length > 0) {
+      
+      var params = {'order_source': type, 'order_type': "dine_in",
+                  'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
+                  'table_id': table_id, 
+                  'order_items': order_items };
+    }
+    var order_items = JSON.stringify(get_order_item_rows());
+    
+    var params = {'order_source': type, 'order_type': "dine_in",
+                  'customer_id': customer_id, 'guest_info': "",
+                  'table_id': table_id, 
+                  'order_items': order_items };
+    $.ajax({
+      type: "POST",
+      url: ajax_url,
+      data: params,
+      dataType: "json",
+       success:function(result){
+        console.log(result)
+          if (result.status) {
+            window.location.href = "/origami/sale/"+result.data["sale_id"]+"/payment"
+          }
+           // window.location.href = "/origami/quick_service"
+          } 
+    });
+  });
+
   //click item row for update qty
   $('.summary-items').on('click', '.item_box', function(){
     $(this).attr('data-active',true);
@@ -863,11 +915,21 @@ $(function() {
   $("#back").on("click", function(){
     var table_id   = $('#table_id').text();
     var table_type = $('#table_type').text();
-    if(table_type == "Table"){
-      window.location.href = "/origami/table/" + table_id
-    }else {
-      window.location.href = "/origami/room/" + table_id
-   } 
+    type = $('#type').val();
+    if (type == 'true') {
+      var table_type = $('#table_id').find("option:selected").data('type');
+      var table_id    = $('#table_id').val();
+      window.location.href = "/origami/dashboard"
+    }else{
+      var table_type = $('#table_type').text();
+      var table_id    = $('#table_id').text();
+
+      if(table_type == "Table"){
+        window.location.href = "/origami/table/" + table_id
+      }else {
+        window.location.href = "/origami/room/" + table_id
+      }
+    }
   }); 
 
   // Get Selected Class
@@ -970,6 +1032,9 @@ $(function() {
   $(".sub_click").on("click", function(){
     var menu_id = $(this).attr("data-id");
     var url = "get_menu_sub_category/"+menu_id;
+    if ($('#type').val() == 'true') {
+      url = 'addorders/'+url
+    }
     sub_category = $(this).find('.sub_category_list');
     show_sub_category_list(url,sub_category); 
   }); 
@@ -992,7 +1057,12 @@ $(function() {
         data = data.sub_category;
 
         if (data.length>0) {
-          $(sub_category).removeClass('hidden');
+          if ((sub_category.hasClass('hidden'))) {
+            $(sub_category).removeClass('hidden');
+          }else{
+            $(sub_category).addClass('hidden');
+          }
+          
         for(var i in data) { 
 
               row = '<li class="menu_category fadeInTop animated" data-id="'+data[i].id+'">'
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index bf09f726..e319a724 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -53,8 +53,13 @@ section .content{
 
 .nav-tabs .nav-item {
     border-bottom: 1px solid #fff;
-    border-left: 1px solid #54A5AF;
-    border-right: 1px solid #54A5AF;
+    margin-left:2px;
+    
+}
+#ul-navbar{
+  border-left: 1px solid #54A5AF;
+  border-right: 1px solid #54A5AF;
+ 
 }
 .nav > li > a{
   color:#54A5AF;
diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 387b7bf8..4b58e52d 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -46,7 +46,8 @@ class Api::BillController < Api::ApiController
 
       Promotion.promo_activate(@sale)
 
-      BillBroadcastJob.perform_later(table)
+      #BillBroadcastJob.perform_later(table)
+      ActionCable.server.broadcast "bill_channel",table: table
     else
       @status = false
       @error_message = "No Current Open Shift"
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index bfb1023a..7cf80a5d 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -5,7 +5,8 @@ class Api::CallWaitersController < ActionController::API
     @table_id = params[:dining_id]
     @time     = params[:time]
     @table    = DiningFacility.find(@table_id)
-    CallWaiterJob.perform_later(@table,@time)
+    # CallWaiterJob.perform_later(@table,@time)
+    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
 
     # get printer info
     @shop          = Shop::ShopDetail 
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index ec415bad..a43b596b 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -8,7 +8,8 @@ class BaseOrigamiController < ActionController::Base
   protect_from_forgery with: :exception
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
-    redirect_to origami_root_path
+    # redirect_to origami_root_path
+    redirect_to origami_dashboard_path
   end
 
   def current_user
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 25fb0d70..3ed9115f 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -146,7 +146,8 @@ class HomeController < ApplicationController
       #check if cashier has existing open cashier
       shift = ShiftSale.current_open_shift(employee.id)
       if !shift.nil?
-        redirect_to origami_root_path
+        redirect_to origami_dashboard_path
+        # redirect_to origami_root_path
       else
         redirect_to new_origami_shift_path
        end
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index af404d8b..b601a0e6 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -131,6 +131,15 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
       @status, @booking = @order.generate
 
+      if @status && @booking && @order.source == 'quick_service'
+        
+        @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+        result = {:status=> @status, :data => @sale }
+        render :json => result.to_json
+        puts @status
+        puts @sale.to_json
+        puts "ssssssssssssssssssss"
+      end
   end
 
   # render json for http status code
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
new file mode 100644
index 00000000..9f5e25a4
--- /dev/null
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -0,0 +1,59 @@
+class Origami::DashboardController < BaseOrigamiController
+
+  def index
+    @shop = Shop.first
+
+    today = DateTime.now.strftime('%Y-%m-%d')
+    # @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
+    # @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
+
+    # @top_products = Sale.top_products(today).sum('i.qty')
+    # @bottom_products = Sale.bottom_products(today).sum('i.qty')
+    # @hourly_sales = Sale.hourly_sales(today).sum(:grand_total)
+    # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
+    # .sum(:grand_total)
+    # @employee_sales = Sale.employee_sales(today)
+                    # .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
+    # @inventories    = StockJournal.inventory_balances(today).sum(:balance)
+
+    @total_sale     = Sale.total_sale(today)
+    @total_count    = Sale.total_count(today)
+    @total_card     = Sale.total_card_sale(today)
+    @total_credit   = Sale.credit_payment(today)
+
+    @sale_data = Array.new
+    @total_payment_methods = Sale.total_payment_methods(today)
+
+    @total_payment_methods.each do |payment|
+      if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
+        pay = Sale.payment_sale('card', today)
+        @sale_data.push({'card' => pay.payment_amount})
+      else 
+        pay = Sale.payment_sale(payment.payment_method, today)
+        @sale_data.push({payment.payment_method => pay.payment_amount})
+      end
+    end
+    @summ_sale              = Sale.summary_sale_receipt(today)
+    @total_customer         = Sale.total_customer(today)
+    @total_dinein           = Sale.total_dinein(today)
+    @total_takeaway         = Sale.total_takeaway(today)
+    @total_other_customer   = Sale.total_other_customer(today)
+    @total_membership       = Sale.total_membership(today)
+
+    @total_order            = Sale.total_order(today)
+    @total_accounts         = Sale.total_account(today)
+    @account_data = Array.new
+    @total_accounts.each do |account|
+      acc = Sale.account_data(account.account_id, today)
+      if !acc.nil?
+        @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
+      end
+    end
+
+    @top_items         = Sale.top_items(today)
+    @total_foc_items   = Sale.total_foc_items(today) 
+
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
+  end
+end
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
new file mode 100644
index 00000000..374b9ffa
--- /dev/null
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -0,0 +1,42 @@
+class Origami::QuickServiceController < ApplicationController
+  # before_action :set_dining, only: [:detail]
+
+  def index
+    @menu   = MenuCategory.all.active
+    @dining = DiningFacility.all.active
+    @customer = Customer.all
+      # @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')
+      render "origami/addorders/detail"
+  end
+
+  def get_menu_category ()
+    if (params[:id])
+      puts params[:id]
+      #Pull this menu
+      @menu = MenuCategory.find_by_id(params[:id])
+      # puts @menu.menu_items[1].item_attributes.to_json
+      return @menu
+    else
+      MenuCategory.current_menu
+    end
+  end
+
+
+  def get_menu_sub_category ()
+    id = params[:id]
+    if (id)
+      #Pull this menu
+      @sub_menu = MenuCategory.where("menu_category_id = #{id}").active
+      # puts @menu.menu_items[1].item_attributes.to_json
+      return @sub_menu
+    end
+  end
+  
+  def get_all_product()
+      @product = Product.all   
+  end
+
+end
diff --git a/app/models/order.rb b/app/models/order.rb
index 6c22cb92..3580e5f1 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -203,8 +203,6 @@ class Order < ApplicationRecord
   def re_order_items(form_items) #reorder inputs items as parents and child
     parent_id = Array.new
     parents = Array.new
-    puts form_items
-    puts "hhhhh"
     parents_and_children_items = Array.new
 
     new_items_list = Array.new
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f6aed95e..0a388e0e 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -137,6 +137,41 @@ class Sale < ApplicationRecord
 
   end
 
+  #fOR Quick Service pay and create
+  def self.request_bill(order,current_user,current_login_employee)
+    @sale = Sale.new
+        sale_order=SaleOrder.new
+
+        if shift = ShiftSale.current_open_shift(current_user.id)
+          order_id = order.order_id # order_id
+          bk_order = BookingOrder.find_by_order_id(order_id)
+          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
+            @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)
+          else
+            @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
+            @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
+          end
+
+          # Bind shift sale id to sale
+          @sale_data.shift_sale_id = shift.id
+          @sale_data.save
+
+          # Promotion Activation
+          Promotion.promo_activate(@sale)
+          @status = true
+          return @status, @sale
+        else
+          @status = false
+          @message = "No Current Open Shift for This Employee"
+        end
+  end
   #This is when spilt bill is request - then we cannot link order to invoice
   #Cos there will be multiple orders - and items are spilt from there.
   #Unless order is spilt by then it is possible.
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index ed1b9170..b92a781c 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -335,7 +335,7 @@ class SalePayment < ApplicationRecord
         
          #record an payment in sale-audit
          remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
-         sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+         sale_audit = SaleAudit.record_paymal(sObj.sale_id, remark, 1)
 
         if !response.nil?
           if response["status"] == true
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index ab813ec6..6faa535a 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -4,14 +4,38 @@
   <div id="oqs_loading"></div>
 </div>
 
+<% type = request.path_info.include?('quick_service')%>
+<input type="hidden" name="type" id="type" value="<%=type%>">
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
-        <ul class="nav nav-tabs flex-column" role="tablist" >
+        <ul class="nav nav-tabs flex-column" role="tablist" id="ul-navbar">
             <% @menu.each do |menu| %>
               <% if !menu.valid_time.nil? %>
                 <% if menu.menu_category_id.nil? %>
-                  <% if @table.get_current_checkout_booking.nil? %>
+                <!--if type quick_service or cashier for table -->
+                  <% if type %>
                     <% if !menu.code.include? "SPL" %>
+                        <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                          <p class="hidden menu-id"><%= menu.id  %></p> 
+                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                             <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                            </ul>
+                          </a>
+                        </li>
+                    <% end%>
+                  <!-- else quick_service or cashier for table -->
+                  <% else %>
+                    <% if @table.get_current_checkout_booking.nil? %>
+                      <% if !menu.code.include? "SPL" %>
+                        <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                          <p class="hidden menu-id"><%= menu.id  %></p> 
+                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                             <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                            </ul>
+                          </a>
+                        </li>
+                      <% end%>
+                    <% else %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -20,15 +44,8 @@
                         </a>
                       </li>
                     <% end%>
-                  <% else %>
-                    <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
-                      <p class="hidden menu-id"><%= menu.id  %></p> 
-                      <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                         <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                        </ul>
-                      </a>
-                    </li>
-                  <% end%>
+                    <!-- end quick_service or cashier for table -->
+                  <% end %>
                 <% end%>
               <% end %>
             <%end %>
@@ -36,8 +53,6 @@
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
             </li>
-
-
         </ul>
     </div>
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
@@ -52,19 +67,36 @@
            Back
         </button>
           <br>
-        <div class="card-header">
-          <div>
+        <div class="card-header" style="padding: 0.5rem 0.25rem">
+          <% if type %>
+            <div class="row clearfix">
+               <div class="col-md-6 ">
+                 <strong id="order-title" class="font-14">ORDER DETAILS </strong>
+               </div>
+               <!-- <div class="col-md-3">Table -</div>  -->
+               <div class="col-md-6">
+               <select class="form-control m-t--5" id="table_id" name="table_id"  >
+                <option value="">Select Table</option>
+                  <%  @dining.each do |table| %>
+                    <option value="<%= table.id %>" data-type="<%=table.type%>"><%= table.name %></option>
+                  <%end %>
+                </select> 
+                </div>
+            </div>
+          <% else %>
+            <div>
              <strong id="order-title" class="font-14">ORDER DETAILS </strong>| <span class="font-14">Table-<%=@table.name%></span>
              <p class="hidden" id="table_id"><%=@table_id%></p>
              <p class="hidden" id="table_type"><%=@table.type%></p>
              <p class="hidden" id="booking_id"><%=@booking_id%></p>
              <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
-
           </div>
+          <% end%>
+          
         </div>
         <div class="card-block">
-            <div class="card-text" style="max-height:550px; overflow:auto"">
-               <table class="table table-striped summary-items">
+            <div class="card-text" id="order-detail-slimscroll" data-height="180">
+               <table class="table table-striped summary-items" id="order-items-table" >
                  <thead>
                    <tr>
                      <th>#</th>
@@ -73,19 +105,39 @@
                      <th class="item-attr">Price</th>
                    </tr>
                  </thead>
-                 <tbody class="font-13">
+                 <tbody class="font-13" >
                  
                  </tbody>
                </table>
             </div>
             <div class="card-footer custom-card-footer">
+            
                <table class="table" id="order-charges-table" border="0">
                  <tr>
                    <td class="charges-name"><strong>Sub Total:</strong></td>
                    <td class="item-attr"><strong id="sub_total">0.00</strong></td>
                  </tr>
                </table>
-               <button type="button" class="btn btn-primary btn-block create" id="create_order" disabled="disabled">Create Order</button>
+
+                <% if type %>
+                  <div class="row clearfix">
+                   <div class="col-md-4 ">
+                     <strong id="order-title" class="font-14">Customer</strong>
+                   </div>
+                   <!-- <div class="col-md-3">Table -</div>  -->
+                   <div class="col-md-8">
+                     <select class="form-control m-t--5" id="customer_id" name="customer_id"  >
+                      <option value="">Select Customer</option>
+                        <%  @customer.each do |cus| %>
+                          <option <%=(cus.customer_id == 'CUS-000000000001')? 'selected':''%> value="<%= cus.customer_id %>"><%= cus.name %></option>
+                        <%end %>
+                      </select> 
+                    </div>
+                  </div>
+                  <button type="button" class="btn btn-primary btn-block create" id="create_pay_order" disabled="disabled">Create Order & Pay</button>
+                <% end %>
+               <button type="button" class="btn btn-primary btn-block create m-t-5" id="create_order" disabled="disabled">Create Order</button>
+               
             </div>
         </div>
     </div>
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
new file mode 100644
index 00000000..67f28f13
--- /dev/null
+++ b/app/views/origami/dashboard/index.html.erb
@@ -0,0 +1,245 @@
+<div class="container-fluid">
+  <div class="block-header">
+    <h2><%= t :dashboard %></h2>
+  </div>
+  <% if @print_settings.precision.to_i > 0
+    precision = @print_settings.precision
+  else
+    precision = 0
+  end
+    #check delimiter
+    if @print_settings.delimiter
+      delimiter = ","
+    else
+      delimiter = ""
+    end
+    %> 
+    <!-- Widgets -->
+    <div class="row clearfix">
+      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+        <div class="info-box bg-cyan hover-expand-effect">
+          <div class="icon">
+            <i class="material-icons">help</i>
+          </div>
+          <div class="content">
+            <div class="text"><%= t :sale_count %></div>
+            <div class="number count-to" data-from="0" data-to="<%= @total_count%>" data-speed="1000" data-fresh-interval="20"></div>
+          </div>
+        </div>
+      </div>
+      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+        <div class="info-box bg-pink hover-expand-effect">
+          <div class="icon">
+            <i class="material-icons">attach_money</i>
+          </div>
+          <div class="content">
+            <div class="text"><%= t :total_sale %></div>
+            <div class="number count-to" data-from="0" data-to="<%= @total_sale%>" data-speed="15" data-fresh-interval="20"></div>
+          </div>
+        </div>
+      </div>
+
+      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+        <div class="info-box bg-light-green hover-expand-effect">
+          <div class="icon">
+            <i class="material-icons">person_add</i>
+          </div>
+          <div class="content">
+            <div class="text"><%= t :total_credit %></div>
+            <div class="number count-to" data-from="0" data-to="<%= @total_credit%>" data-speed="1000" data-fresh-interval="20"></div>
+          </div>
+        </div>
+      </div>
+      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+        <div class="info-box bg-orange hover-expand-effect">
+          <div class="icon">
+            <i class="material-icons">credit_card</i>
+          </div>
+          <div class="content">
+            <div class="text"><%= t :total_card %></div>
+            <div class="number count-to" data-from="0" data-to="<%= @total_card%>" data-speed="1000" data-fresh-interval="20"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- #END# Widgets -->
+    <!-- Widgets -->
+    <div class="row clearfix">
+      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 qs_view">
+        <div class="info-box bg-purple">
+          <div class="icon" >
+            <i class="material-icons">arrow_forward</i>
+          </div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;">Quick Service</div>
+        </div>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-4 col-xs-12 cashier_view">
+        <div class="info-box bg-green">
+          <div class="icon" >
+            <i class="material-icons">arrow_forward</i>
+          </div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;">Cashier</div>
+        </div>
+      </div>
+    </div>
+    <!-- #END# Widgets -->
+    <!-- CPU Usage -->
+    <div class="row clearfix">
+
+      <% if !@summ_sale.nil? %>
+
+      <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+        <div class="card">
+          <div class="body">
+            <h6><%= t :sale %></h6>
+            <table class="table">
+              <tr>
+                <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.receipt") %> : </td>
+                <td align="right"><%= @summ_sale.total_receipt %></td>
+              </tr>
+              <tr>
+                <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
+                <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
+              </tr>
+              <tr>
+                <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
+                <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
+              </tr>
+              <tr>
+                <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
+                <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
+              </tr>
+              <tr>
+                <td><%= t("views.right_panel.detail.grand_total") %> : </td>
+                <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
+              </tr>
+            </table>
+            <table class="table">
+              <% if !(@total_payment_methods.nil?) %>
+              <% @total_payment_methods.each do |payment| %>
+              <% if !@sale_data[0].empty? %>
+              <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
+              <tr>
+                <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
+                <td align="right">
+                  <% @sale_data.each do |data| %>
+                  <% pay_mth = payment.payment_method %>
+                  <%= data[""+pay_mth+""] %>
+                  <% end %>
+                </td>
+              </tr>
+              <% end %>
+              <% end %>
+              <% end %>
+
+              <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
+              <% if !total_card.nil? %>
+              <tr>
+                <td><%= t("views.right_panel.detail.card_sale") %> : </td>
+                <td align="right">
+                  <%= total_card["card"].to_f %>
+                </td>
+              </tr>
+              <% end %>
+
+              <% end %>
+            </table>
+          </div>
+        </div>
+      </div>
+      <% end %> 
+      <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+        <div class="card">
+          <div class="body">
+            <h6><%= t :customer %></h6>
+            <table class="table">
+              <% if !@total_customer.nil? %>
+              <tr>
+                <td><%= t("views.right_panel.detail.total") %> <%= t :customer %> : </td>
+                <td align="right"><%= @total_customer %></td>
+              </tr>
+              <% end %>
+              <% if !@total_dinein.nil? %>
+              <tr>
+                <td><%= t("views.right_panel.detail.dine_in") %> : </td>
+                <td align="right"><%= @total_dinein.total_dinein_cus %></td>
+              </tr>
+              <% end %>
+              <% if !@total_takeaway.nil? %>
+              <tr>
+                <td><%= t("views.right_panel.detail.takeaway") %> : </td>
+                <td align="right"><%= @total_takeaway.total_take_cus %></td>
+              </tr>
+              <% end %>
+              <% if !@total_other_customer.nil? %>
+              <tr>
+                <td><%= t :customer %> : </td>
+                <td align="right"><%= @total_other_customer.total_cus %></td>
+              </tr>
+              <% end %>
+              <% if !@total_membership.nil? %>
+              <tr>
+                <td><%= t("views.right_panel.detail.membership") %> : </td>
+                <td align="right"><%= @total_membership.total_memb_cus %></td>
+              </tr>
+              <% end %>
+            </table>
+          </div>
+        </div>
+      </div>
+      <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+        <div class="card">
+          <div class="body">
+            <h6><%= t("views.right_panel.detail.order") %></h6>
+            <table class="table">
+              <% if !@total_order.nil? %>
+              <tr>
+                <td width="40px"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.order") %> : </td>
+                <td align="right" width="60px"><%= @total_order.total_order %></td>
+              </tr>
+              <% end %>
+
+              <% if !@total_accounts.nil? %>
+              <% @total_accounts.each do |account| %>
+              <tr>
+                <td width="40px"><%= account.title %> (Account) : </td>
+                <td align="right" width="60px">
+                  <% @account_data.each do |data| %>
+                  <% acc = account.title %>
+                  <%= data[""+acc+""] %> <% if !data[''+acc+''].nil? %> ( <%= data[''+acc+'_amount'] %> ) <% end %>
+                  <% end %>
+                </td>
+              </tr>
+              <% end %>
+              <% end %>
+              <% if !@top_items.nil? %>
+              <tr>
+                <td width="40px"><%= t :top %> <%= t("views.right_panel.detail.item") %> : </td>
+                <td align="right" width="60px"><%= @top_items.item_name %> 
+                  <br>(<%= @top_items.item_total_price %>)</td>
+                </tr>
+                <% end %>
+                <% if !@total_foc_items.nil? %>
+                <tr>
+                  <td width="40px"><%= t("views.right_panel.detail.total") %> <%= t("views.btn.foc") %> <%= t("views.right_panel.detail.item") %> : </td>
+                  <td align="right" width="60px"><%= @total_foc_items.to_int %></td>
+                </tr>
+                <% end %>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+<script>
+
+  $(".cashier_view").on('click', function() {
+    window.location.href = '/origami';
+  });
+
+  $(".qs_view").on('click', function() {
+    window.location.href = '/origami/quick_service';
+  });
+
+</script>
\ No newline at end of file
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index a81c5bf9..3ed44abc 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -118,6 +118,10 @@
  </div>
  <div class="col-lg-2 col-md-2 col-sm-2">
    <!-- <button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button> -->
+   <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
+            <i class="material-icons">reply</i>
+             <%= t("views.btn.back") %>
+          </button>
    <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
       <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
       </button>
@@ -239,6 +243,6 @@ $('#close_cashier').on('click',function(){
   window.location.href = '/origami/shift/close';
 })
 $('#back').on('click',function(){
-  window.location.href = '/dashboard';
+  window.location.href = '/origami/dashboard';
 })
 </script>
diff --git a/app/views/origami/quick_service/index.html.erb b/app/views/origami/quick_service/index.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/origami/shifts/new.html.erb b/app/views/origami/shifts/new.html.erb
index eb275f89..35969b1d 100755
--- a/app/views/origami/shifts/new.html.erb
+++ b/app/views/origami/shifts/new.html.erb
@@ -117,7 +117,7 @@
       data: "opening_balance=" + amount + "&cashier_terminal="+ cashier_terminal,
       success:function(result){
         if(result){
-          window.location.href = '/origami';
+          window.location.href = '/origami/dashboard';
         }
       }
     });
diff --git a/config/routes.rb b/config/routes.rb
index 7d21aeb5..5c755179 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -84,6 +84,8 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- Cashier ------------#
   namespace :origami do
+    get "dashboard" => "dashboard#index"
+    get "quick_service" => "quick_service#index"
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]
@@ -200,12 +202,12 @@ scope "(:locale)", locale: /en|mm/ do
     get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
 
     get '/:addorders/:id' => "addorders#detail"
-    post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
+    post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }
     
     resources :commissions
     resources :commissioners
 
-    resources :addorders
+    # resources :addorders
     resources :in_duties
 
     # product_commission

From d5c4f834a02d5cd2e1a96090e00309c261a3661d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 1 Feb 2018 11:04:56 +0630
Subject: [PATCH 137/651] update job

---
 app/controllers/api/bill_controller.rb | 3 +--
 app/models/dining_facility.rb          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 4b58e52d..387b7bf8 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -46,8 +46,7 @@ class Api::BillController < Api::ApiController
 
       Promotion.promo_activate(@sale)
 
-      #BillBroadcastJob.perform_later(table)
-      ActionCable.server.broadcast "bill_channel",table: table
+      BillBroadcastJob.perform_later(table)
     else
       @status = false
       @error_message = "No Current Open Shift"
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index c4da3475..b8386d88 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -157,4 +157,5 @@ class DiningFacility < ApplicationRecord
     #Send to background job for processing
     CheckInBookingJob.perform_later(table)
   end
+  
 end

From 3f584edbd886d40cffda03f01f1be85a657b8281 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 1 Feb 2018 11:08:34 +0630
Subject: [PATCH 138/651] udpate remove call waiter jon

---
 app/controllers/api/call_waiters_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index 7cf80a5d..bfb1023a 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -5,8 +5,7 @@ class Api::CallWaitersController < ActionController::API
     @table_id = params[:dining_id]
     @time     = params[:time]
     @table    = DiningFacility.find(@table_id)
-    # CallWaiterJob.perform_later(@table,@time)
-    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
+    CallWaiterJob.perform_later(@table,@time)
 
     # get printer info
     @shop          = Shop::ShopDetail 

From 9efd54e68b7528a00995547feda942c7fe860be7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 1 Feb 2018 15:30:30 +0630
Subject: [PATCH 139/651] update remove job from cable and cup control in print

---
 app/controllers/api/bill_controller.rb        |  3 +-
 .../api/call_waiters_controller.rb            |  3 +-
 app/models/dining_facility.rb                 | 10 +++-
 app/models/order.rb                           | 13 ++++-
 app/models/order_queue_station.rb             | 47 +++++++++++++++++--
 app/models/sale.rb                            | 39 ++++++++++++++-
 app/models/sale_payment.rb                    |  5 +-
 config/schedule.rb                            |  2 +-
 8 files changed, 110 insertions(+), 12 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 387b7bf8..4b58e52d 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -46,7 +46,8 @@ class Api::BillController < Api::ApiController
 
       Promotion.promo_activate(@sale)
 
-      BillBroadcastJob.perform_later(table)
+      #BillBroadcastJob.perform_later(table)
+      ActionCable.server.broadcast "bill_channel",table: table
     else
       @status = false
       @error_message = "No Current Open Shift"
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index bfb1023a..7cf80a5d 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -5,7 +5,8 @@ class Api::CallWaitersController < ActionController::API
     @table_id = params[:dining_id]
     @time     = params[:time]
     @table    = DiningFacility.find(@table_id)
-    CallWaiterJob.perform_later(@table,@time)
+    # CallWaiterJob.perform_later(@table,@time)
+    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
 
     # get printer info
     @shop          = Shop::ShopDetail 
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index c4da3475..c897b278 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -155,6 +155,14 @@ class DiningFacility < ApplicationRecord
   def self.check_in_booking(table_id)
     table = DiningFacility.find(table_id)
     #Send to background job for processing
-    CheckInBookingJob.perform_later(table)
+    # CheckInBookingJob.perform_later(table)
+    ActionCable.server.broadcast "check_in_booking_channel",table: table
+  end
+
+  def self.checkin_time
+    table = DiningFacility.get_checkin_booking
+    if table.length > 0
+      ActionCable.server.broadcast "checkin_channel",table: table
+  end
   end
 end
diff --git a/app/models/order.rb b/app/models/order.rb
index 6c22cb92..16edc1fa 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -279,6 +279,16 @@ class Order < ApplicationRecord
   def process_order_queue
     #Send to background job for processing
     OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+    # order = Order.find(order_id)    
+
+    # #Execute orders and send to order stations
+    # if order
+    #   oqs = OrderQueueStation.new
+    #   oqs.process_order(order, table_id)
+    # end
+
+    # assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
+    # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
   end
 
 
@@ -287,7 +297,8 @@ class Order < ApplicationRecord
     table = DiningFacility.find(booking.dining_facility_id)
     type  = 'order'
     #Send to background job for processing
-    OrderBroadcastJob.perform_later(table,type)
+    # OrderBroadcastJob.perform_later(table,type)
+    ActionCable.server.broadcast "order_channel",table: table,type:type
   end
 
   #Origami: Cashier : to view order Table
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 2be68fb3..aea44395 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -123,9 +123,25 @@ class OrderQueueStation < ApplicationRecord
     end  
 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
 
+    cup_status = `#{"sudo service cups status"}`
+    print_status = check_cup_status(cup_status)
+
+    if print_status
+      order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
+    else
+      cup_start    = `#{"sudo service cups start"}`
+      cup_status   = `#{"sudo service cups status"}`
+      print_status = check_cup_status(cup_status)
+
+      if print_status
+        order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+        order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
+    
+      end
+    end
+      
     AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
     # update print status for order items
       ai.print_status=true
@@ -159,8 +175,23 @@ class OrderQueueStation < ApplicationRecord
     order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
     # print when complete click 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
+
+    cup_status = `#{"sudo service cups status"}`
+    print_status = check_cup_status(cup_status)
+
+    if print_status
+      order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
+    else
+      cup_start    = `#{"sudo service cups start"}`
+      cup_status   = `#{"sudo service cups status"}`
+      print_status = check_cup_status(cup_status)
+
+      if print_status
+        order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+        order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
+      end
+    end
     
     # update print status for completed same order items
     assigned_order_item.each do |ai|
@@ -168,4 +199,12 @@ class OrderQueueStation < ApplicationRecord
       ai.save       
     end
   end
+
+  def check_cup_status(status)
+    if status.include? "Active: active (running)" || "Active: active (exited)"   #"Cup Server is already running"
+      return true
+    end
+    return false
+  end
+  
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f6aed95e..49f126af 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -128,7 +128,9 @@ class Sale < ApplicationRecord
       booking.checkout_by = requested_by.name
       booking.save      
 
-      InventoryJob.perform_now(self.id)
+      # InventoryJob.perform_now(self.id)
+      saleObj = Sale.find(self.id)
+      InventoryDefinition.calculate_product_count(saleObj)
 
       return true, self.id
     end
@@ -137,6 +139,41 @@ class Sale < ApplicationRecord
 
   end
 
+  #fOR Quick Service pay and create
+  def self.request_bill(order,current_user,current_login_employee)
+    @sale = Sale.new
+        sale_order=SaleOrder.new
+
+        if shift = ShiftSale.current_open_shift(current_user.id)
+          order_id = order.order_id # order_id
+          bk_order = BookingOrder.find_by_order_id(order_id)
+          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
+            @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)
+          else
+            @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
+            @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
+          end
+
+          # Bind shift sale id to sale
+          @sale_data.shift_sale_id = shift.id
+          @sale_data.save
+
+          # Promotion Activation
+          Promotion.promo_activate(@sale)
+          @status = true
+          return @status, @sale
+        else
+          @status = false
+          @message = "No Current Open Shift for This Employee"
+        end
+  end
   #This is when spilt bill is request - then we cannot link order to invoice
   #Cos there will be multiple orders - and items are spilt from there.
   #Unless order is spilt by then it is possible.
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index ed1b9170..9ba5a3bb 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -335,7 +335,7 @@ class SalePayment < ApplicationRecord
         
          #record an payment in sale-audit
          remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
-         sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+         sale_audit = SaleAudit.record_paymal(sObj.sale_id, remark, 1)
 
         if !response.nil?
           if response["status"] == true
@@ -408,7 +408,8 @@ class SalePayment < ApplicationRecord
 
       type  = 'payment'
       #Send to background job for processing
-      OrderBroadcastJob.perform_later(table,type)
+      # OrderBroadcastJob.perform_later(table,type)
+      ActionCable.server.broadcast "order_channel",table: table,type:type
     end
   end
 
diff --git a/config/schedule.rb b/config/schedule.rb
index 17f336a0..4b3f6a3b 100755
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -11,5 +11,5 @@ every 30.minutes do
 end
 
 every 1.minutes do
-  runner "CheckinJob.perform"
+  runner "DiningFacility.checkin_time"
 end
\ No newline at end of file

From e9d7b9e2f5918671c4d91ea63311852b94063718 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 1 Feb 2018 15:31:48 +0630
Subject: [PATCH 140/651] change utc to utc.getlocal

---
 app/controllers/api/check_in_process_controller.rb     | 6 +++---
 app/controllers/origami/check_in_process_controller.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 883fb1ea..45d3ed1a 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -41,12 +41,12 @@ class Api::CheckInProcessController < Api::ApiController
 				lookup_checkout_time = Lookup.collection_of("checkout_time")
 				
 				if !lookup_checkout_time.empty?
-					checkout_at = Time.now.utc
+					checkout_at = Time.now.utc.getlocal
 
 					lookup_checkout_time.each do |checkout_time|
 						arr_time = checkout_time[0].split("-")
-						start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
-						end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+						start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
+						end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
 						if start_time <= checkout_at && checkout_at <= end_time
 							checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 						end
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 14d5c90c..8f28c365 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -2,12 +2,12 @@ class Origami::CheckInProcessController < BaseOrigamiController
 
 	def check_in_process
 		lookup_checkout_time = Lookup.collection_of("checkout_time")
-		checkout_at = Time.now.utc
+		checkout_at = Time.now.utc.getlocal
 		if !lookup_checkout_time.empty?
 			lookup_checkout_time.each do |checkout_time|
 				arr_time = checkout_time[0].split("-")
-				start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
-				end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+				start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
+				end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
 				if start_time <= checkout_at && checkout_at <= end_time
 					checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 				end

From 73858fc29360e8a39619f01b700d95328772b8fe Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 1 Feb 2018 18:19:35 +0630
Subject: [PATCH 141/651] change checkout time

---
 app/controllers/api/check_in_process_controller.rb     | 2 +-
 app/controllers/origami/check_in_process_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 45d3ed1a..12075a50 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -47,7 +47,7 @@ class Api::CheckInProcessController < Api::ApiController
 						arr_time = checkout_time[0].split("-")
 						start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
 						end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
-						if start_time <= checkout_at && checkout_at <= end_time
+						if start_time <= checkout_at.strftime("%H:%M%p") && checkout_at.strftime("%H:%M%p") <= end_time
 							checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 						end
 					end
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 8f28c365..bab40a83 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -8,7 +8,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
 				arr_time = checkout_time[0].split("-")
 				start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
 				end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
-				if start_time <= checkout_at && checkout_at <= end_time
+				if start_time <= checkout_at.strftime("%H:%M%p") && checkout_at.strftime("%H:%M%p") <= end_time
 					checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 				end
 			end

From 383aeded6088c2e4136572a2fc330572a40893eb Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 1 Feb 2018 16:16:26 +0630
Subject: [PATCH 142/651] check checkedin exist in lookups and void - sale

---
 .../api/check_in_process_controller.rb        |  5 ++--
 .../origami/check_in_process_controller.rb    | 26 +++++++++----------
 app/controllers/origami/void_controller.rb    |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 12075a50..a033c49a 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -25,9 +25,10 @@ class Api::CheckInProcessController < Api::ApiController
 			            alert_time_min = checkout_time[1].to_i
 			          end
 			        end
+					render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min, :extra_minutes => extra_minutes }
+				else
+					render :json => { :status => true }
 				end
-
-				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min, :extra_minutes => extra_minutes }
 			else 
 				render :json => { :status => false, :error_message => "No current booking!" }
 			end
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index bab40a83..67191b6e 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -12,21 +12,21 @@ class Origami::CheckInProcessController < BaseOrigamiController
 					checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 				end
 			end
-		end
-		@dining_facility = DiningFacility.find(params[:dining_id])
-		@dining_facility.status = "occupied"
-		@dining_facility.save!
-
-		if @dining_facility.type == "Table"
-			type = "TableBooking"
-		else
-			type = "RoomBooking"
-		end
 		
-		@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
-		@booking.save!
+			@dining_facility = DiningFacility.find(params[:dining_id])
+			@dining_facility.status = "occupied"
+			@dining_facility.save!
 
+			if @dining_facility.type == "Table"
+				type = "TableBooking"
+			else
+				type = "RoomBooking"
+			end
+			
+			@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
+	                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
+			@booking.save!
+		end
 		respond = {:status => 'ok'}
 		respond_to do |format|
 			format.json { render json: respond }
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 0d368224..52b2068c 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -87,7 +87,7 @@ class Origami::VoidController < BaseOrigamiController
         rebate = MembershipSetting.find_by_rebate(1)
         if customer.membership_id != nil && rebate
           member_info = Customer.get_member_account(customer)
-          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          rebate_amount  = Customer.get_membership_transactions(customer,sale.receipt_no)
           current_balance = SaleAudit.paymal_search(sale_id)
         end
 

From 6c33040173f53d01162b27e97dc91a053af9e515 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 1 Feb 2018 16:25:11 +0630
Subject: [PATCH 143/651] remove checkin if checkin not used

---
 app/controllers/origami/home_controller.rb   | 7 +++++++
 app/controllers/origami/shifts_controller.rb | 6 ++++++
 app/views/origami/home/show.html.erb         | 4 +++-
 app/views/origami/shifts/show.html.erb       | 4 +++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 536defe7..e7116553 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -84,6 +84,13 @@ class Origami::HomeController < BaseOrigamiController
          end
        end
      end
+
+    #for bank integration
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
      
   end
 
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 6d0fbe02..cb2cc830 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -4,6 +4,12 @@ class Origami::ShiftsController < BaseOrigamiController
 
   def show
     @shift = ShiftSale.current_open_shift(current_user.id)
+    #for bank integration
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def new
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8440f354..a77ac31a 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -431,7 +431,9 @@
 
               <!-- <button type="button" id="re-print" class="btn btn-block bg-blue waves-effect" >Re.Print</button> -->
           <% else %>
-            <button type="button" id="check_in" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.check_in") %></button>
+            <% if @bank_integration == '1' %>
+              <button type="button" id="check_in" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.check_in") %></button>
+            <% end %>
           <% end %>
            <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
            <span class="hidden" id="member_discount"><%= @membership.discount%></span>
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index f2ee019e..4ea71dec 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -31,7 +31,9 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
     <button type="button" class="btn bg-default btn-block" id='back'><i class="material-icons">reply</i> <%= t("views.btn.back") %> </button>
     <button type="button" class="btn bg-blue btn-block green" id='close_cashier'> <%= t("views.btn.close_cashier") %> </button>
-    <button type="button" class="btn bg-blue btn-block green" id="card_settlement"> <%= t("views.btn.card_settle") %> </button>
+    <% if @bank_integration == '1' %>
+      <button type="button" class="btn bg-blue btn-block green" id="card_settlement"> <%= t("views.btn.card_settle") %> </button>
+    <% end %>
     </div>
   </div>
 

From ae4746acfcb79432c88b0ea8c57fdf21a333cc64 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 1 Feb 2018 16:34:18 +0630
Subject: [PATCH 144/651] change checkin time checked

---
 app/controllers/origami/home_controller.rb | 8 ++------
 app/views/origami/home/show.html.erb       | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index e7116553..c00b39bf 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -86,12 +86,8 @@ class Origami::HomeController < BaseOrigamiController
      end
 
     #for bank integration
-    bank_integration = Lookup.collection_of('bank_integration')
-    @bank_integration = 0
-    if !bank_integration[0].nil?
-      @bank_integration = bank_integration[0][1]
-    end
-     
+    @checkout_time = Lookup.collection_of('checkout_time')
+    @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
   end
 
 private
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index a77ac31a..0b70e159 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -431,7 +431,7 @@
 
               <!-- <button type="button" id="re-print" class="btn btn-block bg-blue waves-effect" >Re.Print</button> -->
           <% else %>
-            <% if @bank_integration == '1' %>
+            <% if !@checkout_time.empty? && !@checkout_alert_time.empty? %>
               <button type="button" id="check_in" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.check_in") %></button>
             <% end %>
           <% end %>

From f608aa8516b28ffa28ed121bf055427f51a52f2f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 1 Feb 2018 17:00:57 +0630
Subject: [PATCH 145/651] check checkin time is available or valid time

---
 .../api/check_in_process_controller.rb        | 27 ++++++++++-------
 .../origami/check_in_process_controller.rb    | 29 ++++++++++---------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index a033c49a..6f32c613 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -42,6 +42,7 @@ class Api::CheckInProcessController < Api::ApiController
 				lookup_checkout_time = Lookup.collection_of("checkout_time")
 				
 				if !lookup_checkout_time.empty?
+					today = Time.now.utc.getlocal
 					checkout_at = Time.now.utc.getlocal
 
 					lookup_checkout_time.each do |checkout_time|
@@ -53,20 +54,24 @@ class Api::CheckInProcessController < Api::ApiController
 						end
 					end
 
-					dining_facility.status = "occupied"
-					dining_facility.save!
+					if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p")
+						dining_facility.status = "occupied"
+						dining_facility.save!
 
-					if dining_facility.type == "Table"
-						type = "TableBooking"
+						if dining_facility.type == "Table"
+							type = "TableBooking"
+						else
+							type = "RoomBooking"
+						end
+						
+						booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
+				                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
+						booking.save!
+
+						render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
 					else
-						type = "RoomBooking"
+						render :json => { :status => true }
 					end
-					
-					booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-			                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
-					booking.save!
-
-					render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
 				else
 					render :json => { :status => true }
 				end
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 67191b6e..2c5b0b38 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -2,6 +2,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
 
 	def check_in_process
 		lookup_checkout_time = Lookup.collection_of("checkout_time")
+		today = Time.now.utc.getlocal
 		checkout_at = Time.now.utc.getlocal
 		if !lookup_checkout_time.empty?
 			lookup_checkout_time.each do |checkout_time|
@@ -12,20 +13,22 @@ class Origami::CheckInProcessController < BaseOrigamiController
 					checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 				end
 			end
-		
-			@dining_facility = DiningFacility.find(params[:dining_id])
-			@dining_facility.status = "occupied"
-			@dining_facility.save!
-
-			if @dining_facility.type == "Table"
-				type = "TableBooking"
-			else
-				type = "RoomBooking"
-			end
 			
-			@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-	                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
-			@booking.save!
+			if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p")
+				@dining_facility = DiningFacility.find(params[:dining_id])
+				@dining_facility.status = "occupied"
+				@dining_facility.save!
+
+				if @dining_facility.type == "Table"
+					type = "TableBooking"
+				else
+					type = "RoomBooking"
+				end
+				
+				@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
+		                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
+				@booking.save!
+			end
 		end
 		respond = {:status => 'ok'}
 		respond_to do |format|

From 6657c11122c3bc5a7c74e4927cd14a98b34746a9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 1 Feb 2018 17:14:34 +0630
Subject: [PATCH 146/651] update cups restart for order

---
 .../javascripts/channels/call_waiter.js       | 22 +++++++--
 app/models/order.rb                           | 35 ++++++++++----
 app/models/order_queue_station.rb             | 47 ++-----------------
 3 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/app/assets/javascripts/channels/call_waiter.js b/app/assets/javascripts/channels/call_waiter.js
index 941a6359..f0a804a2 100644
--- a/app/assets/javascripts/channels/call_waiter.js
+++ b/app/assets/javascripts/channels/call_waiter.js
@@ -7,15 +7,27 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
 
   received: function(data) {                 
    table = data.table
+   time  = data.time
    
     // for Notificaiotn message
     var element        = "#notify-wrapper"
-    var placementFrom  = "top";
-    var placementAlign = "center";
     var animateEnter   = "";
     var animateExit    = "";
-    var colorName      = "alert-warning";
-    var text           = " Calling Waiter <br>  "+table.name ;
+    
+    if (time == 'print_error') {
+      var colorName      = "alert-danger";
+      var placementFrom  = "center";
+      var placementAlign = "center";
+      var text           = " Hello <br>  "+table ;
+      style =""
+    }else{
+      var colorName      = "alert-warning";
+      var placementFrom  = "top";
+      var placementAlign = "center";
+      var text           = " Calling Waiter <br>  "+table.name ;
+      style ="width:180px !important;"
+    }
+    
 
     if (text != null || colorName != null){
      showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
@@ -43,7 +55,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
         enter: animateEnter,
         exit: animateExit
       },
-      template: '<div data-notify="container" style="width:180px !important;" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
+      template: '<div data-notify="container" style="'+style+'" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
       '<button type="button" aria-hidden="true" class="close notify-close float-right m-l-5 m-t--5" data-notify="dismiss">×</button>' +
       '<span data-notify="icon"></span> ' +
       '<span data-notify="title">{1}</span> ' +
diff --git a/app/models/order.rb b/app/models/order.rb
index 16edc1fa..5b1601d8 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -278,19 +278,34 @@ class Order < ApplicationRecord
   #Process order items and send to order queue
   def process_order_queue
     #Send to background job for processing
-    OrderQueueProcessorJob.perform_later(self.id, self.table_id)
-    # order = Order.find(order_id)    
 
-    # #Execute orders and send to order stations
-    # if order
-    #   oqs = OrderQueueStation.new
-    #   oqs.process_order(order, table_id)
-    # end
+    cup_status = `#{"sudo service cups status"}`
+    print_status = check_cup_status(cup_status)
+     
+    if print_status
+      OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+    else
+      cup_start    = `#{"sudo service cups start"}`
+      cup_status   = `#{"sudo service cups status"}`
+      print_status = check_cup_status(cup_status)
 
-    # assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
-    # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+      if print_status
+        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      else
+        msg = ' Print Error ! Please contact to service'
+        ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      end
+    end
+ 
+  end
+  
+  def check_cup_status(status)
+    if status.include? "Active: active (running)" || "Active: active (exited)"   #"Cup Server is already running"
+      return true
+    end
+    return false
   end
-
 
   #send order items and send to order queue
   def send_order_broadcast(booking)
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index aea44395..2be68fb3 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -123,25 +123,9 @@ class OrderQueueStation < ApplicationRecord
     end  
 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
 
-    cup_status = `#{"sudo service cups status"}`
-    print_status = check_cup_status(cup_status)
-
-    if print_status
-      order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
-    else
-      cup_start    = `#{"sudo service cups start"}`
-      cup_status   = `#{"sudo service cups status"}`
-      print_status = check_cup_status(cup_status)
-
-      if print_status
-        order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-        order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
-    
-      end
-    end
-      
     AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
     # update print status for order items
       ai.print_status=true
@@ -175,23 +159,8 @@ class OrderQueueStation < ApplicationRecord
     order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
     # print when complete click 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
-
-    cup_status = `#{"sudo service cups status"}`
-    print_status = check_cup_status(cup_status)
-
-    if print_status
-      order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
-    else
-      cup_start    = `#{"sudo service cups start"}`
-      cup_status   = `#{"sudo service cups status"}`
-      print_status = check_cup_status(cup_status)
-
-      if print_status
-        order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-        order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
-      end
-    end
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
     
     # update print status for completed same order items
     assigned_order_item.each do |ai|
@@ -199,12 +168,4 @@ class OrderQueueStation < ApplicationRecord
       ai.save       
     end
   end
-
-  def check_cup_status(status)
-    if status.include? "Active: active (running)" || "Active: active (exited)"   #"Cup Server is already running"
-      return true
-    end
-    return false
-  end
-  
 end

From 48ce8e4809351947d9e28a0429f5d256a26aff19 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 1 Feb 2018 18:12:59 +0630
Subject: [PATCH 147/651] split bill

---
 .../javascripts/origami/split_bill.coffee     |   3 +
 .../stylesheets/origami/split_bill.scss       |   3 +
 .../origami/split_bill_controller.rb          |   7 +
 app/helpers/origami/split_bill_helper.rb      |   2 +
 app/views/origami/home/show.html.erb          |  44 +-
 app/views/origami/split_bill/index.html.erb   | 780 ++++++++++++++++++
 config/routes.rb                              |   2 +
 .../origami/split_bill_controller_spec.rb     |   5 +
 .../helpers/origami/split_bill_helper_spec.rb |  15 +
 9 files changed, 846 insertions(+), 15 deletions(-)
 create mode 100644 app/assets/javascripts/origami/split_bill.coffee
 create mode 100644 app/assets/stylesheets/origami/split_bill.scss
 create mode 100644 app/controllers/origami/split_bill_controller.rb
 create mode 100644 app/helpers/origami/split_bill_helper.rb
 create mode 100755 app/views/origami/split_bill/index.html.erb
 create mode 100644 spec/controllers/origami/split_bill_controller_spec.rb
 create mode 100644 spec/helpers/origami/split_bill_helper_spec.rb

diff --git a/app/assets/javascripts/origami/split_bill.coffee b/app/assets/javascripts/origami/split_bill.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/origami/split_bill.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/origami/split_bill.scss b/app/assets/stylesheets/origami/split_bill.scss
new file mode 100644
index 00000000..343bce7f
--- /dev/null
+++ b/app/assets/stylesheets/origami/split_bill.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the origami/split_bill controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
new file mode 100644
index 00000000..24ded975
--- /dev/null
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -0,0 +1,7 @@
+class Origami::SplitBillController < BaseOrigamiController
+
+	def index
+		dining_id = params[:dining_id]
+		@table = DiningFacility.find_by_id(dining_id)
+	end
+end
diff --git a/app/helpers/origami/split_bill_helper.rb b/app/helpers/origami/split_bill_helper.rb
new file mode 100644
index 00000000..cc88e5b2
--- /dev/null
+++ b/app/helpers/origami/split_bill_helper.rb
@@ -0,0 +1,2 @@
+module Origami::SplitBillHelper
+end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8440f354..4f81116d 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -670,22 +670,36 @@
 
     // Bill Request
     $('#request_bills').click(function () {
-        var order_id = $('#save_order_id').attr('data-order');
-        var ajax_url = "/origami/" + order_id + "/request_bills";
-        $.ajax({
-            type: "GET",
-            url: ajax_url,
-            // data: 'order_id='+ order_id,
-            success: function (result) {
-
-                if (!result.status) {
-                  swal("Information!", result.error_message);
+        swal({
+            title: "Alert",
+            text: "Are you sure want to Split?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, split it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+            var dining_id = "<%= @dining.id %>";
+            window.location.href = '/origami/table/' + dining_id + "/split_bill";
+          }else{
+            var order_id = $('#save_order_id').attr('data-order');
+            var ajax_url = "/origami/" + order_id + "/request_bills";
+            $.ajax({
+                type: "GET",
+                url: ajax_url,
+                // data: 'order_id='+ order_id,
+                success: function (result) {
+                    if (!result.status) {
+                      swal("Information!", result.error_message);
+                    }
+                    else {              
+                      location.reload();
+                    }
                 }
-                else {              
-                  location.reload();
-                }
-            }
-        });
+            });
+          }
+        }); 
     });
 
     $('#move').on('click', function () {
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
new file mode 100755
index 00000000..0691ca2c
--- /dev/null
+++ b/app/views/origami/split_bill/index.html.erb
@@ -0,0 +1,780 @@
+ <div class="container-fluid">
+ <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+ </div>
+ 	<div class="row">
+ 		<!-- Column One -->
+ 		<div class="col-lg-6 col-md-6 col-sm-6">
+ 			<!-- Order Details -->
+ 			<div class="card"  >
+        <!-- <div class="card-header">
+          <div><strong id="order-title">ORDER DETAILS</strong></div>
+      </div> -->
+      <div class="card-block">
+      	<div class="card-title row">
+      		<div class="col-lg-6 col-md-6 col-sm-6">
+      		    <span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
+      		    <span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
+      		</div>
+      		<div class="col-lg-6 col-md-6 col-sm-6 text-right">
+      			<p class="m-r-10">Date:  <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+      		</div>
+      	</div>
+      	<div id="order-detail-slimscroll" data-height="160">
+      	<div class="card-text dining">
+      		<table class="table table-default" id="order-items-table">
+      			<thead>
+      				<tr>
+      					<th class="item-name">Items</th>
+      					<th class="item-attr">QTY</th>
+      						<th class="item-attr">Price</th>
+      						</tr>
+      					</thead>
+      					<tbody>
+      						<% sub_total = 0 %>
+      						<% @sale_data.sale_items.each do |sale_item| %>
+      						<% 
+      						sub_total += sale_item.qty*sale_item.unit_price 
+      						if sale_item.price != 0 && sale_item.remark != "void" && sale_item.remark != "foc"
+      							%>
+      							<tr class="item-row" id=<%= sale_item.sale_item_id %> >
+      								<td style="width:60%; text-align:left">
+      									<span id="item-account-type" class="hidden"><%=sale_item.account_id%></span>
+      									<span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
+      								</td>
+      								<td style="width:20%; text-align:right">
+      									<span id="item-qty"><%=sale_item.qty%></span>
+      								</td>
+      								<td style="width:20%; text-align:right">
+      									<span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span>
+      								</td>
+      							</tr>
+      							<%
+      						end
+      					end 
+      					%>
+      				</tbody>
+      			</table>
+      		</div>
+      		</div>
+      		<div class="card-footer">
+      			<table class="table" id="order-charges-table" border="0">
+      				<tr>
+      					<td class="charges-name"><strong>Sub Total:</strong></td>
+      					<td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
+      				</tr>
+              <!-- <tr>
+                <td class="charges-name"><strong>Food:</strong></td>
+                <td class="item-attr"><strong id="order-food"></strong></td>
+              </tr>
+              <tr>
+                <td class="charges-name"><strong>Beverage:</strong></td>
+                <td class="item-attr"><strong id="order-beverage"></strong></td>
+            </tr> -->
+            <tr>
+            	<%if @sale_data.discount_type == 'member_discount'%>
+            	<td class="charges-name"><strong>Member Discount:</strong></td>
+            	<%else%>
+            	<td class="charges-name"><strong>Discount:</strong></td>
+            	<%end%>
+
+            	<td class="item-attr">(<strong id="order-discount"><%=@sale_data.total_discount rescue 0%></strong>)</td>
+            </tr>
+            <tr class="hidden">
+            	<td class="charges-name"><strong>Tax:</strong></td>
+            	<td class="item-attr"><strong id="order-Tax"><%=@sale_data.total_tax rescue 0%></strong></td>
+            </tr>
+            <tr class="hidden">
+            	<td class="charges-name"><strong>Grand Total:</strong></td>
+            	<td class="item-attr"><strong id="order-grand-total"><%=@sale_data.grand_total rescue 0%></strong></td>
+            </tr>
+        </table>
+    </div>
+</div>
+</div>
+</div>
+<!-- Column One -->
+
+<!-- Column Two -->
+<div class="col-lg-5 col-md-5 col-sm-5">
+	<!-- Discount Amount -->
+	<div class="card">
+		<div class="card-header">
+			<div><strong id="order-title">Discount Control</strong></div>
+		</div>
+		<div class="card-block">
+			<div class="card-title">
+				<div class="form-horizontal">
+					<div class="col-md-12">	
+						<div class="form-group">											
+							<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
+						</div>
+						<br>
+						<div class="form-group">			
+							<%
+							@accounts.each do |acc|								
+								%>
+								<button id="account-<%= acc.id %>" class="accounts-type btn bg-default"><%= acc.title %></button>
+								<% end %>
+							</div>
+						</div>					
+					</div>
+				</div>
+
+				<hr />
+				<div class="p-l-20">
+					<div class="row">
+					<div class="col-md-8">
+						<div class="row bottom">
+							<div class="col-md-3">
+								<div class="fluid cashier_number" data-value="5" data-type="add">5%</div>
+							</div>
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" data-value="1" data-type="num" style="margin-left: 6px;">1</div>
+									<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
+									<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="row bottom clearfix">
+							<div class="col-md-3">
+								<div class="fluid cashier_number" data-value="10" data-type="add">10%</div>
+							</div>
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" data-value="4" data-type="num" style="margin-left: 6px;">4</div>
+									<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
+									<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="row bottom">
+							<div class="col-md-3">
+								<div class="fluid cashier_number" data-value="15" data-type="add">15%</div>
+							</div>
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" data-value="7" data-type="num" style="margin-left: 6px;">7</div>
+									<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
+									<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="row bottom">
+							<div class="col-md-3">
+								<div class="fluid cashier_number" data-value="20" data-type="add">20%</div>
+							</div>
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" data-value="0" data-type="num" style="margin-left: 6px;">0</div>
+									<div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
+									<div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="row bottom">
+							<div class="col-md-3">
+								<div class="fluid cashier_number" data-value="30" data-type="add">30%</div>
+							</div>
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" style="margin-left: 6px;"></div>
+									<div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
+									<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="col-md-4">
+						<div class="form-group">
+							<button id="net" class="btn bg-info fluid action-btn">Nett</button>
+							<button id="percentage" class="btn bg-primary fluid action-btn" style="font-size: 12.4px">Percentage</button>	
+							<button id="remove-item" class="btn bg-default fluid action-btn">Clear Discount</button>
+						</div>
+					</div>
+					</div>	
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<!-- Column Three -->
+	<div class="col-lg-1 col-md-1 col-sm-1">
+		<!-- Action Panel -->
+		<div>
+			<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
+			<button id="remove-item-discount" class="btn btn-primary btn- action-btn">Remove Item Discount</button>
+			<button id="remove-all" class="btn bg-primary btn-block action-btn">Remove All</button>
+			<button id="pay-discount" class="btn bg-primary btn-block action-btn">Enter</button>
+			<% if @member_discount%>
+			<!-- <hr />		
+			<button id="member-discount" class="btn btn-success btn-block action-btn
+			<%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button> -->
+			<%end %>
+		</div>
+	</div>
+</div>
+</div>
+
+<script type="text/javascript">
+	$(document).ready(function(){
+
+		$('#back').on('click',function(){
+		    var id       = $("#table_id").text();
+		    var type     = $("#table_type").text();
+		    console.log(id);
+		    console.log(type);
+		    if (type=="Table") {
+		      window.location.href = '/origami/table/'+id
+		    }else{
+		     window.location.href = '/origami/room/'+id
+		   }
+		 })
+
+		$(".cashier_number").on('click', function(event){
+			if(event.handled !== true) {
+				var original_value=0;
+				original_value = $('#discount-amount').val();
+
+				var input_type = $(this).attr("data-type");
+
+				switch (input_type) {
+					case 'num':
+					var input_value = $(this).attr("data-value");
+					if (original_value == "0.0"){
+						$('#discount-amount').val(input_value);						
+					}
+					else{
+						$('#discount-amount').val(original_value + '' + input_value);						
+					}
+					break;
+
+					case 'add':
+					var input_value = $(this).attr("data-value");
+					amount = parseInt(input_value);
+					$('#discount-amount').val(amount);										
+					break;
+
+					case 'del' :
+					var discount_text=$('#discount-amount').val();
+					$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));		
+					break;
+
+					case 'clr':
+					$('#discount-amount').val("0.0");	            
+					break;
+				}
+				event.handled = true;
+			} else {
+				return false;
+			}
+		});
+
+	// Select Sale Item
+	$('.item-row').on('click',function(){
+		if($(this).hasClass('selected-item') == true){
+			$(this).removeClass('selected-item');
+		}
+		else {
+			$(this).addClass('selected-item');
+		}
+	});
+
+	// Select discount-item
+	$('#order-items-table tbody').on('click', '.discount-item-row',function(){
+		if($(this).hasClass('selected-item') == true){
+			$(this).removeClass('selected-item');
+		}
+		else {
+			$(this).addClass('selected-item');
+		}
+	});
+
+	// Select for account types
+	$(".accounts-type").on('click', function(e){
+		var account_id = $(this).attr('id').substr(8);
+
+		if($(this).hasClass('selected-account') == true){
+			$(this).removeClass('selected-account');
+			$(".item-row").each(function(i){
+				if($(this).children().find("#item-account-type").text() == account_id){
+					$(this).removeClass("selected-item");
+				}
+			});
+		}
+		else {
+			$(this).addClass('selected-account');
+			$(".item-row").each(function(i){
+				if($(this).children().find("#item-account-type").text() == account_id){
+					$(this).addClass("selected-item");
+				}
+			});
+		}        
+	});
+
+	// Calculate Net Discount for Payment
+	$("#net").on('click', function(e){
+		e.preventDefault();
+		var sale_id = $('#sale-id').text();
+		var discount_value = parseFloat($('#discount-amount').val());
+		var ajax_url = "/origami/" + sale_id + "/discount";
+
+		// Selected Items
+		var sale_items = get_selected_sale_items();					
+
+		// Selected Account
+		var account_types = get_selected_account_types();
+
+		if(sale_items.length == 0 && account_types.length == 0){
+			calculate_overall_discount(0, discount_value);
+		}
+		else {
+			calculate_item_discount(0, discount_value, sale_items, account_types);	
+		}	
+
+		// Remove Selection
+		selection_remove();						
+	});
+
+	// Calculate Percentage Discount for Payment
+	$("#percentage").on('click', function(e){
+		e.preventDefault();
+		var sale_id = $('#sale-id').text();
+		var discount_value = $('#discount-amount').val();
+		var ajax_url = "/origami/" + sale_id + "/discount";
+
+		// Selected Items
+		var sale_items = get_selected_sale_items();					
+
+		// Selected Account
+		var account_types = get_selected_account_types();
+		
+		if(sale_items.length == 0 && account_types.length == 0){
+			calculate_overall_discount(1, discount_value);
+		}
+		else {
+			calculate_item_discount(1, discount_value, sale_items, account_types);	
+		}
+
+		// Remove Selection
+		selection_remove();			
+	});
+
+	// Remove selected discount items
+	$("#remove-item").on('click', function(e){
+		e.preventDefault();
+		var origin_sub_total = parseFloat($("#order-sub-total").text());
+		var total = 0;
+
+		$('.discount-item-row.selected-item').each(function(i){
+			var amount = parseFloat($(this).find('#item-total-price').text());		
+			total = total + Math.abs(amount);	
+			$(this).remove();
+		});
+		$("#order-sub-total").text(origin_sub_total + total);
+	});
+
+	// Pay Discount for Payment
+	$("#pay-discount").on('click', function(e){
+		e.preventDefault();
+		$("#loading_wrapper").show();
+		var sale_id = $('#sale-id').text();
+		var discount_items = JSON.stringify(get_discount_item_rows());
+		var overall_discount = $("#order-discount").text();
+		var sub_total = $('#order-sub-total').text();		
+		var ajax_url = "/origami/" + sale_id + "/discount";	
+
+		var params = { 'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount };
+
+		$.ajax({
+			type: "POST",
+			url: ajax_url,
+			data: params,
+			success:function(result){	
+				$("#loading_wrapper").hide(); 
+				swal({
+			        title: "Information!",
+			        text: result.status,
+			    }, function () {
+			    	if(result.table_type == "Table"){
+			    		window.location.href = "/origami/table/" + result.table_id
+			    	}
+			    	else {
+			    		window.location.href = "/origami/room/" + result.table_id
+			    	}
+			    });	    			    	
+			}
+		});
+	});
+
+	// Remove selected given discount item
+	$("#remove-item-discount").on('click', function(e){
+		e.preventDefault();
+		var sale_id = $('#sale-id').text();
+		var discount_items = [];
+
+		// Selected Items		
+		var sale_items = get_selected_sale_items();	
+		console.log(sale_items.length);
+		if(sale_items.length == 0){
+			//swal("Information!", "You have no selected item!");
+			swal ( "Oops" ,  "You have no selected item!" ,  "error" );		
+			return;				
+		}
+
+		for(var i=0;i < sale_items.length;i++){
+			if(sale_items[i].price < 0){
+				discount_items.push(sale_items[i]);
+			}
+			else {
+				swal ("Oops" , "You have no selected item!" ,  "error" );
+				return;	
+			}
+		}
+
+		var params = { 'sale_id': sale_id, 'discount_items': JSON.stringify(discount_items) };
+		$.ajax({
+			type: "POST",
+			url: "/origami/" + sale_id + "/remove_discount_items",
+			data: params,
+			success: function(result){
+				swal({
+			        title: "Information!",
+			        text: result.status,
+			        type: "success",
+			    }, function () {
+			    	if(result.table_type == "Table"){
+			    		window.location.href = "/origami/table/" + result.table_id
+			    	}
+			    	else {
+			    		window.location.href = "/origami/room/" + result.table_id
+			    	}
+			    });			
+			}
+		});
+	});
+
+	$("#remove-all").on('click', function(e){
+		e.preventDefault();
+		var sale_id = $('#sale-id').text();
+		$.ajax({
+			type: "GET",
+			url: "/origami/" + sale_id + "/remove_all_discount",
+			success: function(result){
+				swal({
+			        title: "Information!",
+			        text: result.status,
+			        type: "success",
+			    }, function () {
+			    	if(result.table_type == "Table"){
+			    		window.location.href = "/origami/table/" + result.table_id
+			    	}
+			    	else {
+			    		window.location.href = "/origami/room/" + result.table_id
+			    	}
+			    });			
+			}
+		});
+	});
+
+	// Pay Discount for membership
+	$("#member-discount").on('click', function(e){
+		e.preventDefault();
+		var sale_id = $('#sale-id').text();
+		var sub_total = $('#order-sub-total').text();		
+		var ajax_url = "/origami/" + sale_id + "/member_discount";	
+
+		// Selected Account
+		//var account_types = JSON.stringify(get_selected_account_types());
+
+		// if($('.accounts-type').hasClass('selected-account') == true){
+
+		// var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
+
+		var params = {'sale_id':sale_id, 'sub_total':sub_total };
+
+		$.ajax({
+			type: "POST",
+			url: ajax_url,
+			data: params,
+			success:function(result){
+				 if (result.status == "Success") {
+					type   = 'success'
+					btn_color = 'green'
+				}else{
+					type   = 'error'
+					btn_color = 'red'
+				}
+				swal({
+			        title: "Information!",
+			        text: result.status,
+			        confirmButtonText: 'OK',
+			        confirmButtonColor: btn_color,
+			    }, function () {
+			    	if(result.table_type == "Table"){
+			    		window.location.href = "/origami/table/" + result.table_id
+			    	}
+			    	else {
+			    		window.location.href = "/origami/room/" + result.table_id
+			    	}
+			    });
+			}
+		});
+		
+	});//end member discount
+});
+
+ /* Remove Selection */
+ function selection_remove(){
+ 	$(".item-row").removeClass("selected-item");
+ 	$(".discount_item_row").removeClass("selected-item");
+ 	$(".accounts-type").removeClass("selected-account");
+ }
+
+ /* Get Item rows but not discount*/
+ function get_item_rows(){
+ 	var sale_items = [];	
+ 	$('.item-row').not('.discount-item-row').each(function(i){
+ 		var sale_item = {};
+ 		sale_item.id = $(this).attr('id').substr(0,16);
+ 		sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
+ 		sale_item.account_id = $(this).find('#item-account-type').text();
+ 		sale_item.price = $(this).find('#item-total-price').text();
+ 		sale_items.push(sale_item);
+ 	});	
+ 	return sale_items;
+ }
+
+ /* Get discount Item rows */
+ function get_discount_item_rows(){
+ 	var sale_items = [];	
+ 	$('.discount-item-row').each(function(i){
+ 		var sale_item = {};
+ 		sale_item.id = $(this).attr('id');
+ 		sale_item.name = $(this).find('#item-name-price').text();
+ 		sale_item.account_id = $(this).find('#item_account_type').text();
+ 		sale_item.price = $(this).find('#item-total-price').text();
+ 		sale_items.push(sale_item);
+ 	});	
+ 	return sale_items;
+ }
+
+ /* Get discount Item rows */
+// function get_selected_discount_items(){
+// 	var sale_items = [];	
+// 	$('.discount-item-row').hasClass('.selected-item').each(function(i){
+// 		var sale_item = {};
+// 		sale_item.id = $(this).attr('id');
+// 		sale_item.name = $(this).find('#item-name-price').text();
+// 		sale_item.account_id = $(this).find('#item_account_type').text();
+// 		sale_item.price = $(this).find('#item-total-price').text();
+// 		sale_items.push(sale_item);
+// 	});	
+// 	return sale_items;
+// }
+
+/* Get Selected Sale Item's ID and Price */
+function get_selected_sale_items(){
+	var sale_items = [];	
+	$('.item-row.selected-item').each(function(i){
+		var sale_item = {};
+		sale_item.id = $(this).attr('id').substr(0,16);
+		sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
+		sale_item.account_id = $(this).find('#item-account-type').text();
+		sale_item.price = $(this).find('#item-total-price').text();
+		sale_items.push(sale_item);
+	});	
+	return sale_items;
+}
+
+/* Get Selected Accounts ID and Price */
+function get_selected_account_types(){	
+	var account_types = [];
+
+	$('.selected-account').each(function(i){
+		var account= {};
+		account.id = $(this).attr('id').substr(8);
+		account.name = $(this).text();			
+		account_types.push(account);
+	});	
+	return account_types;
+}
+
+/* Calculate Overall Discount*/
+function calculate_overall_discount(type, amount){
+	var origin_sub_total = parseFloat($("#order-sub-total").text());	
+	var dis_amount = 0;
+	var sub_total = 0;
+	var total_discount = 0;
+
+	// For Net Pay
+	if(type == 0){
+		total_discount = amount;
+	}
+
+	// For Percentage Pay
+	if(type == 1){
+		if(amount > 100 ){
+			swal({
+			    title:"Oops!",
+			    text:'Percentage Value over 100!',
+			    type: "error",
+			    confirmButtonText: 'OK',
+			    confirmButtonColor:"red"
+			});	
+		}
+		else{
+			total_discount = (origin_sub_total * amount)/100;
+		}
+	}
+
+	$("#order-discount").text(total_discount);
+}
+
+/* Calculate Items Discount*/
+function calculate_item_discount(type, amount, sale_items, account_types){
+	var origin_sub_total = parseFloat($("#order-sub-total").text());	
+	var dis_amount = 0;
+	var sub_total = 0;
+	var total_discount = 0;
+	// For Net Pay
+	if(type == 0){
+		dis_amount = (0 - amount);
+		if(sale_items.length > 0){
+			for(var i=0;i < sale_items.length;i++){
+				// if(account_types.length > 0){
+				// 	for(var j=0; j < account_types.length; j++){
+				// 		if(sale_items[i].account_id == account_types[j].id){						
+				// 			// Discount Items
+				// 	        var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount);
+				// 	        $("#order-items-table tbody").append(discount_item_row);
+				// 	        total_discount = total_discount + amount;
+				// 		}
+				// 	}
+				// }
+				// else {
+					var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+					$("#order-items-table tbody").append(discount_item_row);
+					total_discount = total_discount + amount;
+				// }
+			}
+		}
+
+		// No Needs For Auto Selected
+		// if(account_types.length > 0){			
+		// 	var item_rows=get_item_rows();
+		// 	if(item_rows.length > 0){
+		// 		for(var k=0; k < item_rows.length; k++){
+		// 			for(var j=0; j < account_types.length; j++){
+		// 				if(item_rows[k].account_id == account_types[j].id){
+		// 					// Discount Items
+		// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
+		// 			        $("#order-items-table tbody").append(discount_item_row);
+		// 			        total_discount = total_discount + amount;
+		// 				}
+		// 			}
+		// 		}
+		// 	}
+		// 	else {
+		// 		alert("No Items!");
+		// 	}						
+		// }
+
+		sub_total = origin_sub_total - total_discount;
+	}
+
+	// For Percentage Pay
+	if(type == 1){
+		if(amount > 100 ){
+			swal({
+			    title:"Oops!",
+			    text:'Percentage Value over 100!',
+			    type: "error",
+			    confirmButtonText: 'OK',
+			    confirmButtonColor:"red"
+			});				
+		}
+		else{
+			// Check sale items exists
+			if(sale_items.length > 0){
+				for(var i=0;i < sale_items.length;i++){
+					// if(account_types.length > 0){
+					// 	for(var j=0; j < account_types.length; j++){
+					// 		if(sale_items[i].account_id == account_types[j].id){						
+					// 			// Discount Items
+					// 			dis_amount = 0 - ((sale_items[i].price * amount)/100);
+					// 	        var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+					// 	        $("#order-items-table tbody").append(discount_item_row);
+					// 	        total_discount = total_discount + dis_amount;
+					// 		}
+					// 	}
+					// }
+					// else {
+						dis_amount = 0 - ((sale_items[i].price * amount)/100);
+						var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+						$("#order-items-table tbody").append(discount_item_row);
+						total_discount = total_discount + dis_amount;
+					// }
+				}
+				sub_total = origin_sub_total + total_discount;
+			}
+		}
+		// No Needs For Auto Selected
+		// Check account types exists
+		// if(account_types.length > 0){			
+		// 	var item_rows=get_item_rows();
+		// 	console.log(account_types);
+		// 	if(item_rows.length > 0){
+		// 		for(var k=0; k < item_rows.length; k++){
+		// 			for(var j=0; j < account_types.length; j++){
+		// 				if(item_rows[k].account_id == account_types[j].id){
+		// 					// Discount Items							
+		// 					dis_amount = 0 - ((item_rows[k].price * amount)/100);
+		// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
+		// 			        $("#order-items-table tbody").append(discount_item_row);
+		// 			        total_discount = total_discount + dis_amount;
+		// 				}
+		// 			}
+		// 		}
+		// 	}
+		// 	else {
+		// 		alert("No Items!");
+		// 	}						
+		// }		
+	}
+	
+	$("#order-sub-total").text(sub_total);
+}
+
+function item_row_template(type, item, discount_amount, amount){
+	var dis_str = "-discount";
+	if(type == 1){
+		dis_str = dis_str + "(" + amount + "%)"
+	}
+	var discount_item_row = "<tr class='discount-item-row' id='" + item.id + "'>" +
+	"<td style='width: 60%; text-align: left;'>" + 
+	"<span id='item_account_type' class='hidden'>" + 
+	item.account_id +
+	"</span>" + 
+	"<span id='item-name-price'>" + 
+	item.name + dis_str +
+	"</span>" + 
+	"</td>" +
+	"<td style='width: 20%; text-align: right;'>" + 
+	"<span id='item-qty'>1</span>" +
+	"</td>" +
+	"<td style='width: 20%; text-align: right;'>" + 
+	"<span id='item-total-price'>" + 
+	discount_amount +
+	"</span>" + 
+	"</td>" +
+	"</tr>";
+	return  discount_item_row; 					   		
+}
+
+</script>
diff --git a/config/routes.rb b/config/routes.rb
index 7d21aeb5..58fd5ffd 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -220,6 +220,8 @@ scope "(:locale)", locale: /en|mm/ do
     post "bank_integration/settle_trans", to: "bank_integration#settle_trans", as:"settle_trans"
     post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
 
+    #split bill
+    get 'table/:dining_id/split_bill' => 'split_bill#index', as:'split_bill_index'
   end
 
   #--------- Waiter/Ordering Station ------------#
diff --git a/spec/controllers/origami/split_bill_controller_spec.rb b/spec/controllers/origami/split_bill_controller_spec.rb
new file mode 100644
index 00000000..2ab33eb0
--- /dev/null
+++ b/spec/controllers/origami/split_bill_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::SplitBillController, type: :controller do
+
+end
diff --git a/spec/helpers/origami/split_bill_helper_spec.rb b/spec/helpers/origami/split_bill_helper_spec.rb
new file mode 100644
index 00000000..db065ff0
--- /dev/null
+++ b/spec/helpers/origami/split_bill_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Origami::SplitBillHelper. For example:
+#
+# describe Origami::SplitBillHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Origami::SplitBillHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From d1fd92bfd326b9d36e7521ad0bfed00225475f0e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 2 Feb 2018 13:41:38 +0630
Subject: [PATCH 148/651] split bill ui

---
 .../origami/split_bill_controller.rb          |  16 +-
 app/views/origami/home/show.html.erb          |   4 +-
 app/views/origami/split_bill/index.html.erb   | 582 +++++-------------
 config/routes.rb                              |   2 +-
 4 files changed, 183 insertions(+), 421 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 24ded975..87b8644d 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -2,6 +2,20 @@ class Origami::SplitBillController < BaseOrigamiController
 
 	def index
 		dining_id = params[:dining_id]
-		@table = DiningFacility.find_by_id(dining_id)
+		@table = DiningFacility.find(dining_id) 
+		@booking = @table.get_booking
+		@order_items = Array.new
+		if @booking
+	      @booking.booking_orders.each do |booking_order|
+	        @order = Order.find(booking_order.order_id)
+	        if (@order.status == "new")
+	          @order.order_items.each do |item|
+	            @order_items.push(item)
+	          end
+	        end
+	      end
+	    else
+	      @booking = nil
+	    end
 	end
 end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index bc068a1d..f9599783 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -674,7 +674,7 @@
     $('#request_bills').click(function () {
         swal({
             title: "Alert",
-            text: "Are you sure want to Split?",
+            text: "Do you want to Split bill?",
             type: "warning",
             showCancelButton: true,
             confirmButtonColor: "#DD6B55",
@@ -683,7 +683,7 @@
         }, function (isConfirm) {
           if (isConfirm) {
             var dining_id = "<%= @dining.id %>";
-            window.location.href = '/origami/table/' + dining_id + "/split_bill";
+            window.location.href = '/origami/table/' + dining_id + "/split_bills";
           }else{
             var order_id = $('#save_order_id').attr('data-order');
             var ajax_url = "/origami/" + order_id + "/request_bills";
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 0691ca2c..9aa09d37 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -1,7 +1,7 @@
  <div class="container-fluid">
- <div id="loading_wrapper" style="display:none;">
-    <div id="loading"></div>
- </div>
+ 	<div id="loading_wrapper" style="display:none;">
+ 		<div id="loading"></div>
+ 	</div>
  	<div class="row">
  		<!-- Column One -->
  		<div class="col-lg-6 col-md-6 col-sm-6">
@@ -13,84 +13,58 @@
       <div class="card-block">
       	<div class="card-title row">
       		<div class="col-lg-6 col-md-6 col-sm-6">
-      		    <span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
-      		    <span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
+      			<span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
+      			<span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
+      			<p class="m-l-10">Order No: <span id="order_no"><%=@order.order_id rescue ' '%></span></p>
       		</div>
       		<div class="col-lg-6 col-md-6 col-sm-6 text-right">
-      			<p class="m-r-10">Date:  <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+      			<p class="m-r-10">Date:  <span id="order_date"> <%=@order.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
       		</div>
       	</div>
       	<div id="order-detail-slimscroll" data-height="160">
-      	<div class="card-text dining">
-      		<table class="table table-default" id="order-items-table">
-      			<thead>
-      				<tr>
-      					<th class="item-name">Items</th>
-      					<th class="item-attr">QTY</th>
+      		<div class="card-text dining">
+      			<table class="table table-default" id="order-items-table">
+      				<thead>
+      					<tr>
+      						<th class="item-name">Items</th>
+      						<th class="item-attr">QTY</th>
       						<th class="item-attr">Price</th>
-      						</tr>
-      					</thead>
-      					<tbody>
-      						<% sub_total = 0 %>
-      						<% @sale_data.sale_items.each do |sale_item| %>
-      						<% 
-      						sub_total += sale_item.qty*sale_item.unit_price 
-      						if sale_item.price != 0 && sale_item.remark != "void" && sale_item.remark != "foc"
-      							%>
-      							<tr class="item-row" id=<%= sale_item.sale_item_id %> >
-      								<td style="width:60%; text-align:left">
-      									<span id="item-account-type" class="hidden"><%=sale_item.account_id%></span>
-      									<span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
-      								</td>
-      								<td style="width:20%; text-align:right">
-      									<span id="item-qty"><%=sale_item.qty%></span>
-      								</td>
-      								<td style="width:20%; text-align:right">
-      									<span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span>
-      								</td>
-      							</tr>
-      							<%
-      						end
-      					end 
+      					</tr>
+      				</thead>
+      				<tbody>
+      					<% sub_total = 0 %>
+      					<% @order_items.each do |order_item| %>
+      					<% 
+      					sub_total += order_item.qty*order_item.price 
       					%>
-      				</tbody>
-      			</table>
-      		</div>
-      		</div>
-      		<div class="card-footer">
-      			<table class="table" id="order-charges-table" border="0">
-      				<tr>
-      					<td class="charges-name"><strong>Sub Total:</strong></td>
-      					<td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
-      				</tr>
-              <!-- <tr>
-                <td class="charges-name"><strong>Food:</strong></td>
-                <td class="item-attr"><strong id="order-food"></strong></td>
-              </tr>
-              <tr>
-                <td class="charges-name"><strong>Beverage:</strong></td>
-                <td class="item-attr"><strong id="order-beverage"></strong></td>
-            </tr> -->
-            <tr>
-            	<%if @sale_data.discount_type == 'member_discount'%>
-            	<td class="charges-name"><strong>Member Discount:</strong></td>
-            	<%else%>
-            	<td class="charges-name"><strong>Discount:</strong></td>
-            	<%end%>
-
-            	<td class="item-attr">(<strong id="order-discount"><%=@sale_data.total_discount rescue 0%></strong>)</td>
-            </tr>
-            <tr class="hidden">
-            	<td class="charges-name"><strong>Tax:</strong></td>
-            	<td class="item-attr"><strong id="order-Tax"><%=@sale_data.total_tax rescue 0%></strong></td>
-            </tr>
-            <tr class="hidden">
-            	<td class="charges-name"><strong>Grand Total:</strong></td>
-            	<td class="item-attr"><strong id="order-grand-total"><%=@sale_data.grand_total rescue 0%></strong></td>
-            </tr>
-        </table>
-    </div>
-</div>
+      					<tr class="item-row" id=<%= order_item.order_items_id %> >
+      						<td style="width:60%; text-align:left">
+      							<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
+      							<span id="item-name-price"><%=order_item.item_name%>@<%=order_item.price%></span>
+      						</td>
+      						<td style="width:20%; text-align:right">
+      							<span id="item-qty"><%=order_item.qty%></span>
+      						</td>
+      						<td style="width:20%; text-align:right">
+      							<span id="item-total-price"><%=(order_item.qty*order_item.price)%></span>
+      						</td>
+      					</tr>
+      					<%
+      				end 
+      				%>
+      			</tbody>
+      		</table>
+      	</div>
+      </div>
+      <div class="card-footer">
+      	<table class="table" id="order-charges-table" border="0">
+      		<tr>
+      			<td class="charges-name"><strong>Sub Total:</strong></td>
+      			<td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
+      		</tr>
+      	</table>
+      </div>
+  </div>
 </div>
 </div>
 <!-- Column One -->
@@ -100,173 +74,116 @@
 	<!-- Discount Amount -->
 	<div class="card">
 		<div class="card-header">
-			<div><strong id="order-title">Discount Control</strong></div>
+			<div><strong id="order-title">Split Bill Control</strong></div>
 		</div>
 		<div class="card-block">
 			<div class="card-title">
 				<div class="form-horizontal">
 					<div class="col-md-12">	
-						<div class="form-group">											
-							<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
+						<div class="form-group">	
+							<input type="text" id="per_person" name="per_person" value="" class="form-control" placeholder="Bill per person" onkeypress="return isNumberKey(event);" />
 						</div>
-						<br>
-						<div class="form-group">			
-							<%
-							@accounts.each do |acc|								
-								%>
-								<button id="account-<%= acc.id %>" class="accounts-type btn bg-default"><%= acc.title %></button>
-								<% end %>
-							</div>
-						</div>					
-					</div>
+					</div>					
 				</div>
+			</div>
 
-				<hr />
-				<div class="p-l-20">
-					<div class="row">
-					<div class="col-md-8">
+			<hr />
+
+			<div class="m-t-10 p-l-20">
+				<div class="row">
+					<div class="col-lg-8 col-md-8 col-sm-8">
 						<div class="row bottom">
-							<div class="col-md-3">
-								<div class="fluid cashier_number" data-value="5" data-type="add">5%</div>
-							</div>
-							<div class="col-md-9">
-								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="1" data-type="num" style="margin-left: 6px;">1</div>
-									<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
-									<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
-								</div>
-							</div>
-						</div>
-
-						<div class="row bottom clearfix">
-							<div class="col-md-3">
-								<div class="fluid cashier_number" data-value="10" data-type="add">10%</div>
-							</div>
-							<div class="col-md-9">
-								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="4" data-type="num" style="margin-left: 6px;">4</div>
-									<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
-									<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
-								</div>
-							</div>
+							<div class="col-md-3 cashier_number border-left" data-value="1" data-type="num">1</div>
+							<div class="col-md-3 left cashier_number border-left" data-value="2" data-type="num">2</div>
+							<div class="col-md-3 left cashier_number border-left" data-value="3" data-type="num">3</div>
 						</div>
 
 						<div class="row bottom">
-							<div class="col-md-3">
-								<div class="fluid cashier_number" data-value="15" data-type="add">15%</div>
-							</div>
-							<div class="col-md-9">
-								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="7" data-type="num" style="margin-left: 6px;">7</div>
-									<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
-									<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
-								</div>
-							</div>
+							<div class="col-md-3 cashier_number border-left" data-value="4" data-type="num">4</div>
+							<div class="col-md-3 left cashier_number border-left" data-value="5" data-type="num">5</div>
+							<div class="col-md-3 left cashier_number border-left" data-value="6" data-type="num">6</div>
 						</div>
 
 						<div class="row bottom">
-							<div class="col-md-3">
-								<div class="fluid cashier_number" data-value="20" data-type="add">20%</div>
-							</div>
-							<div class="col-md-9">
-								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="0" data-type="num" style="margin-left: 6px;">0</div>
-									<div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
-									<div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
-								</div>
-							</div>
+							<div class="col-md-3 cashier_number border-left" data-value="7" data-type="num">7</div>
+							<div class="col-md-3 left cashier_number border-left" data-value="8" data-type="num">8</div>
+							<div class="col-md-3 left cashier_number border-left" data-value="9" data-type="num">9</div>
 						</div>
 
 						<div class="row bottom">
-							<div class="col-md-3">
-								<div class="fluid cashier_number" data-value="30" data-type="add">30%</div>
-							</div>
-							<div class="col-md-9">
-								<div class="row">
-									<div class="col-md-3 cashier_number" style="margin-left: 6px;"></div>
-									<div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
-									<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
-								</div>
-							</div>
+							<div class="col-md-3 cashier_number border-left" data-value="0" data-type="num">0</div>
+							<div class="col-md-3 left cashier_number red border-left" data-type="del">DEL</div>
+							<div class="col-md-3 left cashier_number green border-left" data-type="clr">CLR</div>
 						</div>
 					</div>
 					<div class="col-md-4">
 						<div class="form-group">
-							<button id="net" class="btn bg-info fluid action-btn">Nett</button>
-							<button id="percentage" class="btn bg-primary fluid action-btn" style="font-size: 12.4px">Percentage</button>	
-							<button id="remove-item" class="btn bg-default fluid action-btn">Clear Discount</button>
+							<button id="net" class="btn bg-info fluid action-btn">Order Item Split</button>
+							<button id="percentage" class="btn bg-primary fluid action-btn" style="font-size: 12.4px">Per Person</button>	
+							<button id="remove-item" class="btn bg-default fluid action-btn">Clear Split Bill</button>
 						</div>
 					</div>
-					</div>	
-				</div>
+				</div>	
 			</div>
 		</div>
 	</div>
+</div>
 
-	<!-- Column Three -->
-	<div class="col-lg-1 col-md-1 col-sm-1">
-		<!-- Action Panel -->
-		<div>
-			<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
-			<button id="remove-item-discount" class="btn btn-primary btn- action-btn">Remove Item Discount</button>
-			<button id="remove-all" class="btn bg-primary btn-block action-btn">Remove All</button>
-			<button id="pay-discount" class="btn bg-primary btn-block action-btn">Enter</button>
-			<% if @member_discount%>
-			<!-- <hr />		
-			<button id="member-discount" class="btn btn-success btn-block action-btn
-			<%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button> -->
-			<%end %>
-		</div>
+<!-- Column Three -->
+<div class="col-lg-1 col-md-1 col-sm-1">
+	<!-- Action Panel -->
+	<div>
+		<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
+		<button id="remove-item-discount" class="btn btn-primary btn- action-btn">Remove Item Split</button>
+		<button id="remove-all" class="btn bg-primary btn-block action-btn">Remove All</button>
+		<button id="pay-discount" class="btn bg-primary btn-block action-btn">Enter</button>
 	</div>
 </div>
 </div>
+</div>
 
 <script type="text/javascript">
 	$(document).ready(function(){
 
 		$('#back').on('click',function(){
-		    var id       = $("#table_id").text();
-		    var type     = $("#table_type").text();
-		    console.log(id);
-		    console.log(type);
-		    if (type=="Table") {
-		      window.location.href = '/origami/table/'+id
-		    }else{
-		     window.location.href = '/origami/room/'+id
-		   }
-		 })
+			var id       = $("#table_id").text();
+			var type     = $("#table_type").text();
+			if (type=="Table") {
+				window.location.href = '/origami/table/'+id
+			}else{
+				window.location.href = '/origami/room/'+id
+			}
+		})
 
 		$(".cashier_number").on('click', function(event){
 			if(event.handled !== true) {
 				var original_value=0;
-				original_value = $('#discount-amount').val();
-
+				original_value = $('#per_person').val();
 				var input_type = $(this).attr("data-type");
-
 				switch (input_type) {
 					case 'num':
-					var input_value = $(this).attr("data-value");
-					if (original_value == "0.0"){
-						$('#discount-amount').val(input_value);						
-					}
-					else{
-						$('#discount-amount').val(original_value + '' + input_value);						
-					}
+						var input_value = $(this).attr("data-value");
+						if (original_value == "0"){
+							$('#per_person').val(input_value);						
+						}
+						else{
+							$('#per_person').val(original_value + '' + input_value);						
+						}
 					break;
 
 					case 'add':
-					var input_value = $(this).attr("data-value");
-					amount = parseInt(input_value);
-					$('#discount-amount').val(amount);										
+						var input_value = $(this).attr("data-value");
+						amount = parseInt(input_value);
+						$('#per_person').val(amount);										
 					break;
 
 					case 'del' :
-					var discount_text=$('#discount-amount').val();
-					$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));		
+						var discount_text=$('#per_person').val();
+						$('#per_person').val(discount_text.substr(0,discount_text.length-1));		
 					break;
 
 					case 'clr':
-					$('#discount-amount').val("0.0");	            
+						$('#per_person').val("0");	            
 					break;
 				}
 				event.handled = true;
@@ -295,28 +212,6 @@
 		}
 	});
 
-	// Select for account types
-	$(".accounts-type").on('click', function(e){
-		var account_id = $(this).attr('id').substr(8);
-
-		if($(this).hasClass('selected-account') == true){
-			$(this).removeClass('selected-account');
-			$(".item-row").each(function(i){
-				if($(this).children().find("#item-account-type").text() == account_id){
-					$(this).removeClass("selected-item");
-				}
-			});
-		}
-		else {
-			$(this).addClass('selected-account');
-			$(".item-row").each(function(i){
-				if($(this).children().find("#item-account-type").text() == account_id){
-					$(this).addClass("selected-item");
-				}
-			});
-		}        
-	});
-
 	// Calculate Net Discount for Payment
 	$("#net").on('click', function(e){
 		e.preventDefault();
@@ -398,16 +293,16 @@
 			success:function(result){	
 				$("#loading_wrapper").hide(); 
 				swal({
-			        title: "Information!",
-			        text: result.status,
-			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
-			    	}
-			    });	    			    	
+					title: "Information!",
+					text: result.status,
+				}, function () {
+					if(result.table_type == "Table"){
+						window.location.href = "/origami/table/" + result.table_id
+					}
+					else {
+						window.location.href = "/origami/room/" + result.table_id
+					}
+				});	    			    	
 			}
 		});
 	});
@@ -444,17 +339,17 @@
 			data: params,
 			success: function(result){
 				swal({
-			        title: "Information!",
-			        text: result.status,
-			        type: "success",
-			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
-			    	}
-			    });			
+					title: "Information!",
+					text: result.status,
+					type: "success",
+				}, function () {
+					if(result.table_type == "Table"){
+						window.location.href = "/origami/table/" + result.table_id
+					}
+					else {
+						window.location.href = "/origami/room/" + result.table_id
+					}
+				});			
 			}
 		});
 	});
@@ -467,73 +362,24 @@
 			url: "/origami/" + sale_id + "/remove_all_discount",
 			success: function(result){
 				swal({
-			        title: "Information!",
-			        text: result.status,
-			        type: "success",
-			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
-			    	}
-			    });			
+					title: "Information!",
+					text: result.status,
+					type: "success",
+				}, function () {
+					if(result.table_type == "Table"){
+						window.location.href = "/origami/table/" + result.table_id
+					}
+					else {
+						window.location.href = "/origami/room/" + result.table_id
+					}
+				});			
 			}
 		});
 	});
-
-	// Pay Discount for membership
-	$("#member-discount").on('click', function(e){
-		e.preventDefault();
-		var sale_id = $('#sale-id').text();
-		var sub_total = $('#order-sub-total').text();		
-		var ajax_url = "/origami/" + sale_id + "/member_discount";	
-
-		// Selected Account
-		//var account_types = JSON.stringify(get_selected_account_types());
-
-		// if($('.accounts-type').hasClass('selected-account') == true){
-
-		// var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
-
-		var params = {'sale_id':sale_id, 'sub_total':sub_total };
-
-		$.ajax({
-			type: "POST",
-			url: ajax_url,
-			data: params,
-			success:function(result){
-				 if (result.status == "Success") {
-					type   = 'success'
-					btn_color = 'green'
-				}else{
-					type   = 'error'
-					btn_color = 'red'
-				}
-				swal({
-			        title: "Information!",
-			        text: result.status,
-			        confirmButtonText: 'OK',
-			        confirmButtonColor: btn_color,
-			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
-			    	}
-			    });
-			}
-		});
-		
-	});//end member discount
-});
-
+	
  /* Remove Selection */
  function selection_remove(){
  	$(".item-row").removeClass("selected-item");
- 	$(".discount_item_row").removeClass("selected-item");
- 	$(".accounts-type").removeClass("selected-account");
  }
 
  /* Get Item rows but not discount*/
@@ -564,20 +410,6 @@
  	return sale_items;
  }
 
- /* Get discount Item rows */
-// function get_selected_discount_items(){
-// 	var sale_items = [];	
-// 	$('.discount-item-row').hasClass('.selected-item').each(function(i){
-// 		var sale_item = {};
-// 		sale_item.id = $(this).attr('id');
-// 		sale_item.name = $(this).find('#item-name-price').text();
-// 		sale_item.account_id = $(this).find('#item_account_type').text();
-// 		sale_item.price = $(this).find('#item-total-price').text();
-// 		sale_items.push(sale_item);
-// 	});	
-// 	return sale_items;
-// }
-
 /* Get Selected Sale Item's ID and Price */
 function get_selected_sale_items(){
 	var sale_items = [];	
@@ -621,11 +453,11 @@ function calculate_overall_discount(type, amount){
 	if(type == 1){
 		if(amount > 100 ){
 			swal({
-			    title:"Oops!",
-			    text:'Percentage Value over 100!',
-			    type: "error",
-			    confirmButtonText: 'OK',
-			    confirmButtonColor:"red"
+				title:"Oops!",
+				text:'Percentage Value over 100!',
+				type: "error",
+				confirmButtonText: 'OK',
+				confirmButtonColor:"red"
 			});	
 		}
 		else{
@@ -647,44 +479,12 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 		dis_amount = (0 - amount);
 		if(sale_items.length > 0){
 			for(var i=0;i < sale_items.length;i++){
-				// if(account_types.length > 0){
-				// 	for(var j=0; j < account_types.length; j++){
-				// 		if(sale_items[i].account_id == account_types[j].id){						
-				// 			// Discount Items
-				// 	        var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount);
-				// 	        $("#order-items-table tbody").append(discount_item_row);
-				// 	        total_discount = total_discount + amount;
-				// 		}
-				// 	}
-				// }
-				// else {
-					var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-					$("#order-items-table tbody").append(discount_item_row);
-					total_discount = total_discount + amount;
-				// }
+				var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+				$("#order-items-table tbody").append(discount_item_row);
+				total_discount = total_discount + amount;
 			}
 		}
 
-		// No Needs For Auto Selected
-		// if(account_types.length > 0){			
-		// 	var item_rows=get_item_rows();
-		// 	if(item_rows.length > 0){
-		// 		for(var k=0; k < item_rows.length; k++){
-		// 			for(var j=0; j < account_types.length; j++){
-		// 				if(item_rows[k].account_id == account_types[j].id){
-		// 					// Discount Items
-		// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
-		// 			        $("#order-items-table tbody").append(discount_item_row);
-		// 			        total_discount = total_discount + amount;
-		// 				}
-		// 			}
-		// 		}
-		// 	}
-		// 	else {
-		// 		alert("No Items!");
-		// 	}						
-		// }
-
 		sub_total = origin_sub_total - total_discount;
 	}
 
@@ -692,89 +492,37 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 	if(type == 1){
 		if(amount > 100 ){
 			swal({
-			    title:"Oops!",
-			    text:'Percentage Value over 100!',
-			    type: "error",
-			    confirmButtonText: 'OK',
-			    confirmButtonColor:"red"
+				title:"Oops!",
+				text:'Percentage Value over 100!',
+				type: "error",
+				confirmButtonText: 'OK',
+				confirmButtonColor:"red"
 			});				
 		}
 		else{
 			// Check sale items exists
 			if(sale_items.length > 0){
 				for(var i=0;i < sale_items.length;i++){
-					// if(account_types.length > 0){
-					// 	for(var j=0; j < account_types.length; j++){
-					// 		if(sale_items[i].account_id == account_types[j].id){						
-					// 			// Discount Items
-					// 			dis_amount = 0 - ((sale_items[i].price * amount)/100);
-					// 	        var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-					// 	        $("#order-items-table tbody").append(discount_item_row);
-					// 	        total_discount = total_discount + dis_amount;
-					// 		}
-					// 	}
-					// }
-					// else {
-						dis_amount = 0 - ((sale_items[i].price * amount)/100);
-						var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-						$("#order-items-table tbody").append(discount_item_row);
-						total_discount = total_discount + dis_amount;
-					// }
+					dis_amount = 0 - ((sale_items[i].price * amount)/100);
+					var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+					$("#order-items-table tbody").append(discount_item_row);
+					total_discount = total_discount + dis_amount;
 				}
 				sub_total = origin_sub_total + total_discount;
 			}
-		}
-		// No Needs For Auto Selected
-		// Check account types exists
-		// if(account_types.length > 0){			
-		// 	var item_rows=get_item_rows();
-		// 	console.log(account_types);
-		// 	if(item_rows.length > 0){
-		// 		for(var k=0; k < item_rows.length; k++){
-		// 			for(var j=0; j < account_types.length; j++){
-		// 				if(item_rows[k].account_id == account_types[j].id){
-		// 					// Discount Items							
-		// 					dis_amount = 0 - ((item_rows[k].price * amount)/100);
-		// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
-		// 			        $("#order-items-table tbody").append(discount_item_row);
-		// 			        total_discount = total_discount + dis_amount;
-		// 				}
-		// 			}
-		// 		}
-		// 	}
-		// 	else {
-		// 		alert("No Items!");
-		// 	}						
-		// }		
+		}	
 	}
 	
 	$("#order-sub-total").text(sub_total);
 }
 
-function item_row_template(type, item, discount_amount, amount){
-	var dis_str = "-discount";
-	if(type == 1){
-		dis_str = dis_str + "(" + amount + "%)"
-	}
-	var discount_item_row = "<tr class='discount-item-row' id='" + item.id + "'>" +
-	"<td style='width: 60%; text-align: left;'>" + 
-	"<span id='item_account_type' class='hidden'>" + 
-	item.account_id +
-	"</span>" + 
-	"<span id='item-name-price'>" + 
-	item.name + dis_str +
-	"</span>" + 
-	"</td>" +
-	"<td style='width: 20%; text-align: right;'>" + 
-	"<span id='item-qty'>1</span>" +
-	"</td>" +
-	"<td style='width: 20%; text-align: right;'>" + 
-	"<span id='item-total-price'>" + 
-	discount_amount +
-	"</span>" + 
-	"</td>" +
-	"</tr>";
-	return  discount_item_row; 					   		
+//check for isNumber
+function isNumberKey(evt) {
+  var charCode = (evt.which) ? evt.which : event.keyCode;
+  if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
+      return false;
+  } else {
+      return true;
+  }      
 }
-
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 58fd5ffd..12c263d5 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -221,7 +221,7 @@ scope "(:locale)", locale: /en|mm/ do
     post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
 
     #split bill
-    get 'table/:dining_id/split_bill' => 'split_bill#index', as:'split_bill_index'
+    get '/table/:dining_id/split_bills' => 'split_bill#index', as:'split_bill_index'
   end
 
   #--------- Waiter/Ordering Station ------------#

From 2821f4bb1c7f57585ab884f3069a0f7481b193da Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 2 Feb 2018 13:42:37 +0630
Subject: [PATCH 149/651] change booking_id

---
 app/controllers/api/orders_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index cab929bd..2e9602c8 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -184,9 +184,9 @@ class Api::OrdersController <  Api::ApiController
   #checked checkin and checkout time
   def checkin_checkout_time(booking_id)
     status = true
-    if !params[:booking_id].nil?
+    if !booking_id.nil?
       today = Time.now.utc
-      booking = Booking.find(params[:booking_id])
+      booking = Booking.find(booking_id)
       if !booking.nil?
         if !booking.checkout_at.nil?
           checkout_time = booking.checkout_at.utc

From 1d9164aaf0d267d2e4ef09763f898d3351b88c50 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 2 Feb 2018 18:03:43 +0630
Subject: [PATCH 150/651] update quick service for payment

---
 app/assets/javascripts/addorder.js            |  2 +-
 .../origami/addorders_controller.rb           |  3 --
 .../origami/credit_payments_controller.rb     |  1 +
 app/controllers/origami/jcb_controller.rb     |  2 +-
 app/controllers/origami/master_controller.rb  |  2 +-
 app/controllers/origami/mpu_controller.rb     |  2 +-
 .../origami/others_payments_controller.rb     |  1 +
 .../origami/payments_controller.rb            |  1 +
 .../origami/paypar_payments_controller.rb     |  1 +
 .../origami/redeem_payments_controller.rb     |  1 +
 .../origami/unionpay_controller.rb            |  4 +-
 app/controllers/origami/visa_controller.rb    |  2 +-
 .../origami/credit_payments/index.html.erb    |  5 ++-
 app/views/origami/home/show.html.erb          |  2 +-
 app/views/origami/jcb/index.html.erb          |  5 ++-
 app/views/origami/master/index.html.erb       |  5 ++-
 app/views/origami/mpu/index.html.erb          |  6 ++-
 .../origami/others_payments/index.html.erb    |  4 +-
 app/views/origami/payments/show.html.erb      | 38 +++++++++++++++----
 .../origami/redeem_payments/index.html.erb    |  3 +-
 app/views/origami/rooms/show.html.erb         |  2 +-
 app/views/origami/unionpay/index.html.erb     |  6 ++-
 app/views/origami/visa/index.html.erb         |  5 ++-
 config/routes.rb                              | 28 ++++++++------
 24 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 60bcbcc3..e330015a 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -797,7 +797,7 @@ $(function() {
        success:function(result){
         console.log(result)
           if (result.status) {
-            window.location.href = "/origami/sale/"+result.data["sale_id"]+"/payment"
+            window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
           }
            // window.location.href = "/origami/quick_service"
           } 
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index b601a0e6..a6e9c737 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -136,9 +136,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
         @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
         result = {:status=> @status, :data => @sale }
         render :json => result.to_json
-        puts @status
-        puts @sale.to_json
-        puts "ssssssssssssssssssss"
       end
   end
 
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index 404b1506..d70ef870 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -1,6 +1,7 @@
 class Origami::CreditPaymentsController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
+    @cashier_type   = params[:type]
 
     # limit visa_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index b8c7e7e0..e17c773e 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -2,7 +2,7 @@ class Origami::JcbController < BaseOrigamiController
 
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit jcb_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index b3813577..95710f11 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -2,7 +2,7 @@ class Origami::MasterController < BaseOrigamiController
 
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit master_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 7b7ef5a0..6eb2a0a0 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -1,7 +1,7 @@
 class Origami::MpuController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit mpu_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total     = sale_data.grand_total
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index 16c7edae..e4a39662 100755
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -2,6 +2,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   def index
   	@membership_rebate_balance = 0
   	@sale_id = params[:sale_id]
+  	@cashier_type   = params[:type]
   	@payment_method_setting = PaymentMethodSetting.all
 
   	@rebate = MembershipSetting.find_by_rebate(1)
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 6fa61bc7..0e3245ca 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -146,6 +146,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
   def show
     sale_id = params[:sale_id]
+    @cashier_type   = params[:type]
 
     @member_discount = MembershipSetting.find_by_discount(1)
     
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 5a15aa8c..4a4944ca 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -1,6 +1,7 @@
 class Origami::PayparPaymentsController < BaseOrigamiController
 	def create
 		sale_id = params[:sale_id]
+		@cashier_type   = params[:type]
 		redeem_amount = params[:redeem_amount]
 		membership_id = params[:membership_id]
 		payment_method = "paypar"
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 2fdedf32..4b0c70f8 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -2,6 +2,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  	def index
  		@sale_id = params[:sale_id]
  		payment_method = params[:payment_method]
+        @cashier_type   = params[:type]
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index fc15b7f5..7f084fd4 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -1,7 +1,7 @@
 class Origami::UnionpayController < BaseOrigamiController
 	def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit unionpay_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
@@ -23,8 +23,6 @@ class Origami::UnionpayController < BaseOrigamiController
           others = others + sale_payment.payment_amount
         end
     end
-    puts "unionpaycount"
-    puts @unionpaycount
     @can_unionpay = total - @unionpaycount - others
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index b872aec3..f04ec001 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -1,7 +1,7 @@
 class Origami::VisaController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit visa_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index 82e66d7e..827ae6d4 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -115,6 +115,7 @@
 </div>
 </div>
 </div>
+ <span id="cashier_type" class="hidden"><%=@cashier_type%></span>
 <script>
   $(document).ready(function() {
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
@@ -122,6 +123,7 @@
        $('#validamount').attr("value",parseFloat("<%= @can_credit %>") - parseFloat(localStorage.getItem("cash")));
      }
    });
+  cashier_type = $('#cashier_type').text();
   $(document).on('click', '.cashier_number', function(event){
     event.stopPropagation();
     event.preventDefault();
@@ -165,6 +167,7 @@
     return false;
   }
 });
+
   $('#credit_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
@@ -184,7 +187,7 @@
               closeOnCancel: false,
               allowOutsideClick: false
             }, function () {
-              window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              window.location.href = '/origami/sale/'+ sale_id  +"/"+ cashier_type  + "/payment";
             });            
           }
         }
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8440f354..71666293 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -665,7 +665,7 @@
 
     $('#pay').on('click', function () {
         var sale_id = $('#sale_id').val();
-        window.location.href = '/origami/sale/' + sale_id + "/payment";
+        window.location.href = '/origami/sale/' + sale_id + "/cashier/payment";
     });
 
     // Bill Request
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index ada30a8b..945ac11c 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -119,6 +119,7 @@
 </div>
 </div>
 <script>
+var cashier_type = "<%= @cashier_type %>";  
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
@@ -140,7 +141,7 @@
 				  closeOnCancel: false,
 				  allowOutsideClick: false
 				}, function () {
-					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+					window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
 				});
 			}
 		}
@@ -228,7 +229,7 @@ $('#jcb_pay').on('click',function(){
 	            closeOnCancel: false,
 	            allowOutsideClick: false
 	              }, function () {
-	                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+	                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
 	              });
 	            }
 	          }
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index f2f3756c..66d19bb5 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -120,6 +120,7 @@
 </div>
 </div>
 <script>
+  var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function() {
       var sale_id = "<%= @sale_id %>";
       var bank_integration = "<%= @bank_integration %>";
@@ -141,7 +142,7 @@
             closeOnCancel: false,
             allowOutsideClick: false
           }, function () {
-            window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+            window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
           });
         }
       }
@@ -226,7 +227,7 @@
             closeOnCancel: false,
             allowOutsideClick: false
               }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
               });
             }
           }
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 747049b9..2c00bf2e 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -125,6 +125,7 @@
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
+		var cashier_type = "<%= @cashier_type %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
@@ -143,7 +144,7 @@
 				  closeOnCancel: false,
 				  allowOutsideClick: false
 				}, function () {
-					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+					window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment/others_payment";
 				});
 			}
 		}
@@ -198,6 +199,7 @@
 		var sale_id = "<%= @sale_id %>";
 		var receipt_no = "<%= @receipt_no %>";
 		var bank_integration = "<%= @bank_integration %>";
+		var cashier_type = "<%= @cashier_type %>";
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 		//start member discount 5% by pay card	
@@ -230,7 +232,7 @@
 		            closeOnCancel: false,
 		            allowOutsideClick: false
 		              }, function () {
-		                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		                window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment";
 		              });
 		            }
 		          }
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index e8eebbac..7c22ad03 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -9,7 +9,6 @@
 			</span>
 		</ol>
 	</div> -->
-	
 	<div class="row">
 		<div class="col-lg-11col-md-11 col-sm-11">
 			<div >
@@ -29,6 +28,7 @@
 <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
 <script type="text/javascript">
 	/* start check first bill or not*/
+	var cashier_type = "<%= @cashier_type %>";
         var receipt_no = "";
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
           receipt_no = ($("#receipt_no").html()).trim();
@@ -47,7 +47,7 @@
 	$('.others-payment').on('click',function(){
 		var input_type = $(this).attr("data-type");
 		var sale_id = $(this).attr("data-sale-id");
-		window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/" + input_type;
+		window.location.href = '/origami/sale/'+ sale_id  +"/"+ cashier_type  + "/payment/others_payment/" + input_type;
 	})
 
 	$('#back').on('click',function(){
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 96f69da9..d73a7ed6 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -2,7 +2,6 @@
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
-
   <div class="row clearfix">
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
       <div class="card">
@@ -303,6 +302,7 @@
 </div>
 
 <script>
+var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
@@ -337,7 +337,12 @@
 
     $("#back").on('click', function() {
       localStorage.removeItem('cash');
-      window.location.href = '/origami/table/'+ dining_id;
+      if (cashier_type=="cashier") {
+        window.location.href = '/origami/table/'+ dining_id;
+      }else{
+        window.location.href = '/origami/quick_service';
+      }  
+      
     });
 
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){
@@ -407,19 +412,20 @@
   });
 
   $( document ).ready(function() {
+     
     // Disable click event cash to prevent
     $(".payment .cash-color").off('click');
 
     $('#credit_payment').click(function() {
       var sale_id = $('#sale_id').text();
-      window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
+      window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment/credit_payment"
       return false;
     });
 
     $('#card_payment').click(function() {
       localStorage.setItem("cash",$('#cash').text() );
       var sale_id = $('#sale_id').text();
-      window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
+      window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment"
       return false;
     });
 
@@ -492,7 +498,11 @@
                     closeOnCancel: false,
                     allowOutsideClick: false
                   }, function () {
-                    window.location.href = '/origami';
+                    if (cashier_type=="cashier") {
+                      window.location.href = '/origami';
+                    }else{
+                      window.location.href = '/origami/quick_service';
+                    }                    
                   });
                 }else{         
                   $('#pay').text("Pay");
@@ -504,7 +514,11 @@
                    closeOnCancel: false,
                    allowOutsideClick: false
                  }, function () {
-                  window.location.href = '/origami';
+                  if (cashier_type=="cashier") {
+                    window.location.href = '/origami';
+                  }else{
+                    window.location.href = '/origami/quick_service';
+                  }                  
                 });
                 }
               }
@@ -525,7 +539,11 @@
               type: 'POST',
               url: ajax_url,
               success: function () {
-                window.location.href = '/origami/';
+               if (cashier_type=="cashier") {
+                 window.location.href = '/origami';
+               }else{
+                 window.location.href = '/origami/quick_service';
+               }  
               }
             })
          });
@@ -573,7 +591,11 @@
                title: "Information!",
                text: 'Thank You !',
              }, function () {
-              window.location.href = '/origami';
+              if (cashier_type=="cashier") {
+                window.location.href = '/origami';
+              }else{
+                window.location.href = '/origami/quick_service';
+              }  
             });
             }
             
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index d250e0b7..5698eb41 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -108,6 +108,7 @@
 	</div>
 </div>
 <script type="text/javascript">
+    var cashier_type = "<%= @cashier_type %>"; 
 	$(document).ready(function() {
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
@@ -185,7 +186,7 @@
 								closeOnCancel: false,
 								allowOutsideClick: false
 							}, function () {
-								window.location.href = '/origami/sale/'+ sale_id  + "/payment"
+								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
 							});
 
 						}else{
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 385129bf..fda2eb54 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -669,7 +669,7 @@ $('#pay').on('click',function() {
       type: "POST",
         url: '/origami/sale/'+ sale_id + "/rounding_adj",
         success:function(result){          
-          window.location.href = '/origami/sale/'+ sale_id + "/payment";
+          window.location.href = '/origami/sale/'+ sale_id + "/cashier/payment";
         }
     });
    
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 37476be9..e1425947 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -120,6 +120,8 @@
 </div>
 </div>
 <script>
+  var cashier_type = "<%= @cashier_type %>"; 
+  
   $(document).ready(function() {
     var sale_id = "<%= @sale_id %>";
     var bank_integration = "<%= @bank_integration %>";
@@ -143,7 +145,7 @@
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+          window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
         });
       }
     }
@@ -230,7 +232,7 @@
                 closeOnCancel: false,
                 allowOutsideClick: false
               }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
               });
             }
           }
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index f9a693c1..49c2e23d 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -120,6 +120,7 @@
 </div>
 </div>
 <script>
+  var cashier_type = "<%= @cashier_type %>";  
   $(document).ready(function() {
     var sale_id = "<%= @sale_id %>";
     var bank_integration = "<%= @bank_integration %>";
@@ -143,7 +144,7 @@
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+          window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
         });
       }
     }
@@ -232,7 +233,7 @@
             closeOnCancel: false,
             allowOutsideClick: false
               }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
               });
             }
           }
diff --git a/config/routes.rb b/config/routes.rb
index 5c755179..1b23f1b2 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -84,8 +84,11 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- Cashier ------------#
   namespace :origami do
-    get "dashboard" => "dashboard#index"
+    get "dashboard" => "dashboard#index" 
+
     get "quick_service" => "quick_service#index"
+    
+    # post '/:quick_service/create' => "quick_service#create", :defaults => { :format => 'json' }   
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]
@@ -154,7 +157,7 @@ scope "(:locale)", locale: /en|mm/ do
     #--------- Payment ------------#
     post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj', :as => "calculate_rouding_adjs"
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => {:format => 'json'}
-    get 'sale/:sale_id/payment' => 'payments#show'
+    get 'sale/:sale_id/:type/payment' => 'payments#show'
 
     post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
@@ -167,15 +170,15 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
 
-    get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
-    get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
-    get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
-    get 'sale/:sale_id/payment/others_payment/VISA' => "visa#index"
-    get 'sale/:sale_id/payment/others_payment/Master' => "master#index"
-    get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index"
-    get 'sale/:sale_id/payment/others_payment/UNIONPAY' => "unionpay#index"
-    get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
-    get 'sale/:sale_id/payment/others_payment/Voucher' => "voucher#index"
+    get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
+    get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
+    get 'sale/:sale_id/:type/payment/others_payment/MPU' => "mpu#index"
+    get 'sale/:sale_id/:type/payment/others_payment/VISA' => "visa#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
+    get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
+    get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/void' => 'void#overall_void'
@@ -222,6 +225,9 @@ scope "(:locale)", locale: /en|mm/ do
     post "bank_integration/settle_trans", to: "bank_integration#settle_trans", as:"settle_trans"
     post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
 
+   
+    
+
   end
 
   #--------- Waiter/Ordering Station ------------#

From 991bc48505b9c46c1dc6ce38ba2b9faeb09193df Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 6 Feb 2018 09:46:30 +0630
Subject: [PATCH 151/651] order item split bill process

---
 README.md                                     |   2 +
 app/controllers/api/bill_controller.rb        |   2 +-
 app/controllers/base_origami_controller.rb    |   5 +
 app/controllers/origami/home_controller.rb    |   6 +
 .../origami/split_bill_controller.rb          |  51 ++
 app/models/ability.rb                         |   4 +
 app/views/origami/home/show.html.erb          |  55 +-
 app/views/origami/orders/show.html.erb        |  81 ++-
 app/views/origami/split_bill/index.html.erb   | 607 +++++-------------
 config/routes.rb                              |   1 +
 10 files changed, 309 insertions(+), 505 deletions(-)

diff --git a/README.md b/README.md
index 8c5cf006..8655b6d9 100755
--- a/README.md
+++ b/README.md
@@ -103,6 +103,8 @@ Change type in mysql
 	=> ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table 
 	=> ALTER DATABASE [database_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci  #for database
 
+For split bill
+	1) settings/lookups => { type:split_bill, name:SplitBill, value:1 }
 
 * ToDo list
 
diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 387b7bf8..2c2ac133 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -5,7 +5,7 @@ class Api::BillController < Api::ApiController
   def create
     @status = false
     @error_message = "Order ID or Booking ID is require to request for a bill."
-
+    byebug
     if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
     #create Bill by Booking ID
       table = 0
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index ec415bad..e448cf17 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -18,4 +18,9 @@ class BaseOrigamiController < ActionController::Base
   # def checkin_process
   #   CheckinJob.set(wait: 1.minute).perform_later()
   # end
+
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
 end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index c00b39bf..d90d7f2d 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -88,6 +88,12 @@ class Origami::HomeController < BaseOrigamiController
     #for bank integration
     @checkout_time = Lookup.collection_of('checkout_time')
     @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
+    #for split bill
+    lookup_spit_bill = Lookup.collection_of('split_bill')
+    @spit_bill = 0
+    if !lookup_spit_bill[0].nil?
+      @spit_bill = lookup_spit_bill[0][1]
+    end
   end
 
 private
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 87b8644d..59cdae1e 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -1,4 +1,5 @@
 class Origami::SplitBillController < BaseOrigamiController
+	authorize_resource :class => false
 
 	def index
 		dining_id = params[:dining_id]
@@ -18,4 +19,54 @@ class Origami::SplitBillController < BaseOrigamiController
 	      @booking = nil
 	    end
 	end
+
+	def create
+		order_items = JSON.parse(params[:order_items])
+		# byebug
+		status = false
+		if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+	    	#create Bill by Booking ID
+	      	table = 0
+	    	if !params[:booking_id].empty?
+		        booking  = Booking.find(params[:booking_id])
+		        # for Multiple Cashier by Zone
+		        table = DiningFacility.find(booking.dining_facility_id)
+
+		        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+
+		        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+		        get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id)
+
+				if booking
+					if booking.sale_id.nil?
+					  sale = Sale.new
+					  status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, get_cashier_by_terminal)
+					  sale_data = Sale.find_by_sale_id(sale_id)
+					else
+					  status = true
+					  sale_id = booking.sale_id
+					  sale_data = Sale.find_by_sale_id(sale_id)
+					end
+				end
+			else
+				puts "new booking"
+				puts "new order"
+				puts "update order_id in order"
+				puts "do process"
+	    	end
+
+	    	# Bind shift sale id to sale
+			sale_data.shift_sale_id = shift_by_terminal.id
+			sale_data.save
+
+			Promotion.promo_activate(sale)
+
+			BillBroadcastJob.perform_later(table)
+
+			render :json => { status: status }
+	    else
+	      render :json => { status: false, error_message: 'No Current Open Shift!'}
+	    end
+	end
+
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index a72a47d2..406d757a 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -132,6 +132,10 @@ class Ability
         can :manage, Commissioner
         can :manage, Promotion
         can :manage, Product
+
+        #ability for split_bill
+        can :index, :split_bill
+        can :create, :split_bill
                                                
     elsif user.role == "account"
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f9599783..edbcaced 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -672,7 +672,9 @@
 
     // Bill Request
     $('#request_bills').click(function () {
-        swal({
+        var lookup_split_bill = '<%= @spit_bill %>';
+        if(lookup_split_bill == '1'){
+          swal({
             title: "Alert",
             text: "Do you want to Split bill?",
             type: "warning",
@@ -680,30 +682,37 @@
             confirmButtonColor: "#DD6B55",
             confirmButtonText: "Yes, split it!",
             closeOnConfirm: false
-        }, function (isConfirm) {
-          if (isConfirm) {
-            var dining_id = "<%= @dining.id %>";
-            window.location.href = '/origami/table/' + dining_id + "/split_bills";
-          }else{
-            var order_id = $('#save_order_id').attr('data-order');
-            var ajax_url = "/origami/" + order_id + "/request_bills";
-            $.ajax({
-                type: "GET",
-                url: ajax_url,
-                // data: 'order_id='+ order_id,
-                success: function (result) {
-                    if (!result.status) {
-                      swal("Information!", result.error_message);
-                    }
-                    else {              
-                      location.reload();
-                    }
-                }
-            });
-          }
-        }); 
+          }, function (isConfirm) {
+            if (isConfirm) {
+              var dining_id = "<%= @dining.id %>";
+              window.location.href = '/origami/table/' + dining_id + "/split_bills";
+            }else{
+              requestBillProcess();
+            }
+          }); 
+        }else{
+          requestBillProcess();
+        }
     });
 
+    function requestBillProcess(){
+      var order_id = $('#save_order_id').attr('data-order');
+      var ajax_url = "/origami/" + order_id + "/request_bills";
+      $.ajax({
+          type: "GET",
+          url: ajax_url,
+          // data: 'order_id='+ order_id,
+          success: function (result) {
+              if (!result.status) {
+                swal("Information!", result.error_message);
+              }
+              else {              
+                location.reload();
+              }
+          }
+      });
+    }
+
     $('#move').on('click', function () {
         var dining_id = "<%= @dining.id %>";
         window.location.href = '/origami/table/' + dining_id + "/movetable";
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index b08328b6..70e1ba9d 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -39,22 +39,37 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @tables.each do |table| %>
          <% if table.status == 'occupied' %>
-         <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
-           <div class="card-block">
-              <%= table.name %>
-              <% if table.get_booking.nil? %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
-              <% else %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> new</span>
-              <% end %>
-           </div>
-         </div>
+            <% if table.get_booking.nil? %>
+              <% if table.get_checkout_booking.nil? %>
+                <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% else %>                            
+                <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% end %>                         
+                  <div class="card-block">
+                    <%= table.name %>
+                    <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
+                    <div style="font-size:12px;"></div>
+                  </div>
+                </div>
+            <% else %>         
+              <% if table.get_checkout_booking.nil? %>
+                <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% else %>                       
+                <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% end %>                   
+              <div class="card-block">
+                  <%= table.name %>
+                  <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
+                </div>
+              </div>
+            <% end %>
          <% else %>
-         <div class="card tables green text-white" data-id="<%= table.id %>">
-           <div class="card-block">
+         <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+            <div class="card-block">
               <%= table.name %>
-           </div>
-         </div>
+              <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
+            </div>
+          </div>
          <% end %>
          <% end %>
        </div>
@@ -64,24 +79,30 @@
      <div class="tab-pane" id="rooms" role="tabpanel" style="">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @rooms.each do |room| %>
-         <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-              <% if room.get_booking.nil? %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
+          <% if room.status == 'occupied' %>
+            <% if room.get_booking.nil? %>
+              <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                <div class="card-block">
+                  <%= room.name %>
+                      <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
+                </div>
+              </div>
               <% else %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> new</span>
+                <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                  <div class="card-block">
+                    <%= room.name %>
+                        <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
+                  </div>
+                </div>
               <% end %>
-           </div>
-         </div>
-         <% else %>
-         <div class="card rooms green text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-           </div>
-         </div>
-         <% end %>
+          <% else %>
+              <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                <div class="card-block">
+                  <%= room.name %>
+                  <span class="float-right font-12 new_text_<%= room.id %> hide"> 
+                </div>
+              </div>
+          <% end %>
          <% end %>
        </div>
      </div>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 9aa09d37..c96e2674 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -4,139 +4,78 @@
  	</div>
  	<div class="row">
  		<!-- Column One -->
- 		<div class="col-lg-6 col-md-6 col-sm-6">
+ 		<div class="col-lg-8 col-md-8 col-sm-8">
  			<!-- Order Details -->
  			<div class="card"  >
-        <!-- <div class="card-header">
-          <div><strong id="order-title">ORDER DETAILS</strong></div>
-      </div> -->
-      <div class="card-block">
-      	<div class="card-title row">
-      		<div class="col-lg-6 col-md-6 col-sm-6">
-      			<span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
-      			<span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
-      			<p class="m-l-10">Order No: <span id="order_no"><%=@order.order_id rescue ' '%></span></p>
-      		</div>
-      		<div class="col-lg-6 col-md-6 col-sm-6 text-right">
-      			<p class="m-r-10">Date:  <span id="order_date"> <%=@order.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
-      		</div>
-      	</div>
-      	<div id="order-detail-slimscroll" data-height="160">
-      		<div class="card-text dining">
-      			<table class="table table-default" id="order-items-table">
-      				<thead>
-      					<tr>
-      						<th class="item-name">Items</th>
-      						<th class="item-attr">QTY</th>
-      						<th class="item-attr">Price</th>
-      					</tr>
-      				</thead>
-      				<tbody>
-      					<% sub_total = 0 %>
-      					<% @order_items.each do |order_item| %>
-      					<% 
-      					sub_total += order_item.qty*order_item.price 
-      					%>
-      					<tr class="item-row" id=<%= order_item.order_items_id %> >
-      						<td style="width:60%; text-align:left">
-      							<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
-      							<span id="item-name-price"><%=order_item.item_name%>@<%=order_item.price%></span>
-      						</td>
-      						<td style="width:20%; text-align:right">
-      							<span id="item-qty"><%=order_item.qty%></span>
-      						</td>
-      						<td style="width:20%; text-align:right">
-      							<span id="item-total-price"><%=(order_item.qty*order_item.price)%></span>
-      						</td>
-      					</tr>
-      					<%
-      				end 
-      				%>
-      			</tbody>
-      		</table>
-      	</div>
-      </div>
-      <div class="card-footer">
-      	<table class="table" id="order-charges-table" border="0">
-      		<tr>
-      			<td class="charges-name"><strong>Sub Total:</strong></td>
-      			<td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
-      		</tr>
-      	</table>
-      </div>
-  </div>
-</div>
+		        <!-- <div class="card-header">
+		          <div><strong id="order-title">ORDER DETAILS</strong></div>
+		      </div> -->
+		      <div class="card-block">
+		      	<div class="card-title row">
+		      		<div class="col-lg-6 col-md-6 col-sm-6">
+		      			<span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
+		      			<span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
+		      			<p class="m-l-10">Order No: <span id="order_no"><%=@order.order_id rescue ' '%></span></p>
+		      		</div>
+		      		<div class="col-lg-6 col-md-6 col-sm-6 text-right">
+		      			<p class="m-r-10">Date:  <span id="order_date"> <%=@order.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+		      		</div>
+		      	</div>
+		      	<div id="order-detail-slimscroll" data-height="160">
+		      		<div class="card-text dining">
+		      			<table class="table table-default" id="order-items-table">
+		      				<thead>
+		      					<tr>
+		      						<th class="item-name">Items</th>
+		      						<th class="item-attr">QTY</th>
+		      						<th class="item-attr">Price</th>
+		      					</tr>
+		      				</thead>
+		      				<tbody>
+		      					<% sub_total = 0 %>
+		      					<% @order_items.each do |order_item| %>
+		      					<% 
+		      					sub_total += order_item.qty*order_item.price 
+		      					%>
+		      					<tr class="item-row" id=<%= order_item.order_items_id %> >
+		      						<td style="width:60%; text-align:left">
+		      							<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
+		      							<span id="item-name-price"><%=order_item.item_name%></span>
+		      						</td>
+		      						<td style="width:20%; text-align:right">
+		      							<span id="item-qty"><%=order_item.qty%></span>
+		      						</td>
+		      						<td style="width:20%; text-align:right">
+		      							<span id="item-total-price"><%=(order_item.qty*order_item.price)%></span>
+		      						</td>
+		      					</tr>
+		      					<%
+		      				end 
+		      				%>
+		      			</tbody>
+		      		</table>
+		      	</div>
+		      </div>
+		      <div class="card-footer">
+		      	<table class="table" id="order-charges-table" border="0">
+		      		<tr>
+		      			<td class="charges-name"><strong>Sub Total:</strong></td>
+		      			<td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
+		      		</tr>
+		      	</table>
+		      </div>
+		  </div>
+		</div>
 </div>
 <!-- Column One -->
-
+<div class="col-lg-3 col-md-3 col-sm-3 clearfix"></div>
 <!-- Column Two -->
-<div class="col-lg-5 col-md-5 col-sm-5">
-	<!-- Discount Amount -->
-	<div class="card">
-		<div class="card-header">
-			<div><strong id="order-title">Split Bill Control</strong></div>
-		</div>
-		<div class="card-block">
-			<div class="card-title">
-				<div class="form-horizontal">
-					<div class="col-md-12">	
-						<div class="form-group">	
-							<input type="text" id="per_person" name="per_person" value="" class="form-control" placeholder="Bill per person" onkeypress="return isNumberKey(event);" />
-						</div>
-					</div>					
-				</div>
-			</div>
-
-			<hr />
-
-			<div class="m-t-10 p-l-20">
-				<div class="row">
-					<div class="col-lg-8 col-md-8 col-sm-8">
-						<div class="row bottom">
-							<div class="col-md-3 cashier_number border-left" data-value="1" data-type="num">1</div>
-							<div class="col-md-3 left cashier_number border-left" data-value="2" data-type="num">2</div>
-							<div class="col-md-3 left cashier_number border-left" data-value="3" data-type="num">3</div>
-						</div>
-
-						<div class="row bottom">
-							<div class="col-md-3 cashier_number border-left" data-value="4" data-type="num">4</div>
-							<div class="col-md-3 left cashier_number border-left" data-value="5" data-type="num">5</div>
-							<div class="col-md-3 left cashier_number border-left" data-value="6" data-type="num">6</div>
-						</div>
-
-						<div class="row bottom">
-							<div class="col-md-3 cashier_number border-left" data-value="7" data-type="num">7</div>
-							<div class="col-md-3 left cashier_number border-left" data-value="8" data-type="num">8</div>
-							<div class="col-md-3 left cashier_number border-left" data-value="9" data-type="num">9</div>
-						</div>
-
-						<div class="row bottom">
-							<div class="col-md-3 cashier_number border-left" data-value="0" data-type="num">0</div>
-							<div class="col-md-3 left cashier_number red border-left" data-type="del">DEL</div>
-							<div class="col-md-3 left cashier_number green border-left" data-type="clr">CLR</div>
-						</div>
-					</div>
-					<div class="col-md-4">
-						<div class="form-group">
-							<button id="net" class="btn bg-info fluid action-btn">Order Item Split</button>
-							<button id="percentage" class="btn bg-primary fluid action-btn" style="font-size: 12.4px">Per Person</button>	
-							<button id="remove-item" class="btn bg-default fluid action-btn">Clear Split Bill</button>
-						</div>
-					</div>
-				</div>	
-			</div>
-		</div>
-	</div>
-</div>
-
-<!-- Column Three -->
 <div class="col-lg-1 col-md-1 col-sm-1">
 	<!-- Action Panel -->
 	<div>
 		<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
-		<button id="remove-item-discount" class="btn btn-primary btn- action-btn">Remove Item Split</button>
-		<button id="remove-all" class="btn bg-primary btn-block action-btn">Remove All</button>
-		<button id="pay-discount" class="btn bg-primary btn-block action-btn">Enter</button>
+		<button id="order_item_split" class="btn btn-primary btn- action-btn">Order Items Split</button>
+		<!-- <button id="per_person" class="btn bg-primary btn-block action-btn">Per Person</button> -->
 	</div>
 </div>
 </div>
@@ -146,13 +85,7 @@
 	$(document).ready(function(){
 
 		$('#back').on('click',function(){
-			var id       = $("#table_id").text();
-			var type     = $("#table_type").text();
-			if (type=="Table") {
-				window.location.href = '/origami/table/'+id
-			}else{
-				window.location.href = '/origami/room/'+id
-			}
+			backToOrigami();
 		})
 
 		$(".cashier_number").on('click', function(event){
@@ -162,28 +95,28 @@
 				var input_type = $(this).attr("data-type");
 				switch (input_type) {
 					case 'num':
-						var input_value = $(this).attr("data-value");
-						if (original_value == "0"){
-							$('#per_person').val(input_value);						
-						}
-						else{
-							$('#per_person').val(original_value + '' + input_value);						
-						}
+					var input_value = $(this).attr("data-value");
+					if (original_value == "0"){
+						$('#per_person').val(input_value);						
+					}
+					else{
+						$('#per_person').val(original_value + '' + input_value);						
+					}
 					break;
 
 					case 'add':
-						var input_value = $(this).attr("data-value");
-						amount = parseInt(input_value);
-						$('#per_person').val(amount);										
+					var input_value = $(this).attr("data-value");
+					amount = parseInt(input_value);
+					$('#per_person').val(amount);										
 					break;
 
 					case 'del' :
-						var discount_text=$('#per_person').val();
-						$('#per_person').val(discount_text.substr(0,discount_text.length-1));		
+					var discount_text=$('#per_person').val();
+					$('#per_person').val(discount_text.substr(0,discount_text.length-1));		
 					break;
 
 					case 'clr':
-						$('#per_person').val("0");	            
+					$('#per_person').val("0");	            
 					break;
 				}
 				event.handled = true;
@@ -202,327 +135,99 @@
 		}
 	});
 
-	// Select discount-item
-	$('#order-items-table tbody').on('click', '.discount-item-row',function(){
-		if($(this).hasClass('selected-item') == true){
-			$(this).removeClass('selected-item');
-		}
-		else {
-			$(this).addClass('selected-item');
-		}
-	});
-
-	// Calculate Net Discount for Payment
-	$("#net").on('click', function(e){
-		e.preventDefault();
-		var sale_id = $('#sale-id').text();
-		var discount_value = parseFloat($('#discount-amount').val());
-		var ajax_url = "/origami/" + sale_id + "/discount";
-
-		// Selected Items
-		var sale_items = get_selected_sale_items();					
-
-		// Selected Account
-		var account_types = get_selected_account_types();
-
-		if(sale_items.length == 0 && account_types.length == 0){
-			calculate_overall_discount(0, discount_value);
-		}
-		else {
-			calculate_item_discount(0, discount_value, sale_items, account_types);	
-		}	
-
-		// Remove Selection
-		selection_remove();						
-	});
-
-	// Calculate Percentage Discount for Payment
-	$("#percentage").on('click', function(e){
-		e.preventDefault();
-		var sale_id = $('#sale-id').text();
-		var discount_value = $('#discount-amount').val();
-		var ajax_url = "/origami/" + sale_id + "/discount";
-
-		// Selected Items
-		var sale_items = get_selected_sale_items();					
-
-		// Selected Account
-		var account_types = get_selected_account_types();
-		
-		if(sale_items.length == 0 && account_types.length == 0){
-			calculate_overall_discount(1, discount_value);
-		}
-		else {
-			calculate_item_discount(1, discount_value, sale_items, account_types);	
-		}
-
-		// Remove Selection
-		selection_remove();			
-	});
-
-	// Remove selected discount items
-	$("#remove-item").on('click', function(e){
-		e.preventDefault();
-		var origin_sub_total = parseFloat($("#order-sub-total").text());
-		var total = 0;
-
-		$('.discount-item-row.selected-item').each(function(i){
-			var amount = parseFloat($(this).find('#item-total-price').text());		
-			total = total + Math.abs(amount);	
-			$(this).remove();
-		});
-		$("#order-sub-total").text(origin_sub_total + total);
-	});
-
-	// Pay Discount for Payment
-	$("#pay-discount").on('click', function(e){
-		e.preventDefault();
-		$("#loading_wrapper").show();
-		var sale_id = $('#sale-id').text();
-		var discount_items = JSON.stringify(get_discount_item_rows());
-		var overall_discount = $("#order-discount").text();
-		var sub_total = $('#order-sub-total').text();		
-		var ajax_url = "/origami/" + sale_id + "/discount";	
-
-		var params = { 'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount };
-
-		$.ajax({
-			type: "POST",
-			url: ajax_url,
-			data: params,
-			success:function(result){	
-				$("#loading_wrapper").hide(); 
+	//order_item_split
+	$('#order_item_split').on('click',function () {
+		var cnt_order_item = "<%= @order_items.count %>";
+		var order_items = get_selected_order_items();// Selected Order Items
+		var cnt_items = parseInt(cnt_order_item) - parseInt(order_items.length);
+		if (order_items.length > 0){
+			if(cnt_items > 0){
 				swal({
-					title: "Information!",
-					text: result.status,
-				}, function () {
-					if(result.table_type == "Table"){
-						window.location.href = "/origami/table/" + result.table_id
-					}
-					else {
-						window.location.href = "/origami/room/" + result.table_id
-					}
-				});	    			    	
+		            title: "Alert",
+		            text: "Are you sure, you want to Split?",
+		            type: "warning",
+		            showCancelButton: true,
+		            confirmButtonColor: "#DD6B55",
+		            confirmButtonText: "Yes, split it!",
+		            closeOnConfirm: false
+		        }, function (isConfirm) {
+		        	if(isConfirm){
+		        		splitBillProcess(cnt_items);
+		        	}
+		        });
 			}
-		});
-	});
-
-	// Remove selected given discount item
-	$("#remove-item-discount").on('click', function(e){
-		e.preventDefault();
-		var sale_id = $('#sale-id').text();
-		var discount_items = [];
-
-		// Selected Items		
-		var sale_items = get_selected_sale_items();	
-		console.log(sale_items.length);
-		if(sale_items.length == 0){
-			//swal("Information!", "You have no selected item!");
-			swal ( "Oops" ,  "You have no selected item!" ,  "error" );		
-			return;				
+			else{
+				splitBillProcess(cnt_items);
+			}
+		}else{
+			swal("Opps","Please select at least on item!","warning");
 		}
-
-		for(var i=0;i < sale_items.length;i++){
-			if(sale_items[i].price < 0){
-				discount_items.push(sale_items[i]);
-			}
-			else {
-				swal ("Oops" , "You have no selected item!" ,  "error" );
-				return;	
-			}
-		}
-
-		var params = { 'sale_id': sale_id, 'discount_items': JSON.stringify(discount_items) };
-		$.ajax({
-			type: "POST",
-			url: "/origami/" + sale_id + "/remove_discount_items",
-			data: params,
-			success: function(result){
-				swal({
-					title: "Information!",
-					text: result.status,
-					type: "success",
-				}, function () {
-					if(result.table_type == "Table"){
-						window.location.href = "/origami/table/" + result.table_id
-					}
-					else {
-						window.location.href = "/origami/room/" + result.table_id
-					}
-				});			
-			}
-		});
 	});
+});
 
-	$("#remove-all").on('click', function(e){
-		e.preventDefault();
-		var sale_id = $('#sale-id').text();
-		$.ajax({
-			type: "GET",
-			url: "/origami/" + sale_id + "/remove_all_discount",
-			success: function(result){
-				swal({
-					title: "Information!",
-					text: result.status,
-					type: "success",
-				}, function () {
-					if(result.table_type == "Table"){
-						window.location.href = "/origami/table/" + result.table_id
-					}
-					else {
-						window.location.href = "/origami/room/" + result.table_id
-					}
-				});			
-			}
-		});
-	});
+/* function for split bill process */
+function splitBillProcess(cnt_items){
+	var order_items = get_selected_order_items();// Selected Order Items
+	var json_booking = JSON.parse('<%= @booking.to_json.html_safe %>');
+	var booking_id = "";
+	if(cnt_items == 0){
+		booking_id = json_booking.booking_id;
+	}
 	
- /* Remove Selection */
- function selection_remove(){
- 	$(".item-row").removeClass("selected-item");
- }
+	var ajax_url = "/origami/split_bills";
+	$.ajax({
+        type: "POST",
+        url: ajax_url,
+        dataType: 'JSON',
+        data: {'booking_id' : booking_id, 'order_items' : JSON.stringify(order_items)},
+        success: function (result) {
+            if (!result.status) {
+              swal("Information!", result.error_message);
+            }
+            else {   
+            	if (cnt_items > 0){
+            		window.location.reload();
+            	}else{
+            		backToOrigami();
+            	}
+            }
+        }
+    });
+}
 
- /* Get Item rows but not discount*/
- function get_item_rows(){
- 	var sale_items = [];	
- 	$('.item-row').not('.discount-item-row').each(function(i){
- 		var sale_item = {};
- 		sale_item.id = $(this).attr('id').substr(0,16);
- 		sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
- 		sale_item.account_id = $(this).find('#item-account-type').text();
- 		sale_item.price = $(this).find('#item-total-price').text();
- 		sale_items.push(sale_item);
- 	});	
- 	return sale_items;
- }
-
- /* Get discount Item rows */
- function get_discount_item_rows(){
- 	var sale_items = [];	
- 	$('.discount-item-row').each(function(i){
- 		var sale_item = {};
- 		sale_item.id = $(this).attr('id');
- 		sale_item.name = $(this).find('#item-name-price').text();
- 		sale_item.account_id = $(this).find('#item_account_type').text();
- 		sale_item.price = $(this).find('#item-total-price').text();
- 		sale_items.push(sale_item);
- 	});	
- 	return sale_items;
- }
+/* back to origami */
+function backToOrigami(){
+	var id       = $("#table_id").text();
+	var type     = $("#table_type").text();
+	if (type=="Table") {
+		window.location.href = '/origami/table/'+id
+	}else{
+		window.location.href = '/origami/room/'+id
+	}
+}
 
 /* Get Selected Sale Item's ID and Price */
-function get_selected_sale_items(){
-	var sale_items = [];	
+function get_selected_order_items(){
+	var order_items = [];	
 	$('.item-row.selected-item').each(function(i){
-		var sale_item = {};
-		sale_item.id = $(this).attr('id').substr(0,16);
-		sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
-		sale_item.account_id = $(this).find('#item-account-type').text();
-		sale_item.price = $(this).find('#item-total-price').text();
-		sale_items.push(sale_item);
+		var order_item = {};
+		order_item.id = $(this).attr('id').substr(0,16);
+		order_item.name = $(this).find('#item-name-price').text().split('@')[0];
+		order_item.account_id = $(this).find('#item-account-type').text();
+		order_item.price = $(this).find('#item-total-price').text();
+		order_items.push(order_item);
 	});	
-	return sale_items;
-}
-
-/* Get Selected Accounts ID and Price */
-function get_selected_account_types(){	
-	var account_types = [];
-
-	$('.selected-account').each(function(i){
-		var account= {};
-		account.id = $(this).attr('id').substr(8);
-		account.name = $(this).text();			
-		account_types.push(account);
-	});	
-	return account_types;
-}
-
-/* Calculate Overall Discount*/
-function calculate_overall_discount(type, amount){
-	var origin_sub_total = parseFloat($("#order-sub-total").text());	
-	var dis_amount = 0;
-	var sub_total = 0;
-	var total_discount = 0;
-
-	// For Net Pay
-	if(type == 0){
-		total_discount = amount;
-	}
-
-	// For Percentage Pay
-	if(type == 1){
-		if(amount > 100 ){
-			swal({
-				title:"Oops!",
-				text:'Percentage Value over 100!',
-				type: "error",
-				confirmButtonText: 'OK',
-				confirmButtonColor:"red"
-			});	
-		}
-		else{
-			total_discount = (origin_sub_total * amount)/100;
-		}
-	}
-
-	$("#order-discount").text(total_discount);
-}
-
-/* Calculate Items Discount*/
-function calculate_item_discount(type, amount, sale_items, account_types){
-	var origin_sub_total = parseFloat($("#order-sub-total").text());	
-	var dis_amount = 0;
-	var sub_total = 0;
-	var total_discount = 0;
-	// For Net Pay
-	if(type == 0){
-		dis_amount = (0 - amount);
-		if(sale_items.length > 0){
-			for(var i=0;i < sale_items.length;i++){
-				var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-				$("#order-items-table tbody").append(discount_item_row);
-				total_discount = total_discount + amount;
-			}
-		}
-
-		sub_total = origin_sub_total - total_discount;
-	}
-
-	// For Percentage Pay
-	if(type == 1){
-		if(amount > 100 ){
-			swal({
-				title:"Oops!",
-				text:'Percentage Value over 100!',
-				type: "error",
-				confirmButtonText: 'OK',
-				confirmButtonColor:"red"
-			});				
-		}
-		else{
-			// Check sale items exists
-			if(sale_items.length > 0){
-				for(var i=0;i < sale_items.length;i++){
-					dis_amount = 0 - ((sale_items[i].price * amount)/100);
-					var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-					$("#order-items-table tbody").append(discount_item_row);
-					total_discount = total_discount + dis_amount;
-				}
-				sub_total = origin_sub_total + total_discount;
-			}
-		}	
-	}
-	
-	$("#order-sub-total").text(sub_total);
+	return order_items;
 }
 
 //check for isNumber
 function isNumberKey(evt) {
-  var charCode = (evt.which) ? evt.which : event.keyCode;
-  if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
-      return false;
-  } else {
-      return true;
-  }      
+	var charCode = (evt.which) ? evt.which : event.keyCode;
+	if (charCode > 31 && (charCode < 48 || charCode > 57)) {
+		return false;
+	} else {
+		return true;
+	}      
 }
+
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 12c263d5..5afcb32e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -222,6 +222,7 @@ scope "(:locale)", locale: /en|mm/ do
 
     #split bill
     get '/table/:dining_id/split_bills' => 'split_bill#index', as:'split_bill_index'
+    post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
   end
 
   #--------- Waiter/Ordering Station ------------#

From 8fed8d701a15a302ae60721c653914791eca407f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Feb 2018 11:05:58 +0630
Subject: [PATCH 152/651] add booking

---
 app/controllers/origami/split_bill_controller.rb | 13 +++++++++----
 app/views/origami/split_bill/index.html.erb      |  5 ++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 59cdae1e..e9698da6 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -49,10 +49,15 @@ class Origami::SplitBillController < BaseOrigamiController
 					end
 				end
 			else
-				puts "new booking"
-				puts "new order"
-				puts "update order_id in order"
-				puts "do process"
+				if params[:type] == "Table"
+					type = "TableBooking"
+				else
+					type = "RoomBooking"
+				end
+				
+				booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
+                                :checkin_at => Time.now.utc, :checkin_by =>  current_user.name,
+                                :booking_status => "assign" })
 	    	end
 
 	    	# Bind shift sale id to sale
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index c96e2674..e776dacf 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -15,6 +15,7 @@
 		      		<div class="col-lg-6 col-md-6 col-sm-6">
 		      			<span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
 		      			<span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
+		      			<span class="hidden" id="customer_id" value="<%= @order.customer_id %>"><%= @order.customer_id %></span>
 		      			<p class="m-l-10">Order No: <span id="order_no"><%=@order.order_id rescue ' '%></span></p>
 		      		</div>
 		      		<div class="col-lg-6 col-md-6 col-sm-6 text-right">
@@ -167,6 +168,8 @@
 
 /* function for split bill process */
 function splitBillProcess(cnt_items){
+	var dining_id       = $("#table_id").text();
+	var type     = $("#table_type").text();
 	var order_items = get_selected_order_items();// Selected Order Items
 	var json_booking = JSON.parse('<%= @booking.to_json.html_safe %>');
 	var booking_id = "";
@@ -179,7 +182,7 @@ function splitBillProcess(cnt_items){
         type: "POST",
         url: ajax_url,
         dataType: 'JSON',
-        data: {'booking_id' : booking_id, 'order_items' : JSON.stringify(order_items)},
+        data: {'dining_id' : dining_id, 'type': type, 'booking_id' : booking_id, 'order_items' : JSON.stringify(order_items)},
         success: function (result) {
             if (!result.status) {
               swal("Information!", result.error_message);

From f84b01a0582e095c0be8f2d25e3459079c11883d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 6 Feb 2018 10:19:30 +0630
Subject: [PATCH 153/651] change item unit price in sale ite report

---
 app/models/sale.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f6aed95e..2e4cd1f2 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -706,7 +706,7 @@ def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
                      "i.remark as status_type,"+
-                     " i.unit_price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 

From 0ef45bbc7054ebb141f4f208b072d527dcbef05c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Feb 2018 11:08:10 +0630
Subject: [PATCH 154/651] change auth token

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8c5cf006..09e64a61 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ ruby 2.4.1p111
 
 	Osaka
 
-		Auth Token        => rj0MJ0XI5GsKZehE => New
+		Auth Token        => wu8YvlLmah0CL => New 	##note : Old => rj0MJ0XI5GsKZehE
 
 						  => code2lab => Old
 
@@ -23,7 +23,7 @@ ruby 2.4.1p111
 
     BITP
 
-		Auth Token        => rj0MJ0XI5GsKZehE => New
+		Auth Token        => pZBHXEFbGNj/G => New   ##note : Old => rj0MJ0XI5GsKZehE
 
 						  => code2lab => Old
 

From 1324f381d13f4149bd1eab5bc6d6e7b66d2a29dd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Feb 2018 11:21:52 +0630
Subject: [PATCH 155/651] update quick service payment view

---
 app/views/origami/credit_payments/index.html.erb | 2 +-
 app/views/origami/home/index.html.erb            | 4 ++--
 app/views/origami/jcb/index.html.erb             | 2 +-
 app/views/origami/master/index.html.erb          | 2 +-
 app/views/origami/mpu/index.html.erb             | 2 +-
 app/views/origami/others_payments/index.html.erb | 4 ++--
 app/views/origami/payments/show.html.erb         | 3 +++
 app/views/origami/paypar_payments/index.html.erb | 2 +-
 app/views/origami/redeem_payments/index.html.erb | 2 +-
 app/views/origami/unionpay/index.html.erb        | 2 +-
 app/views/origami/visa/index.html.erb            | 2 +-
 app/views/origami/voucher/index.html.erb         | 2 +-
 12 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index 827ae6d4..d92ad452 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -111,7 +111,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1 m-t-10">
-  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 3ed44abc..4b32c515 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -123,8 +123,8 @@
              <%= t("views.btn.back") %>
           </button>
    <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
-      <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
-      </button>
+      <!-- <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
+      </button> -->
    <%end%>
    <%if current_login_employee.role != "waiter" %>
    <button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 945ac11c..837c9f43 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -114,7 +114,7 @@
 		</div>
 
 	<div class="col-lg-1 col-md-1 col-sm-1">
-		<button type="button" class="btn btn-default  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+		<button type="button" class="btn btn-default  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 	</div>
 </div>
 </div>
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 66d19bb5..f5c8f06b 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -115,7 +115,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn btn-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+ <button type="button" class="btn btn-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 2c00bf2e..f40ce252 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -116,7 +116,7 @@
 		</div>
 
 		<div class="col-md-1 col-lg-1 col-sm-1">
-			 <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+			 <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
 
 		</div>
 	</div>
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 7c22ad03..a6a13a77 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -21,7 +21,7 @@
 			</div>
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1 m-t-10">
-  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 </div>
 	</div>
 </div>
@@ -51,6 +51,6 @@
 	})
 
 	$('#back').on('click',function(){
-		window.location.href = '/origami/sale/<%= @sale_id %>/payment/';
+		window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/';
 	})
 </script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index d73a7ed6..ff7ceacc 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -295,6 +295,9 @@
   </button>
   <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
   <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
+  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
+<button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
+<button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
   <!-- Waiter Buttons -->
 </div>
 <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
diff --git a/app/views/origami/paypar_payments/index.html.erb b/app/views/origami/paypar_payments/index.html.erb
index b83695ce..3b9fd2a3 100755
--- a/app/views/origami/paypar_payments/index.html.erb
+++ b/app/views/origami/paypar_payments/index.html.erb
@@ -10,7 +10,7 @@
 			</div>
 	</div>
 	<div class="col-lg-1 col-md-1 col-sm-1 m-t-10">
-  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
+  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> Back </button>
 </div>
 	
  <div>
\ No newline at end of file
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 5698eb41..1d29e563 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -103,7 +103,7 @@
 
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1">
-		 <button type="button" class="btn bg-default m-t-10 btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+		 <button type="button" class="btn bg-default m-t-10 btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 		</div>
 	</div>
 </div>
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index e1425947..5dee20f1 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -115,7 +115,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+ <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 49c2e23d..2970ba44 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -115,7 +115,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+ <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb
index 52dc64d7..0d349116 100755
--- a/app/views/origami/voucher/index.html.erb
+++ b/app/views/origami/voucher/index.html.erb
@@ -92,7 +92,7 @@
     </div>
 
 		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+			<button type="button" class="btn btn-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> Back </button>
 		</div>
 </div>
 

From 65d9f0fb6f65494e0b09d2cc040abfdda0ba1faf Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Feb 2018 13:07:30 +0630
Subject: [PATCH 156/651] order update

---
 .../origami/split_bill_controller.rb          | 33 +++++++++++++++++++
 app/views/origami/split_bill/index.html.erb   |  3 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index e9698da6..3fa36f7d 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -58,6 +58,39 @@ class Origami::SplitBillController < BaseOrigamiController
 				booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
                                 :checkin_at => Time.now.utc, :checkin_by =>  current_user.name,
                                 :booking_status => "assign" })
+
+				customer = Customer.find(params[:customer_id])
+				order_type = "dine_in"
+				if !customer.nil?
+					if customer.customer_type == "Takeaway"
+						order_type = "takeaway"
+					elsif customer.customer_type == "Delivery"
+						order_type = "delivery"
+					end
+				end
+				# begin
+			    order = Order.new
+			    order.date = Time.now.utc
+			    order.source = "cashier"
+			    order.order_type = order_type
+			    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+			    order.item_count = order_items.count
+			    order.status = "new"
+			    order.table_id = params[:dining_id]  # this is dining facilities's id
+			    order.waiters = current_user.name
+			    order.employee_name = current_user.name
+			    order.guest_info = nil
+			    order.save
+
+			    order_items.each do |order_item|
+			    	orderItem = OrderItem.find(order_item.order_items_id)
+			    	orderItem.order_id = order.order_id
+			    	orderItem.save
+			    end
+
+			    sale = Sale.new
+				status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, get_cashier_by_terminal)
+				sale_data = Sale.find_by_sale_id(sale_id)
 	    	end
 
 	    	# Bind shift sale id to sale
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index e776dacf..6057077e 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -170,6 +170,7 @@
 function splitBillProcess(cnt_items){
 	var dining_id       = $("#table_id").text();
 	var type     = $("#table_type").text();
+	var customer_id     = $("#customer_id").text();
 	var order_items = get_selected_order_items();// Selected Order Items
 	var json_booking = JSON.parse('<%= @booking.to_json.html_safe %>');
 	var booking_id = "";
@@ -182,7 +183,7 @@ function splitBillProcess(cnt_items){
         type: "POST",
         url: ajax_url,
         dataType: 'JSON',
-        data: {'dining_id' : dining_id, 'type': type, 'booking_id' : booking_id, 'order_items' : JSON.stringify(order_items)},
+        data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_items' : JSON.stringify(order_items)},
         success: function (result) {
             if (!result.status) {
               swal("Information!", result.error_message);

From 3ac6871a8917331d18400234332059dc8393b45f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Feb 2018 14:03:30 +0630
Subject: [PATCH 157/651] update show payment

---
 app/views/origami/payments/show.html.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index ff7ceacc..6a45234c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -295,10 +295,16 @@
   </button>
   <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
   <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
+  <% if @cashier_type=="quick_service" %>
+<hr>
+  <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
+ <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
+ <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
 <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
 <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
   <!-- Waiter Buttons -->
+  <%end %>
 </div>
 <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
 </div>
@@ -307,6 +313,8 @@
 <script>
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
+
+    <%= ENV["SERVER_MODE"] %>
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
         var member_discount = $('#member_discount').text();

From 76a094972e58d5f9ceacba34afa1eee52fcd228c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Feb 2018 15:10:35 +0630
Subject: [PATCH 158/651] update payment

---
 .../origami/payments_controller.rb            |  2 +
 app/views/origami/home/show.html.erb          |  2 +-
 app/views/origami/payments/show.html.erb      | 75 ++++++++++++++++++-
 config/routes.rb                              |  2 +-
 4 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 0e3245ca..06a0fc4a 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -163,6 +163,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @balance = 0.00
       @accountable_type = ''
       @table_no = ''
+      @dining  = ''
 
       @shop        =  Shop::ShopDetail  
 
@@ -215,6 +216,7 @@ class Origami::PaymentsController < BaseOrigamiController
         df = DiningFacility.find(sbk.dining_facility_id)
         @table_no = df.type + ' ' + df.name
         @checkin_time = sbk.checkin_at
+        @dining = df
         break
       end
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 71666293..deeb997b 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -534,7 +534,7 @@
                 var sale_id = "<%= @dining.id %>";
             }
             //var table_id = $('.tables').attr("data-id");            
-            window.location.href = '/origami/' + sale_id + "/surveys"
+            window.location.href = '/origami/' + sale_id +"/"+cashier_type+ "/surveys"
         });
 
         // bind customer to order or sale
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 6a45234c..3c711051 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -313,8 +313,6 @@
 <script>
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
-
-    <%= ENV["SERVER_MODE"] %>
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
         var member_discount = $('#member_discount').text();
@@ -353,7 +351,6 @@ var cashier_type = "<%= @cashier_type %>";
       }else{
         window.location.href = '/origami/quick_service';
       }  
-      
     });
 
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){
@@ -365,6 +362,78 @@ var cashier_type = "<%= @cashier_type %>";
     update_balance();
   });
 
+  // bind survey to order or sale
+  $("#survey").on('click', function () {
+    var sale = $('#sale_id').text();
+    if (sale) {
+      var sale_id = sale
+    } else {
+      var sale_id = "<%= @dining.id %>";
+    }
+    //var table_id = $('.tables').attr("data-id");            
+     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
+  });
+
+  // bind customer to order or sale
+  $("#customer").on('click', function () {
+    var sale = $('#sale_id').text();
+    if (sale) {
+      var sale_id = sale
+    } else {
+      var sale_id = $('#save_order_id').attr('data-order');
+     }
+    var table_id = $('.tables').attr("data-id");
+    window.location.href = '/origami/' + sale_id + "/customers"
+  });
+
+  // Add Other Charges
+  $('#other-charges').click(function () {
+    var sale = $('#sale_id').text();
+    if (sale != "") {
+      var sale_id = sale
+    } else {
+      var sale_id = $('#save_order_id').attr('data-order');
+    }
+    if (sale_id != "") {
+      window.location.href = '/origami/' + sale_id + '/other_charges'
+    }
+    else {
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+    }
+    return false;
+  });
+  // Discount for Payment
+  $('#discount').click(function () {
+    if ($(this).attr('active')=== "true") {
+      var sale = $('#sale_id').text();
+      if (sale != "") {
+        var sale_id = sale
+      } else {
+        var sale_id = $('#save_order_id').attr('data-order');
+      }
+
+      if (sale_id != "") {
+        window.location.href = '/origami/' + sale_id + '/discount'
+      }
+      else {
+        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+      }
+    }else{
+      swal("Opps","You are not authorized for Discount","warning")
+    }
+    return false;
+  });
+
+  $('#edit').on('click', function () {
+    var dining_id = "<%= @dining.id %>"
+    var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+    if ($(this).attr('active')=== "true") {
+      window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+    }else{
+      swal("Opps","You are not authorized for void","warning")
+    }
+  });
+
   $(document).on('click', '.cashier_number', function(event){
     if(event.handled !== true) {
       var original_value;
diff --git a/config/routes.rb b/config/routes.rb
index 1b23f1b2..57cb6743 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -197,7 +197,7 @@ scope "(:locale)", locale: /en|mm/ do
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 
-    get '/:id/surveys', to: "surveys#new"
+    get '/:id/:type/surveys', to: "surveys#new"
     post '/:id/create_survey' => "surveys#create", :as => "create_surveys"
 
     get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }

From 2ebfdbe8bc27fb5bb07103804d9f69166af78a00 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Feb 2018 15:29:31 +0630
Subject: [PATCH 159/651] add updated qty text in oqs

---
 app/controllers/oqs/edit_controller.rb    |  6 ++++--
 app/controllers/oqs/print_controller.rb   |  2 +-
 app/models/printer/order_queue_printer.rb | 12 ++++++------
 app/pdf/order_item_pdf.rb                 | 20 +++++++++++++++++---
 app/pdf/order_item_slim_pdf.rb            | 20 +++++++++++++++++---
 app/pdf/order_set_item_pdf.rb             | 20 +++++++++++++++++---
 6 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 01372dd3..af37253e 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -10,7 +10,9 @@ class Oqs::EditController < BaseOqsController
     qty_weight = params[:qty_weight]
     remarks = params[:remarks]
 
-    order_item = OrderItem.find(order_items_id);
+    order_item = OrderItem.find(order_items_id)
+    before_updated_qty = order_item.qty
+
     order_item.item_order_by = current_user.name
     order_item.qty = qty_weight
     order_item.remark = remarks
@@ -45,7 +47,7 @@ class Oqs::EditController < BaseOqsController
 
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
     end
   end
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index aaa6b262..36e5d6d9 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -38,7 +38,7 @@ class Oqs::PrintController < ApplicationController
       # print when complete click 
       print_settings = PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
+      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, "", options )
       
       # update print status for completed same order items
       assigned_items.each do |ai|
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 85264737..04ad5896 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,6 +1,6 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
-  def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, options="")
+  def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, before_updated_qty="", options="")
     #Use CUPS service
     #Generate PDF
     #Print
@@ -14,7 +14,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
-    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
     order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     # check for item not to show 
     # if order_item[0].price != 0 
@@ -22,15 +22,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         order_slim_pdf.each do |order_item_slim|
           if order_item_slim[0] == 'OrderSlimPdf'
             if order_item_slim[1] == '1'
-              pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             else
-              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             end
           elsif order_item_slim[0] == 'OrderSetPdf'
             if order_item_slim[1] == '1'
-              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             else
-              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             end
           end
         end
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 9483b847..7482776c 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,7 +1,7 @@
 class OrderItemPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order_item, print_status, options, alt_name)
+  def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemPdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision)
+    order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item, options, alt_name, precision)
+  def order_items(order_item, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderItemPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_item.qty, precision)
     move_down 5
   end
 
@@ -127,4 +128,17 @@ class OrderItemPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if !before_updated_qty.nil?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 6887d201..adf212d2 100644
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -1,7 +1,7 @@
 class OrderItemSlimPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order_item_slim, print_status, options, alt_name)
+  def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemSlimPdf < Prawn::Document
     order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
 
     # order items slim
-    order_items_slim(order_item_slim, options, alt_name, print_settings.precision)
+    order_items_slim(order_item_slim, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemSlimPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items_slim(order_item_slim, options, alt_name, precision)
+  def order_items_slim(order_item_slim, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderItemSlimPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_item_slim.qty, precision)
     move_down 1
   end
 
@@ -126,4 +127,17 @@ class OrderItemSlimPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if !before_updated_qty.nil?
+        move_down 1
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 30a800b4..17be07ff 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSetItemPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order_set_item, print_status, options, alt_name)
+  def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderSetItemPdf < Prawn::Document
     order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
 
     # order items
-    order_set_items(order_set_item, options, alt_name, print_settings.precision)
+    order_set_items(order_set_item, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderSetItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_set_items(order_set_item, options, alt_name, precision)
+  def order_set_items(order_set_item, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderSetItemPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_set_item.qty, precision)
     move_down 5
   end
 
@@ -143,4 +144,17 @@ class OrderSetItemPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if !before_updated_qty.nil?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end

From 07807443776242eab2aa0066762c279dbba40a3a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Feb 2018 16:57:46 +0630
Subject: [PATCH 160/651] check booking with order item split

---
 app/controllers/origami/split_bill_controller.rb | 6 ++++--
 app/models/sale_payment.rb                       | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 3fa36f7d..96caf298 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -82,14 +82,16 @@ class Origami::SplitBillController < BaseOrigamiController
 			    order.guest_info = nil
 			    order.save
 
+			    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+
 			    order_items.each do |order_item|
-			    	orderItem = OrderItem.find(order_item.order_items_id)
+			    	orderItem = OrderItem.find(order_item["id"])
 			    	orderItem.order_id = order.order_id
 			    	orderItem.save
 			    end
 
 			    sale = Sale.new
-				status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, get_cashier_by_terminal)
+				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, get_cashier_by_terminal)
 				sale_data = Sale.find_by_sale_id(sale_id)
 	    	end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index ed1b9170..eb7e3e94 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -398,6 +398,7 @@ class SalePayment < ApplicationRecord
             end
           else
             status = false
+            sale_count += 1
           end
         end
       end

From 62ef44fd2a6d36ce9f0b2006ed2f22d558835e78 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Feb 2018 17:05:44 +0630
Subject: [PATCH 161/651] check before updated qty

---
 app/pdf/order_item_pdf.rb      | 2 +-
 app/pdf/order_item_slim_pdf.rb | 2 +-
 app/pdf/order_set_item_pdf.rb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 7482776c..26253b6e 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -130,7 +130,7 @@ class OrderItemPdf < Prawn::Document
 
   #add updated qty text
   def add_updated_qty_text(before_updated_qty, updated_qty, precision)
-    if !before_updated_qty.nil?
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
         move_down 5
 
         # add option
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index adf212d2..f419f185 100644
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -129,7 +129,7 @@ class OrderItemSlimPdf < Prawn::Document
 
   #add updated qty text
   def add_updated_qty_text(before_updated_qty, updated_qty, precision)
-    if !before_updated_qty.nil?
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
         move_down 1
 
         # add option
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 17be07ff..8f915ad0 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -146,7 +146,7 @@ class OrderSetItemPdf < Prawn::Document
 
   #add updated qty text
   def add_updated_qty_text(before_updated_qty, updated_qty, precision)
-    if !before_updated_qty.nil?
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
         move_down 5
 
         # add option

From 3f247f731eac607fbdf45ae9fb83779b99e8890f Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 5 Feb 2018 18:11:45 +0630
Subject: [PATCH 162/651] Shop name in navbar,linke to shop info

---
 Gemfile.lock                                  | 60 +++++++++----------
 app/assets/stylesheets/origami.scss           |  2 +-
 app/assets/stylesheets/reset.css              |  9 +++
 app/controllers/application_controller.rb     |  6 +-
 app/controllers/crm/bookings_controller.rb    |  7 ++-
 app/controllers/crm/customers_controller.rb   |  6 ++
 .../crm/dining_queues_controller.rb           |  6 ++
 app/controllers/crm/home_controller.rb        |  7 ++-
 app/controllers/oqs/backhome_controller.rb    | 11 ++++
 app/controllers/oqs/edit_controller.rb        |  6 ++
 app/controllers/oqs/home_controller.rb        |  6 ++
 app/controllers/oqs/print_controller.rb       |  6 ++
 .../origami/addorders_controller.rb           |  5 ++
 .../origami/bank_integration_controller.rb    |  6 ++
 .../origami/card_payments_controller.rb       |  5 ++
 .../origami/cash_ins_controller.rb            |  6 ++
 .../origami/cash_mgmt_controller.rb           |  6 ++
 .../origami/cash_outs_controller.rb           |  6 ++
 .../origami/check_in_process_controller.rb    |  6 ++
 .../origami/credit_payments_controller.rb     |  6 ++
 .../origami/customers_controller.rb           |  6 +-
 .../origami/discounts_controller.rb           |  6 +-
 app/controllers/origami/home_controller.rb    |  5 ++
 app/controllers/origami/home_controller_bk.rb |  5 ++
 .../origami/in_duties_controller.rb           |  6 ++
 app/controllers/origami/jcb_controller.rb     |  5 ++
 app/controllers/origami/master_controller.rb  |  5 ++
 .../origami/moveroom_controller.rb            |  6 ++
 .../origami/movetable_controller.rb           |  6 ++
 app/controllers/origami/mpu_controller.rb     |  5 ++
 app/controllers/origami/orders_controller.rb  |  6 ++
 .../origami/other_charges_controller.rb       |  6 ++
 .../origami/others_payments_controller.rb     |  5 ++
 .../origami/payments_controller.rb            |  6 ++
 .../origami/paypar_payments_controller.rb     |  6 ++
 .../origami/product_commissions_controller.rb |  6 ++
 .../origami/redeem_payments_controller.rb     |  6 ++
 .../origami/request_bills_controller.rb       |  6 ++
 .../origami/room_invoices_controller.rb       |  5 ++
 app/controllers/origami/rooms_controller.rb   |  6 +-
 .../origami/sale_edit_controller.rb           |  6 ++
 app/controllers/origami/sales_controller.rb   |  6 +-
 app/controllers/origami/shifts_controller.rb  |  5 ++
 app/controllers/origami/surveys_controller.rb |  6 ++
 .../origami/table_invoices_controller.rb      |  5 ++
 .../origami/unionpay_controller.rb            |  6 ++
 app/controllers/origami/visa_controller.rb    |  5 ++
 app/controllers/origami/void_controller.rb    |  6 ++
 app/controllers/origami/voucher_controller.rb |  5 ++
 .../reports/bksaleitem_controller.rb          |  6 ++
 .../reports/commission_controller.rb          |  6 ++
 .../reports/credit_payment_controller.rb      |  6 ++
 .../reports/dailysale_controller.rb           |  6 ++
 .../reports/payment_method_controller.rb      |  6 ++
 .../reports/receipt_no_controller.rb          |  6 ++
 .../reports/saleitem_controller.rb            |  7 ++-
 .../reports/shiftsale_controller.rb           |  6 ++
 .../reports/stock_check_controller.rb         |  6 ++
 .../reports/void_sale_controller.rb           |  6 ++
 app/models/ability.rb                         |  7 ++-
 app/views/layouts/_header.html.erb            | 21 ++++++-
 app/views/layouts/_left_sidebar.html.erb      | 18 +++---
 app/views/layouts/login_dashboard.html.erb    |  2 +-
 app/views/origami/home/show.html.erb          |  5 +-
 64 files changed, 400 insertions(+), 55 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c7e6534..899a471a 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,7 +53,7 @@ GEM
     bcrypt (3.1.11)
     bindex (0.5.0)
     builder (3.2.3)
-    byebug (9.1.0)
+    byebug (10.0.0)
     cancancan (1.17.0)
     capistrano (3.10.1)
       airbrussh (>= 1.0.0)
@@ -66,7 +66,7 @@ GEM
     capistrano-rails (1.3.1)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    carrierwave (1.2.1)
+    carrierwave (1.2.2)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
@@ -81,7 +81,7 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
-    crass (1.0.2)
+    crass (1.0.3)
     cups (0.1.10)
     database_cleaner (1.6.2)
     diff-lcs (1.3)
@@ -92,17 +92,17 @@ GEM
     factory_girl_rails (4.9.0)
       factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.8.7)
+      i18n (>= 0.7)
     ffi (1.9.18)
-    filterrific (2.1.2)
-    font-awesome-rails (4.7.0.2)
+    filterrific (5.0.1)
+    font-awesome-rails (4.7.0.3)
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
@@ -142,32 +142,32 @@ GEM
     mini_magick (4.8.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
     momentjs-rails (2.17.1)
       railties (>= 3.1)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
-    mysql2 (0.4.9)
+    mysql2 (0.4.10)
     nested_form (0.3.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
-    nio4r (2.1.0)
-    nokogiri (1.8.1)
+    nio4r (2.2.0)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     pdf-core (0.7.0)
-    pg (0.21.0)
+    pg (1.0.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    puma (3.10.0)
-    rack (2.0.3)
+    puma (3.11.2)
+    rack (2.0.4)
     rack-cors (1.0.2)
     rack-protection (2.0.0)
       rack
-    rack-test (0.7.0)
+    rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rails (5.1.4)
       actioncable (= 5.1.4)
@@ -192,12 +192,12 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.2.1)
+    rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redis (3.3.5)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -205,7 +205,7 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-rails (3.7.1)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -213,14 +213,14 @@ GEM
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+    rspec-support (3.7.1)
     ruby-ole (1.2.12.1)
-    sass (3.5.3)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.6)
+    sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -238,7 +238,7 @@ GEM
     simple_form (3.5.0)
       actionpack (> 4, < 5.2)
       activemodel (> 4, < 5.2)
-    spreadsheet (1.1.4)
+    spreadsheet (1.1.5)
       ruby-ole (>= 1.0)
     spring (2.0.2)
       activesupport (>= 4.2)
@@ -263,12 +263,12 @@ GEM
     to_xls-rails (1.3.1)
       spreadsheet (>= 0.8.5)
     ttfunk (1.5.1)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.3)
+    turbolinks (5.1.0)
+      turbolinks-source (~> 5.1)
+    turbolinks-source (5.1.0)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
+    uglifier (4.1.5)
       execjs (>= 0.3.0, < 3)
     web-console (3.5.1)
       actionview (>= 5.0)
@@ -277,8 +277,8 @@ GEM
       railties (>= 5.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    whenever (0.9.7)
+    websocket-extensions (0.1.3)
+    whenever (0.10.0)
       chronic (>= 0.6.3)
 
 PLATFORMS
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 30d8a090..0e67c57e 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -134,7 +134,7 @@ select.form-control {
 }
 
 .credit-color{
-	background-color:#FF5722;
+	background-color:#FFA500;
 }
 
 .other-payment-color{
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index ea0aaa4f..78f23e15 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -68,6 +68,15 @@
   background-color: #ccc;
 }
 
+/*Shop Info color in navbar*/
+.shopinfo {
+  color: #212529;
+}
+
+.link-buttoon {
+  text-decoration: none;
+}
+
 @media (min-width: 768px){
   .dropdown-menu {
       padding: .3rem 0;
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66d7700..3a35a15b 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base
   # lookup domain for db from  provision
   before_action :lookup_domain, :set_locale
 
-  helper_method :current_company,:current_login_employee,:current_user
+  helper_method :current_company,:current_login_employee,:current_user,:shop_detail
    # alias_method :current_user, :current_login_employee,:current_user
   #this is base api base controller to need to inherit.
   #all token authentication must be done here
@@ -101,6 +101,10 @@ class ApplicationController < ActionController::Base
 
   end
 
+  def shop_detail
+    @shop = Shop.first
+  end
+
   def current_login_employee
     if (!session[:session_token].nil?)
       @employee = Employee.find_by_token_session(session[:session_token])
diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb
index efaa5419..30a9eb92 100755
--- a/app/controllers/crm/bookings_controller.rb
+++ b/app/controllers/crm/bookings_controller.rb
@@ -14,5 +14,10 @@ class Crm::BookingsController < BaseCrmController
 
 	    end 
     end
-
+    
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index f917538e..12944632 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -398,4 +398,10 @@ end
       params.require(:customer).permit(:id, :name, :company, :contact_no, :email,
                 :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type)
     end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end    
 end
diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb
index 8184c660..4b1eddcc 100755
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -142,4 +142,10 @@ class Crm::DiningQueuesController < BaseCrmController
     def dining_queue_params
       params.require(:dining_queue).permit(:customer_id, :name, :contact_no, :queue_no,:status,:seater,:remark)
     end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end    
 end
diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb
index 13b4ede3..b5acf59a 100755
--- a/app/controllers/crm/home_controller.rb
+++ b/app/controllers/crm/home_controller.rb
@@ -55,6 +55,11 @@ class Crm::HomeController < BaseCrmController
 
   #     end 
   # end
-
+  
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
 
diff --git a/app/controllers/oqs/backhome_controller.rb b/app/controllers/oqs/backhome_controller.rb
index 4ac5f0a2..990fa459 100755
--- a/app/controllers/oqs/backhome_controller.rb
+++ b/app/controllers/oqs/backhome_controller.rb
@@ -30,6 +30,12 @@ class Oqs::HomeController < BaseOqsController
     @queue_stations_items
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
   # Get Order items
   def get_order_items
     items = []
@@ -123,4 +129,9 @@ class Oqs::HomeController < BaseOqsController
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 01372dd3..b924702e 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -48,4 +48,10 @@ class Oqs::EditController < BaseOqsController
       order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
     end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 3ee71e8d..5ecd6920 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -209,4 +209,10 @@ class Oqs::HomeController < BaseOqsController
 
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index aaa6b262..c78dbc10 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -101,4 +101,10 @@ class Oqs::PrintController < ApplicationController
       end
     end              
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index af404d8b..400cffa5 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -179,4 +179,9 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   #    @dining = DiningFacility.find(params[:id])
   # end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/bank_integration_controller.rb b/app/controllers/origami/bank_integration_controller.rb
index a5e5d59f..6dde10da 100644
--- a/app/controllers/origami/bank_integration_controller.rb
+++ b/app/controllers/origami/bank_integration_controller.rb
@@ -95,4 +95,10 @@ class Origami::BankIntegrationController < ApplicationController #BaseOrigamiCon
 		end
 		render json: response 
 	end
+
+	#Shop Name in Navbor
+	helper_method :shop_detail
+	def shop_detail
+		@shop = Shop.first
+	end
 end
diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb
index e0c56971..cd08c16a 100755
--- a/app/controllers/origami/card_payments_controller.rb
+++ b/app/controllers/origami/card_payments_controller.rb
@@ -24,4 +24,9 @@ class Origami::CardPaymentsController < BaseOrigamiController
   def create
   end
 
+	#Shop Name in Navbor
+	helper_method :shop_detail
+	def shop_detail
+		@shop = Shop.first
+	end  
 end
diff --git a/app/controllers/origami/cash_ins_controller.rb b/app/controllers/origami/cash_ins_controller.rb
index 36860b85..4d7c2b64 100755
--- a/app/controllers/origami/cash_ins_controller.rb
+++ b/app/controllers/origami/cash_ins_controller.rb
@@ -14,4 +14,10 @@ class Origami::CashInsController < BaseOrigamiController
     shift.cash_in = shift.cash_in + amount.to_i
     shift.save
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/cash_mgmt_controller.rb b/app/controllers/origami/cash_mgmt_controller.rb
index aaf55c1f..1f48370e 100755
--- a/app/controllers/origami/cash_mgmt_controller.rb
+++ b/app/controllers/origami/cash_mgmt_controller.rb
@@ -7,4 +7,10 @@ class Origami::CashMgmtController < ApplicationController
 
   def create
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/cash_outs_controller.rb b/app/controllers/origami/cash_outs_controller.rb
index 048e78b4..cc22516c 100755
--- a/app/controllers/origami/cash_outs_controller.rb
+++ b/app/controllers/origami/cash_outs_controller.rb
@@ -12,4 +12,10 @@ class Origami::CashOutsController < BaseOrigamiController
     shift.cash_out = shift.cash_out + amount.to_i
     shift.save
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 2c5b0b38..48d55c9a 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -35,4 +35,10 @@ class Origami::CheckInProcessController < BaseOrigamiController
 			format.json { render json: respond }
 		end
 	end
+
+	#Shop Name in Navbor
+  	helper_method :shop_detail
+  	def shop_detail
+    	@shop = Shop.first
+  	end
 end
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index 404b1506..cddf4feb 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -46,4 +46,10 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+    helper_method :shop_detail
+    def shop_detail
+      @shop = Shop.first
+    end
+
 end
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index d84dac92..be1cc4dd 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -130,5 +130,9 @@ class Origami::CustomersController < BaseOrigamiController
     end
   end
 
- 
+  #Shop Name in Navbor
+    helper_method :shop_detail
+    def shop_detail
+      @shop = Shop.first
+    end   
 end
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 1166a705..4c7555b8 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -289,5 +289,9 @@ class Origami::DiscountsController < BaseOrigamiController
 
   #   redirect_to origami_path(sale_id)
   # end
-
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end    
 end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index c00b39bf..cc8aaaef 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -96,4 +96,9 @@ def set_dining
    @dining = DiningFacility.find(params[:dining_id])
 end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/home_controller_bk.rb b/app/controllers/origami/home_controller_bk.rb
index 4839f15c..3e414665 100755
--- a/app/controllers/origami/home_controller_bk.rb
+++ b/app/controllers/origami/home_controller_bk.rb
@@ -81,4 +81,9 @@ class Origami::HomeController < ApplicationController
      end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb
index 5607939a..945f3bd9 100755
--- a/app/controllers/origami/in_duties_controller.rb
+++ b/app/controllers/origami/in_duties_controller.rb
@@ -168,4 +168,10 @@ class Origami::InDutiesController < BaseOrigamiController
   def in_duty_params
     params.require(:in_duty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time)
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end 
 end
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index b8c7e7e0..e0e8e233 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -58,4 +58,9 @@ class Origami::JcbController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index b3813577..3d08bcfa 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -57,4 +57,9 @@ class Origami::MasterController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb
index 47a9fec9..5b53f68c 100755
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -36,4 +36,10 @@ class Origami::MoveroomController < BaseOrigamiController
     end
   end
   
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end 
+
 end
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 52780381..8da417ac 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -70,4 +70,10 @@ class Origami::MovetableController < BaseOrigamiController
 
      @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
    end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end   
 end
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 7b7ef5a0..7709734d 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -57,4 +57,9 @@ class Origami::MpuController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 85047ef0..c2670184 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -13,4 +13,10 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index 51a1f7db..6cb9fbf9 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -57,4 +57,10 @@ class Origami::OtherChargesController < BaseOrigamiController
 	    dining = {:table_id => table_id, :table_type => table.type }
 	    render :json => dining.to_json
 	end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end	
 end
\ No newline at end of file
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index 16c7edae..6b034ed3 100755
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -36,4 +36,9 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   def create
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 6fa61bc7..e65d9550 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -366,4 +366,10 @@ class Origami::PaymentsController < BaseOrigamiController
         end
       end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
\ No newline at end of file
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 5a15aa8c..9b23a12f 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -27,4 +27,10 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 		end
 
 	end
+	
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index 74dd8095..2ab9a618 100755
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -136,4 +136,10 @@ class Origami::ProductCommissionsController < BaseOrigamiController
   def product_commission_params
     params.fetch(:product_commission, {})
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 2fdedf32..56fcb738 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -67,4 +67,10 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
      		end
      		@out = false, 0
      	end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end        
 end
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index e0f1d06c..c076a820 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -55,4 +55,10 @@ class Origami::RequestBillsController < ApplicationController
 
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/origami/room_invoices_controller.rb b/app/controllers/origami/room_invoices_controller.rb
index 8d805771..9c3b16a6 100755
--- a/app/controllers/origami/room_invoices_controller.rb
+++ b/app/controllers/origami/room_invoices_controller.rb
@@ -37,4 +37,9 @@ class Origami::RoomInvoicesController < BaseOrigamiController
     @customer = @sale.customer
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index bd375d63..13769860 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -92,5 +92,9 @@ class Origami::RoomsController < BaseOrigamiController
     # end
   end
 
-
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index c00c35f0..a4b50689 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -160,4 +160,10 @@ class Origami::SaleEditController < BaseOrigamiController
       ProductCommission.remove_product_commission(item)
     end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index bdf481c2..e57d2ca0 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -51,5 +51,9 @@ class Origami::SalesController < BaseOrigamiController
     end
   end
 
-
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index cb2cc830..435a98d1 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -108,4 +108,9 @@ class Origami::ShiftsController < BaseOrigamiController
     
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index b1baa0a8..90ff4c08 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -37,4 +37,10 @@ class Origami::SurveysController < BaseOrigamiController
     def survey_params
       params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, :dining_name,:receipt_no,:shift_id,:created_by,:total_customer,:total_amount)
     end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end    
 end
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index 655083df..a9d5d340 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -61,4 +61,9 @@ class Origami::TableInvoicesController < BaseOrigamiController
     @customer = @sale.customer
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index fc15b7f5..813f4eb5 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -58,4 +58,10 @@ class Origami::UnionpayController < BaseOrigamiController
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay")
     end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index b872aec3..8bdd8a90 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -57,4 +57,9 @@ class Origami::VisaController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 52b2068c..f9ad89a4 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -112,4 +112,10 @@ class Origami::VoidController < BaseOrigamiController
       end
     end
   end 
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
\ No newline at end of file
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index c4b3c840..750189df 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -78,4 +78,9 @@ class Origami::VoucherController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/reports/bksaleitem_controller.rb b/app/controllers/reports/bksaleitem_controller.rb
index 0f91681d..118269bb 100755
--- a/app/controllers/reports/bksaleitem_controller.rb
+++ b/app/controllers/reports/bksaleitem_controller.rb
@@ -16,4 +16,10 @@ class Reports::SaleitemController < BaseReportController
   	
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
+
 end
diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb
index e97a1a77..9e13bd75 100755
--- a/app/controllers/reports/commission_controller.rb
+++ b/app/controllers/reports/commission_controller.rb
@@ -49,5 +49,11 @@ class Reports::CommissionController < BaseReportController
       format.json { render json: out }
     end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
 
diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb
index 3b716cc2..abf7a6af 100755
--- a/app/controllers/reports/credit_payment_controller.rb
+++ b/app/controllers/reports/credit_payment_controller.rb
@@ -59,4 +59,10 @@ authorize_resource :class => false
 	      format.json { render json: out }
 	    end
 	end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end	
 end
\ No newline at end of file
diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb
index e2102d87..d43355fa 100755
--- a/app/controllers/reports/dailysale_controller.rb
+++ b/app/controllers/reports/dailysale_controller.rb
@@ -19,4 +19,10 @@ class Reports::DailysaleController < BaseReportController
   def show
   	
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index 01a904ae..0262594f 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -61,4 +61,10 @@ class Reports::PaymentMethodController < BaseReportController
 	      format.json { render json: out }
 	    end
 	end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end	
 end
\ No newline at end of file
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index faa12eae..ead85d72 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -61,4 +61,10 @@ authorize_resource :class => false
 	      format.json { render json: out }
 	    end
 	end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end	
 end
\ No newline at end of file
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index a9d23797..58421342 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -76,5 +76,10 @@ class Reports::SaleitemController < BaseReportController
         format.json { render json: out }
       end
   end
-  
+ 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index f9373374..cf722495 100755
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -47,5 +47,11 @@ class Reports::ShiftsaleController < BaseReportController
         format.json { render json: out }
       end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
 
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index a9188f5d..9a033956 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -46,5 +46,11 @@ class Reports::StockCheckController < BaseReportController
       format.json { render json: out }
     end
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
 
diff --git a/app/controllers/reports/void_sale_controller.rb b/app/controllers/reports/void_sale_controller.rb
index 6169dadc..50a7c57d 100755
--- a/app/controllers/reports/void_sale_controller.rb
+++ b/app/controllers/reports/void_sale_controller.rb
@@ -58,4 +58,10 @@ authorize_resource :class => false
 	      format.json { render json: out }
 	    end
 	end
+
+  	#Shop Name in Navbor
+  	helper_method :shop_detail
+  	def shop_detail
+    	@shop = Shop.first
+  	end	
 end
\ No newline at end of file
diff --git a/app/models/ability.rb b/app/models/ability.rb
index a72a47d2..1d310367 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -102,7 +102,9 @@ class Ability
         can :menage, Booking
         can :manage, OrderQueueStation
         can :read, Sale  
-        can :update, Sale      
+        can :update, Sale    
+
+        can :manage, Customer   
         can :get_customer, Customer
         can :add_customer, Customer
         can :update_sale_by_customer, Customer
@@ -126,12 +128,11 @@ class Ability
 
         can :move_dining, :moveroom
 
-        can :manage, DiningQueue
-
         can :manage, Commission
         can :manage, Commissioner
         can :manage, Promotion
         can :manage, Product
+
                                                
     elsif user.role == "account"
 
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 67746ba6..babc6e06 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -25,6 +25,13 @@
             </a>
                        
         </div>
+        <!-- Start Shop Info -->
+        <div class="navbar-right">
+            <div class="col-lg-12 col-md-12 col-sm-12 navbar-brand">
+                <span class="navbar-brand-txt"><%= shop_detail.name %></span>
+            </div>
+        </div>
+        <!-- End Shop Info -->
         <!-- Start Delete confirrm text !-->
         <div class="navbar-right">
             <a href="javascript:void(0);" class="dropdown-toggle waves-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 
@@ -33,12 +40,24 @@
                 <% end %>
             </a>
             <ul class="dropdown-menu">
+                <li>
+                    <p class="waves-effect waves-block p-l-30 m-b-5">
+                        <a href="/settings/shops/1" style="text-decoration: none;">
+                            <i class="material-icons font-7 logout_icon shopinfo">info</i>
+                            <span class="font-15 shopinfo" >Shop Info</span>
+                        </a>
+                    </p>    
+                </li>
                 <li>
                     <!-- <%if current_login_employee.role !="waiter" %> -->
                     <!-- <%end%> -->  
-                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
+                    <!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
                         <i class="material-icons font-10 logout_icon">exit_to_app</i>
                         <span class="font-18">Logout</span>
+                    </p> -->
+                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
+                        <i class="material-icons font-7 logout_icon">exit_to_app</i>
+                        <span class="font-15">Logout</span>
                     </p>
                      <span class="hidden" id="delete_text">
                         <h6>Are you sure you want to Logout ?</h6>
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index c6b1356a..f9ac6d79 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -51,22 +51,24 @@
 				</a>
 			</li>
 			<% end %>
-			<% if can? :menage, Customer %>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">widgets</i>
 					<span><%= t :crm %></span>
 				</a>
 				<ul class="ml-menu">
-					<li>
-						<a href="<%= crm_customers_path %>"><%= t :customer %></a>
-					</li>
-					<li>
-						<a href="<%= crm_dining_queues_path %>"><%= t :queue %></a>
-					</li>
+					<% if can? :menage, Customer %>
+						<li>
+							<a href="<%= crm_customers_path %>"><%= t :customer %></a>
+						</li>
+					<% end %>	
+					<% if can? :menage, DiningQueue %>
+						<li>
+							<a href="<%= crm_dining_queues_path %>"><%= t :queue %></a>
+						</li>	
+					<% end %>	
 				</ul>
 			</li>
-			<% end %>
 			<% if can? :menage, Inventory %>
 			<!-- <li>
 				<a href="<%= inventory_path %>">
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index f847ae54..e238953f 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -58,7 +58,7 @@
     <!-- #END# Page Loader -->
     <div class="container">
     	<div class="row">
-	    	<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">
+	    	<div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
                 <img src="/image/SX-logo.png" width="150px" height="150px">
 	    		 <p>
 		            <small>Version - 1.0.1</small>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0b70e159..8167a8eb 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -406,14 +406,13 @@
                   <!-- <button type="button" class="btn btn-block bg-blue waves-effect" disabled> Void</button> -->
               <% end %>
               <% if @status_sale == 'sale' %>
+                  <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
+                  <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true"> Void</button>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
-
-                  <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
-                  <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
                    <!-- first bill not used in cloud -->
                   <% if ENV["SERVER_MODE"] == "cloud" %>
                     <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>

From 85020d91bf2f9586c5871ada19a273f5b9778eae Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 09:52:27 +0630
Subject: [PATCH 163/651] update table box

---
 .../origami/customers_controller.rb           |  2 +
 .../origami/discounts_controller.rb           |  1 +
 .../origami/other_charges_controller.rb       |  1 +
 .../origami/quick_service_controller.rb       |  4 +-
 .../origami/sale_edit_controller.rb           |  7 +-
 app/controllers/origami/surveys_controller.rb | 11 ++-
 app/views/origami/addorders/detail.html.erb   | 55 +++++++++----
 app/views/origami/customers/index.html.erb    | 14 +++-
 app/views/origami/discounts/index.html.erb    | 78 ++++++++++++-------
 app/views/origami/home/show.html.erb          |  9 ++-
 .../origami/other_charges/index.html.erb      | 18 +++--
 app/views/origami/payments/show.html.erb      | 12 +--
 app/views/origami/sale_edit/edit.html.erb     | 21 +++--
 app/views/origami/surveys/_form.html.erb      |  9 ++-
 config/routes.rb                              | 10 +--
 15 files changed, 173 insertions(+), 79 deletions(-)

diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index d84dac92..499f0cd4 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -49,6 +49,8 @@ class Origami::CustomersController < BaseOrigamiController
   def add_customer
 
     @sale_id             = params[:sale_id]
+    @cashier_type        = params[:type]
+    
      if(@sale_id[0,3] == "SAL")
        @booking          = Booking.find_by_sale_id(@sale_id)
        @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 1166a705..17c00af7 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -4,6 +4,7 @@ class Origami::DiscountsController < BaseOrigamiController
   #discount page show from origami index with selected order
   def index
 	  sale_id = params[:id]
+    @cashier_type = params[:type]
     if Sale.exists?(sale_id)
       @sale_data = Sale.find(sale_id)
       @table =  DiningFacility.find(@sale_data.bookings[0].dining_facility_id)
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index 51a1f7db..1cc50224 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -3,6 +3,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 
 	def index
 		sale_id = params[:sale_id]
+		@cashier_type = params[:type]
 	    if Sale.exists?(sale_id)
 	      @sale_data = Sale.find(sale_id)
 	      @table =  DiningFacility.find(@sale_data.bookings[0].dining_facility_id)
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 374b9ffa..744d4d68 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -3,8 +3,10 @@ class Origami::QuickServiceController < ApplicationController
 
   def index
     @menu   = MenuCategory.all.active
-    @dining = DiningFacility.all.active
+    @dining   = DiningFacility.all.active
     @customer = Customer.all
+    @tables   = Table.all.active.order('status desc')
+    @rooms    = Room.all.active.order('status desc')
       # @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')
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index c00c35f0..e539356a 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -2,9 +2,10 @@ class Origami::SaleEditController < BaseOrigamiController
   authorize_resource class: false
   # Index for sale item void OR edit
   def edit
-    sale_id = params[:sale_id]
-    @table_id = params[:table_id]
-    @saleobj = Sale.find(sale_id)
+    sale_id     = params[:sale_id]
+    @table_id   = params[:table_id]
+    @cashier_type = params[:type]
+    @saleobj    = Sale.find(sale_id)
   end
 
   # create item void. make duplicate old record and update qty and price
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index b1baa0a8..cfabae01 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -2,6 +2,7 @@ class Origami::SurveysController < BaseOrigamiController
 	def new
 		@survey = Survey.new
 		@id             = params[:id]
+		@cashier_type   = params[:type]
 
 	    if(@id[0,3] == "SAL")
 	       @sale             = Sale.find(@id)
@@ -20,8 +21,14 @@ class Origami::SurveysController < BaseOrigamiController
 
 	def create
 		@dining_facility   = DiningFacility.find(params[:table_id])
-		@url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id]
-
+		
+		@type = params[:cashier_type]
+		@sale_id = params[:sale_id]
+		if @type == "quick_service"
+			@url = "/origami/sale/"+@sale_id+"/"+@type+"/payment"
+		else
+			@url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id]
+		end
 		@survey = Survey.new(survey_params)
 		@survey.foreigner = params["survey"]["foreigner"].to_json
 		# respond_to do |format|
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 6faa535a..0dbfe61c 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -75,12 +75,7 @@
                </div>
                <!-- <div class="col-md-3">Table -</div>  -->
                <div class="col-md-6">
-               <select class="form-control m-t--5" id="table_id" name="table_id"  >
-                <option value="">Select Table</option>
-                  <%  @dining.each do |table| %>
-                    <option value="<%= table.id %>" data-type="<%=table.type%>"><%= table.name %></option>
-                  <%end %>
-                </select> 
+               <a class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#TableModal">Select Table</a>
                 </div>
             </div>
           <% else %>
@@ -120,7 +115,7 @@
                </table>
 
                 <% if type %>
-                  <div class="row clearfix">
+                  <div class="row clearfix hidden">
                    <div class="col-md-4 ">
                      <strong id="order-title" class="font-14">Customer</strong>
                    </div>
@@ -232,7 +227,6 @@
                   <div class="col-md-7 item-detail">      
                       <h5>Attributes</h5>           
                      <div class="attributes-list">
-
                      </div>
                      <hr>
                      <h5>Options</h5>
@@ -246,11 +240,7 @@
                 <div class="mr-auto">
                   <h4 class=" pull-left">Total : <span id="total_price"></span></h4>
                 </div>
-               
-              
-
                <div class="row">
-
                 <div class="col-md-4">
                   <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
                 </div>
@@ -333,4 +323,43 @@
       </div>
     </div>
 
-
+    <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h4 class="modal-title" id="TableModalLabel">Select Table</h4>
+             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+          </div>
+          <div class="modal-body">
+           <h5>Table</h5>
+            <div class="card-columns">
+                  <% @tables.each do |table| %>
+                      <div class="card tables  text-white" data-id="<%= table.name %>">
+                        <div class="card-block">
+                          <%= table.name %>
+                          <span class="float-right font-12"><%= table.name %></span>
+                        </div>
+                      </div>
+                  <% end %>
+                </div>
+                <hr>
+                <h5>Room</h5>
+            <div class="card-columns">
+                  <% @rooms.each do |room| %>
+                      <div class="card tables  text-white" data-id="<%= room.name %>">
+                        <div class="card-block">
+                          <%= room.name %>
+                          <span class="float-right font-12"><%= room.name %></span>
+                        </div>
+                      </div>
+                  <% end %>
+                </div>
+          </div>
+          <div class="modal-footer  p-r-30">
+            <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+            &nbsp;  &nbsp;
+            <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+          </div>
+        </div>
+      </div>
+    </div>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 80f90a2d..88f4646d 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -258,6 +258,7 @@
   </div>
 </div>
 <script type="text/javascript">
+  var cashier_type = "<%= @cashier_type %>"; 
   $(function() {
       /*$('.datepicker').datepicker({
        setDate: '12-12-1999',
@@ -435,11 +436,16 @@
           {
             var id       = $("#table_id").val();
             var type     = $("#type").val();
-            if (type=="Table") {
-              window.location.href = '/origami/table/'+id
+            if (cashier_type == "quick_service") {
+               window.location.href = '/origami/table/'+id
+               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
             }else{
-             window.location.href = '/origami/room/'+id
-           }
+              if (type=="Table") {
+                window.location.href = '/origami/table/'+id
+              }else{
+               window.location.href = '/origami/room/'+id
+              }
+            }
           }else{
             swal("Alert!", "Record not found!", "error");
             location.reload();
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 72f4fd3c..33141666 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -225,18 +225,22 @@
 </div>
 
 <script type="text/javascript">
+var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function(){
 
 		$('#back').on('click',function(){
 		    var id       = $("#table_id").text();
 		    var type     = $("#table_type").text();
-		    console.log(id);
-		    console.log(type);
-		    if (type=="Table") {
-		      window.location.href = '/origami/table/'+id
+		    var sale_id = $('#sale-id').text();
+		    if (cashier_type=="quick_service") {
+				window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
 		    }else{
-		     window.location.href = '/origami/room/'+id
-		   }
+		    	if (type=="Table") {
+			      window.location.href = '/origami/table/'+id
+			    }else{
+			      window.location.href = '/origami/room/'+id
+			    }
+		    }
 		 })
 
 		$(".cashier_number").on('click', function(event){
@@ -404,11 +408,15 @@
 			        title: "Information!",
 			        text: result.status,
 			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
+			    	if (cashier_type=="quick_service") {
+			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+			    	}else{
+			    		if(result.table_type == "Table"){
+			    			window.location.href = "/origami/table/" + result.table_id
+				    	}
+				    	else {
+				    		window.location.href = "/origami/room/" + result.table_id
+				    	}
 			    	}
 			    });	    			    	
 			}
@@ -451,12 +459,16 @@
 			        text: result.status,
 			        type: "success",
 			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
-			    	}
+			    	if (cashier_type=="quick_service") {
+			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+			    	}else{
+				    	if(result.table_type == "Table"){
+				    		window.location.href = "/origami/table/" + result.table_id
+				    	}
+				    	else {
+				    		window.location.href = "/origami/room/" + result.table_id
+				    	}
+				    }
 			    });			
 			}
 		});
@@ -474,12 +486,16 @@
 			        text: result.status,
 			        type: "success",
 			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
-			    	}
+			    	if (cashier_type=="quick_service") {
+			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+			    	}else{
+				    	if(result.table_type == "Table"){
+				    		window.location.href = "/origami/table/" + result.table_id
+				    	}
+				    	else {
+				    		window.location.href = "/origami/room/" + result.table_id
+				    	}
+				    }
 			    });			
 			}
 		});
@@ -519,12 +535,16 @@
 			        confirmButtonText: 'OK',
 			        confirmButtonColor: btn_color,
 			    }, function () {
-			    	if(result.table_type == "Table"){
-			    		window.location.href = "/origami/table/" + result.table_id
-			    	}
-			    	else {
-			    		window.location.href = "/origami/room/" + result.table_id
-			    	}
+			    	if (cashier_type=="quick_service") {
+			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+			    	}else{
+				    	if(result.table_type == "Table"){
+				    		window.location.href = "/origami/table/" + result.table_id
+				    	}
+				    	else {
+				    		window.location.href = "/origami/room/" + result.table_id
+				    	}
+				    }
 			    });
 			}
 		});
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index deeb997b..f42f0c12 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -467,6 +467,7 @@
     </div>
 </div>
 <script>
+  cashier_type = "cashier"
     $(document).ready(function () {
       /* start check first bill or not*/
         var receipt_no = "";
@@ -547,7 +548,7 @@
             }
             var table_id = $('.tables').attr("data-id");
 
-            window.location.href = '/origami/' + sale_id + "/customers"
+            window.location.href = '/origami/' + sale_id+"/"+cashier_type + "/customers"
 
         });
 
@@ -568,7 +569,7 @@
             }
 
             if (sale_id != "") {
-                window.location.href = '/origami/' + sale_id + '/other_charges'
+                window.location.href = '/origami/' + sale_id + "/"+cashier_type+ '/other_charges'
             }
             else {
                 swal ( "Oops" ,  "Please select an table!" ,  "warning" );
@@ -589,7 +590,7 @@
             }
 
             if (sale_id != "") {
-                window.location.href = '/origami/' + sale_id + '/discount'
+                window.location.href = '/origami/' + sale_id+ "/"+cashier_type+'/discount'
             }
             else {
               swal ( "Oops" ,  "Please select an table!" ,  "warning" );
@@ -758,7 +759,7 @@
         var dining_id = "<%= @dining.id %>"
         var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
         if ($(this).attr('active')=== "true") {
-           window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+           window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
         }else{
           swal("Opps","You are not authorized for void","warning")
         }
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index 627e7342..9e3b7c3f 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -204,6 +204,8 @@
 </div>
 </div>
 <script type="text/javascript">
+var cashier_type = "<%= @cashier_type %>";
+
 	$(document).ready(function(){     
 		$(".cashier_number").on('click', function(event){
 			if(event.handled !== true) {
@@ -313,12 +315,16 @@
             title: "Information!",
             text: "Success",
           }, function () {
-            if(result.table_type == "Table"){
-              window.location.href = "/origami/table/" + result.table_id
-            }
-            else {
-              window.location.href = "/origami/room/" + result.table_id
-            }
+            if (cashier_type=="quick_service") {
+              window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+            }else{
+              if(result.table_type == "Table"){
+                window.location.href = "/origami/table/" + result.table_id
+              }
+              else {
+                window.location.href = "/origami/room/" + result.table_id
+              }
+            }s
           });		    	
 				}
 			});
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 3c711051..bac0b8c8 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -297,7 +297,7 @@
   <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
   <% if @cashier_type=="quick_service" %>
 <hr>
-  <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
+
  <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
  <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
@@ -383,7 +383,7 @@ var cashier_type = "<%= @cashier_type %>";
       var sale_id = $('#save_order_id').attr('data-order');
      }
     var table_id = $('.tables').attr("data-id");
-    window.location.href = '/origami/' + sale_id + "/customers"
+    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers"
   });
 
   // Add Other Charges
@@ -395,7 +395,7 @@ var cashier_type = "<%= @cashier_type %>";
       var sale_id = $('#save_order_id').attr('data-order');
     }
     if (sale_id != "") {
-      window.location.href = '/origami/' + sale_id + '/other_charges'
+      window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/other_charges'
     }
     else {
       swal ( "Oops" ,  "Please select an table!" ,  "warning" );
@@ -413,7 +413,7 @@ var cashier_type = "<%= @cashier_type %>";
       }
 
       if (sale_id != "") {
-        window.location.href = '/origami/' + sale_id + '/discount'
+        window.location.href = '/origami/' + sale_id + "/"+cashier_type+'/discount'
       }
       else {
         swal ( "Oops" ,  "Please select an table!" ,  "warning" );
@@ -426,9 +426,9 @@ var cashier_type = "<%= @cashier_type %>";
 
   $('#edit').on('click', function () {
     var dining_id = "<%= @dining.id %>"
-    var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+    var sale_id = $('#sale_id').text();
     if ($(this).attr('active')=== "true") {
-      window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+      window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
     }else{
       swal("Opps","You are not authorized for void","warning")
     }
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 1aaa02ca..013d2845 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -128,15 +128,16 @@
 </div>
 </div>
 <script>
+var cashier_type = "<%= @cashier_type %>"; 
     // Bill Request
     $(document).ready(function () {
 
         $(".update").on('click', function () {
             var sale_item_id = $(this).attr('data-id');
-            var qty = $('#' + sale_item_id + "_qty").val();
-            var price = $('#' + sale_item_id + "_price").val();
+            var qty          = $('#' + sale_item_id + "_qty").val();
+            var price        = $('#' + sale_item_id + "_price").val();
             console.log(qty + "|" + price)
-            var ajax_url = "/origami/item_edit";
+            var ajax_url      = "/origami/item_edit";
             $.ajax({
                 type: "POST",
                 url: ajax_url,
@@ -196,7 +197,12 @@
 
     $('#back').on('click', function () {
         var table_id = '<%= @table_id %>'
-        window.location.href = '/origami/table/' + table_id;
+        var sale_id = "<%= @saleobj.sale_id %>"
+        if (cashier_type=="quick_service") {
+          window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+        }else{
+          window.location.href = '/origami/table/' + table_id;
+        }        
     })
 
     $('#cancel_all_void').on('click', function () {
@@ -221,7 +227,12 @@
             url: ajax_url,
             data: 'sale_id=' + sale_id,
             success: function (result) {
-                window.location.href = '/origami/table/' + table_id;
+              if (cashier_type=="quick_service") {
+                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+              }else{
+                 window.location.href = '/origami/table/' + table_id;
+              } 
+               
             }
         });
     })
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index b5e9e8e4..9f2b5d06 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -42,6 +42,8 @@
          </div>
 
          <input type="hidden" name="table_id" value="<%=@dining_facility.id%>">
+          <input type="hidden" name="sale_id" value="<%=@id%>">
+          <input type="hidden" name="cashier_type" value="<%=@cashier_type%>">
          <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
          <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %>
          <%= f.input :receipt_no, :as => :hidden, :input_html => { :value => @receipt_no} %>
@@ -145,6 +147,7 @@
 </div>
 
 <script type="text/javascript">
+var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
     //click add button for new row
     $('#addForeigner').on('click',function(){
@@ -223,17 +226,21 @@
         return false;
       }
     });
-
     // click back button for redirect
     $('#back').on('click',function(){
       table_type    = '<%=@table_type%>';
       table_id      = '<%=@dining_facility.id%>';
+
+      if (cashier_type == "quick_service") {
+        window.location.href = '/origami/sale/<%= @id %>/<%= @cashier_type %>/payment/';
+      }else{
         if(table_type == "Table"){
           window.location.href = "/origami/table/" + table_id
         }
         else {
           window.location.href = "/origami/room/" + table_id
         }
+      }
     });
 
   });
diff --git a/config/routes.rb b/config/routes.rb
index 57cb6743..546a456a 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -98,7 +98,7 @@ scope "(:locale)", locale: /en|mm/ do
       resources :customers #add customer type
     end
     post 'moving' => "movetable#moving"
-    get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
+    get "/table/:table_id/sale/:sale_id/:type/edit" => "sale_edit#edit"
     post 'item_void' => "sale_edit#item_void"
     post 'item_foc' => "sale_edit#item_foc"
     post 'item_edit' => "sale_edit#item_edit"
@@ -124,11 +124,11 @@ scope "(:locale)", locale: /en|mm/ do
     # post '/:booking_id' => 'home#item_show'
 
     # Other Charges
-    get "/:sale_id/other_charges" => "other_charges#index"
+    get "/:sale_id/:type/other_charges" => "other_charges#index"
     post "/:sale_id/other_charges" => "other_charges#create"
 
     # Discount
-    get "/:id/discount" => "discounts#index"
+    get "/:id/:type/discount" => "discounts#index"
     post "/:id/discount" => "discounts#create"
     get "/:id/remove_all_discount" => "discounts#remove_all_discount"
     post "/:id/remove_discount_items" => "discounts#remove_discount_items"
@@ -191,9 +191,9 @@ scope "(:locale)", locale: /en|mm/ do
 
     #---------Add Customer --------------#
     #resources :customers
-    get '/:sale_id/customers', to: "customers#add_customer"
+    get '/:sale_id/:type/customers', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
-    post '/:sale_id/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
+    post '/:sale_id/:type/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 

From 5543b64b2785956892e9276f0cbb7b9cd342e02e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 10:30:16 +0630
Subject: [PATCH 164/651] update table box

---
 app/assets/stylesheets/addorder.scss        | 30 ++++++-
 app/views/origami/addorders/detail.html.erb | 94 ++++++++++++++++-----
 2 files changed, 103 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index e319a724..368f21c9 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -178,4 +178,32 @@ section.content{
 i.logout_icon{
   position: relative;
   top: 5px;
-}
\ No newline at end of file
+}
+
+.text-white{
+  color: #fff;
+}
+/* Colors */
+.purple {
+  background-color:#7a62d3;
+}
+
+.orange{
+   background-color:#FF7F50;
+}
+
+.red {
+  background-color:#F44336;
+}
+
+.green{
+  background-color: #009900;
+}
+
+.orange{
+  background-color: #FF8C00;
+}
+
+.blue{
+  background-color: blue;
+}
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 0dbfe61c..34c78b04 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -328,33 +328,87 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title" id="TableModalLabel">Select Table</h4>
-             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
           </div>
           <div class="modal-body">
-           <h5>Table</h5>
-            <div class="card-columns">
-                  <% @tables.each do |table| %>
-                      <div class="card tables  text-white" data-id="<%= table.name %>">
-                        <div class="card-block">
-                          <%= table.name %>
-                          <span class="float-right font-12"><%= table.name %></span>
-                        </div>
+            <h5>Table</h5>
+            <div class="card-columns" style="column-count: 7">
+              <% @tables.each do |table| %>       
+                <% if table.status == 'occupied' %>
+                  <% if table.get_booking.nil? %>
+                    <% if table.get_checkout_booking.nil? %>
+                      <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                    <% else %>                            
+                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                    <% end %>                         
+                      <div class="card-block">
+                        <%= table.name %>
+                          <!-- <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
+                          <div style="font-size:12px;"></div> -->
                       </div>
+                      </div>
+                  <% else %>         
+                    <% if table.get_checkout_booking.nil? %>
+                       <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                    <% else %>                       
+                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                    <% end %>                   
+                      <div class="card-block">
+                        <%= table.name %>
+                        <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
+                      </div>
+                    </div>
                   <% end %>
-                </div>
+                  <% else %>
+                      <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                      <div class="card-block">
+                        <%= table.name %>
+                        <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
+                      </div>
+                    </div>
+                   <% end %>
+                  <% end %>
+              </div>
                 <hr>
                 <h5>Room</h5>
-            <div class="card-columns">
-                  <% @rooms.each do |room| %>
-                      <div class="card tables  text-white" data-id="<%= room.name %>">
-                        <div class="card-block">
-                          <%= room.name %>
-                          <span class="float-right font-12"><%= room.name %></span>
+                <div class="card-columns" style="column-count: 7">
+                  <% @rooms.each do |table| %>       
+                    <% if table.status == 'occupied' %>
+                      <% if table.get_booking.nil? %>
+                        <% if table.get_checkout_booking.nil? %>
+                          <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                        <% else %>                            
+                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                        <% end %>                         
+                          <div class="card-block">
+                            <%= table.name %>
+                              <!-- <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
+                              <div style="font-size:12px;"></div> -->
+                          </div>
+                          </div>
+                      <% else %>         
+                        <% if table.get_checkout_booking.nil? %>
+                           <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                        <% else %>                       
+                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                        <% end %>                   
+                          <div class="card-block">
+                            <%= table.name %>
+                            <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
+                          </div>
                         </div>
-                      </div>
-                  <% end %>
-                </div>
-          </div>
+                      <% end %>
+                      <% else %>
+                          <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                          <div class="card-block">
+                            <%= table.name %>
+                            <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
+                          </div>
+                        </div>
+                       <% end %>
+                      <% end %>
+                  </div>
+              </div>
           <div class="modal-footer  p-r-30">
             <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
             &nbsp;  &nbsp;

From 79894d2a96ac0fed7b7201eb807a952b84e60674 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 10:33:32 +0630
Subject: [PATCH 165/651] update readme

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 8c5cf006..0bfd8bbf 100755
--- a/README.md
+++ b/README.md
@@ -103,6 +103,10 @@ Change type in mysql
 	=> ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table 
 	=> ALTER DATABASE [database_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci  #for database
 
+###please open 	
+sudo cat /etc/sudoers
+### cope and parse
+%superuser ALL=(ALL) NOPASSWD: ALL
 
 * ToDo list
 

From 1cbcab75b4a06fa2ec747b11f6b42d6d5888fe3d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 10:43:59 +0630
Subject: [PATCH 166/651] update for first bill

---
 app/controllers/origami/payments_controller.rb |  4 ++--
 app/views/origami/home/show.html.erb           | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 6fa61bc7..199325e9 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -45,8 +45,8 @@ class Origami::PaymentsController < BaseOrigamiController
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
         member_info = Customer.get_member_account(customer)
-        # current_balance = SaleAudit.paymal_search(sale_id)
-        current_balance = 0
+        current_balance = SaleAudit.paymal_search(sale_id)
+        # current_balance = 0
       end
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0b70e159..cc7c564f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -476,12 +476,15 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         
-        // console.log(checkReceiptNoInFirstBillData(receipt_no));
+        discount="<%= @membership.discount%>"
+        membership_id="<%= @obj_sale.customer.membership_id%>"
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          if(checkReceiptNoInFirstBillData(receipt_no,"")){
-            $("#pay").show();
-          }else{
-            $("#pay").hide();
+          if (discount && membership_id) {
+            if(checkReceiptNoInFirstBillData(receipt_no,"")){
+              $("#pay").show();
+            }else{
+              $("#pay").hide();
+            }
           }
         }
       /* end check first bill or not*/

From aaec4778f2ae33968beb41ad538bca979d955998 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 11:04:50 +0630
Subject: [PATCH 167/651] update table box

---
 app/views/origami/addorders/detail.html.erb | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 34c78b04..cb849a01 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -326,20 +326,20 @@
     <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
       <div class="modal-dialog" role="document">
         <div class="modal-content">
-          <div class="modal-header">
-            <h4 class="modal-title" id="TableModalLabel">Select Table</h4>
+          <div class="modal-header" style="margin-top: -1rem;">
+            <!-- <h4 class="modal-title" id="TableModalLabel">Select Table</h4> -->
              <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
           </div>
-          <div class="modal-body">
+          <div class="modal-body" style="margin-top: -0.5rem;">
             <h5>Table</h5>
-            <div class="card-columns" style="column-count: 7">
+            <div class="card-columns" style="column-count: 7;">
               <% @tables.each do |table| %>       
                 <% if table.status == 'occupied' %>
                   <% if table.get_booking.nil? %>
                     <% if table.get_checkout_booking.nil? %>
-                      <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                      <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                     <% else %>                            
-                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                     <% end %>                         
                       <div class="card-block">
                         <%= table.name %>
@@ -349,9 +349,9 @@
                       </div>
                   <% else %>         
                     <% if table.get_checkout_booking.nil? %>
-                       <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                       <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                     <% else %>                       
-                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                     <% end %>                   
                       <div class="card-block">
                         <%= table.name %>
@@ -360,7 +360,7 @@
                     </div>
                   <% end %>
                   <% else %>
-                      <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                      <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                       <div class="card-block">
                         <%= table.name %>
                         <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
@@ -371,14 +371,14 @@
               </div>
                 <hr>
                 <h5>Room</h5>
-                <div class="card-columns" style="column-count: 7">
+                <div class="card-columns" style="column-count: 7;">
                   <% @rooms.each do |table| %>       
                     <% if table.status == 'occupied' %>
                       <% if table.get_booking.nil? %>
                         <% if table.get_checkout_booking.nil? %>
-                          <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                          <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                         <% else %>                            
-                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                         <% end %>                         
                           <div class="card-block">
                             <%= table.name %>
@@ -388,9 +388,9 @@
                           </div>
                       <% else %>         
                         <% if table.get_checkout_booking.nil? %>
-                           <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                           <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                         <% else %>                       
-                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                         <% end %>                   
                           <div class="card-block">
                             <%= table.name %>
@@ -399,7 +399,7 @@
                         </div>
                       <% end %>
                       <% else %>
-                          <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                          <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
                           <div class="card-block">
                             <%= table.name %>
                             <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>

From 90e30440c1b4f69de1041b672505e8800084189e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 11:06:30 +0630
Subject: [PATCH 168/651] update discount for first bill

---
 app/views/origami/home/show.html.erb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index cc7c564f..b7d38125 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -476,10 +476,9 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         
-        discount="<%= @membership.discount%>"
-        membership_id="<%= @obj_sale.customer.membership_id%>"
+        discount="<%= @membership.discount%>"\
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          if (discount && membership_id) {
+          if (discount) {
             if(checkReceiptNoInFirstBillData(receipt_no,"")){
               $("#pay").show();
             }else{

From 76b1cda5300852a9d4f5849fcd304e29318c1db3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 11:15:43 +0630
Subject: [PATCH 169/651] update discount for first bill

---
 app/views/origami/home/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b7d38125..a5b7b23c 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -476,7 +476,7 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         
-        discount="<%= @membership.discount%>"\
+        discount="<%= @membership.discount%>"
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           if (discount) {
             if(checkReceiptNoInFirstBillData(receipt_no,"")){

From 3fcd09f8efd750e14ec1ddc7dd908bb5dc3341c8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 14:19:00 +0630
Subject: [PATCH 170/651] update update ddetail for table

---
 app/views/origami/addorders/detail.html.erb | 52 +++++++++++++++------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index cb849a01..440009e1 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -73,9 +73,10 @@
                <div class="col-md-6 ">
                  <strong id="order-title" class="font-14">ORDER DETAILS </strong>
                </div>
-               <!-- <div class="col-md-3">Table -</div>  -->
-               <div class="col-md-6">
-               <a class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#TableModal">Select Table</a>
+               <div class="col-md-3">Select</div> 
+               <div class="col-md-3 m-t--5">
+               <a class="btn btn-block bg-blue waves-effect select_table" data-toggle="modal" data-target="#TableModal"> Select </a>
+               <input type="hidden" name="table_id" value="" id="table_id">
                 </div>
             </div>
           <% else %>
@@ -337,9 +338,9 @@
                 <% if table.status == 'occupied' %>
                   <% if table.get_booking.nil? %>
                     <% if table.get_checkout_booking.nil? %>
-                      <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                      <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                     <% else %>                            
-                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                     <% end %>                         
                       <div class="card-block">
                         <%= table.name %>
@@ -349,9 +350,9 @@
                       </div>
                   <% else %>         
                     <% if table.get_checkout_booking.nil? %>
-                       <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                       <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                     <% else %>                       
-                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                     <% end %>                   
                       <div class="card-block">
                         <%= table.name %>
@@ -360,7 +361,7 @@
                     </div>
                   <% end %>
                   <% else %>
-                      <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                      <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                       <div class="card-block">
                         <%= table.name %>
                         <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
@@ -376,9 +377,9 @@
                     <% if table.status == 'occupied' %>
                       <% if table.get_booking.nil? %>
                         <% if table.get_checkout_booking.nil? %>
-                          <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                          <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                         <% else %>                            
-                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                         <% end %>                         
                           <div class="card-block">
                             <%= table.name %>
@@ -388,9 +389,9 @@
                           </div>
                       <% else %>         
                         <% if table.get_checkout_booking.nil? %>
-                           <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                           <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                         <% else %>                       
-                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                         <% end %>                   
                           <div class="card-block">
                             <%= table.name %>
@@ -399,7 +400,7 @@
                         </div>
                       <% end %>
                       <% else %>
-                          <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" style="margin-bottom: .5rem;">
+                          <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
                           <div class="card-block">
                             <%= table.name %>
                             <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
@@ -412,8 +413,31 @@
           <div class="modal-footer  p-r-30">
             <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
             &nbsp;  &nbsp;
-            <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+            <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
           </div>
         </div>
       </div>
     </div>
+<script>
+  cashier_type = "cashier"
+    $(document).ready(function () {
+    $(".tables").on('click', function () {
+        $('.tables').css('background-color','');
+        $('.tables').removeClass('purple')
+        var dining_id = $(this).attr("data-id");
+        var name = $(this).attr("data-name");
+        $(this).css('background-color','purple');
+        $(this).addClass('purple')
+        $('.confirm_table').attr("data-id",dining_id)
+        $('.confirm_table').attr("data-name",name)
+
+    });
+    $(".confirm_table").on('click', function () {
+        var dining_id = $(this).attr("data-id");
+        var name      = $(this).attr("data-name");
+        $('#table_id').val(dining_id)
+        $('.select_table').text(name)
+
+    });
+  });
+</script>
\ No newline at end of file

From f093f1f0a7446a99c331e428c9301d6a8a40665b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 6 Feb 2018 16:17:08 +0630
Subject: [PATCH 171/651] split bill for order item

---
 .../origami/split_bill_controller.rb          | 107 ++++++++++++------
 app/views/origami/orders/show.html.erb        |  10 +-
 app/views/origami/split_bill/index.html.erb   |  83 ++++++++++----
 3 files changed, 140 insertions(+), 60 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 96caf298..e1432951 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -6,21 +6,31 @@ class Origami::SplitBillController < BaseOrigamiController
 		@table = DiningFacility.find(dining_id) 
 		@booking = @table.get_booking
 		@order_items = Array.new
+		@sale_data = Array.new
+
+		table_bookings = Booking.where("dining_facility_id = #{dining_id} and sale_id IS NOT NULL")
+		if !table_bookings.nil?
+			table_bookings.each do |table_booking|
+				@sale_data.push(table_booking.sale)
+			end
+		end
+
 		if @booking
-	      @booking.booking_orders.each do |booking_order|
-	        @order = Order.find(booking_order.order_id)
-	        if (@order.status == "new")
-	          @order.order_items.each do |item|
-	            @order_items.push(item)
-	          end
-	        end
-	      end
+	      	@booking.booking_orders.each do |booking_order|
+	        	@order = Order.find(booking_order.order_id)
+		        if (@order.status == "new")
+		          @order.order_items.each do |item|
+		            @order_items.push(item)
+		          end
+		        end
+	      	end
 	    else
 	      @booking = nil
 	    end
 	end
 
 	def create
+		order_ids = params[:order_ids]
 		order_items = JSON.parse(params[:order_items])
 		# byebug
 		status = false
@@ -59,36 +69,65 @@ class Origami::SplitBillController < BaseOrigamiController
                                 :checkin_at => Time.now.utc, :checkin_by =>  current_user.name,
                                 :booking_status => "assign" })
 
-				customer = Customer.find(params[:customer_id])
-				order_type = "dine_in"
-				if !customer.nil?
-					if customer.customer_type == "Takeaway"
-						order_type = "takeaway"
-					elsif customer.customer_type == "Delivery"
-						order_type = "delivery"
+				order_item_count = 0
+				order_id = nil
+
+				order_items.each do |order_item|
+					order_item_count = 0
+					order = Order.find(order_item["order_id"])
+					if order.order_items.count == 1
+						order_id = order.id
+						break
+					else
+						order_item_count += 1
 					end
 				end
-				# begin
-			    order = Order.new
-			    order.date = Time.now.utc
-			    order.source = "cashier"
-			    order.order_type = order_type
-			    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-			    order.item_count = order_items.count
-			    order.status = "new"
-			    order.table_id = params[:dining_id]  # this is dining facilities's id
-			    order.waiters = current_user.name
-			    order.employee_name = current_user.name
-			    order.guest_info = nil
-			    order.save
 
-			    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+				if !order_id.nil?
+					BookingOrder.find_by_order_id(order_id).delete
 
-			    order_items.each do |order_item|
-			    	orderItem = OrderItem.find(order_item["id"])
-			    	orderItem.order_id = order.order_id
-			    	orderItem.save
-			    end
+					BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
+					order_items.each do |order_item|
+				    	orderItem = OrderItem.find(order_item["id"])
+				    	orderItem.order_id = order_id
+				    	orderItem.save!
+				    end
+				else
+					if order_ids.count == 1 && order_item_count == 1
+						BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
+					else
+						customer = Customer.find(params[:customer_id])
+						order_type = "dine_in"
+						if !customer.nil?
+							if customer.customer_type == "Takeaway"
+								order_type = "takeaway"
+							elsif customer.customer_type == "Delivery"
+								order_type = "delivery"
+							end
+						end
+
+						# begin
+					    order = Order.new
+					    order.source = "cashier"
+					    order.order_type = order_type
+					    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+					    order.item_count = order_items.count
+					    order.status = "new"
+					    order.table_id = params[:dining_id]  # this is dining facilities's id
+					    order.waiters = current_user.name
+					    order.employee_name = current_user.name
+					    order.guest_info = nil
+					    order.save!
+
+					    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+
+					    order_items.each do |order_item|
+					    	orderItem = OrderItem.find(order_item["id"])
+					    	orderItem.order_id = order.order_id
+					    	orderItem.save!
+					    end
+					end
+				end
 
 			    sale = Sale.new
 				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, get_cashier_by_terminal)
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 70e1ba9d..6e8163ed 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -194,16 +194,14 @@
          </div>
          </div>
          <div class="card-footer ">
-           <table class="m-b--20" id="order-charges-table" border="0">
+           <table class="table" id="order-charges-table" border="0">
              <tr>
-               <td class="charges-name"><strong>Sub Total:</strong></td>
+               <td colspan="2" class="charges-name"><strong>Sub Total:</strong></td>
                <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
              </tr>
              <tr>
-               
-                <td class="charges-name"><strong>Discount:</strong></td>
-      
-               <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
+                <td colspan="2" class="charges-name"><strong>Discount:</strong></td>
+                <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
              </tr>
               <tr class="rebate_amount"></tr>
            </table>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 6057077e..6cac0e72 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -4,7 +4,7 @@
  	</div>
  	<div class="row">
  		<!-- Column One -->
- 		<div class="col-lg-8 col-md-8 col-sm-8">
+ 		<div class="col-lg-7 col-md-7 col-sm-7">
  			<!-- Order Details -->
  			<div class="card"  >
 		        <!-- <div class="card-header">
@@ -12,14 +12,13 @@
 		      </div> -->
 		      <div class="card-block">
 		      	<div class="card-title row">
-		      		<div class="col-lg-6 col-md-6 col-sm-6">
+		      		<div class="col-lg-12 col-md-12 col-sm-12">
 		      			<span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
 		      			<span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
-		      			<span class="hidden" id="customer_id" value="<%= @order.customer_id %>"><%= @order.customer_id %></span>
-		      			<p class="m-l-10">Order No: <span id="order_no"><%=@order.order_id rescue ' '%></span></p>
-		      		</div>
-		      		<div class="col-lg-6 col-md-6 col-sm-6 text-right">
-		      			<p class="m-r-10">Date:  <span id="order_date"> <%=@order.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+		      			<% if !@order.nil? %>
+			      			<span class="hidden" id="customer_id" value="<%= @order.customer_id %>"><%= @order.customer_id %></span>
+		      			<% end %>
+		      			<p class="m-l-15">Order Lists</p>
 		      		</div>
 		      	</div>
 		      	<div id="order-detail-slimscroll" data-height="160">
@@ -40,6 +39,7 @@
 		      					%>
 		      					<tr class="item-row" id=<%= order_item.order_items_id %> >
 		      						<td style="width:60%; text-align:left">
+		      							<span id="item-order-id" class="hidden"><%=order_item.order_id%></span>
 		      							<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
 		      							<span id="item-name-price"><%=order_item.item_name%></span>
 		      						</td>
@@ -69,16 +69,42 @@
 		</div>
 </div>
 <!-- Column One -->
-<div class="col-lg-3 col-md-3 col-sm-3 clearfix"></div>
 <!-- Column Two -->
+<div class="col-lg-4 col-md-4 col-sm-4">
+	<div class="card">
+		<div class="card-block">
+			<div class="card-title row">
+				<p class="m-l-15">Receipt Lists</p>
+			</div>
+			<div id="order-detail-slimscroll" data-height="160">
+				<div class="card-text dining">
+					<% if !@sale_data.nil? %>
+						<table class="table table-default">
+							<tbody>
+								<% @sale_data.each do |sale_data| %>
+									<tr class="receipt_row" id=<%= sale_data.sale_id %> >
+										<td>Receipt No. - <span id="receipt_no"><%= sale_data.receipt_no %></span></td>
+									</tr>
+								<% end %>
+							</tbody>
+						</table>
+					<% end %>
+				</div>
+			</div>
+			<div class="card-footer"></div>
+		</div>
+	</div>
+</div>
+<!-- Column Two -->
+<!-- Column Three -->
 <div class="col-lg-1 col-md-1 col-sm-1">
 	<!-- Action Panel -->
 	<div>
 		<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
 		<button id="order_item_split" class="btn btn-primary btn- action-btn">Order Items Split</button>
-		<!-- <button id="per_person" class="btn bg-primary btn-block action-btn">Per Person</button> -->
 	</div>
 </div>
+<!-- Column Three -->
 </div>
 </div>
 
@@ -142,7 +168,7 @@
 		var order_items = get_selected_order_items();// Selected Order Items
 		var cnt_items = parseInt(cnt_order_item) - parseInt(order_items.length);
 		if (order_items.length > 0){
-			if(cnt_items > 0){
+			// if(cnt_items > 0){
 				swal({
 		            title: "Alert",
 		            text: "Are you sure, you want to Split?",
@@ -156,14 +182,21 @@
 		        		splitBillProcess(cnt_items);
 		        	}
 		        });
-			}
-			else{
-				splitBillProcess(cnt_items);
-			}
+			// }
+			// else{
+			// 	splitBillProcess(cnt_items);
+			// }
 		}else{
 			swal("Opps","Please select at least on item!","warning");
 		}
 	});
+
+	//selected receipt row click
+	$('.receipt_row').on('click',function(){
+		var dining_id       = $("#table_id").text();
+		var sale_id = $(this).attr('id').substr(0,16);
+		window.location = '/origami/table/' + dining_id + "/table_invoice/" + sale_id;
+	});
 });
 
 /* function for split bill process */
@@ -177,23 +210,32 @@ function splitBillProcess(cnt_items){
 	if(cnt_items == 0){
 		booking_id = json_booking.booking_id;
 	}
-	
+
+	var order_ids = [];
+	if(order_items!=undefined && order_items!=null){
+		$.each(order_items,function(key,value){
+			if($.inArray(value.order_id,order_ids) == -1){
+				order_ids.push(value.order_id);
+			}
+		});
+	}
+
 	var ajax_url = "/origami/split_bills";
 	$.ajax({
         type: "POST",
         url: ajax_url,
         dataType: 'JSON',
-        data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_items' : JSON.stringify(order_items)},
+        data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items)},
         success: function (result) {
             if (!result.status) {
               swal("Information!", result.error_message);
             }
             else {   
-            	if (cnt_items > 0){
+            	// if (cnt_items > 0){
             		window.location.reload();
-            	}else{
-            		backToOrigami();
-            	}
+            	// }else{
+            	// 	backToOrigami();
+            	// }
             }
         }
     });
@@ -216,6 +258,7 @@ function get_selected_order_items(){
 	$('.item-row.selected-item').each(function(i){
 		var order_item = {};
 		order_item.id = $(this).attr('id').substr(0,16);
+		order_item.order_id = $(this).find('#item-order-id').text().trim();
 		order_item.name = $(this).find('#item-name-price').text().split('@')[0];
 		order_item.account_id = $(this).find('#item-account-type').text();
 		order_item.price = $(this).find('#item-total-price').text();

From ee5abb65f846e6070aa258e9c9be67d1c6ca002d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 16:21:47 +0630
Subject: [PATCH 172/651] update home for order

---
 app/controllers/origami/home_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index c00b39bf..0dda31f5 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders   = Order.all.order('date desc')
+    @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @shop     = Shop::ShopDetail
     
     # @shift = ShiftSale.current_open_shift(current_user.id)
@@ -17,7 +17,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     
     @status_order = ""
     @status_sale = ""

From 6503ca9a484ab028589df037716f657dfac6bbbe Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 16:24:00 +0630
Subject: [PATCH 173/651] update home for oqs

---
 app/controllers/oqs/home_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 3ee71e8d..ebe737d7 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -28,9 +28,9 @@ class Oqs::HomeController < BaseOqsController
 
     if !@filter.nil?
       @count = queue_items_count_query(false,@filter)
-      @count.each do |count|
+      # @count.each do |count|
 
-      end
+      # end
     end
 
     # @queue_stations_items=Array.new

From 4440f1655989ac330f521e041e2522815d1f465b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 6 Feb 2018 17:44:10 +0630
Subject: [PATCH 174/651] update oqs for loading

---
 app/assets/javascripts/OQS.js          |  1 +
 app/controllers/oqs/home_controller.rb | 45 +++++++++++++++++++-------
 app/views/oqs/home/index.html.erb      | 17 +++-------
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index da50ac34..d039425c 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -38,6 +38,7 @@ $(document).on('turbolinks:load', function() {
        $(this).addClass('oqs_active');
        $(".queue_station").addClass('queue_station_box');
        var oqs_id = $(this).find(".oqs-id").text();
+       console.log(oqs_id)
        var url    = 'oqs/get_items/'+oqs_id;
       
        show_details(url);
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index ebe737d7..1810fade 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -1,7 +1,7 @@
 class Oqs::HomeController < BaseOqsController
   def index
 
-  	@queue_stations = OrderQueueStation.all
+  	
 
     # Query for OQS with delivery status false
   	# @queue_items_details = queue_items_query(false)
@@ -11,6 +11,8 @@ class Oqs::HomeController < BaseOqsController
 
     @filter = params[:filter]
 
+    @queue_stations = queue_items_count_query(false,@filter)
+
     @queue_completed_item = completed_order(@filter)
     if !@queue_completed_item.empty?
       @queue_completed_item.each do |queue_item|
@@ -26,12 +28,12 @@ class Oqs::HomeController < BaseOqsController
       end
     end
 
-    if !@filter.nil?
-      @count = queue_items_count_query(false,@filter)
+    # if !@filter.nil?
+      # @count = queue_items_count_query(false,@filter)
       # @count.each do |count|
 
       # end
-    end
+    # end
 
     # @queue_stations_items=Array.new
 
@@ -99,7 +101,6 @@ class Oqs::HomeController < BaseOqsController
         end
       end
     end
-
     render :json => items.to_json
   end
 
@@ -194,18 +195,38 @@ class Oqs::HomeController < BaseOqsController
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
   end
 
+  # def queue_items_count_query(status,filter) 
+  #   query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id")
+  #   .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
+  #             left join orders as od ON od.order_id = assigned_order_items.order_id
+  #             left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
+  #             left join customers as cus ON cus.customer_id = od.customer_id
+  #             left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+  #             left join bookings as bk on bk.booking_id = bo.booking_id
+  #             left join dining_facilities as df on df.id = bk.dining_facility_id")
+  #   .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
+  #   query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
+  #   .group("oqs.id")
+
+  # end
+
   def queue_items_count_query(status,filter) 
-    query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id")
-    .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
-              left join orders as od ON od.order_id = assigned_order_items.order_id
-              left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
+    query = OrderQueueStation.select("order_queue_stations.is_active as is_active,
+                                  order_queue_stations.id as station_id,
+                                  order_queue_stations.station_name as station_name,
+                                  order_queue_stations.auto_print as auto_print,
+                                  order_queue_stations.id as id,
+                                  count(odt.item_code) as total")
+    .joins(" left join assigned_order_items as aoi on aoi.order_queue_station_id= order_queue_stations.id
+              left join orders as od ON od.order_id = aoi.order_id
+              left join order_items as odt ON odt.item_instance_code = aoi.instance_code AND odt.order_id = aoi.order_id
               left join customers as cus ON cus.customer_id = od.customer_id
-              left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+              left join booking_orders as bo on bo.order_id = aoi.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
+    .where("aoi.delivery_status = #{status} AND aoi.created_at >= '#{Time.now.beginning_of_day.utc}' ")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
-    .group("oqs.id")
+    .group("order_queue_stations.id")
 
   end
 
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 1f25e275..948c1a29 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -36,19 +36,10 @@
             <p class="hidden oqs-id"><%= qsi.id  %></p>
             <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
               <%= qsi.station_name %>
-              <% if @filter.nil? %>
-              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
-              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
-              </span> 
-              <%else%>
-              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
-               <% @count.each do |c|%>    
-               <% if qsi.id == c.station_id %>
-               <%= c.total %>                
-               <%end %>  
-               <%end %>    
-             </span>
-             <%end%>
+                <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
+                <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.total %>                
+                </span> 
+              
              <% if qsi.auto_print %>
              <span>(ap)</span>
              <% end %>  

From 7a055470e8252047d4ebc26a4190f41888db1a7b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 6 Feb 2018 17:46:58 +0630
Subject: [PATCH 175/651] add split bill for order item in room

---
 app/controllers/origami/orders_controller.rb |  2 +-
 app/controllers/origami/rooms_controller.rb  |  8 +-
 app/views/origami/home/show.html.erb         | 19 ++++-
 app/views/origami/orders/show.html.erb       |  4 +-
 app/views/origami/rooms/show.html.erb        | 77 +++++++++++++-------
 config/routes.rb                             |  3 +-
 6 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 85047ef0..22a1e802 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('status desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)
     if sale_order
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index bd375d63..d2c89e37 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -11,7 +11,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
 
     @room = DiningFacility.find(params[:room_id])
 
@@ -90,6 +90,12 @@ class Origami::RoomsController < BaseOrigamiController
     #        end
     #      end
     # end
+
+    lookup_spit_bill = Lookup.collection_of('split_bill')
+    @spit_bill = 0
+    if !lookup_spit_bill[0].nil?
+      @spit_bill = lookup_spit_bill[0][1]
+    end
   end
 
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 64aa00ff..7f16833e 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -116,7 +116,22 @@
                   <% @orders.each do |order| %>
                       <div class="card orders red text-white" data-id="<%= order.order_id %>">
                         <div class="card-block">
-                          <%= order.order_id %>
+                          <%
+                            order_status = ""
+                            sale_order = SaleOrder.find_by_order_id(order)
+                            if sale_order
+                              unless sale_order.sale_id.nil?
+                                sale = Sale.find(sale_order.sale_id)
+                                order_status = sale.sale_status
+                                if order_status == 'new'
+                                  order_status  = order.status
+                                end
+                              end
+                            else
+                              order_status = order.status
+                            end
+                          %>
+                          <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
                         </div>
                       </div>
                   <% end %>
@@ -678,7 +693,7 @@
         if(lookup_split_bill == '1'){
           swal({
             title: "Alert",
-            text: "Do you want to Split bill?",
+            text: "Are you sure, you want to Split bill?",
             type: "warning",
             showCancelButton: true,
             confirmButtonColor: "#DD6B55",
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 6e8163ed..779755ae 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -128,7 +128,7 @@
                   order_status = order.status
                 end
               %>
-              <%= order.order_id %> | <%= order_status %>
+              <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
            </div>
          </div>
          <% end %>
@@ -150,7 +150,7 @@
        <div class="card-block">
          <div class="card-title row p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-              Receipt No: <span id="receipt_no">
+              Order No: <span id="receipt_no"> <%= @order.order_id %>
              </span>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 385129bf..26986ac6 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -117,7 +117,22 @@
            <% @orders.each do |order| %>
            <div class="card orders red text-white" data-id = "<%= order.order_id %>">
              <div class="card-block">
-                <%= order.order_id %>
+              <%
+                order_status = ""
+                sale_order = SaleOrder.find_by_order_id(order)
+                if sale_order
+                  unless sale_order.sale_id.nil?
+                    sale = Sale.find(sale_order.sale_id)
+                    order_status = sale.sale_status
+                    if order_status == 'new'
+                      order_status  = order.status
+                    end
+                  end
+                else
+                  order_status = order.status
+                end
+              %>
+                <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
              </div>
            </div>
            <% end %>
@@ -676,34 +691,46 @@ $('#pay').on('click',function() {
 });
 // Bill Request
 $('#request_bills').click(function() {
-    var order_id = $('#save_order_id').attr('data-order');
-    var ajax_url = "/origami/" + order_id + "/request_bills";
-    $.ajax({
+  var lookup_split_bill = '<%= @spit_bill %>';
+  if(lookup_split_bill == '1'){
+    swal({
+      title: "Alert",
+      text: "Are you sure, you want to Split bill?",
+      type: "warning",
+      showCancelButton: true,
+      confirmButtonColor: "#DD6B55",
+      confirmButtonText: "Yes, split it!",
+      closeOnConfirm: false
+    }, function (isConfirm) {
+      if (isConfirm) {
+        var dining_id = "<%= @room.id %>";
+        window.location.href = '/origami/room/' + dining_id + "/split_bills";
+      }else{
+        requestBillProcess();
+      }
+    }); 
+  }else{
+    requestBillProcess();
+  }
+});
+
+function requestBillProcess(){
+  var order_id = $('#save_order_id').attr('data-order');
+  var ajax_url = "/origami/" + order_id + "/request_bills";
+  $.ajax({
       type: "GET",
-        url: ajax_url,
-        // data: 'order_id='+ order_id,
-        success:function(result){
-          if(!result.status){
-            $.confirm({
-              title: 'Information!',
-              content: result.error_message,
-              buttons: {
-                confirm: {
-                text: 'Ok',
-                btnClass: 'btn-green',
-                  action: function(){
-                    window.location.href = '/origami';
-                  }
-                }
-              }
-            });
+      url: ajax_url,
+      // data: 'order_id='+ order_id,
+      success: function (result) {
+          if (!result.status) {
+            swal("Information!", result.error_message);
           }
-          else {
+          else {              
             location.reload();
           }
-        }
-    });
-});
+      }
+  });
+}
 
 $('#move').on('click',function(){
   var dining_id = "<%= @room.id %>"
diff --git a/config/routes.rb b/config/routes.rb
index 5afcb32e..f37c6895 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -221,7 +221,8 @@ scope "(:locale)", locale: /en|mm/ do
     post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
 
     #split bill
-    get '/table/:dining_id/split_bills' => 'split_bill#index', as:'split_bill_index'
+    get '/table/:dining_id/split_bills' => 'split_bill#index'
+    get '/room/:dining_id/split_bills' => 'split_bill#index'
     post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
   end
 

From 503f1df0abbffcaa7bbaa8ddbaff4980870662d8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 6 Feb 2018 18:05:02 +0630
Subject: [PATCH 176/651] change order data

---
 app/controllers/origami/orders_controller.rb | 2 +-
 app/views/origami/orders/show.html.erb       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 85047ef0..22a1e802 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('status desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)
     if sale_order
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index b08328b6..f18365ac 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -129,7 +129,7 @@
        <div class="card-block">
          <div class="card-title row p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-              Receipt No: <span id="receipt_no">
+              Order No: <span id="receipt_no"> <%= @order.order_id %>
              </span>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
@@ -173,7 +173,7 @@
          </div>
          </div>
          <div class="card-footer ">
-           <table class="m-b--20" id="order-charges-table" border="0">
+           <table class="table" id="order-charges-table" border="0">
              <tr>
                <td class="charges-name"><strong>Sub Total:</strong></td>
                <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
@@ -195,7 +195,7 @@
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
    <% if @sale_status != 'completed' %>
-     <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button>
+     <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
    <% end %>
    <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
  </div>

From 21538f38f848154343adfdcd1fd5f012be52e227 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 6 Feb 2018 18:06:40 +0630
Subject: [PATCH 177/651] order query changed

---
 app/views/origami/orders/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index f18365ac..c1a581dc 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -107,7 +107,7 @@
                   order_status = order.status
                 end
               %>
-              <%= order.order_id %> | <%= order_status %>
+              <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
            </div>
          </div>
          <% end %>

From 0517d66d487700596a4b962ccca5364716fb2b4d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 7 Feb 2018 10:51:49 +0630
Subject: [PATCH 178/651] update oqs

---
 app/controllers/oqs/home_controller.rb | 51 ++++++++++++--------------
 app/views/oqs/home/index.html.erb      | 17 +++++++--
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 1810fade..d8642df4 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -11,30 +11,30 @@ class Oqs::HomeController < BaseOqsController
 
     @filter = params[:filter]
 
-    @queue_stations = queue_items_count_query(false,@filter)
-
+    @queue_stations = OrderQueueStation.all
+   
     @queue_completed_item = completed_order(@filter)
-    if !@queue_completed_item.empty?
-      @queue_completed_item.each do |queue_item|
-        if !queue_item.set_menu_items.nil?
-          instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
-          arr_instance_item_sets = Array.new
-          instance_item_sets.each do |instance_item|
-            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-            arr_instance_item_sets.push(item_instance_name)
-          end
-          queue_item.set_menu_items = arr_instance_item_sets
-        end
-      end
-    end
-
-    # if !@filter.nil?
-      # @count = queue_items_count_query(false,@filter)
-      # @count.each do |count|
-
-      # end
+    # if !@queue_completed_item.empty?
+    #   @queue_completed_item.each do |queue_item|
+    #     if !queue_item.set_menu_items.nil?
+    #       instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
+    #       arr_instance_item_sets = Array.new
+    #       instance_item_sets.each do |instance_item|
+    #         item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+    #         arr_instance_item_sets.push(item_instance_name)
+    #       end
+    #       queue_item.set_menu_items = arr_instance_item_sets
+    #     end
+    #   end
     # end
 
+    if !@filter.nil?
+      @count = queue_items_count_query(false,@filter)
+      #@count.each do |count|
+
+      #end
+    end
+
     # @queue_stations_items=Array.new
 
     # Calculate Count for each station tab
@@ -211,12 +211,9 @@ class Oqs::HomeController < BaseOqsController
   # end
 
   def queue_items_count_query(status,filter) 
-    query = OrderQueueStation.select("order_queue_stations.is_active as is_active,
-                                  order_queue_stations.id as station_id,
-                                  order_queue_stations.station_name as station_name,
-                                  order_queue_stations.auto_print as auto_print,
-                                  order_queue_stations.id as id,
-                                  count(odt.item_code) as total")
+    # query = OrderQueueStation.all
+    query = OrderQueueStation.select("order_queue_stations.id as station_id,
+                                  (case when (count(odt.item_code)>0) then count(odt.item_code) else 0 end) as total")
     .joins(" left join assigned_order_items as aoi on aoi.order_queue_station_id= order_queue_stations.id
               left join orders as od ON od.order_id = aoi.order_id
               left join order_items as odt ON odt.item_instance_code = aoi.instance_code AND odt.order_id = aoi.order_id
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 948c1a29..1f25e275 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -36,10 +36,19 @@
             <p class="hidden oqs-id"><%= qsi.id  %></p>
             <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
               <%= qsi.station_name %>
-                <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
-                <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.total %>                
-                </span> 
-              
+              <% if @filter.nil? %>
+              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
+              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
+              </span> 
+              <%else%>
+              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
+               <% @count.each do |c|%>    
+               <% if qsi.id == c.station_id %>
+               <%= c.total %>                
+               <%end %>  
+               <%end %>    
+             </span>
+             <%end%>
              <% if qsi.auto_print %>
              <span>(ap)</span>
              <% end %>  

From 7c3cab41095501ac37ff1fe86a2050ba2c134bfe Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 7 Feb 2018 11:13:18 +0630
Subject: [PATCH 179/651] update origami order

---
 app/controllers/origami/rooms_controller.rb | 4 ++--
 app/controllers/origami/sales_controller.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index bd375d63..cda8c299 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
@@ -11,7 +11,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
 
     @room = DiningFacility.find(params[:room_id])
 
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index bdf481c2..f64cef88 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
     @booking = BookingOrder.find_by_order_id(@order).booking_id

From 625ee9bd34e807fdcdaa0447fe9918750e0a96c8 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 7 Feb 2018 13:23:01 +0630
Subject: [PATCH 180/651] For add alert box for Close Cashier

---
 app/views/origami/home/index.html.erb | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index a81c5bf9..f40cb3b3 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -235,10 +235,25 @@ $('#cash_out').on('click',function(){
   window.location.href  = '/origami/cash_outs/new';
 })
 
-$('#close_cashier').on('click',function(){
-  window.location.href = '/origami/shift/close';
+$('#close_cashier').on('click',function(e){
+    e.preventDefault(); // Prevent the href from redirecting directly
+    var linkURL = '/origami/shift/close';
+    warnBeforeRedirect(linkURL);
 })
+
 $('#back').on('click',function(){
   window.location.href = '/dashboard';
 })
+
+function warnBeforeRedirect(linkURL) {
+    swal({
+      title: "Oops", 
+      text: "Are you sure you want to Logout ?", 
+      type: "warning",
+      showCancelButton: true
+    }, function() {
+      // Redirect the user
+      window.location.href = linkURL;
+    });
+  }
 </script>

From 492bf93185cb2042a6b74d465ca3772ed4f0820f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 7 Feb 2018 15:50:36 +0630
Subject: [PATCH 181/651] change split bill ui

---
 app/assets/stylesheets/origami.scss           |   6 +
 .../origami/split_bill_controller.rb          | 176 +++---
 app/views/origami/home/show.html.erb          |  33 +-
 app/views/origami/rooms/show.html.erb         |  31 +-
 app/views/origami/split_bill/index.html.erb   | 499 ++++++++++++------
 5 files changed, 508 insertions(+), 237 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 30d8a090..01b4780f 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -390,3 +390,9 @@ i.logout_icon{
 }
 
 /* End Notify */
+
+/* selected color for split bills */
+.selected-split-item {
+	color: #fff !important;
+	background-color: #5DADE2 !important;
+}
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index e1432951..d50c0cd4 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -5,6 +5,7 @@ class Origami::SplitBillController < BaseOrigamiController
 		dining_id = params[:dining_id]
 		@table = DiningFacility.find(dining_id) 
 		@booking = @table.get_booking
+		@orders = Array.new
 		@order_items = Array.new
 		@sale_data = Array.new
 
@@ -19,9 +20,20 @@ class Origami::SplitBillController < BaseOrigamiController
 	      	@booking.booking_orders.each do |booking_order|
 	        	@order = Order.find(booking_order.order_id)
 		        if (@order.status == "new")
-		          @order.order_items.each do |item|
-		            @order_items.push(item)
-		          end
+		        	@orders.push(@order)
+
+					@order.order_items.each do |item|
+						if !item.set_menu_items.nil?
+							instance_item_sets = JSON.parse(item.set_menu_items)
+							arr_instance_item_sets = Array.new
+							instance_item_sets.each do |instance_item|
+							  item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+							  arr_instance_item_sets.push(item_instance_name)
+							end
+							item.set_menu_items = arr_instance_item_sets
+						end
+						@order_items.push(item)
+					end
 		        end
 	      	end
 	    else
@@ -31,8 +43,15 @@ class Origami::SplitBillController < BaseOrigamiController
 
 	def create
 		order_ids = params[:order_ids]
-		order_items = JSON.parse(params[:order_items])
-		# byebug
+		orders = nil
+		if !params[:orders].empty? 
+			orders = JSON.parse(params[:orders])
+		end
+		order_items = nil
+		if !params[:order_items].empty?
+			order_items = JSON.parse(params[:order_items])
+		end
+
 		status = false
 		if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
 	    	#create Bill by Booking ID
@@ -64,72 +83,111 @@ class Origami::SplitBillController < BaseOrigamiController
 				else
 					type = "RoomBooking"
 				end
-				
+
 				booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-                                :checkin_at => Time.now.utc, :checkin_by =>  current_user.name,
-                                :booking_status => "assign" })
+	                                :checkin_at => Time.now.utc, :checkin_by =>  current_user.name,
+	                                :booking_status => "assign" })
 
-				order_item_count = 0
-				order_id = nil
-
-				order_items.each do |order_item|
+				if !orders.nil?
+					orders.each do |order|
+						BookingOrder.create({:booking_id => booking.booking_id, :order_id => order["id"]})
+					end
+				elsif !order_items.nil?
 					order_item_count = 0
-					order = Order.find(order_item["order_id"])
-					if order.order_items.count == 1
-						order_id = order.id
-						break
-					else
-						order_item_count += 1
-					end
-				end
+					order_id_count = 0
+					order_id = nil
 
-				if !order_id.nil?
-					BookingOrder.find_by_order_id(order_id).delete
-
-					BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
 					order_items.each do |order_item|
-				    	orderItem = OrderItem.find(order_item["id"])
-				    	orderItem.order_id = order_id
-				    	orderItem.save!
-				    end
-				else
-					if order_ids.count == 1 && order_item_count == 1
-						BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
-					else
-						customer = Customer.find(params[:customer_id])
-						order_type = "dine_in"
-						if !customer.nil?
-							if customer.customer_type == "Takeaway"
-								order_type = "takeaway"
-							elsif customer.customer_type == "Delivery"
-								order_type = "delivery"
-							end
+						order_item_count = 0
+						order = Order.find(order_item["order_id"])
+						if order.order_items.count == 1
+							order_id = order.id
+							order_id_count += 1
+						else
+							order_item_count += 1
 						end
+					end
 
-						# begin
-					    order = Order.new
-					    order.source = "cashier"
-					    order.order_type = order_type
-					    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-					    order.item_count = order_items.count
-					    order.status = "new"
-					    order.table_id = params[:dining_id]  # this is dining facilities's id
-					    order.waiters = current_user.name
-					    order.employee_name = current_user.name
-					    order.guest_info = nil
-					    order.save!
+					if !order_id.nil?
+						if order_id_count > 1
+							updated_order_id = Array.new
+							order_ids.each do |odr_id|
+								odr = Order.find(odr_id)
+								if odr.order_items.count > 1
+									updated_order_id.push(odr_id)
+								end
+							end
 
-					    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+							if !updated_order_id.empty?
+								order_ids.each do |odr_id|
+									unless updated_order_id.include?(odr_id)
+										BookingOrder.find_by_order_id(odr_id).delete
+										BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
+									end
+								end
 
-					    order_items.each do |order_item|
-					    	orderItem = OrderItem.find(order_item["id"])
-					    	orderItem.order_id = order.order_id
-					    	orderItem.save!
-					    end
+								order_items.each do |order_item|
+									if updated_order_id.include?(order_item["order_id"])
+								       	orderItem = OrderItem.find(order_item["id"])
+								    	orderItem.order_id = order_id
+								    	orderItem.save!
+								    end
+							    end
+							else
+								order_ids.each do |odr_id|
+									BookingOrder.find_by_order_id(odr_id).delete
+									BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
+								end
+							end
+						else
+							BookingOrder.find_by_order_id(order_id).delete
+
+							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
+							order_items.each do |order_item|
+						    	orderItem = OrderItem.find(order_item["id"])
+						    	orderItem.order_id = order_id
+						    	orderItem.save!
+						    end
+						end
+					else
+						if order_ids.count == 1 && order_item_count == 1
+							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
+						else
+							customer = Customer.find(params[:customer_id])
+							order_type = "dine_in"
+							if !customer.nil?
+								if customer.customer_type == "Takeaway"
+									order_type = "takeaway"
+								elsif customer.customer_type == "Delivery"
+									order_type = "delivery"
+								end
+							end
+
+							# begin
+						    order = Order.new
+						    order.source = "cashier"
+						    order.order_type = order_type
+						    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+						    order.item_count = order_items.count
+						    order.status = "new"
+						    order.table_id = params[:dining_id]  # this is dining facilities's id
+						    order.waiters = current_user.name
+						    order.employee_name = current_user.name
+						    order.guest_info = nil
+						    order.save!
+
+						    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+
+						    order_items.each do |order_item|
+						    	orderItem = OrderItem.find(order_item["id"])
+						    	orderItem.order_id = order.order_id
+						    	orderItem.save!
+						    end
+						end
 					end
 				end
 
-			    sale = Sale.new
+				sale = Sale.new
 				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, get_cashier_by_terminal)
 				sale_data = Sale.find_by_sale_id(sale_id)
 	    	end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 7f16833e..48da04e3 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -367,6 +367,9 @@
                         %>
                       </table>
                       <button class='btn btn-primary' id='add_invoice'> Add to existing invoice</button>
+                      <% if !@spit_bill.nil? && @spit_bill == '1' %>
+                        <button class='btn btn-primary' id='split_bill'> Split Bill</button>
+                      <% end %>
                   <% end %>
                   <% if @sale_array.size > 1 %>
                       <br><br>
@@ -692,11 +695,11 @@
         var lookup_split_bill = '<%= @spit_bill %>';
         if(lookup_split_bill == '1'){
           swal({
-            title: "Alert",
-            text: "Are you sure, you want to Split bill?",
-            type: "warning",
+            title: "Information!",
+            text: "Do you want to Split bill?",
+            type: "success",
             showCancelButton: true,
-            confirmButtonColor: "#DD6B55",
+            confirmButtonColor: "#009900",
             confirmButtonText: "Yes, split it!",
             closeOnConfirm: false
           }, function (isConfirm) {
@@ -740,8 +743,8 @@
     })
 
     $('#add_invoice').on('click', function () {
-        var dining_id = "<%= @dining.id %>"
-        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        var dining_id = "<%= @dining.id %>";
+        var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
         var ajax_url = "/origami/sale/append_order";
         $.ajax({
             type: "POST",
@@ -867,4 +870,22 @@
         }
       });
     });
+
+    /* split bill in add to existing invoice*/
+    $('#split_bill').on('click', function(){
+      swal({
+        title: "Alert",
+        text: "Are you sure, you want to split bill?",
+        type: "warning",
+        showCancelButton: true,
+        confirmButtonColor: "#DD6B55",
+        confirmButtonText: "Yes, split it!",
+        closeOnConfirm: false
+      }, function (isConfirm) {
+        if(isConfirm){
+          var dining_id = "<%= @dining.id %>";
+          window.location.href = '/origami/table/' + dining_id + "/split_bills";
+        }
+      });
+    });
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 26986ac6..b0568a34 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -344,7 +344,10 @@
                    end
                    %>
                      </table>
-                    <button class='btn bg-blue' id='add_invoice'> Add to existing invoice </button>
+                    <button class='btn bg-primary' id='add_invoice'> Add to existing invoice </button>
+                    <% if !@spit_bill.nil? && @spit_bill == '1' %>
+                      <button class='btn btn-primary' id='split_bill'> Split Bill</button>
+                    <% end %>
                    <% end %>
                    <% if @sale_array.size > 1 %>
                    <br><br>
@@ -694,11 +697,11 @@ $('#request_bills').click(function() {
   var lookup_split_bill = '<%= @spit_bill %>';
   if(lookup_split_bill == '1'){
     swal({
-      title: "Alert",
-      text: "Are you sure, you want to Split bill?",
-      type: "warning",
+      title: "Information!",
+      text: "Do you want to Split bill?",
+      type: "success",
       showCancelButton: true,
-      confirmButtonColor: "#DD6B55",
+      confirmButtonColor: "#009900",
       confirmButtonText: "Yes, split it!",
       closeOnConfirm: false
     }, function (isConfirm) {
@@ -871,4 +874,22 @@ $('#add_invoice').on('click',function(){
         var dining_id = "<%= @room.id %>"
         window.location.href = '/origami/addorders/' + dining_id;
     });
+
+  /* split bill in add to existing invoice*/
+    $('#split_bill').on('click', function(){
+      swal({
+        title: "Alert",
+        text: "Are you sure, you want to split bill?",
+        type: "warning",
+        showCancelButton: true,
+        confirmButtonColor: "#DD6B55",
+        confirmButtonText: "Yes, split it!",
+        closeOnConfirm: false
+      }, function (isConfirm) {
+        if(isConfirm){
+          var dining_id = "<%= @room.id %>";
+          window.location.href = '/origami/table/' + dining_id + "/split_bills";
+        }
+      });
+    });
 </script>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 6cac0e72..999302d0 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -7,158 +7,205 @@
  		<div class="col-lg-7 col-md-7 col-sm-7">
  			<!-- Order Details -->
  			<div class="card"  >
-		        <!-- <div class="card-header">
-		          <div><strong id="order-title">ORDER DETAILS</strong></div>
-		      </div> -->
-		      <div class="card-block">
-		      	<div class="card-title row">
-		      		<div class="col-lg-12 col-md-12 col-sm-12">
-		      			<span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
-		      			<span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
-		      			<% if !@order.nil? %>
-			      			<span class="hidden" id="customer_id" value="<%= @order.customer_id %>"><%= @order.customer_id %></span>
-		      			<% end %>
-		      			<p class="m-l-15">Order Lists</p>
-		      		</div>
-		      	</div>
-		      	<div id="order-detail-slimscroll" data-height="160">
-		      		<div class="card-text dining">
-		      			<table class="table table-default" id="order-items-table">
-		      				<thead>
-		      					<tr>
-		      						<th class="item-name">Items</th>
-		      						<th class="item-attr">QTY</th>
-		      						<th class="item-attr">Price</th>
-		      					</tr>
-		      				</thead>
-		      				<tbody>
-		      					<% sub_total = 0 %>
-		      					<% @order_items.each do |order_item| %>
-		      					<% 
-		      					sub_total += order_item.qty*order_item.price 
-		      					%>
-		      					<tr class="item-row" id=<%= order_item.order_items_id %> >
-		      						<td style="width:60%; text-align:left">
-		      							<span id="item-order-id" class="hidden"><%=order_item.order_id%></span>
-		      							<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
-		      							<span id="item-name-price"><%=order_item.item_name%></span>
-		      						</td>
-		      						<td style="width:20%; text-align:right">
-		      							<span id="item-qty"><%=order_item.qty%></span>
-		      						</td>
-		      						<td style="width:20%; text-align:right">
-		      							<span id="item-total-price"><%=(order_item.qty*order_item.price)%></span>
-		      						</td>
-		      					</tr>
-		      					<%
-		      				end 
-		      				%>
-		      			</tbody>
-		      		</table>
-		      	</div>
-		      </div>
-		      <div class="card-footer">
-		      	<table class="table" id="order-charges-table" border="0">
-		      		<tr>
-		      			<td class="charges-name"><strong>Sub Total:</strong></td>
-		      			<td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
-		      		</tr>
-		      	</table>
-		      </div>
-		  </div>
-		</div>
-</div>
-<!-- Column One -->
-<!-- Column Two -->
-<div class="col-lg-4 col-md-4 col-sm-4">
-	<div class="card">
-		<div class="card-block">
-			<div class="card-title row">
-				<p class="m-l-15">Receipt Lists</p>
-			</div>
-			<div id="order-detail-slimscroll" data-height="160">
-				<div class="card-text dining">
-					<% if !@sale_data.nil? %>
-						<table class="table table-default">
-							<tbody>
-								<% @sale_data.each do |sale_data| %>
-									<tr class="receipt_row" id=<%= sale_data.sale_id %> >
-										<td>Receipt No. - <span id="receipt_no"><%= sale_data.receipt_no %></span></td>
-									</tr>
-								<% end %>
-							</tbody>
-						</table>
-					<% end %>
-				</div>
-			</div>
-			<div class="card-footer"></div>
-		</div>
-	</div>
-</div>
-<!-- Column Two -->
-<!-- Column Three -->
-<div class="col-lg-1 col-md-1 col-sm-1">
-	<!-- Action Panel -->
-	<div>
-		<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
-		<button id="order_item_split" class="btn btn-primary btn- action-btn">Order Items Split</button>
-	</div>
-</div>
-<!-- Column Three -->
-</div>
-</div>
+ 				<div class="card-block">
+ 					<div class="card-title row">
+ 						<div class="col-lg-12 col-md-12 col-sm-12">
+ 							<span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
+ 							<span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
+ 							<% if !@order.nil? %>
+ 							<span class="hidden" id="customer_id" value="<%= @order.customer_id %>"><%= @order.customer_id %></span>
+ 							<% end %>
+ 							<p class="m-l-15">Order Lists</p>
+ 						</div>
+ 					</div>
+ 					<div id="split-order-slimscroll" data-height="100">
+ 						<div class="card-text dining">
+ 							<% if !@orders.nil? %>
+ 							<div class="row">
+ 								<div class="col-lg-12 col-md-12 col-sm-12">
+ 									<div class="row m-l-5">
+ 										<div class="col-lg-3 col-md-3 col-sm-3">
+ 											<ul class="nav nav-tabs tabs-left sideways">
+ 												<% @orders.each.with_index(0) do |order, order_index| %>
+ 													<% active_class = "" %>
+ 													<% if order_index == 0 %>
+ 														<% active_class = "active" %>
+ 													<% end %>
+ 													<li class="order-row <%= active_class %>">
+ 														<a href="#<%= order.order_id %>" data-toggle="tab"><%= order.order_id %></a>
+ 													</li>
+ 												<% end %>
+ 											</ul>
+ 										</div>
+ 										<div class="col-lg-8 col-md-8 col-sm-8">
+ 											<div class="tab-content">
+ 												<% @orders.each.with_index(0) do |order, order_index| %>
+												<% active_class = "" %>
+												<% if order_index == 0 %>
+													<% active_class = "active" %>
+												<% end %>
+ 												<div class="tab-pane <%= active_class %>" id="<%= order.order_id %>">
+													<div class="card-title">
+														<p class="m-l-2">Order Items</p>
+													</div>
+													<div id="order-detail-slimscroll-<%= order.order_id %>" data-height="200">
+														<div class="card-text dining">
+	 														<table class="table table-default" id="order-items-table">
+	 															<thead>
+	 																<tr>
+	 																	<th class="item-name">Items</th>
+	 																	<th class="item-attr">QTY</th>
+	 																	<th class="item-attr">Price</th>
+	 																</tr>
+	 															</thead>
+	 															<tbody>
+	 																<% if !order.order_items.nil? %>
+	 																<% sub_total = 0 %>
+	 																<% order.order_items.each do |order_item| %>
+	 																<% 
+	 																sub_total += order_item.qty*order_item.price 
+	 																%>
+	 																<tr class="item-row" id=<%= order_item.order_items_id %> >
+	 																	<td style="width:60%; text-align:left">
+	 																		<span id="item-order-id" class="hidden"><%=order_item.order_id%></span>
+	 																		<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
+	 																		<span id="item-name-price">
+	 																			<%=order_item.item_name%>
+	 																			<% if !order_item.set_menu_items.nil?  
+	 																				order_item.set_menu_items.each do |item_instance| %> 
+	 																				<br><span class="font-13"><%= item_instance %></span> 
+	 																				<% end 
+	 																				end %>
+	 																			</span>
+	 																		</td>
+	 																		<td style="width:20%; text-align:right">
+	 																			<span id="item-qty"><%=order_item.qty%></span>
+	 																		</td>
+	 																		<td style="width:20%; text-align:right">
+	 																			<span id="item-total-price"><%=(order_item.qty*order_item.price)%></span>
+	 																		</td>
+	 																	</tr>
+	 																	<%
+	 																end 
+	 																%>
+	 																<% end %>
+	 															</tbody>
+	 														</table>
+														</div>
+													</div>
+													<!-- <div class="card-footer"> -->
+														<table class="table m-b-20" id="order-charges-table" border="0">
+	 														<tr>
+	 															<td class="charges-name"><strong>Sub Total:</strong></td>
+	 															<td class="item-attr align-right"><strong id="order-sub-total"><%=sub_total%></strong></td>
+	 														</tr>
+ 														</table>
+													<!-- </div> -->
+ 												</div>
+ 												<% end %>
+ 											</div>
+ 										</div>
+ 									</div>
+ 								</div>
+ 							</div>
+ 							<% end %>
+ 						</div>
+ 					</div>
+ 				</div>
+ 			</div>
+ 		</div>
+ 		<!-- Column One -->
+ 		<!-- Column Two -->
+ 		<div class="col-lg-4 col-md-4 col-sm-4">
+ 			<div class="card">
+ 				<div class="card-block">
+ 					<div class="card-title row">
+ 						<p class="m-l-15">Receipt Lists</p>
+ 					</div>
+ 					<div id="split-receipt-slimscroll" data-height="160">
+ 						<div class="card-text dining">
+ 							<% if !@sale_data.nil? %>
+ 							<table class="table table-default">
+ 								<tbody>
+ 									<% @sale_data.each do |sale_data| %>
+ 									<tr class="receipt_row" id=<%= sale_data.sale_id %> >
+ 										<td>Receipt No. - <span id="receipt_no"><%= sale_data.receipt_no %></span></td>
+ 									</tr>
+ 									<% end %>
+ 								</tbody>
+ 							</table>
+ 							<% end %>
+ 						</div>
+ 					</div>
+ 					<div class="card-footer"></div>
+ 				</div>
+ 			</div>
+ 		</div>
+ 		<!-- Column Two -->
+ 		<!-- Column Three -->
+ 		<div class="col-lg-1 col-md-1 col-sm-1">
+ 			<!-- Action Panel -->
+ 			<div>
+ 				<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
+ 				<button id="order_split" class="btn btn-primary text-center action-btn" style="width:100%">Orders Split</button>
+ 				<button id="order_item_split" class="btn btn-primary text-center action-btn">Order Items Split</button>
+ 			</div>
+ 		</div>
+ 		<!-- Column Three -->
+ 	</div>
+ </div>
 
-<script type="text/javascript">
-	$(document).ready(function(){
+ <script type="text/javascript">
+ 	$(document).ready(function(){
 
-		$('#back').on('click',function(){
-			backToOrigami();
-		})
+ 		$('#back').on('click',function(){
+ 			backToOrigami();
+ 		})
 
-		$(".cashier_number").on('click', function(event){
-			if(event.handled !== true) {
-				var original_value=0;
-				original_value = $('#per_person').val();
-				var input_type = $(this).attr("data-type");
-				switch (input_type) {
-					case 'num':
-					var input_value = $(this).attr("data-value");
-					if (original_value == "0"){
-						$('#per_person').val(input_value);						
-					}
-					else{
-						$('#per_person').val(original_value + '' + input_value);						
-					}
-					break;
+ 		$(".cashier_number").on('click', function(event){
+ 			if(event.handled !== true) {
+ 				var original_value=0;
+ 				original_value = $('#per_person').val();
+ 				var input_type = $(this).attr("data-type");
+ 				switch (input_type) {
+ 					case 'num':
+ 					var input_value = $(this).attr("data-value");
+ 					if (original_value == "0"){
+ 						$('#per_person').val(input_value);						
+ 					}
+ 					else{
+ 						$('#per_person').val(original_value + '' + input_value);						
+ 					}
+ 					break;
 
-					case 'add':
-					var input_value = $(this).attr("data-value");
-					amount = parseInt(input_value);
-					$('#per_person').val(amount);										
-					break;
+ 					case 'add':
+ 					var input_value = $(this).attr("data-value");
+ 					amount = parseInt(input_value);
+ 					$('#per_person').val(amount);										
+ 					break;
 
-					case 'del' :
-					var discount_text=$('#per_person').val();
-					$('#per_person').val(discount_text.substr(0,discount_text.length-1));		
-					break;
+ 					case 'del' :
+ 					var discount_text=$('#per_person').val();
+ 					$('#per_person').val(discount_text.substr(0,discount_text.length-1));		
+ 					break;
 
-					case 'clr':
-					$('#per_person').val("0");	            
-					break;
-				}
-				event.handled = true;
-			} else {
-				return false;
-			}
-		});
+ 					case 'clr':
+ 					$('#per_person').val("0");	            
+ 					break;
+ 				}
+ 				event.handled = true;
+ 			} else {
+ 				return false;
+ 			}
+ 		});
 
 	// Select Sale Item
 	$('.item-row').on('click',function(){
-		if($(this).hasClass('selected-item') == true){
-			$(this).removeClass('selected-item');
+		if($(this).hasClass('selected-split-item') == true){
+			$(this).removeClass('selected-split-item');
 		}
 		else {
-			$(this).addClass('selected-item');
+			$(this).addClass('selected-split-item');
 		}
 	});
 
@@ -170,24 +217,63 @@
 		if (order_items.length > 0){
 			// if(cnt_items > 0){
 				swal({
-		            title: "Alert",
-		            text: "Are you sure, you want to Split?",
-		            type: "warning",
-		            showCancelButton: true,
-		            confirmButtonColor: "#DD6B55",
-		            confirmButtonText: "Yes, split it!",
-		            closeOnConfirm: false
-		        }, function (isConfirm) {
-		        	if(isConfirm){
-		        		splitBillProcess(cnt_items);
-		        	}
-		        });
+					title: "Alert",
+					text: "Are you sure, you want to Split?",
+					type: "warning",
+					showCancelButton: true,
+					confirmButtonColor: "#DD6B55",
+					confirmButtonText: "Yes, split it!",
+					closeOnConfirm: false
+				}, function (isConfirm) {
+					if(isConfirm){
+						orderItemSplitBillProcess(cnt_items);
+					}
+				});
 			// }
 			// else{
-			// 	splitBillProcess(cnt_items);
+			// 	orderItemSplitBillProcess(cnt_items);
 			// }
 		}else{
-			swal("Opps","Please select at least on item!","warning");
+			swal("Opps","Please select at least one item!","warning");
+		}
+	});
+
+	// Selected Order 
+	$('.order-row').on('click',function(){
+		if($(this).hasClass('selected-split-item') == true){
+			$(this).removeClass('selected-split-item');
+		}
+		else {
+			$(this).addClass('selected-split-item');
+		}
+	});
+
+	//order_item_split
+	$('#order_split').on('click',function () {
+		var cnt_orders = "<%= @orders.count %>";
+		var orders = get_selected_orders();// Selected Order Items
+		var cnt_odrs = parseInt(cnt_orders) - parseInt(orders.length);
+		if (orders.length > 0){
+			// if(cnt_odrs > 0){
+				swal({
+					title: "Alert",
+					text: "Are you sure, you want to Split?",
+					type: "warning",
+					showCancelButton: true,
+					confirmButtonColor: "#DD6B55",
+					confirmButtonText: "Yes, split it!",
+					closeOnConfirm: false
+				}, function (isConfirm) {
+					if(isConfirm){
+						orderSplitBillProcess(cnt_odrs);
+					}
+				});
+			// }
+			// else{
+			// 	orderSplitBillProcess(cnt_odrs);
+			// }
+		}else{
+			swal("Opps","Please select at least one order!","warning");
 		}
 	});
 
@@ -197,10 +283,45 @@
 		var sale_id = $(this).attr('id').substr(0,16);
 		window.location = '/origami/table/' + dining_id + "/table_invoice/" + sale_id;
 	});
+
+	//slimscroll for order, order items, reciept
+	var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
+
+	$('#split-order-slimscroll').slimScroll({
+		height: height-$('#split-order-slimscroll').attr('data-height'),
+		size: '5px',
+		color: 'rgba(0,0,0,0.5)',
+		alwaysVisible: false,
+		borderRadius: '0',
+		railBorderRadius: '0'
+	});
+
+	$('#split-receipt-slimscroll').slimScroll({
+		height: height-$('#split-receipt-slimscroll').attr('data-height'),
+		size: '5px',
+		color: 'rgba(0,0,0,0.5)',
+		alwaysVisible: false,
+		borderRadius: '0',
+		railBorderRadius: '0'
+	});
+
+	var orders = JSON.parse('<%= @orders.to_json.html_safe %>');
+	if(orders.length > 0){
+		$.each(orders, function(key,order){
+			$('#order-detail-slimscroll-'+order.order_id).slimScroll({
+				height: height-$('#split-receipt-slimscroll').attr('data-height'),
+				size: '5px',
+				color: 'rgba(0,0,0,0.5)',
+				alwaysVisible: false,
+				borderRadius: '0',
+				railBorderRadius: '0'
+			});
+		});
+	}
 });
 
-/* function for split bill process */
-function splitBillProcess(cnt_items){
+/* function for order items split bill process */
+function orderItemSplitBillProcess(cnt_items){
 	var dining_id       = $("#table_id").text();
 	var type     = $("#table_type").text();
 	var customer_id     = $("#customer_id").text();
@@ -222,15 +343,48 @@ function splitBillProcess(cnt_items){
 
 	var ajax_url = "/origami/split_bills";
 	$.ajax({
-        type: "POST",
-        url: ajax_url,
-        dataType: 'JSON',
-        data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items)},
-        success: function (result) {
-            if (!result.status) {
-              swal("Information!", result.error_message);
+		type: "POST",
+		url: ajax_url,
+		dataType: 'JSON',
+		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items), 'orders' : ''},
+		success: function (result) {
+			if (!result.status) {
+				swal("Information!", result.error_message);
+			}
+			else {   
+            	// if (cnt_items > 0){
+            		window.location.reload();
+            	// }else{
+            	// 	backToOrigami();
+            	// }
             }
-            else {   
+        }
+    });
+}
+
+/* function for order items split bill process */
+function orderSplitBillProcess(cnt_orders){
+	var dining_id       = $("#table_id").text();
+	var type     = $("#table_type").text();
+	var customer_id     = $("#customer_id").text();
+	var orders = get_selected_orders();// Selected Orders
+	var json_booking = JSON.parse('<%= @booking.to_json.html_safe %>');
+	var booking_id = "";
+	if(cnt_orders == 0){
+		booking_id = json_booking.booking_id;
+	}
+
+	var ajax_url = "/origami/split_bills";
+	$.ajax({
+		type: "POST",
+		url: ajax_url,
+		dataType: 'JSON',
+		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders)},
+		success: function (result) {
+			if (!result.status) {
+				swal("Information!", result.error_message);
+			}
+			else {   
             	// if (cnt_items > 0){
             		window.location.reload();
             	// }else{
@@ -252,10 +406,10 @@ function backToOrigami(){
 	}
 }
 
-/* Get Selected Sale Item's ID and Price */
+/* Get Selected Order Items */
 function get_selected_order_items(){
 	var order_items = [];	
-	$('.item-row.selected-item').each(function(i){
+	$('.item-row.selected-split-item').each(function(i){
 		var order_item = {};
 		order_item.id = $(this).attr('id').substr(0,16);
 		order_item.order_id = $(this).find('#item-order-id').text().trim();
@@ -267,6 +421,17 @@ function get_selected_order_items(){
 	return order_items;
 }
 
+/* Get Selected Orders */
+function get_selected_orders(){
+	var orders = [];	
+	$('.order-row.selected-split-item').each(function(i){
+		var order = {};
+		order.id = $(this).find('a').attr('href').substr(1);
+		orders.push(order);
+	});	
+	return orders;
+}
+
 //check for isNumber
 function isNumberKey(evt) {
 	var charCode = (evt.which) ? evt.which : event.keyCode;

From c71ece4327139a33eea47042013463b607362551 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 7 Feb 2018 15:58:19 +0630
Subject: [PATCH 182/651] change sale id for add to existing in room

---
 app/views/origami/rooms/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index b0568a34..c32bfe86 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -746,7 +746,7 @@ $('#back').on('click',function(){
 
 $('#add_invoice').on('click',function(){
   var dining_id = "<%= @room.id %>"
-  var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+  var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
   var ajax_url = "/origami/sale/append_order";
   $.ajax({
     type: "POST",

From a2223a6b90d7f109a4584ff983293ce28abbd72c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 7 Feb 2018 17:47:04 +0630
Subject: [PATCH 183/651] add edit route in oqs detail

---
 app/assets/javascripts/OQS.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index d039425c..35e08b4f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -25,6 +25,7 @@
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
+	var oqs_id = "";
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
@@ -37,8 +38,8 @@ $(document).on('turbolinks:load', function() {
        $(".oqs_append").removeClass('hide');
        $(this).addClass('oqs_active');
        $(".queue_station").addClass('queue_station_box');
-       var oqs_id = $(this).find(".oqs-id").text();
-       console.log(oqs_id)
+       oqs_id = $(this).find(".oqs-id").text();
+       console.log(oqs_id);
        var url    = 'oqs/get_items/'+oqs_id;
       
        show_details(url);
@@ -143,8 +144,7 @@ $(document).on('turbolinks:load', function() {
 	    	type: 'GET',
 	    	url: '/oqs/' + orderNo,
 	    	data: { 'status' : order_status },
-	    	success: function(res){	    	
-
+	    	success: function(res){
 	    		for (i = 0; i < res.length; i++) {	    			
 	    			var data = JSON.stringify(res[i]);	
         			var parse_data = JSON.parse(data); 
@@ -157,10 +157,19 @@ $(document).on('turbolinks:load', function() {
 							});
 	        			}
         			}
-	    			var order_item_row = "<tr>" +
+
+        			if (oqs_id > 0){
+        				var order_item_row = "<tr id='edit_"+assigned_item_id+"' class='order-item-edit'>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
 							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
               						 	 "</tr>";
+				 	}else{
+				 		var order_item_row = "<tr>" +
+							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
+							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
+              						 	 "</tr>";
+				 	}
+	    			
               		$("#oqs-order-details-table").children("tbody").append(order_item_row);
 	    		}	    		
 	    	}

From 7ae8b44f4bd8ad1f4b36ec0253fa6eb74cce1c6a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Feb 2018 10:11:05 +0630
Subject: [PATCH 184/651] check status in sale payment

---
 app/models/sale_payment.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 9ba5a3bb..661eb57b 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -398,6 +398,7 @@ class SalePayment < ApplicationRecord
             end
           else
             status = false
+            sale_count += 1
           end
         end
       end

From 38dc13ecf7a57cb2741d6ede86b5364a559d4456 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Feb 2018 11:08:52 +0630
Subject: [PATCH 185/651] update pending order

---
 .../origami/pending_order_controller.rb       |  15 ++
 .../origami/quick_service_controller.rb       |  25 +++
 app/models/sale.rb                            |   7 +
 app/views/origami/addorders/detail.html.erb   |  29 +++-
 .../origami/pending_order/index.html.erb      |  47 ++++++
 app/views/origami/pending_order/show.html.erb | 142 ++++++++++++++++++
 config/routes.rb                              |   4 +
 7 files changed, 261 insertions(+), 8 deletions(-)
 create mode 100644 app/controllers/origami/pending_order_controller.rb
 create mode 100644 app/views/origami/pending_order/index.html.erb
 create mode 100644 app/views/origami/pending_order/show.html.erb

diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
new file mode 100644
index 00000000..5d18e473
--- /dev/null
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -0,0 +1,15 @@
+class Origami::PendingOrderController < BaseOrigamiController
+  def index
+    # @dining= DiningFacility.where("status = 'occupied'")
+    # @order = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status = 'billed' and source = 'quick_service'",DateTime.now.strftime('%Y-%m-%d'))
+    @sale = Sale.pending_order
+  end
+  def show
+    @sales = Sale.pending_order
+    @sale = Sale.find(params[:sale_id])
+    @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
+    @booking = BookingOrder.find_by_order_id(@order).booking_id
+    @table_id = Booking.find(@booking).dining_facility_id
+    @dining  = DiningFacility.find(@table_id)
+  end
+end
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 744d4d68..3b668a32 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -14,6 +14,31 @@ class Origami::QuickServiceController < ApplicationController
       render "origami/addorders/detail"
   end
 
+  def modify_order
+    @menu = MenuCategory.all.active
+    @table_id = params[:id]
+    @table = DiningFacility.find(@table_id)
+    @booking = @table.get_booking
+    if @booking
+      @booking_id = @booking.booking_id
+      @order_items = Array.new
+      @booking.booking_orders.each do |booking_order|
+        order = Order.find(booking_order.order_id)
+        if (order.status == "new")
+          @obj_order = order
+          @customer = order.customer
+          @date = order.created_at
+          order.order_items.each do |item|
+            @order_items.push(item)
+          end
+        end
+      end
+    else
+      @booking = nil
+    end
+     render "origami/addorders/detail"
+  end
+
   def get_menu_category ()
     if (params[:id])
       puts params[:id]
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 0a388e0e..22d1be1a 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1223,6 +1223,13 @@ end
     return query
   end
 
+  def self.pending_order
+    query = Sale.all
+    query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
+                 .joins("join orders as orders on orders.order_id = sale_orders.order_id")
+    query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 440009e1..2c23b37b 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -66,17 +66,26 @@
           <i class="material-icons">reply</i>
            Back
         </button>
+        <% if type %>
+         <button type="button" class="btn btn-block btn-primary waves-effect" id='pending_order'>
+           Pending Order
+        </button>
+        <% end%>
           <br>
         <div class="card-header" style="padding: 0.5rem 0.25rem">
           <% if type %>
             <div class="row clearfix">
-               <div class="col-md-6 ">
+               <div class="col-md-6 col-lg-6 col-sm-12">
                  <strong id="order-title" class="font-14">ORDER DETAILS </strong>
                </div>
-               <div class="col-md-3">Select</div> 
-               <div class="col-md-3 m-t--5">
-               <a class="btn btn-block bg-blue waves-effect select_table" data-toggle="modal" data-target="#TableModal"> Select </a>
+               <div class="col-md-2 col-lg-2 col-sm-6">Table</div> 
+               <div class="col-md-4 col-lg-4 col-sm-6 m-t--5">
+               <a class="btn btn-block bg-blue waves-effect select_table" data-toggle="modal" data-target="#TableModal">Select</a>
                <input type="hidden" name="table_id" value="" id="table_id">
+               <%if @booking_id %>
+                  <p class="hidden" id="booking_id"><%=@booking_id%></p>
+                  <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
+               <%end%>
                 </div>
             </div>
           <% else %>
@@ -323,7 +332,8 @@
         </div>
       </div>
     </div>
-
+    
+    <% if type %>
     <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
       <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -331,7 +341,7 @@
             <!-- <h4 class="modal-title" id="TableModalLabel">Select Table</h4> -->
              <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
           </div>
-          <div class="modal-body" style="margin-top: -0.5rem;">
+          <div class="modal-body" style="margin-top: -0.75rem;padding-top:5px">
             <h5>Table</h5>
             <div class="card-columns" style="column-count: 7;">
               <% @tables.each do |table| %>       
@@ -370,7 +380,7 @@
                    <% end %>
                   <% end %>
               </div>
-                <hr>
+                <hr style="margin: 5px 20px">
                 <h5>Room</h5>
                 <div class="card-columns" style="column-count: 7;">
                   <% @rooms.each do |table| %>       
@@ -418,8 +428,8 @@
         </div>
       </div>
     </div>
+    <% end %>
 <script>
-  cashier_type = "cashier"
     $(document).ready(function () {
     $(".tables").on('click', function () {
         $('.tables').css('background-color','');
@@ -439,5 +449,8 @@
         $('.select_table').text(name)
 
     });
+    $('#pending_order').on('click', function () {
+      window.location.href = '/origami/quick_service/pending_order';
+    });
   });
 </script>
\ No newline at end of file
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
new file mode 100644
index 00000000..a3df293c
--- /dev/null
+++ b/app/views/origami/pending_order/index.html.erb
@@ -0,0 +1,47 @@
+<div class="container-fluid">
+    <div class="row clearfix">
+        <!-- Column One -->
+        <div class="col-lg-10 col-md-10 col-sm-10">
+            <div class="card">
+	            <div class="card-header">
+	              <strong id="order-title"> PENDING ORDER </strong>
+	            </div> 
+	            <div class="card-block">
+	            	<div id="custom-slimscroll">
+		                <div class="card-columns">
+		                  <% @sale.each do |sale| %>
+		                      <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
+						           <div class="card-block">
+						              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
+						           </div>
+						      </div>
+		                  <% end %>
+		                </div>
+		          </div>
+	            </div>
+            </div>
+        </div>
+        <!-- Column Three -->
+        <div class="col-lg-2 col-md-2 col-sm-2">
+            <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
+            <i class="material-icons">reply</i>
+             <%= t("views.btn.back") %>
+          </button>
+			
+        </div>
+    </div>
+</div>
+<script>
+    cashier_type = "quick_service"
+    $(".sales").on('click',function(){
+	    var sale_id = $(this).attr("data-id");
+	    window.location.href = '/origami/quick_service/pending_order/' + sale_id;
+	 })
+    $('#pay').on('click', function () {
+        var sale_id = $('#sale_id').val();
+        window.location.href = '/origami/sale/' + sale_id + "/quick_service/payment";
+    });
+    $('#back').on('click', function () {
+        window.location.href = '/origami/quick_service';
+    })
+</script>
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
new file mode 100644
index 00000000..a7ef5955
--- /dev/null
+++ b/app/views/origami/pending_order/show.html.erb
@@ -0,0 +1,142 @@
+<div class="container-fluid">
+<div class="row">
+ <!-- Column One -->
+ <div class="col-lg-6 col-md-6 col-sm-6">
+    <div class="card">
+      <div class="card-header">
+        <strong id="order-title"> PENDING ORDER </strong>
+      </div> 
+      <div class="card-block">
+        <div id="custom-slimscroll">
+          <div class="card-columns">
+            <% @sales.each do |sale| %>
+            <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
+             <div class="card-block">
+              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
+            </div>
+          </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+ </div>
+ <!-- Column One -->
+
+ <!-- Column Two -->
+  <div class="col-lg-5 col-md-5 col-sm-5">
+     <div class="card"  >
+       <div class="card-header">
+          <div><strong id="order-title">INVOICE DETAILS </strong>| Table <%= @dining.name rescue "" %></div>
+       </div>
+       <div class="card-block">
+         <div class="card-title row p-l-5 p-r-5">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+              &nbsp; Receipt No: <span id="receipt_no">
+                 <%= @sale.receipt_no rescue '' %>
+             </span>
+           </div>
+           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+             Date:  <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%> &nbsp; </span>
+           </div>
+         </div>
+         <div class="card-title row customer_detail p-l-5 p-r-5">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+             Customer : <%= @sale.customer.name rescue "-" %>
+
+           </div>
+
+         </div>
+         <div id="order-detail-slimscroll" data-height="160">
+         <div class="card-text" style="">
+           <table class="table table-striped" id="order-items-table">
+             <thead>
+               <tr>
+                 <th class="item-name">Items</th>
+                 <th class="item-attr">QTY</th>
+                 <th class="item-attr">Price</th>
+               </tr>
+             </thead>
+             <tbody>
+               <%
+                 sub_total = 0
+                  @sale.sale_items.each do |sale_item|
+                  sub_total = sub_total + sale_item.price
+               %>
+               <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
+               <% #unless sale_item.price <= 0 %>
+               <tr>
+                 <td class='item-name'><%= sale_item.product_name %></td>
+                 <td class='item-attr'><%= sale_item.qty %></td>
+                 <td class='item-attr'><%= sale_item.price %></td>
+               </tr>
+               <%
+
+                   #end
+                 end
+
+                %>
+             </tbody>
+           </table>
+         </div>
+         </div>
+         <div class="card-footer">
+           <table class="table" id="order-charges-table" border="0">
+             <tr>
+               <td class="charges-name"><strong>Sub Total:</strong></td>
+               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+             </tr>
+             <tr>
+                <%if @sale.discount_type == 'member_discount'%>
+                <td class="charges-name"><strong>Member Discount:</strong></td>
+               <%else%>
+                <td class="charges-name"><strong>Discount:</strong></td>
+               <%end%>
+               <td class="item-attr"><strong id="order-discount">(<%= @sale.total_discount rescue 0%>)</strong></td>
+             </tr>
+             <tr>
+               <td class="charges-name"><strong>Tax:</strong></td>
+               <td class="item-attr"><strong id="order-Tax"><%= @sale.total_tax rescue 0%></strong></td>
+             </tr>
+             <tr>
+               <td class="charges-name"><strong>Rounding Adj:</strong></td>
+               <td class="item-attr"><strong id="order-round-adj"><%= @sale.rounding_adjustment rescue 0%></strong></td>
+             </tr>
+             <tr>
+               <td class="charges-name"><strong>Grand Total:</strong></td>
+               <td class="item-attr"><strong id="order-grand-total"><%= @sale.grand_total rescue 0%></strong></td>
+             </tr>
+              <tr class="rebate_amount"></tr>
+           </table>
+         </div>
+       </div>
+     </div>
+  </div>
+
+ <!-- Column Three -->
+ <div class="col-lg-1 col-md-1 col-sm-1">
+   <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
+   <button type="button" id="addorder" class="btn bg-blue btn-block">Pay</button>
+   <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
+ </div>
+</div>
+</div>
+<script>
+$(document).ready(function(){
+  $(".sales").on('click',function(){
+      var sale_id = $(this).attr("data-id");
+      window.location.href = '/origami/quick_service/pending_order/' + sale_id;
+  })
+  $('#pay').on('click', function () {
+    var sale_id = $('#sale_id').val();
+    window.location.href = '/origami/sale/' + sale_id + "/quick_service/payment";
+  });
+  $('#back').on('click', function () {
+    window.location.href = '/origami/quick_service';
+  });
+  $('#addorder').on('click', function () {
+    var table_id = "<%=@table_id%>";
+    window.location.href = '/origami/quick_service/modify_order/' + table_id;
+  });
+});
+</script>
diff --git a/config/routes.rb b/config/routes.rb
index 546a456a..45106643 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,6 +88,10 @@ scope "(:locale)", locale: /en|mm/ do
 
     get "quick_service" => "quick_service#index"
     
+    get "quick_service/pending_order" => "pending_order#index"
+    get "quick_service/pending_order/:sale_id" => "pending_order#show"
+
+    get "quick_service/modify_order/:id" => "quick_service#modify_order"
     # post '/:quick_service/create' => "quick_service#create", :defaults => { :format => 'json' }   
 
     resources :cash_ins, only: [:new, :create]

From 4c4d11582d04cf6283e53b14b8d712cdff04de62 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Feb 2018 11:58:41 +0630
Subject: [PATCH 186/651] update order for pay first print last

---
 app/models/order.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index eb856faa..6a8f3b52 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -65,7 +65,9 @@ class Order < ApplicationRecord
       BookingOrder.create({:booking_id => booking.booking_id, :order => self})
 
       #Send order to queue one it done!
-      process_order_queue
+      if self.source != "quick_service"
+        process_order_queue
+      end      
 
       #send order to broadcast job
       send_order_broadcast(booking)
@@ -100,7 +102,9 @@ class Order < ApplicationRecord
       BookingOrder.create({:booking_id => booking.booking_id, :order => self})
 
       #Send order to queue one it done!
-      process_order_queue
+      if self.source != "quick_service"
+        process_order_queue
+      end
 
       #send order to broadcast job
       send_order_broadcast(booking)

From 420461918d404580aa4006dfda0d10559fad7e2f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Feb 2018 13:04:01 +0630
Subject: [PATCH 187/651] update print summary for before_updated_qty

---
 app/models/printer/order_queue_printer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 04ad5896..8dbf4f95 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -52,7 +52,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
    # Query for per order
-  def print_order_summary(print_settings,oqs, order_id, order_items, print_status)
+  def print_order_summary(print_settings,oqs, order_id, order_items, print_status, before_updated_qty="", options="")
     #Use CUPS service
     #Generate PDF
     #Print 

From d052fed8039e65b2ee927665c31ba745e2b13426 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Feb 2018 14:13:58 +0630
Subject: [PATCH 188/651] update pay first and print later

---
 .../origami/payments_controller.rb            | 11 ++++++--
 app/models/order.rb                           | 27 ++++++++++++++++++-
 app/views/origami/payments/show.html.erb      |  2 +-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 0622f173..d5e14bfc 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -65,10 +65,17 @@ class Origami::PaymentsController < BaseOrigamiController
   end
 
   def create
-    cash = params[:cash]
-    sale_id = params[:sale_id]
+    cash        = params[:cash]
+    sale_id     = params[:sale_id]
     member_info = nil
 
+    if params[:type] == "quick_service"
+      booking = Booking.find_by_sale_id(sale_id)
+      booking.booking_orders.each do |order|
+        Order.pay_process_order_queue(order.order_id,booking.dining_facility_id)
+      end
+    end
+
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
diff --git a/app/models/order.rb b/app/models/order.rb
index 6a8f3b52..c4326adb 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -301,8 +301,33 @@ class Order < ApplicationRecord
     end
  
   end
+
+  #Process order items and send to order queue
+  def self.pay_process_order_queue(id,table_id)
+    #Send to background job for processing
+
+    cup_status = `#{"sudo service cups status"}`
+    print_status = check_cup_status(cup_status)
+     
+    if print_status
+      OrderQueueProcessorJob.perform_later(id, table_id)
+    else
+      cup_start    = `#{"sudo service cups start"}`
+      cup_status   = `#{"sudo service cups status"}`
+      print_status = check_cup_status(cup_status)
+
+      if print_status
+        OrderQueueProcessorJob.perform_later(id, table_id)
+      else
+        msg = ' Print Error ! Please contact to service'
+        ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+        OrderQueueProcessorJob.perform_later(id, table_id)
+      end
+    end
+ 
+  end
   
-  def check_cup_status(status)
+  def self.check_cup_status(status)
     if status.include? "Active: active (running)" || "Active: active (exited)"   #"Cup Server is already running"
       return true
     end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index bac0b8c8..c86c0284 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -551,7 +551,7 @@ var cashier_type = "<%= @cashier_type %>";
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",
-              data: "cash="+ cash + "&sale_id=" + sale_id,
+              data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type,
               async: false,
               success:function(result){
                 /* start delete receipt no in first bill*/

From c4452c2730fba0784e9f47c6d06082a3e40721f8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Feb 2018 14:15:29 +0630
Subject: [PATCH 189/651] update order queue printer for order_summary with
 before update qty

---
 app/models/printer/order_queue_printer.rb | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 8dbf4f95..4a8b1653 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -76,20 +76,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               end
             end
@@ -109,20 +109,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           end
         end
@@ -143,7 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
   # Print for orders in booking
-  def print_booking_summary(print_settings,oqs, booking_id, print_status)
+  def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="")
     # Must be one print  
     if print_settings.print_copies == 0
       print_settings.print_copies = 1
@@ -162,20 +162,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               end
             end
@@ -198,20 +198,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'   
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           end
         end

From e445b3e88e94f89a0c32546a8d5f3c0a5d2dce7f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Feb 2018 17:56:41 +0630
Subject: [PATCH 190/651] add order count and change orders UI for table and
 room

---
 app/controllers/origami/home_controller.rb   |  29 +-
 app/controllers/origami/orders_controller.rb |  26 ++
 app/controllers/origami/rooms_controller.rb  |  26 ++
 app/views/home/dashboard.html.erb            |   2 +-
 app/views/origami/home/show.html.erb         |  24 +-
 app/views/origami/orders/show.html.erb       | 425 ++++++++++---------
 app/views/origami/rooms/show.html.erb        |  20 +
 7 files changed, 355 insertions(+), 197 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 0dda31f5..5bb8a02a 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -26,7 +26,33 @@ class Origami::HomeController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-    
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
@@ -65,7 +91,6 @@ class Origami::HomeController < BaseOrigamiController
        else
         sale = Sale.find(booking.sale_id)
          if sale.sale_status != "completed" && sale.sale_status != 'void'
-
            @sale_array.push(sale)
            if @status_order == 'order'
              @status_order = 'sale'
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 22a1e802..f4b11fc5 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -12,5 +12,31 @@ class Origami::OrdersController < BaseOrigamiController
         @sale_status = sale.sale_status
       end
     end
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
   end
 end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index cda8c299..68f8ffe0 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -22,6 +22,32 @@ class Origami::RoomsController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
     
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index eb1bdecd..104c4c67 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -155,7 +155,7 @@
                 <% if !(@total_payment_methods.nil?) %>
                   <% @total_payment_methods.each do |payment| %>
                     <% if !@sale_data[0].empty? %>
-                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
+                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %>
                         <tr>
                           <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
                           <td align="right">
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index a5b7b23c..6e1f7128 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -40,7 +40,7 @@
               <!--- Panel 1 - Table Orders -->
               <div class="tab-pane dining active " id="tables" role="tabpanel">
                 <div class="card-columns">
-                  <% @tables.each do |table| %>       
+                  <% @tables.each do |table| %>  
                       <% if table.status == 'occupied' %>
                           <% if table.get_booking.nil? %>
                             <% if table.get_checkout_booking.nil? %>
@@ -50,6 +50,11 @@
                             <% end %>                         
                                 <div class="card-block">
                                   <%= table.name %>
+                                  <% if !@order_items_count.nil? %>
+                                    <% if @order_items_count.key?(table.id) %>
+                                      (Orders : <%= @order_items_count[table.id] %>)
+                                    <% end %>
+                                  <% end %>
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
@@ -61,7 +66,12 @@
                               <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
                             <% end %>                   
                             <div class="card-block">
-                                <%= table.name %>
+                                <%= table.name %> 
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(table.id) %>
+                                    (Orders : <%= @order_items_count[table.id] %>)
+                                  <% end %>
+                                <% end %>
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                               </div>
                             </div>
@@ -87,6 +97,11 @@
                           <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">
                               <%= room.name %>
+                              <% if !@order_items_count.nil? %>
+                                <% if @order_items_count.key?(room.id) %>
+                                  (Orders : <%= @order_items_count[room.id] %>)
+                                <% end %>
+                              <% end %>
                                   <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                             </div>
                           </div>
@@ -94,6 +109,11 @@
                             <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                               <div class="card-block">
                                 <%= room.name %>
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(room.id) %>
+                                    (Orders : <%= @order_items_count[room.id] %>)
+                                  <% end %>
+                                <% end %>
                                     <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                               </div>
                             </div>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index c1a581dc..852e731a 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -5,7 +5,7 @@
 
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist" id="mytab">
-   <li class="nav-item">
+     <li class="nav-item">
        <a class="nav-link " data-toggle="tab" href="#completed" role="tab">Completed</a>
      </li>
      <li class="nav-item">
@@ -20,223 +20,264 @@
    </ul>
    <!-- Nav tabs - End -->
    <div id="custom-slimscroll">
-      <div class="tab-content">
+    <div class="tab-content">
      <!--- Panel 0 - Completed Orders -->
      <div class="tab-pane " id="completed" role="tabpanel" style="">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @complete.each do |sale| %>
          <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
            <div class="card-block">
-              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
-           </div>
-         </div>
-         <% end %>
-       </div>
-     </div>
+            <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
+          </div>
+        </div>
+        <% end %>
+      </div>
+    </div>
 
-     <!--- Panel 1 - Table Orders -->
-     <div class="tab-pane " id="tables" role="tabpanel" style="">
-       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-         <% @tables.each do |table| %>
-         <% if table.status == 'occupied' %>
-         <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
-           <div class="card-block">
-              <%= table.name %>
-              <% if table.get_booking.nil? %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
-              <% else %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> new</span>
-              <% end %>
-           </div>
-         </div>
-         <% else %>
-         <div class="card tables green text-white" data-id="<%= table.id %>">
-           <div class="card-block">
-              <%= table.name %>
-           </div>
-         </div>
-         <% end %>
-         <% end %>
-       </div>
-     </div>
+    <!--- Panel 1 - Table Orders -->
+    <div class="tab-pane " id="tables" role="tabpanel" style="">
+      <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+        <% @tables.each do |table| %>
+          <% if table.status == 'occupied' %>
+            <% if table.get_booking.nil? %>
+              <% if table.get_checkout_booking.nil? %>
+                <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% else %>                            
+                <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% end %>                         
+                  <div class="card-block">
+                    <%= table.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(table.id) %>
+                        (Orders : <%= @order_items_count[table.id] %>)
+                      <% end %>
+                    <% end %>
+                    <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
+                    <div style="font-size:12px;"></div>
+                  </div>
+                </div>
+            <% else %>         
+              <% if table.get_checkout_booking.nil? %>
+                <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% else %>                       
+                <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% end %>                   
+              <div class="card-block">
+                  <%= table.name %> 
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(table.id) %>
+                      (Orders : <%= @order_items_count[table.id] %>)
+                    <% end %>
+                  <% end %>
+                  <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
+                </div>
+              </div>
+            <% end %>
+        <% else %>
+            <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <div class="card-block">
+                <%= table.name %>
+                <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
+              </div>
+            </div>
+        <% end %>
+        <% end %>
+      </div>
+    </div>
 
-     <!--- Panel 2 - Room Orders -->
-     <div class="tab-pane" id="rooms" role="tabpanel" style="">
+      <!--- Panel 2 - Room Orders -->
+      <div class="tab-pane" id="rooms" role="tabpanel" style="">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @rooms.each do |room| %>
-         <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-              <% if room.get_booking.nil? %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
+          <% if room.status == 'occupied' %>
+            <% if room.get_booking.nil? %>
+              <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                <div class="card-block">
+                  <%= room.name %>
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(room.id) %>
+                      (Orders : <%= @order_items_count[room.id] %>)
+                    <% end %>
+                  <% end %>
+                      <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
+                </div>
+              </div>
               <% else %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> new</span>
+                <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                  <div class="card-block">
+                    <%= room.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(room.id) %>
+                        (Orders : <%= @order_items_count[room.id] %>)
+                      <% end %>
+                    <% end %>
+                        <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
+                  </div>
+                </div>
               <% end %>
-           </div>
-         </div>
-         <% else %>
-         <div class="card rooms green text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-           </div>
-         </div>
-         <% end %>
-         <% end %>
-       </div>
-     </div>
-
-     <!--- Panel 3 - Orders -->
-     <div class="tab-pane active" id="orders" role="tabpanel" style="">
-       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-         <% @orders.each do |order| %>
-         <div class="card orders red text-white" data-id = "<%= order.order_id %>">
-           <div class="card-block">
-              <%
-                order_status = ""
-                sale_order = SaleOrder.find_by_order_id(order)
-                if sale_order
-                  unless sale_order.sale_id.nil?
-                    sale = Sale.find(sale_order.sale_id)
-                    order_status = sale.sale_status
-                    if order_status == 'new'
-                      order_status  = order.status
-                    end
-                  end
-                else
-                  order_status = order.status
-                end
-              %>
-              <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
-           </div>
-         </div>
-         <% end %>
-       </div>
-     </div>
-
-      </div>
-   </div>
-   <!-- tabs - End -->
- </div>
- <!-- Column One -->
-
- <!-- Column Two -->
-  <div class="col-lg-5 col-md-5 col-sm-5">
-     <div class="card"  >
-       <div class="card-header">
-          <div><strong id="order-title">ORDERS DETAILS </strong></div>
-       </div>
-       <div class="card-block">
-         <div class="card-title row p-l-5 p-r-5">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-              Order No: <span id="receipt_no"> <%= @order.order_id %>
-             </span>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-            Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
-           </div>
-         </div>
-         <div class="card-title row customer_detail hide">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-             Customer : <span id="customer_name"></span>
-           </div>
-
-         </div>
-         <div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 200 : 160%>">
-         <div class="card-text" style="">
-           <table class="table table-striped" id="order-items-table">
-             <thead>
-               <tr>
-                 <th class="item-name">Items</th>
-                 <th class="item-attr">QTY</th>
-                 <th class="item-attr">Price</th>
-               </tr>
-             </thead>
-             <tbody>
-               <%
-                 sub_total = 0
-                  @order.order_items.each do |sale_item|
-                  sub_total = sub_total + sale_item.price
-               %>
-               <% unless sale_item.price <= 0 %>
-               <tr>
-                 <td class='item-name'><%= sale_item.item_name %></td>
-                 <td class='item-attr'><%= sale_item.qty %></td>
-                 <td class='item-attr'><%= sale_item.price %></td>
-               </tr>
-               <%
-                   end
-                 end
-                %>
-             </tbody>
-           </table>
-         </div>
-         </div>
-         <div class="card-footer ">
-           <table class="table" id="order-charges-table" border="0">
-             <tr>
-               <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
-             </tr>
-             <tr>
-               
-                <td class="charges-name"><strong>Discount:</strong></td>
-      
-               <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
-             </tr>
-              <tr class="rebate_amount"></tr>
-           </table>
-         </div>
-       </div>
-     </div>
+          <% else %>
+              <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                <div class="card-block">
+                  <%= room.name %>
+                  <span class="float-right font-12 new_text_<%= room.id %> hide"> 
+                </div>
+              </div>
+          <% end %>
+      <% end %>
+    </div>
   </div>
 
- <!-- Column Three -->
- <div class="col-lg-1 col-md-1 col-sm-1">
-   <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
-   <% if @sale_status != 'completed' %>
-     <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
-   <% end %>
-   <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
+  <!--- Panel 3 - Orders -->
+  <div class="tab-pane active" id="orders" role="tabpanel" style="">
+   <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+     <% @orders.each do |order| %>
+     <div class="card orders red text-white" data-id = "<%= order.order_id %>">
+       <div class="card-block">
+        <%
+        order_status = ""
+        sale_order = SaleOrder.find_by_order_id(order)
+        if sale_order
+          unless sale_order.sale_id.nil?
+            sale = Sale.find(sale_order.sale_id)
+            order_status = sale.sale_status
+            if order_status == 'new'
+              order_status  = order.status
+            end
+          end
+        else
+          order_status = order.status
+        end
+        %>
+        <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
+      </div>
+    </div>
+    <% end %>
+  </div>
+</div>
+
+</div>
+</div>
+<!-- tabs - End -->
+</div>
+<!-- Column One -->
+
+<!-- Column Two -->
+<div class="col-lg-5 col-md-5 col-sm-5">
+ <div class="card"  >
+   <div class="card-header">
+    <div><strong id="order-title">ORDERS DETAILS </strong></div>
+  </div>
+  <div class="card-block">
+   <div class="card-title row p-l-5 p-r-5">
+     <div class="col-lg-6 col-md-6 col-sm-6">
+      Order No: <span id="receipt_no"> <%= @order.order_id %>
+    </span>
+  </div>
+  <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+    Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
+  </div>
+</div>
+<div class="card-title row customer_detail hide">
+ <div class="col-lg-6 col-md-6 col-sm-6">
+   Customer : <span id="customer_name"></span>
  </div>
+
+</div>
+<div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 200 : 160%>">
+ <div class="card-text" style="">
+   <table class="table table-striped" id="order-items-table">
+     <thead>
+       <tr>
+         <th class="item-name">Items</th>
+         <th class="item-attr">QTY</th>
+         <th class="item-attr">Price</th>
+       </tr>
+     </thead>
+     <tbody>
+       <%
+       sub_total = 0
+       @order.order_items.each do |sale_item|
+        sub_total = sub_total + sale_item.price
+        %>
+        <% unless sale_item.price <= 0 %>
+        <tr>
+         <td class='item-name'><%= sale_item.item_name %></td>
+         <td class='item-attr'><%= sale_item.qty %></td>
+         <td class='item-attr'><%= sale_item.price %></td>
+       </tr>
+       <%
+     end
+   end
+   %>
+ </tbody>
+</table>
+</div>
+</div>
+<div class="card-footer ">
+ <table class="table" id="order-charges-table" border="0">
+   <tr>
+     <td class="charges-name"><strong>Sub Total:</strong></td>
+     <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+   </tr>
+   <tr>
+
+    <td class="charges-name"><strong>Discount:</strong></td>
+
+    <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
+  </tr>
+  <tr class="rebate_amount"></tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+
+<!-- Column Three -->
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
+ <% if @sale_status != 'completed' %>
+ <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
+ <% end %>
+ <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
+</div>
 </div>
 </div>
 <script>
-$(document).ready(function(){
-  $(".tables").on('click', function(){
+  $(document).ready(function(){
+    $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
-  })
-  $(".sales").on('click',function(){
-    var sale_id = $(this).attr("data-id");
-    window.location.href = '/origami/sale/' + sale_id;
-  })
-  $(".rooms").on('click', function(){
+    })
+    $(".sales").on('click',function(){
+      var sale_id = $(this).attr("data-id");
+      window.location.href = '/origami/sale/' + sale_id;
+    })
+    $(".rooms").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/room/' + dining_id;
-  })
-  $(".orders").on('click',function(){
-    var order_id = $(this).attr("data-id");
-    window.location.href = '/origami/order/' + order_id;
-  })
-});
-$('#pay').on('click',function() {
+    })
+    $(".orders").on('click',function(){
+      var order_id = $(this).attr("data-id");
+      window.location.href = '/origami/order/' + order_id;
+    })
+  });
+  $('#pay').on('click',function() {
    var sale_id = $('#sale_id').val();
    var url = '/origami/sale/'+ sale_id + "/rounding_adj" ;
    alert(url)
    $.ajax({
-      type: "POST",
-        url: '/origami/sale/'+ sale_id + "/rounding_adj",
-        success:function(result){          
-          window.location.href = '/origami/sale/'+ sale_id + "/payment";
-        }
-    });
+    type: "POST",
+    url: '/origami/sale/'+ sale_id + "/rounding_adj",
+    success:function(result){          
+      window.location.href = '/origami/sale/'+ sale_id + "/payment";
+    }
+  });
    
-});
-$('#back').on('click',function(){
-  window.location.href = '/origami/';
-})
-$('#move').on('click',function(){
+ });
+  $('#back').on('click',function(){
+    window.location.href = '/origami/';
+  })
+  $('#move').on('click',function(){
 
-})
+  })
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 385129bf..17674fff 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -50,6 +50,11 @@
                 <% end %>              
                     <div class="card-block">
                        <%= table.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
@@ -61,6 +66,11 @@
                   <% end %>           
                     <div class="card-block">
                        <%= table.name %>
+                       <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                     </div>
                   </div>
@@ -87,6 +97,11 @@
                  <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                       <div  style="font-size:12px;"></div>
                    </div>
@@ -95,6 +110,11 @@
                  <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                    </div>
                  </div>

From d42fc485aebfb422ba62f5d0df5f34b162195f85 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Feb 2018 18:10:11 +0630
Subject: [PATCH 191/651] change ui for left sidebar

---
 app/views/layouts/_left_sidebar.html.erb | 1 +
 config/locales/en.yml                    | 1 +
 config/locales/mm.yml                    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index c6b1356a..57f05179 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -75,6 +75,7 @@
 				</a>
 			</li> -->
 			<%end%>
+			<li class="header"><%= t :backend %></li>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">widgets</i>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6bc0271e..d4dc8005 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -70,6 +70,7 @@ en:
   sale_audits: "Sale Audits"
   bottom: "Bottom"
   payment: "Payment"
+  backend: "Backend"
 
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 6bdb1768..2d35b1bf 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -65,6 +65,7 @@ mm:
   sale_audits: "အရောင်းပြင်ဆင်�ြင်းများ"
   bottom: "အရောင်းအနဲဆုံး"
   payment: "ငွေပေး�ျေမှု"
+  backend: "Backend"
   
   views:
     btn:       

From 88a3deca303e676df71b385adc229bbee0c7890c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Feb 2018 18:17:17 +0630
Subject: [PATCH 192/651] change ui for split bill

---
 app/views/origami/split_bill/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 999302d0..1c396b21 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -18,7 +18,7 @@
  							<p class="m-l-15">Order Lists</p>
  						</div>
  					</div>
- 					<div id="split-order-slimscroll" data-height="100">
+ 					<div id="split-order-slimscroll" data-height="70">
  						<div class="card-text dining">
  							<% if !@orders.nil? %>
  							<div class="row">
@@ -122,7 +122,7 @@
  					<div class="card-title row">
  						<p class="m-l-15">Receipt Lists</p>
  					</div>
- 					<div id="split-receipt-slimscroll" data-height="160">
+ 					<div id="split-receipt-slimscroll" data-height="150">
  						<div class="card-text dining">
  							<% if !@sale_data.nil? %>
  							<table class="table table-default">

From 860e8db202aa4252aac92c74351e31dc41b24549 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Fri, 9 Feb 2018 10:17:56 +0630
Subject: [PATCH 193/651] conflic data

---
 README.md                                     |   8 +-
 app/assets/javascripts/OQS.js                 |  18 +-
 .../javascripts/channels/call_waiter.js       |  22 +-
 app/controllers/api/bill_controller.rb        |   3 +-
 .../api/call_waiters_controller.rb            |   3 +-
 app/controllers/oqs/edit_controller.rb        |   6 +-
 app/controllers/oqs/home_controller.rb        |  66 ++-
 app/controllers/oqs/print_controller.rb       |   2 +-
 app/controllers/origami/home_controller.rb    |  33 +-
 app/controllers/origami/orders_controller.rb  |  28 +-
 .../origami/payments_controller.rb            |   4 +-
 app/controllers/origami/rooms_controller.rb   |  30 +-
 app/controllers/origami/sales_controller.rb   |   2 +-
 app/models/dining_facility.rb                 |  10 +-
 app/models/order.rb                           |  32 +-
 app/models/printer/order_queue_printer.rb     |  56 +--
 app/models/sale.rb                            |  41 +-
 app/models/sale_payment.rb                    |   6 +-
 app/pdf/order_item_pdf.rb                     |  20 +-
 app/pdf/order_item_slim_pdf.rb                |  20 +-
 app/pdf/order_set_item_pdf.rb                 |  20 +-
 app/views/home/dashboard.html.erb             |   2 +-
 app/views/layouts/_left_sidebar.html.erb      |   1 +
 app/views/origami/home/show.html.erb          |  36 +-
 app/views/origami/orders/show.html.erb        | 425 ++++++++++--------
 app/views/origami/rooms/show.html.erb         |  20 +
 config/locales/en.yml                         |   1 +
 config/locales/mm.yml                         |   1 +
 config/schedule.rb                            |   2 +-
 29 files changed, 622 insertions(+), 296 deletions(-)

diff --git a/README.md b/README.md
index 8c5cf006..97f43595 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ ruby 2.4.1p111
 
 	Osaka
 
-		Auth Token        => rj0MJ0XI5GsKZehE => New
+		Auth Token        => wu8YvlLmah0CL => New 	##note : Old => rj0MJ0XI5GsKZehE
 
 						  => code2lab => Old
 
@@ -23,7 +23,7 @@ ruby 2.4.1p111
 
     BITP
 
-		Auth Token        => rj0MJ0XI5GsKZehE => New
+		Auth Token        => pZBHXEFbGNj/G => New   ##note : Old => rj0MJ0XI5GsKZehE
 
 						  => code2lab => Old
 
@@ -103,6 +103,10 @@ Change type in mysql
 	=> ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table 
 	=> ALTER DATABASE [database_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci  #for database
 
+###please open 	
+sudo cat /etc/sudoers
+### cope and parse
+%superuser ALL=(ALL) NOPASSWD: ALL
 
 * ToDo list
 
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index da50ac34..35e08b4f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -25,6 +25,7 @@
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
+	var oqs_id = "";
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
@@ -37,7 +38,8 @@ $(document).on('turbolinks:load', function() {
        $(".oqs_append").removeClass('hide');
        $(this).addClass('oqs_active');
        $(".queue_station").addClass('queue_station_box');
-       var oqs_id = $(this).find(".oqs-id").text();
+       oqs_id = $(this).find(".oqs-id").text();
+       console.log(oqs_id);
        var url    = 'oqs/get_items/'+oqs_id;
       
        show_details(url);
@@ -142,8 +144,7 @@ $(document).on('turbolinks:load', function() {
 	    	type: 'GET',
 	    	url: '/oqs/' + orderNo,
 	    	data: { 'status' : order_status },
-	    	success: function(res){	    	
-
+	    	success: function(res){
 	    		for (i = 0; i < res.length; i++) {	    			
 	    			var data = JSON.stringify(res[i]);	
         			var parse_data = JSON.parse(data); 
@@ -156,10 +157,19 @@ $(document).on('turbolinks:load', function() {
 							});
 	        			}
         			}
-	    			var order_item_row = "<tr>" +
+
+        			if (oqs_id > 0){
+        				var order_item_row = "<tr id='edit_"+assigned_item_id+"' class='order-item-edit'>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
 							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
               						 	 "</tr>";
+				 	}else{
+				 		var order_item_row = "<tr>" +
+							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
+							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
+              						 	 "</tr>";
+				 	}
+	    			
               		$("#oqs-order-details-table").children("tbody").append(order_item_row);
 	    		}	    		
 	    	}
diff --git a/app/assets/javascripts/channels/call_waiter.js b/app/assets/javascripts/channels/call_waiter.js
index 941a6359..f0a804a2 100644
--- a/app/assets/javascripts/channels/call_waiter.js
+++ b/app/assets/javascripts/channels/call_waiter.js
@@ -7,15 +7,27 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
 
   received: function(data) {                 
    table = data.table
+   time  = data.time
    
     // for Notificaiotn message
     var element        = "#notify-wrapper"
-    var placementFrom  = "top";
-    var placementAlign = "center";
     var animateEnter   = "";
     var animateExit    = "";
-    var colorName      = "alert-warning";
-    var text           = " Calling Waiter <br>  "+table.name ;
+    
+    if (time == 'print_error') {
+      var colorName      = "alert-danger";
+      var placementFrom  = "center";
+      var placementAlign = "center";
+      var text           = " Hello <br>  "+table ;
+      style =""
+    }else{
+      var colorName      = "alert-warning";
+      var placementFrom  = "top";
+      var placementAlign = "center";
+      var text           = " Calling Waiter <br>  "+table.name ;
+      style ="width:180px !important;"
+    }
+    
 
     if (text != null || colorName != null){
      showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
@@ -43,7 +55,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
         enter: animateEnter,
         exit: animateExit
       },
-      template: '<div data-notify="container" style="width:180px !important;" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
+      template: '<div data-notify="container" style="'+style+'" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
       '<button type="button" aria-hidden="true" class="close notify-close float-right m-l-5 m-t--5" data-notify="dismiss">×</button>' +
       '<span data-notify="icon"></span> ' +
       '<span data-notify="title">{1}</span> ' +
diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 387b7bf8..4b58e52d 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -46,7 +46,8 @@ class Api::BillController < Api::ApiController
 
       Promotion.promo_activate(@sale)
 
-      BillBroadcastJob.perform_later(table)
+      #BillBroadcastJob.perform_later(table)
+      ActionCable.server.broadcast "bill_channel",table: table
     else
       @status = false
       @error_message = "No Current Open Shift"
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index bfb1023a..7cf80a5d 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -5,7 +5,8 @@ class Api::CallWaitersController < ActionController::API
     @table_id = params[:dining_id]
     @time     = params[:time]
     @table    = DiningFacility.find(@table_id)
-    CallWaiterJob.perform_later(@table,@time)
+    # CallWaiterJob.perform_later(@table,@time)
+    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
 
     # get printer info
     @shop          = Shop::ShopDetail 
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index b924702e..f8bef2de 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -10,7 +10,9 @@ class Oqs::EditController < BaseOqsController
     qty_weight = params[:qty_weight]
     remarks = params[:remarks]
 
-    order_item = OrderItem.find(order_items_id);
+    order_item = OrderItem.find(order_items_id)
+    before_updated_qty = order_item.qty
+
     order_item.item_order_by = current_user.name
     order_item.qty = qty_weight
     order_item.remark = remarks
@@ -45,7 +47,7 @@ class Oqs::EditController < BaseOqsController
 
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
     end
   end
 
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 5ecd6920..471169a8 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -1,7 +1,7 @@
 class Oqs::HomeController < BaseOqsController
   def index
 
-  	@queue_stations = OrderQueueStation.all
+  	
 
     # Query for OQS with delivery status false
   	# @queue_items_details = queue_items_query(false)
@@ -11,26 +11,28 @@ class Oqs::HomeController < BaseOqsController
 
     @filter = params[:filter]
 
+    @queue_stations = OrderQueueStation.all
+   
     @queue_completed_item = completed_order(@filter)
-    if !@queue_completed_item.empty?
-      @queue_completed_item.each do |queue_item|
-        if !queue_item.set_menu_items.nil?
-          instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
-          arr_instance_item_sets = Array.new
-          instance_item_sets.each do |instance_item|
-            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-            arr_instance_item_sets.push(item_instance_name)
-          end
-          queue_item.set_menu_items = arr_instance_item_sets
-        end
-      end
-    end
+    # if !@queue_completed_item.empty?
+    #   @queue_completed_item.each do |queue_item|
+    #     if !queue_item.set_menu_items.nil?
+    #       instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
+    #       arr_instance_item_sets = Array.new
+    #       instance_item_sets.each do |instance_item|
+    #         item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+    #         arr_instance_item_sets.push(item_instance_name)
+    #       end
+    #       queue_item.set_menu_items = arr_instance_item_sets
+    #     end
+    #   end
+    # end
 
     if !@filter.nil?
       @count = queue_items_count_query(false,@filter)
-      @count.each do |count|
+      #@count.each do |count|
 
-      end
+      #end
     end
 
     # @queue_stations_items=Array.new
@@ -99,7 +101,6 @@ class Oqs::HomeController < BaseOqsController
         end
       end
     end
-
     render :json => items.to_json
   end
 
@@ -194,18 +195,35 @@ class Oqs::HomeController < BaseOqsController
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
   end
 
+  # def queue_items_count_query(status,filter) 
+  #   query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id")
+  #   .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
+  #             left join orders as od ON od.order_id = assigned_order_items.order_id
+  #             left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
+  #             left join customers as cus ON cus.customer_id = od.customer_id
+  #             left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+  #             left join bookings as bk on bk.booking_id = bo.booking_id
+  #             left join dining_facilities as df on df.id = bk.dining_facility_id")
+  #   .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
+  #   query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
+  #   .group("oqs.id")
+
+  # end
+
   def queue_items_count_query(status,filter) 
-    query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id")
-    .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
-              left join orders as od ON od.order_id = assigned_order_items.order_id
-              left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
+    # query = OrderQueueStation.all
+    query = OrderQueueStation.select("order_queue_stations.id as station_id,
+                                  (case when (count(odt.item_code)>0) then count(odt.item_code) else 0 end) as total")
+    .joins(" left join assigned_order_items as aoi on aoi.order_queue_station_id= order_queue_stations.id
+              left join orders as od ON od.order_id = aoi.order_id
+              left join order_items as odt ON odt.item_instance_code = aoi.instance_code AND odt.order_id = aoi.order_id
               left join customers as cus ON cus.customer_id = od.customer_id
-              left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+              left join booking_orders as bo on bo.order_id = aoi.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
+    .where("aoi.delivery_status = #{status} AND aoi.created_at >= '#{Time.now.beginning_of_day.utc}' ")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
-    .group("oqs.id")
+    .group("order_queue_stations.id")
 
   end
 
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index c78dbc10..5f973c7a 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -38,7 +38,7 @@ class Oqs::PrintController < ApplicationController
       # print when complete click 
       print_settings = PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
+      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, "", options )
       
       # update print status for completed same order items
       assigned_items.each do |ai|
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index cc8aaaef..f739eb1b 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders   = Order.all.order('date desc')
+    @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @shop     = Shop::ShopDetail
     
     # @shift = ShiftSale.current_open_shift(current_user.id)
@@ -17,7 +17,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     
     @status_order = ""
     @status_sale = ""
@@ -26,7 +26,33 @@ class Origami::HomeController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-    
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
@@ -65,7 +91,6 @@ class Origami::HomeController < BaseOrigamiController
        else
         sale = Sale.find(booking.sale_id)
          if sale.sale_status != "completed" && sale.sale_status != 'void'
-
            @sale_array.push(sale)
            if @status_order == 'order'
              @status_order = 'sale'
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index c2670184..ea976ffd 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('status desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)
     if sale_order
@@ -12,6 +12,32 @@ class Origami::OrdersController < BaseOrigamiController
         @sale_status = sale.sale_status
       end
     end
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
   end
 
   #Shop Name in Navbor
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index e65d9550..adb67963 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -45,8 +45,8 @@ class Origami::PaymentsController < BaseOrigamiController
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
         member_info = Customer.get_member_account(customer)
-        # current_balance = SaleAudit.paymal_search(sale_id)
-        current_balance = 0
+        current_balance = SaleAudit.paymal_search(sale_id)
+        # current_balance = 0
       end
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 13769860..cbf5fdae 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
@@ -11,7 +11,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
 
     @room = DiningFacility.find(params[:room_id])
 
@@ -22,6 +22,32 @@ class Origami::RoomsController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
     
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index e57d2ca0..c522f9e7 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
     @booking = BookingOrder.find_by_order_id(@order).booking_id
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index c4da3475..c897b278 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -155,6 +155,14 @@ class DiningFacility < ApplicationRecord
   def self.check_in_booking(table_id)
     table = DiningFacility.find(table_id)
     #Send to background job for processing
-    CheckInBookingJob.perform_later(table)
+    # CheckInBookingJob.perform_later(table)
+    ActionCable.server.broadcast "check_in_booking_channel",table: table
+  end
+
+  def self.checkin_time
+    table = DiningFacility.get_checkin_booking
+    if table.length > 0
+      ActionCable.server.broadcast "checkin_channel",table: table
+  end
   end
 end
diff --git a/app/models/order.rb b/app/models/order.rb
index 6c22cb92..5b1601d8 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -278,16 +278,42 @@ class Order < ApplicationRecord
   #Process order items and send to order queue
   def process_order_queue
     #Send to background job for processing
-    OrderQueueProcessorJob.perform_later(self.id, self.table_id)
-  end
 
+    cup_status = `#{"sudo service cups status"}`
+    print_status = check_cup_status(cup_status)
+     
+    if print_status
+      OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+    else
+      cup_start    = `#{"sudo service cups start"}`
+      cup_status   = `#{"sudo service cups status"}`
+      print_status = check_cup_status(cup_status)
+
+      if print_status
+        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      else
+        msg = ' Print Error ! Please contact to service'
+        ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      end
+    end
+ 
+  end
+  
+  def check_cup_status(status)
+    if status.include? "Active: active (running)" || "Active: active (exited)"   #"Cup Server is already running"
+      return true
+    end
+    return false
+  end
 
   #send order items and send to order queue
   def send_order_broadcast(booking)
     table = DiningFacility.find(booking.dining_facility_id)
     type  = 'order'
     #Send to background job for processing
-    OrderBroadcastJob.perform_later(table,type)
+    # OrderBroadcastJob.perform_later(table,type)
+    ActionCable.server.broadcast "order_channel",table: table,type:type
   end
 
   #Origami: Cashier : to view order Table
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 85264737..4a8b1653 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,6 +1,6 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
-  def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, options="")
+  def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, before_updated_qty="", options="")
     #Use CUPS service
     #Generate PDF
     #Print
@@ -14,7 +14,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
-    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
     order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     # check for item not to show 
     # if order_item[0].price != 0 
@@ -22,15 +22,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         order_slim_pdf.each do |order_item_slim|
           if order_item_slim[0] == 'OrderSlimPdf'
             if order_item_slim[1] == '1'
-              pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             else
-              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             end
           elsif order_item_slim[0] == 'OrderSetPdf'
             if order_item_slim[1] == '1'
-              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             else
-              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             end
           end
         end
@@ -52,7 +52,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
    # Query for per order
-  def print_order_summary(print_settings,oqs, order_id, order_items, print_status)
+  def print_order_summary(print_settings,oqs, order_id, order_items, print_status, before_updated_qty="", options="")
     #Use CUPS service
     #Generate PDF
     #Print 
@@ -76,20 +76,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               end
             end
@@ -109,20 +109,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           end
         end
@@ -143,7 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
   # Print for orders in booking
-  def print_booking_summary(print_settings,oqs, booking_id, print_status)
+  def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="")
     # Must be one print  
     if print_settings.print_copies == 0
       print_settings.print_copies = 1
@@ -162,20 +162,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               end
             end
@@ -198,20 +198,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'   
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           end
         end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f6aed95e..f42b62a0 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -128,7 +128,9 @@ class Sale < ApplicationRecord
       booking.checkout_by = requested_by.name
       booking.save      
 
-      InventoryJob.perform_now(self.id)
+      # InventoryJob.perform_now(self.id)
+      saleObj = Sale.find(self.id)
+      InventoryDefinition.calculate_product_count(saleObj)
 
       return true, self.id
     end
@@ -137,6 +139,41 @@ class Sale < ApplicationRecord
 
   end
 
+  #fOR Quick Service pay and create
+  def self.request_bill(order,current_user,current_login_employee)
+    @sale = Sale.new
+        sale_order=SaleOrder.new
+
+        if shift = ShiftSale.current_open_shift(current_user.id)
+          order_id = order.order_id # order_id
+          bk_order = BookingOrder.find_by_order_id(order_id)
+          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
+            @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)
+          else
+            @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
+            @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
+          end
+
+          # Bind shift sale id to sale
+          @sale_data.shift_sale_id = shift.id
+          @sale_data.save
+
+          # Promotion Activation
+          Promotion.promo_activate(@sale)
+          @status = true
+          return @status, @sale
+        else
+          @status = false
+          @message = "No Current Open Shift for This Employee"
+        end
+  end
   #This is when spilt bill is request - then we cannot link order to invoice
   #Cos there will be multiple orders - and items are spilt from there.
   #Unless order is spilt by then it is possible.
@@ -706,7 +743,7 @@ def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
                      "i.remark as status_type,"+
-                     " i.unit_price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index ed1b9170..661eb57b 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -335,7 +335,7 @@ class SalePayment < ApplicationRecord
         
          #record an payment in sale-audit
          remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
-         sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+         sale_audit = SaleAudit.record_paymal(sObj.sale_id, remark, 1)
 
         if !response.nil?
           if response["status"] == true
@@ -398,6 +398,7 @@ class SalePayment < ApplicationRecord
             end
           else
             status = false
+            sale_count += 1
           end
         end
       end
@@ -408,7 +409,8 @@ class SalePayment < ApplicationRecord
 
       type  = 'payment'
       #Send to background job for processing
-      OrderBroadcastJob.perform_later(table,type)
+      # OrderBroadcastJob.perform_later(table,type)
+      ActionCable.server.broadcast "order_channel",table: table,type:type
     end
   end
 
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 9483b847..26253b6e 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,7 +1,7 @@
 class OrderItemPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order_item, print_status, options, alt_name)
+  def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemPdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision)
+    order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item, options, alt_name, precision)
+  def order_items(order_item, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderItemPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_item.qty, precision)
     move_down 5
   end
 
@@ -127,4 +128,17 @@ class OrderItemPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 6887d201..f419f185 100644
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -1,7 +1,7 @@
 class OrderItemSlimPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order_item_slim, print_status, options, alt_name)
+  def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemSlimPdf < Prawn::Document
     order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
 
     # order items slim
-    order_items_slim(order_item_slim, options, alt_name, print_settings.precision)
+    order_items_slim(order_item_slim, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemSlimPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items_slim(order_item_slim, options, alt_name, precision)
+  def order_items_slim(order_item_slim, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderItemSlimPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_item_slim.qty, precision)
     move_down 1
   end
 
@@ -126,4 +127,17 @@ class OrderItemSlimPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+        move_down 1
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 30a800b4..8f915ad0 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSetItemPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order_set_item, print_status, options, alt_name)
+  def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderSetItemPdf < Prawn::Document
     order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
 
     # order items
-    order_set_items(order_set_item, options, alt_name, print_settings.precision)
+    order_set_items(order_set_item, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderSetItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_set_items(order_set_item, options, alt_name, precision)
+  def order_set_items(order_set_item, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderSetItemPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_set_item.qty, precision)
     move_down 5
   end
 
@@ -143,4 +144,17 @@ class OrderSetItemPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index eb1bdecd..104c4c67 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -155,7 +155,7 @@
                 <% if !(@total_payment_methods.nil?) %>
                   <% @total_payment_methods.each do |payment| %>
                     <% if !@sale_data[0].empty? %>
-                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
+                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %>
                         <tr>
                           <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
                           <td align="right">
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index f9ac6d79..a4e8d653 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -77,6 +77,7 @@
 				</a>
 			</li> -->
 			<%end%>
+			<li class="header"><%= t :backend %></li>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">widgets</i>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8167a8eb..0993d30b 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -40,7 +40,7 @@
               <!--- Panel 1 - Table Orders -->
               <div class="tab-pane dining active " id="tables" role="tabpanel">
                 <div class="card-columns">
-                  <% @tables.each do |table| %>       
+                  <% @tables.each do |table| %>  
                       <% if table.status == 'occupied' %>
                           <% if table.get_booking.nil? %>
                             <% if table.get_checkout_booking.nil? %>
@@ -50,6 +50,11 @@
                             <% end %>                         
                                 <div class="card-block">
                                   <%= table.name %>
+                                  <% if !@order_items_count.nil? %>
+                                    <% if @order_items_count.key?(table.id) %>
+                                      (Orders : <%= @order_items_count[table.id] %>)
+                                    <% end %>
+                                  <% end %>
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
@@ -61,7 +66,12 @@
                               <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
                             <% end %>                   
                             <div class="card-block">
-                                <%= table.name %>
+                                <%= table.name %> 
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(table.id) %>
+                                    (Orders : <%= @order_items_count[table.id] %>)
+                                  <% end %>
+                                <% end %>
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                               </div>
                             </div>
@@ -87,6 +97,11 @@
                           <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">
                               <%= room.name %>
+                              <% if !@order_items_count.nil? %>
+                                <% if @order_items_count.key?(room.id) %>
+                                  (Orders : <%= @order_items_count[room.id] %>)
+                                <% end %>
+                              <% end %>
                                   <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                             </div>
                           </div>
@@ -94,6 +109,11 @@
                             <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                               <div class="card-block">
                                 <%= room.name %>
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(room.id) %>
+                                    (Orders : <%= @order_items_count[room.id] %>)
+                                  <% end %>
+                                <% end %>
                                     <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                               </div>
                             </div>
@@ -475,12 +495,14 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         
-        // console.log(checkReceiptNoInFirstBillData(receipt_no));
+        discount="<%= @membership.discount%>"
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          if(checkReceiptNoInFirstBillData(receipt_no,"")){
-            $("#pay").show();
-          }else{
-            $("#pay").hide();
+          if (discount) {
+            if(checkReceiptNoInFirstBillData(receipt_no,"")){
+              $("#pay").show();
+            }else{
+              $("#pay").hide();
+            }
           }
         }
       /* end check first bill or not*/
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index b08328b6..852e731a 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -5,7 +5,7 @@
 
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist" id="mytab">
-   <li class="nav-item">
+     <li class="nav-item">
        <a class="nav-link " data-toggle="tab" href="#completed" role="tab">Completed</a>
      </li>
      <li class="nav-item">
@@ -20,223 +20,264 @@
    </ul>
    <!-- Nav tabs - End -->
    <div id="custom-slimscroll">
-      <div class="tab-content">
+    <div class="tab-content">
      <!--- Panel 0 - Completed Orders -->
      <div class="tab-pane " id="completed" role="tabpanel" style="">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @complete.each do |sale| %>
          <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
            <div class="card-block">
-              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
-           </div>
-         </div>
-         <% end %>
-       </div>
-     </div>
+            <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
+          </div>
+        </div>
+        <% end %>
+      </div>
+    </div>
 
-     <!--- Panel 1 - Table Orders -->
-     <div class="tab-pane " id="tables" role="tabpanel" style="">
-       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-         <% @tables.each do |table| %>
-         <% if table.status == 'occupied' %>
-         <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
-           <div class="card-block">
-              <%= table.name %>
-              <% if table.get_booking.nil? %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
-              <% else %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> new</span>
-              <% end %>
-           </div>
-         </div>
-         <% else %>
-         <div class="card tables green text-white" data-id="<%= table.id %>">
-           <div class="card-block">
-              <%= table.name %>
-           </div>
-         </div>
-         <% end %>
-         <% end %>
-       </div>
-     </div>
+    <!--- Panel 1 - Table Orders -->
+    <div class="tab-pane " id="tables" role="tabpanel" style="">
+      <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+        <% @tables.each do |table| %>
+          <% if table.status == 'occupied' %>
+            <% if table.get_booking.nil? %>
+              <% if table.get_checkout_booking.nil? %>
+                <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% else %>                            
+                <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% end %>                         
+                  <div class="card-block">
+                    <%= table.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(table.id) %>
+                        (Orders : <%= @order_items_count[table.id] %>)
+                      <% end %>
+                    <% end %>
+                    <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
+                    <div style="font-size:12px;"></div>
+                  </div>
+                </div>
+            <% else %>         
+              <% if table.get_checkout_booking.nil? %>
+                <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% else %>                       
+                <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% end %>                   
+              <div class="card-block">
+                  <%= table.name %> 
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(table.id) %>
+                      (Orders : <%= @order_items_count[table.id] %>)
+                    <% end %>
+                  <% end %>
+                  <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
+                </div>
+              </div>
+            <% end %>
+        <% else %>
+            <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <div class="card-block">
+                <%= table.name %>
+                <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
+              </div>
+            </div>
+        <% end %>
+        <% end %>
+      </div>
+    </div>
 
-     <!--- Panel 2 - Room Orders -->
-     <div class="tab-pane" id="rooms" role="tabpanel" style="">
+      <!--- Panel 2 - Room Orders -->
+      <div class="tab-pane" id="rooms" role="tabpanel" style="">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @rooms.each do |room| %>
-         <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-              <% if room.get_booking.nil? %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
+          <% if room.status == 'occupied' %>
+            <% if room.get_booking.nil? %>
+              <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                <div class="card-block">
+                  <%= room.name %>
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(room.id) %>
+                      (Orders : <%= @order_items_count[room.id] %>)
+                    <% end %>
+                  <% end %>
+                      <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
+                </div>
+              </div>
               <% else %>
-                <span style="font-size:12px;float:right;line-height:inherit;"> new</span>
+                <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                  <div class="card-block">
+                    <%= room.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(room.id) %>
+                        (Orders : <%= @order_items_count[room.id] %>)
+                      <% end %>
+                    <% end %>
+                        <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
+                  </div>
+                </div>
               <% end %>
-           </div>
-         </div>
-         <% else %>
-         <div class="card rooms green text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-           </div>
-         </div>
-         <% end %>
-         <% end %>
-       </div>
-     </div>
-
-     <!--- Panel 3 - Orders -->
-     <div class="tab-pane active" id="orders" role="tabpanel" style="">
-       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-         <% @orders.each do |order| %>
-         <div class="card orders red text-white" data-id = "<%= order.order_id %>">
-           <div class="card-block">
-              <%
-                order_status = ""
-                sale_order = SaleOrder.find_by_order_id(order)
-                if sale_order
-                  unless sale_order.sale_id.nil?
-                    sale = Sale.find(sale_order.sale_id)
-                    order_status = sale.sale_status
-                    if order_status == 'new'
-                      order_status  = order.status
-                    end
-                  end
-                else
-                  order_status = order.status
-                end
-              %>
-              <%= order.order_id %> | <%= order_status %>
-           </div>
-         </div>
-         <% end %>
-       </div>
-     </div>
-
-      </div>
-   </div>
-   <!-- tabs - End -->
- </div>
- <!-- Column One -->
-
- <!-- Column Two -->
-  <div class="col-lg-5 col-md-5 col-sm-5">
-     <div class="card"  >
-       <div class="card-header">
-          <div><strong id="order-title">ORDERS DETAILS </strong></div>
-       </div>
-       <div class="card-block">
-         <div class="card-title row p-l-5 p-r-5">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-              Receipt No: <span id="receipt_no">
-             </span>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-            Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
-           </div>
-         </div>
-         <div class="card-title row customer_detail hide">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-             Customer : <span id="customer_name"></span>
-           </div>
-
-         </div>
-         <div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 200 : 160%>">
-         <div class="card-text" style="">
-           <table class="table table-striped" id="order-items-table">
-             <thead>
-               <tr>
-                 <th class="item-name">Items</th>
-                 <th class="item-attr">QTY</th>
-                 <th class="item-attr">Price</th>
-               </tr>
-             </thead>
-             <tbody>
-               <%
-                 sub_total = 0
-                  @order.order_items.each do |sale_item|
-                  sub_total = sub_total + sale_item.price
-               %>
-               <% unless sale_item.price <= 0 %>
-               <tr>
-                 <td class='item-name'><%= sale_item.item_name %></td>
-                 <td class='item-attr'><%= sale_item.qty %></td>
-                 <td class='item-attr'><%= sale_item.price %></td>
-               </tr>
-               <%
-                   end
-                 end
-                %>
-             </tbody>
-           </table>
-         </div>
-         </div>
-         <div class="card-footer ">
-           <table class="m-b--20" id="order-charges-table" border="0">
-             <tr>
-               <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
-             </tr>
-             <tr>
-               
-                <td class="charges-name"><strong>Discount:</strong></td>
-      
-               <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
-             </tr>
-              <tr class="rebate_amount"></tr>
-           </table>
-         </div>
-       </div>
-     </div>
+          <% else %>
+              <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
+                <div class="card-block">
+                  <%= room.name %>
+                  <span class="float-right font-12 new_text_<%= room.id %> hide"> 
+                </div>
+              </div>
+          <% end %>
+      <% end %>
+    </div>
   </div>
 
- <!-- Column Three -->
- <div class="col-lg-1 col-md-1 col-sm-1">
-   <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
-   <% if @sale_status != 'completed' %>
-     <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button>
-   <% end %>
-   <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
+  <!--- Panel 3 - Orders -->
+  <div class="tab-pane active" id="orders" role="tabpanel" style="">
+   <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+     <% @orders.each do |order| %>
+     <div class="card orders red text-white" data-id = "<%= order.order_id %>">
+       <div class="card-block">
+        <%
+        order_status = ""
+        sale_order = SaleOrder.find_by_order_id(order)
+        if sale_order
+          unless sale_order.sale_id.nil?
+            sale = Sale.find(sale_order.sale_id)
+            order_status = sale.sale_status
+            if order_status == 'new'
+              order_status  = order.status
+            end
+          end
+        else
+          order_status = order.status
+        end
+        %>
+        <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
+      </div>
+    </div>
+    <% end %>
+  </div>
+</div>
+
+</div>
+</div>
+<!-- tabs - End -->
+</div>
+<!-- Column One -->
+
+<!-- Column Two -->
+<div class="col-lg-5 col-md-5 col-sm-5">
+ <div class="card"  >
+   <div class="card-header">
+    <div><strong id="order-title">ORDERS DETAILS </strong></div>
+  </div>
+  <div class="card-block">
+   <div class="card-title row p-l-5 p-r-5">
+     <div class="col-lg-6 col-md-6 col-sm-6">
+      Order No: <span id="receipt_no"> <%= @order.order_id %>
+    </span>
+  </div>
+  <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+    Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
+  </div>
+</div>
+<div class="card-title row customer_detail hide">
+ <div class="col-lg-6 col-md-6 col-sm-6">
+   Customer : <span id="customer_name"></span>
  </div>
+
+</div>
+<div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 200 : 160%>">
+ <div class="card-text" style="">
+   <table class="table table-striped" id="order-items-table">
+     <thead>
+       <tr>
+         <th class="item-name">Items</th>
+         <th class="item-attr">QTY</th>
+         <th class="item-attr">Price</th>
+       </tr>
+     </thead>
+     <tbody>
+       <%
+       sub_total = 0
+       @order.order_items.each do |sale_item|
+        sub_total = sub_total + sale_item.price
+        %>
+        <% unless sale_item.price <= 0 %>
+        <tr>
+         <td class='item-name'><%= sale_item.item_name %></td>
+         <td class='item-attr'><%= sale_item.qty %></td>
+         <td class='item-attr'><%= sale_item.price %></td>
+       </tr>
+       <%
+     end
+   end
+   %>
+ </tbody>
+</table>
+</div>
+</div>
+<div class="card-footer ">
+ <table class="table" id="order-charges-table" border="0">
+   <tr>
+     <td class="charges-name"><strong>Sub Total:</strong></td>
+     <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+   </tr>
+   <tr>
+
+    <td class="charges-name"><strong>Discount:</strong></td>
+
+    <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
+  </tr>
+  <tr class="rebate_amount"></tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+
+<!-- Column Three -->
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
+ <% if @sale_status != 'completed' %>
+ <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
+ <% end %>
+ <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
+</div>
 </div>
 </div>
 <script>
-$(document).ready(function(){
-  $(".tables").on('click', function(){
+  $(document).ready(function(){
+    $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
-  })
-  $(".sales").on('click',function(){
-    var sale_id = $(this).attr("data-id");
-    window.location.href = '/origami/sale/' + sale_id;
-  })
-  $(".rooms").on('click', function(){
+    })
+    $(".sales").on('click',function(){
+      var sale_id = $(this).attr("data-id");
+      window.location.href = '/origami/sale/' + sale_id;
+    })
+    $(".rooms").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/room/' + dining_id;
-  })
-  $(".orders").on('click',function(){
-    var order_id = $(this).attr("data-id");
-    window.location.href = '/origami/order/' + order_id;
-  })
-});
-$('#pay').on('click',function() {
+    })
+    $(".orders").on('click',function(){
+      var order_id = $(this).attr("data-id");
+      window.location.href = '/origami/order/' + order_id;
+    })
+  });
+  $('#pay').on('click',function() {
    var sale_id = $('#sale_id').val();
    var url = '/origami/sale/'+ sale_id + "/rounding_adj" ;
    alert(url)
    $.ajax({
-      type: "POST",
-        url: '/origami/sale/'+ sale_id + "/rounding_adj",
-        success:function(result){          
-          window.location.href = '/origami/sale/'+ sale_id + "/payment";
-        }
-    });
+    type: "POST",
+    url: '/origami/sale/'+ sale_id + "/rounding_adj",
+    success:function(result){          
+      window.location.href = '/origami/sale/'+ sale_id + "/payment";
+    }
+  });
    
-});
-$('#back').on('click',function(){
-  window.location.href = '/origami/';
-})
-$('#move').on('click',function(){
+ });
+  $('#back').on('click',function(){
+    window.location.href = '/origami/';
+  })
+  $('#move').on('click',function(){
 
-})
+  })
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 385129bf..17674fff 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -50,6 +50,11 @@
                 <% end %>              
                     <div class="card-block">
                        <%= table.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
@@ -61,6 +66,11 @@
                   <% end %>           
                     <div class="card-block">
                        <%= table.name %>
+                       <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                     </div>
                   </div>
@@ -87,6 +97,11 @@
                  <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                       <div  style="font-size:12px;"></div>
                    </div>
@@ -95,6 +110,11 @@
                  <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                    </div>
                  </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6bc0271e..d4dc8005 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -70,6 +70,7 @@ en:
   sale_audits: "Sale Audits"
   bottom: "Bottom"
   payment: "Payment"
+  backend: "Backend"
 
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 6bdb1768..2d35b1bf 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -65,6 +65,7 @@ mm:
   sale_audits: "အရောင်းပြင်ဆင်�ြင်းများ"
   bottom: "အရောင်းအနဲဆုံး"
   payment: "ငွေပေး�ျေမှု"
+  backend: "Backend"
   
   views:
     btn:       
diff --git a/config/schedule.rb b/config/schedule.rb
index 17f336a0..4b3f6a3b 100755
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -11,5 +11,5 @@ every 30.minutes do
 end
 
 every 1.minutes do
-  runner "CheckinJob.perform"
+  runner "DiningFacility.checkin_time"
 end
\ No newline at end of file

From edade3662b5c4cdb6b12c2c3eb2d904278a7ed80 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 9 Feb 2018 11:32:29 +0630
Subject: [PATCH 194/651] update quickservice

---
 app/assets/javascripts/addorder.js            |  54 +++++---
 .../origami/payments_controller.rb            |  14 +-
 .../origami/quick_service_controller.rb       | 125 ++++++++++++++++++
 app/models/order.rb                           |  21 +--
 app/models/sale.rb                            |  44 ++++++
 app/views/layouts/_left_sidebar.html.erb      |   2 +-
 app/views/origami/addorders/detail.html.erb   |  48 +++----
 app/views/origami/pending_order/show.html.erb |   4 +-
 config/routes.rb                              |   5 +-
 9 files changed, 243 insertions(+), 74 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index e330015a..9d5edf7e 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -1,4 +1,7 @@
 $(function() { 
+
+  type = $('#type').val();
+  modify_order = $('#modify_order').val();
   //click menu sidebar menu category
   $(".product").on("click", function(){
     var url = $(this).attr('data-ref');
@@ -85,8 +88,13 @@ $(function() {
   function show_menu_item_list(url_item){ 
     var menu_list = $('.menu_items_list');
     menu_list.empty();
-    if ($('#type').val() == 'true') {
-      url_item = 'addorders/'+url_item
+  
+    if (modify_order=="true" && type =="true") {
+       url_item = '../../../addorders/'+url_item;
+    }if(modify_order=="false" && type =="true"){
+       url_item = 'addorders/'+url_item
+    }else{
+       url_item = url_item;
     }
 
     //Start Ajax
@@ -763,18 +771,27 @@ $(function() {
 
   // Pay Discount for Payment
   $("#create_pay_order").on('click', function(e){
-
     $(this).attr('disabled', 'disabled');
     e.preventDefault();
+    type = "quick_service"
     $("#oqs_loading_wrapper").show();
-    
-    type = $('#type').val();
-      type = 'quick_service'
-      var table_type = $('#table_id').find("option:selected").data('type');
-      var table_id    = $('#table_id').val();
-      var customer_id = $('#customer_id').val();
-      var booking_id  = $('#booking_id').text();
-      var ajax_url = 'addorders/create';
+    console.log(modify_order)
+      if (modify_order == "true") {
+        console.log($('#sale_id').text())
+        var ajax_url   = '../../../quick_service/update_modify_order';
+        var table_type = $('#table_type').text();
+        var table_id    = $('#table_id').text();
+        var customer_id = $('#customer_id').text();
+        var booking_id  = $('#booking_id').text();
+        var sale_id     = $('#sale_id').text();
+      }else{
+        var ajax_url = 'addorders/create';
+        var table_type = $('#table_id').find("option:selected").data('type');
+        var table_id    = $('#table_id').val();
+        var customer_id = $('#customer_id').val();
+        var booking_id  = $('#booking_id').text();
+        var sale_id     = ""
+      }
     
     if (!booking_id.length > 0) {
       
@@ -788,7 +805,8 @@ $(function() {
     var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
-                  'order_items': order_items };
+                  'order_items': order_items,'sale_id': sale_id };
+                  console.log(params)
     $.ajax({
       type: "POST",
       url: ajax_url,
@@ -799,7 +817,6 @@ $(function() {
           if (result.status) {
             window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
           }
-           // window.location.href = "/origami/quick_service"
           } 
     });
   });
@@ -1032,9 +1049,6 @@ $(function() {
   $(".sub_click").on("click", function(){
     var menu_id = $(this).attr("data-id");
     var url = "get_menu_sub_category/"+menu_id;
-    if ($('#type').val() == 'true') {
-      url = 'addorders/'+url
-    }
     sub_category = $(this).find('.sub_category_list');
     show_sub_category_list(url,sub_category); 
   }); 
@@ -1043,6 +1057,14 @@ $(function() {
   //show menu item list when click menu category
   function show_sub_category_list(url,sub_category){ 
 
+    if (modify_order == "true" && type =="true") {
+      var url = "../../../addorders/"+url;
+    }if(modify_order=="false" && type =="true"){
+      var url = 'addorders/'+url;
+    }else{
+      var url = url;
+    }
+
     var menu_list = $('.sub_category_list');
     menu_list.empty();
     //Start Ajax
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index d5e14bfc..4069edd0 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -69,13 +69,6 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_id     = params[:sale_id]
     member_info = nil
 
-    if params[:type] == "quick_service"
-      booking = Booking.find_by_sale_id(sale_id)
-      booking.booking_orders.each do |order|
-        Order.pay_process_order_queue(order.order_id,booking.dining_facility_id)
-      end
-    end
-
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
@@ -147,6 +140,13 @@ class Origami::PaymentsController < BaseOrigamiController
 
         printer = Printer::ReceiptPrinter.new(print_settings)
         printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+
+        if params[:type] == "quick_service"
+          booking = Booking.find_by_sale_id(sale_id)
+          booking.booking_orders.each do |order|
+          Order.pay_process_order_queue(order.order_id,booking.dining_facility_id)
+        end
+    end
       end
     end    
   end
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 3b668a32..0c90530f 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -17,6 +17,7 @@ class Origami::QuickServiceController < ApplicationController
   def modify_order
     @menu = MenuCategory.all.active
     @table_id = params[:id]
+    @sale_id = params[:sale_id]
     @table = DiningFacility.find(@table_id)
     @booking = @table.get_booking
     if @booking
@@ -39,6 +40,90 @@ class Origami::QuickServiceController < ApplicationController
      render "origami/addorders/detail"
   end
 
+  def update_modify_order
+    Rails.logger.debug "Order Source - " + params[:order_source].to_s
+    Rails.logger.debug "Table ID - " + params[:table_id].to_s
+    is_extra_time = false
+    extra_time = ''
+
+    items_arr = []
+    JSON.parse(params[:order_items]).each { |i| 
+      i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
+         is_extra_time = true
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
+         end
+       end
+       if i["parent_order_item_id"]
+         items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"parent_order_item_id": i["parent_order_item_id"],"options": i["options"]}
+       else
+        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
+       end
+       items_arr.push(items)
+     }
+
+    # begin
+    @order = Order.new
+    @order.source = params[:order_source]
+    @order.order_type = params[:order_type]
+    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    @order.items = items_arr
+    @order.guest = params[:guest_info]
+    @order.table_id = params[:table_id]  # this is dining facilities's id
+    @order.new_booking = true
+    @order.waiters = current_login_employee.name
+    @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
+
+      #Create Table Booking or Room Booking
+      if !params["booking_id"].nil?
+          # check booking id is already completed.
+          booking = Booking.find(params[:booking_id])
+
+          if booking
+              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)
+                  if sale_status
+                    return return_json_status_with_code(400, "bill requested")
+                  end
+                else
+                  @order.new_booking = false
+                  @order.booking_id = params[:booking_id]
+                end
+              else
+                  sale_status = check_order_with_table(params[:table_id])
+                  if sale_status
+                    return return_json_status_with_code(400, "bill requested")
+                  end
+              end
+          end #booking exists
+      else
+        sale_status = check_order_with_table(params[:table_id])
+        if sale_status
+          # return false , @message = "bill requested"
+          return return_json_status_with_code(400, "bill requested")
+        end
+      end
+
+      @status, @booking = @order.generate
+
+      if @status && @booking && @order.source == 'quick_service'
+        if params[:sale_id]
+          @sale = Sale.find(params[:sale_id])
+          update = Sale.add_to_existing_pending_invoice(@order.table_id,params[:sale_id])
+        end
+        
+        result = {:status=> true, :data => @sale }
+        render :json => result.to_json
+      end
+  end
+
   def get_menu_category ()
     if (params[:id])
       puts params[:id]
@@ -66,4 +151,44 @@ class Origami::QuickServiceController < ApplicationController
       @product = Product.all   
   end
 
+  # render json for http status code
+  def return_json_status_with_code(code, msg)
+    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_id.nil?
+          if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"
+           @order.new_booking = true
+           return false
+          end
+        else
+           @order.new_booking = false
+           @order.booking_id = booking.booking_id
+           return false
+         end
+       end
+    end
+  end
+
+  # this can always true
+  def check_order_with_booking(booking)
+    if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"
+      @order.new_booking = true
+      return false
+    else
+      @order.new_booking = false
+      @order.booking_id = params[:booking_id]
+      return false
+    end
+  end
+
 end
diff --git a/app/models/order.rb b/app/models/order.rb
index c4326adb..0ca06316 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -305,29 +305,10 @@ class Order < ApplicationRecord
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)
     #Send to background job for processing
-
-    cup_status = `#{"sudo service cups status"}`
-    print_status = check_cup_status(cup_status)
-     
-    if print_status
       OrderQueueProcessorJob.perform_later(id, table_id)
-    else
-      cup_start    = `#{"sudo service cups start"}`
-      cup_status   = `#{"sudo service cups status"}`
-      print_status = check_cup_status(cup_status)
-
-      if print_status
-        OrderQueueProcessorJob.perform_later(id, table_id)
-      else
-        msg = ' Print Error ! Please contact to service'
-        ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
-        OrderQueueProcessorJob.perform_later(id, table_id)
-      end
-    end
- 
   end
   
-  def self.check_cup_status(status)
+  def check_cup_status(status)
     if status.include? "Active: active (running)" || "Active: active (exited)"   #"Cup Server is already running"
       return true
     end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index a5ffa8d9..6c6f5795 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1232,6 +1232,50 @@ end
     query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
   end
 
+  def self.add_to_existing_pending_invoice(dining,sale_id)
+    puts sale_id
+    table = DiningFacility.find(dining)
+    existing_booking = Booking.find_by_sale_id(sale_id)
+    puts existing_booking.to_json
+      table.bookings.each do |booking|
+        # if !booking.checkout_at.nil?
+        #     existing_booking.update_attributes(checkout_at: checkout_at)
+        # end
+
+       if booking.sale_id.nil?
+         puts booking.to_json
+         booking.booking_orders.each do |booking_order|
+          
+             booking.booking_status = 'moved'
+             order = Order.find(booking_order.order_id)
+             order.status = 'billed'
+             order.order_items.each do |item|
+               item.order_item_status = 'billed'
+             end
+             #  create sale item
+             saleobj = Sale.find(sale_id)
+             puts "saleobj"
+             puts saleobj.to_json
+             order.order_items.each do |orer_item|
+               saleobj.add_item (orer_item)
+             end
+
+             # Re-compute for add
+             saleobj.compute
+             saleobj.save
+             order.save
+             booking.save
+         end
+         
+         booking_order = BookingOrder.where('booking_id=?',booking)
+         booking_order.each do |bo|
+           bo.booking_id = existing_booking.booking_id
+           bo.save
+         end
+      end
+    end
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index c6b1356a..3944f5a8 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -45,7 +45,7 @@
 			<% end %>
 			<% if can? :index, :home %> 
 			<li>
-				<a href="<%= origami_root_path %>">
+				<a href="<%= origami_dashboard_path %>">
 					<i class="material-icons">monetization_on</i>
 					<span><%= t :origami %></span>
 				</a>
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 2c23b37b..8c6a5974 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -5,7 +5,9 @@
 </div>
 
 <% type = request.path_info.include?('quick_service')%>
+<% modify_order = request.path_info.include?('modify_order')%>
 <input type="hidden" name="type" id="type" value="<%=type%>">
+<input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" id="ul-navbar">
@@ -78,15 +80,20 @@
                <div class="col-md-6 col-lg-6 col-sm-12">
                  <strong id="order-title" class="font-14">ORDER DETAILS </strong>
                </div>
-               <div class="col-md-2 col-lg-2 col-sm-6">Table</div> 
-               <div class="col-md-4 col-lg-4 col-sm-6 m-t--5">
-               <a class="btn btn-block bg-blue waves-effect select_table" data-toggle="modal" data-target="#TableModal">Select</a>
-               <input type="hidden" name="table_id" value="" id="table_id">
-               <%if @booking_id %>
-                  <p class="hidden" id="booking_id"><%=@booking_id%></p>
-                  <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
-               <%end%>
-                </div>
+               <% if modify_order %>
+                  <div class="col-md-6 col-lg-6 col-sm-6">Table : <%=@table.name%></div>
+                     <p class="hidden" id="table_id"><%=@table_id%></p>
+                     <p class="hidden" id="table_type"><%=@table.type%></p>
+                     <p class="hidden" id="booking_id"><%=@booking_id%></p>
+                     <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
+                     <p class="hidden" id="sale_id"><%=@sale_id%></p>
+              <% else%>
+                <div class="col-md-2 col-lg-2 col-sm-6">Table</div> 
+                  <div class="col-md-4 col-lg-4 col-sm-6 m-t--5">
+                     <a class="btn btn-block bg-blue waves-effect select_table" data-toggle="modal" data-target="#TableModal">Select</a>
+                     <input type="hidden" name="table_id" value="" id="table_id">
+                  </div>
+              <% end%>
             </div>
           <% else %>
             <div>
@@ -125,24 +132,13 @@
                </table>
 
                 <% if type %>
-                  <div class="row clearfix hidden">
-                   <div class="col-md-4 ">
-                     <strong id="order-title" class="font-14">Customer</strong>
-                   </div>
-                   <!-- <div class="col-md-3">Table -</div>  -->
-                   <div class="col-md-8">
-                     <select class="form-control m-t--5" id="customer_id" name="customer_id"  >
-                      <option value="">Select Customer</option>
-                        <%  @customer.each do |cus| %>
-                          <option <%=(cus.customer_id == 'CUS-000000000001')? 'selected':''%> value="<%= cus.customer_id %>"><%= cus.name %></option>
-                        <%end %>
-                      </select> 
-                    </div>
-                  </div>
-                  <button type="button" class="btn btn-primary btn-block create" id="create_pay_order" disabled="disabled">Create Order & Pay</button>
+                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
+                  
+                  <button type="button" class="btn btn-primary btn-block create" id="create_pay_order" disabled="disabled"><%if modify_order%>Update Order & Pay<%else%>Create Order & Pay<%end%></button>
                 <% end %>
+                <% if !modify_order %>
                <button type="button" class="btn btn-primary btn-block create m-t-5" id="create_order" disabled="disabled">Create Order</button>
-               
+               <% end %>
             </div>
         </div>
     </div>
@@ -333,7 +329,7 @@
       </div>
     </div>
     
-    <% if type %>
+    <% if type && !modify_order%>
     <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
       <div class="modal-dialog" role="document">
         <div class="modal-content">
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index a7ef5955..3b0aad83 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -116,7 +116,7 @@
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
-   <button type="button" id="addorder" class="btn bg-blue btn-block">Pay</button>
+   <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
  </div>
 </div>
@@ -136,7 +136,7 @@ $(document).ready(function(){
   });
   $('#addorder').on('click', function () {
     var table_id = "<%=@table_id%>";
-    window.location.href = '/origami/quick_service/modify_order/' + table_id;
+    window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val();
   });
 });
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 45106643..6a5b284e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -91,8 +91,9 @@ scope "(:locale)", locale: /en|mm/ do
     get "quick_service/pending_order" => "pending_order#index"
     get "quick_service/pending_order/:sale_id" => "pending_order#show"
 
-    get "quick_service/modify_order/:id" => "quick_service#modify_order"
-    # post '/:quick_service/create' => "quick_service#create", :defaults => { :format => 'json' }   
+    get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order"
+    post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
+    
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]

From e7206dbafd5b091a80c7e22ec6ee988a7f95e245 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 9 Feb 2018 12:07:37 +0630
Subject: [PATCH 195/651] update add order for set price

---
 app/assets/javascripts/addorder.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 4b158946..53b0f1e0 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -114,10 +114,17 @@ $(function() {
                 add = '';
                 menu_item_box = 'set_item_box';
                 data_target = 'sx_item_set_detailModal';
-
+console.log(menu_items[field].instances)
                    code            =  menu_items[field].code;
                    name            =  menu_items[field].name;
-                   price           = 0;//parseFloat( menu_items[field].price).toFixed(2);
+                   instances       =  menu_items[field].instances;
+                    $(instances).each(function(i){
+                      if (instances[i].is_default == true) {
+                        price           = parseFloat(instances[i].price).toFixed(2);
+                      }else{
+                        price = 0;
+                      }
+                    });
                    is_available    = menu_items[field].is_available ;
                    is_on_promotion = 0;
                    item_attributes = menu_items[field].attributes;
@@ -255,8 +262,8 @@ $(function() {
     $('#set_item_instances').text(instances);
     $('#set_name').text(data.attr('data-name'));
     $('#set_item_code').text(data.attr('data-item-code'));
-    // $('#set_total_price').text(data.attr('data-price'));
-    $('#set_total_price').text(0);
+     $('#set_total_price').text(data.attr('data-price'));
+    // $('#set_total_price').text(0);
     $('#set_unit_price').text(data.attr('data-price'));
     // $('#set_unit_price').text(0);
   });

From 19e9a941c82d7691090ac114f4e06604dece7f7f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Feb 2018 12:07:53 +0630
Subject: [PATCH 196/651] show set item price in origami

---
 app/controllers/origami/home_controller.rb  | 1 +
 app/controllers/origami/rooms_controller.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 5bb8a02a..bf4008a2 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -73,6 +73,7 @@ class Origami::HomeController < BaseOrigamiController
                     instance_item_sets.each do |instance_item|
                       item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
                       arr_instance_item_sets.push(item_instance_name)
+                      item.price = item.price.to_f + instance_item["price"].to_f
                     end
                     item.set_menu_items = arr_instance_item_sets
                   end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 68f8ffe0..7ffac1f0 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -67,6 +67,7 @@ class Origami::RoomsController < BaseOrigamiController
                     instance_item_sets.each do |instance_item|
                       item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
                       arr_instance_item_sets.push(item_instance_name)
+                      item.price = item.price.to_f + instance_item["price"].to_f
                     end
                     item.set_menu_items = arr_instance_item_sets
                   end

From 8cce090566fbd9cf0b13eca1390b4b19e3d22ae3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 9 Feb 2018 14:13:18 +0630
Subject: [PATCH 197/651] update addorder set price

---
 app/assets/javascripts/addorder.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 4b158946..cefa64fb 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -114,10 +114,16 @@ $(function() {
                 add = '';
                 menu_item_box = 'set_item_box';
                 data_target = 'sx_item_set_detailModal';
-
                    code            =  menu_items[field].code;
                    name            =  menu_items[field].name;
-                   price           = 0;//parseFloat( menu_items[field].price).toFixed(2);
+                   instances       =  menu_items[field].instances;
+                    $(instances).each(function(i){
+                      if (instances[i].is_default == true) {
+                        price           = parseFloat(instances[i].price).toFixed(2);
+                      }else{
+                        price = 0;
+                      }
+                    });
                    is_available    = menu_items[field].is_available ;
                    is_on_promotion = 0;
                    item_attributes = menu_items[field].attributes;
@@ -255,8 +261,8 @@ $(function() {
     $('#set_item_instances').text(instances);
     $('#set_name').text(data.attr('data-name'));
     $('#set_item_code').text(data.attr('data-item-code'));
-    // $('#set_total_price').text(data.attr('data-price'));
-    $('#set_total_price').text(0);
+     $('#set_total_price').text(data.attr('data-price'));
+    // $('#set_total_price').text(0);
     $('#set_unit_price').text(data.attr('data-price'));
     // $('#set_unit_price').text(0);
   });

From 4c563e23bfe6e4c4925a93f52ec09412cdcaa6fb Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Feb 2018 14:19:53 +0630
Subject: [PATCH 198/651] add shop info in split bill

---
 app/controllers/origami/split_bill_controller.rb | 6 ++++++
 app/views/layouts/_header.html.erb               | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index d50c0cd4..9a27010d 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -206,4 +206,10 @@ class Origami::SplitBillController < BaseOrigamiController
 	    end
 	end
 
+	#Shop Name in Navbor
+	helper_method :shop_detail
+	def shop_detail
+		@shop = Shop.first
+	end
+
 end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index babc6e06..ec0a3c68 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -40,14 +40,16 @@
                 <% end %>
             </a>
             <ul class="dropdown-menu">
+                <%if current_login_employee.role =="administrator" %>
                 <li>
                     <p class="waves-effect waves-block p-l-30 m-b-5">
-                        <a href="/settings/shops/1" style="text-decoration: none;">
+                        <a href="<%= settings_shops_path %>" style="text-decoration: none;">
                             <i class="material-icons font-7 logout_icon shopinfo">info</i>
                             <span class="font-15 shopinfo" >Shop Info</span>
                         </a>
                     </p>    
                 </li>
+                <% end %>
                 <li>
                     <!-- <%if current_login_employee.role !="waiter" %> -->
                     <!-- <%end%> -->  

From c902e2ea1b13ce024bb5b93e9ef808a242c6f795 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Feb 2018 14:56:33 +0630
Subject: [PATCH 199/651] check one condition in order item

---
 app/controllers/origami/split_bill_controller.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 9a27010d..12f5780f 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -108,6 +108,12 @@ class Origami::SplitBillController < BaseOrigamiController
 						end
 					end
 
+					puts order_id
+					puts order_ids.count
+					puts order_id_count
+					puts order_items.count
+					puts order_item_count
+
 					if !order_id.nil?
 						if order_id_count > 1
 							updated_order_id = Array.new
@@ -150,7 +156,7 @@ class Origami::SplitBillController < BaseOrigamiController
 						    end
 						end
 					else
-						if order_ids.count == 1 && order_item_count == 1
+						if order_ids.count == 1 && order_id_count > 0 && order_item_count == 1
 							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
 						else
 							customer = Customer.find(params[:customer_id])

From 974dde54c00dee4c3cec6f9d727483335b912177 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 9 Feb 2018 14:58:08 +0630
Subject: [PATCH 200/651] update shop.name

---
 app/controllers/home_controller.rb                  | 7 +++++++
 app/controllers/origami/dashboard_controller.rb     | 5 +++++
 app/controllers/origami/pending_order_controller.rb | 4 ++++
 app/views/origami/table_invoices/show.html.erb      | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 3ed9115f..1c006be1 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -126,6 +126,12 @@ class HomeController < ApplicationController
     render :json => {:status=> "Success", :url => root_path }.to_json
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
   private
 
   # Never trust parameters from the scary internet, only allow the white list through.
@@ -163,4 +169,5 @@ class HomeController < ApplicationController
         redirect_to reports_dailysale_index_path
     end
   end
+
 end
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index 9f5e25a4..e47a8e48 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -56,4 +56,9 @@ class Origami::DashboardController < BaseOrigamiController
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
   end
+
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index 5d18e473..766c7e47 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -12,4 +12,8 @@ class Origami::PendingOrderController < BaseOrigamiController
     @table_id = Booking.find(@booking).dining_facility_id
     @dining  = DiningFacility.find(@table_id)
   end
+   helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index b70c2ffc..648fdf7c 100755
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -170,7 +170,7 @@ $('#pay').on('click',function() {
           // location.reload();
         }
     });
-   window.location.href = '/origami/sale/'+ sale_id + "/payment";
+   window.location.href = '/origami/sale/'+ sale_id + "/cashier/payment";
 });
 $('#back').on('click',function(){
   window.location.href = '/origami/table/<%= @table.id %>';

From 1b1ffa11467615506c9658f11b1b5a0e56c44ee9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Feb 2018 15:07:01 +0630
Subject: [PATCH 201/651] check receipt

---
 app/views/origami/split_bill/index.html.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 1c396b21..4e9dda80 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -128,9 +128,11 @@
  							<table class="table table-default">
  								<tbody>
  									<% @sale_data.each do |sale_data| %>
- 									<tr class="receipt_row" id=<%= sale_data.sale_id %> >
- 										<td>Receipt No. - <span id="receipt_no"><%= sale_data.receipt_no %></span></td>
- 									</tr>
+	 									<% if sale_data.sale_status != 'completed' %>
+	 									<tr class="receipt_row" id=<%= sale_data.sale_id %> >
+	 										<td>Receipt No. - <span id="receipt_no"><%= sale_data.receipt_no %></span></td>
+	 									</tr>
+	 									<% end %>
  									<% end %>
  								</tbody>
  							</table>

From 7c07cd011857f998f6a6253f1429c79eb00887fe Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 9 Feb 2018 15:07:39 +0630
Subject: [PATCH 202/651] update dashbord

---
 app/views/origami/dashboard/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 67f28f13..8f432e1e 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -73,7 +73,7 @@
           <div class="text font-20 m-l-5" style="line-height: 80px;">Quick Service</div>
         </div>
       </div>
-      <div class="col-lg-2 col-md-2 col-sm-4 col-xs-12 cashier_view">
+      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 cashier_view">
         <div class="info-box bg-green">
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>

From 5854bd88e16c3d4319b70e3dfbbd28a2581f526e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Feb 2018 10:53:29 +0630
Subject: [PATCH 203/651] update liscense file

---
 app/controllers/application_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66d7700..0966a573 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end
   end
 

From 839fb144366b6b5affaa24cd540dfb5f91bb14ee Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Feb 2018 11:34:06 +0630
Subject: [PATCH 204/651] update inventory

---
 app/views/layouts/_left_sidebar.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 57f05179..9bffd4d7 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -68,12 +68,12 @@
 			</li>
 			<% end %>
 			<% if can? :menage, Inventory %>
-			<!-- <li>
+			<li>
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
 				</a>
-			</li> -->
+			</li>
 			<%end%>
 			<li class="header"><%= t :backend %></li>
 			<li>

From 5ef5ff4fbefa68eafbb6dfbf9246da181cec68c6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 13 Feb 2018 13:29:19 +0630
Subject: [PATCH 205/651] add column to existing table and new table for second
 display images

---
 .../20180213050551_add_image_path_to_employees.rb  |  9 +++++++++
 .../20180213050631_add_image_path_to_customers.rb  |  9 +++++++++
 ...180213052206_add_image_path_to_commissioners.rb |  9 +++++++++
 db/migrate/20180213053009_create_display_images.rb | 14 ++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 db/migrate/20180213050551_add_image_path_to_employees.rb
 create mode 100644 db/migrate/20180213050631_add_image_path_to_customers.rb
 create mode 100644 db/migrate/20180213052206_add_image_path_to_commissioners.rb
 create mode 100644 db/migrate/20180213053009_create_display_images.rb

diff --git a/db/migrate/20180213050551_add_image_path_to_employees.rb b/db/migrate/20180213050551_add_image_path_to_employees.rb
new file mode 100644
index 00000000..bb26e888
--- /dev/null
+++ b/db/migrate/20180213050551_add_image_path_to_employees.rb
@@ -0,0 +1,9 @@
+class AddImagePathToEmployees < ActiveRecord::Migration[5.1]
+  def change
+    add_column :employees, :image_path, :string
+  end
+
+  def down
+  	remove_column :image_path
+  end
+end
diff --git a/db/migrate/20180213050631_add_image_path_to_customers.rb b/db/migrate/20180213050631_add_image_path_to_customers.rb
new file mode 100644
index 00000000..11eecdc0
--- /dev/null
+++ b/db/migrate/20180213050631_add_image_path_to_customers.rb
@@ -0,0 +1,9 @@
+class AddImagePathToCustomers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :customers, :image_path, :string
+  end
+
+  def down
+  	remove_column :image_path
+  end
+end
diff --git a/db/migrate/20180213052206_add_image_path_to_commissioners.rb b/db/migrate/20180213052206_add_image_path_to_commissioners.rb
new file mode 100644
index 00000000..f61dce61
--- /dev/null
+++ b/db/migrate/20180213052206_add_image_path_to_commissioners.rb
@@ -0,0 +1,9 @@
+class AddImagePathToCommissioners < ActiveRecord::Migration[5.1]
+  def change
+    add_column :commissioners, :image_path, :string
+  end
+
+  def down
+  	remove_column :image_path
+  end
+end
diff --git a/db/migrate/20180213053009_create_display_images.rb b/db/migrate/20180213053009_create_display_images.rb
new file mode 100644
index 00000000..f40a9179
--- /dev/null
+++ b/db/migrate/20180213053009_create_display_images.rb
@@ -0,0 +1,14 @@
+class CreateDisplayImages < ActiveRecord::Migration[5.1]
+  def change
+    create_table :display_images do |t|
+      t.integer :shop_id
+      t.binary :image
+      t.string :created_by
+      t.timestamps
+    end
+  end
+
+  def down
+  	drop_table :display_images
+  end
+end

From 23cb3dbbc18fb2eec83e945d0afb537848b115e5 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 13 Feb 2018 13:48:25 +0630
Subject: [PATCH 206/651] gemfile.lock

---
 Gemfile.lock | 60 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 899a471a..1c7e6534 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,7 +53,7 @@ GEM
     bcrypt (3.1.11)
     bindex (0.5.0)
     builder (3.2.3)
-    byebug (10.0.0)
+    byebug (9.1.0)
     cancancan (1.17.0)
     capistrano (3.10.1)
       airbrussh (>= 1.0.0)
@@ -66,7 +66,7 @@ GEM
     capistrano-rails (1.3.1)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    carrierwave (1.2.2)
+    carrierwave (1.2.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
@@ -81,7 +81,7 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
-    crass (1.0.3)
+    crass (1.0.2)
     cups (0.1.10)
     database_cleaner (1.6.2)
     diff-lcs (1.3)
@@ -92,17 +92,17 @@ GEM
     factory_girl_rails (4.9.0)
       factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
-    faker (1.8.7)
-      i18n (>= 0.7)
+    faker (1.8.4)
+      i18n (~> 0.5)
     ffi (1.9.18)
-    filterrific (5.0.1)
-    font-awesome-rails (4.7.0.3)
+    filterrific (2.1.2)
+    font-awesome-rails (4.7.0.2)
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.9.3)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
@@ -142,32 +142,32 @@ GEM
     mini_magick (4.8.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    minitest (5.10.3)
     momentjs-rails (2.17.1)
       railties (>= 3.1)
-    multi_json (1.13.1)
+    multi_json (1.12.2)
     multi_xml (0.6.0)
-    mysql2 (0.4.10)
+    mysql2 (0.4.9)
     nested_form (0.3.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
-    nio4r (2.2.0)
-    nokogiri (1.8.2)
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     pdf-core (0.7.0)
-    pg (1.0.0)
+    pg (0.21.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    puma (3.11.2)
-    rack (2.0.4)
+    puma (3.10.0)
+    rack (2.0.3)
     rack-cors (1.0.2)
     rack-protection (2.0.0)
       rack
-    rack-test (0.8.2)
+    rack-test (0.7.0)
       rack (>= 1.0, < 3)
     rails (5.1.4)
       actioncable (= 5.1.4)
@@ -192,12 +192,12 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
+    rake (12.2.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redis (3.3.5)
-    rspec-core (3.7.1)
+    rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -205,7 +205,7 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+    rspec-rails (3.7.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -213,14 +213,14 @@ GEM
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+    rspec-support (3.7.0)
     ruby-ole (1.2.12.1)
-    sass (3.5.5)
+    sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
+    sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -238,7 +238,7 @@ GEM
     simple_form (3.5.0)
       actionpack (> 4, < 5.2)
       activemodel (> 4, < 5.2)
-    spreadsheet (1.1.5)
+    spreadsheet (1.1.4)
       ruby-ole (>= 1.0)
     spring (2.0.2)
       activesupport (>= 4.2)
@@ -263,12 +263,12 @@ GEM
     to_xls-rails (1.3.1)
       spreadsheet (>= 0.8.5)
     ttfunk (1.5.1)
-    turbolinks (5.1.0)
-      turbolinks-source (~> 5.1)
-    turbolinks-source (5.1.0)
+    turbolinks (5.0.1)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.3)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (4.1.5)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     web-console (3.5.1)
       actionview (>= 5.0)
@@ -277,8 +277,8 @@ GEM
       railties (>= 5.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    whenever (0.10.0)
+    websocket-extensions (0.1.2)
+    whenever (0.9.7)
       chronic (>= 0.6.3)
 
 PLATFORMS

From 22a9e75efa7c245c43ee65cd9a77890203ddeab0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Feb 2018 15:12:09 +0630
Subject: [PATCH 207/651] update license and sym_master

---
 app/controllers/origami/home_controller.rb |  3 ++
 app/controllers/sym_control_controller.rb  |  6 ++--
 app/models/license.rb                      | 20 +++++++-----
 config/license.yml                         | 15 ---------
 config/shops.json                          | 10 +-----
 db/sym_master.sql                          | 37 ++++++++++++++++++++++
 6 files changed, 56 insertions(+), 35 deletions(-)
 delete mode 100644 config/license.yml

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index bf4008a2..c40dbe43 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -80,6 +80,9 @@ class Origami::HomeController < BaseOrigamiController
                   @order_items.push(item)
                 end
                 accounts = @customer.tax_profiles
+                puts accounts.to_json
+                puts "sssssssssss"
+                puts @customer.tax_profiles
                 @account_arr =[]
                 accounts.each do |acc|
                   account = TaxProfile.find(acc)
diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb
index bbd4a087..8ef6fd78 100644
--- a/app/controllers/sym_control_controller.rb
+++ b/app/controllers/sym_control_controller.rb
@@ -3,7 +3,7 @@ class SymControlController < BaseController
   http_basic_authenticate_with name: "vip", password: "!abcABC01"
 
   def run
-  	sym_path = "/home/yan/symmetric/"
+  	sym_path =  File.expand_path("~/symmetric/")
   	check_sym_proc_str = `#{"sudo service SymmetricDS status"}`
       # Check Sym Installed
       # if sym_install_status[1] == "false"
@@ -12,13 +12,13 @@ class SymControlController < BaseController
 
       if check_sym_proc_str.include? "Active: active (running)" || "Active: active (exited)"   #"Server is already running"
         # Create Sym Table
-        check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables")
+        check_sym_table = system("sudo " + sym_path + "/bin/symadmin --engine sx create-sym-tables")
         if check_sym_table
           sym_sql = Rails.root + "db/sym_master.sql"
           
           if File.exist? (sym_sql)
             # Import Sym Sql to db and start sym
-            run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+            run_sym_sql = system("sudo " + sym_path + "/bin/dbimport --engine sx " + sym_sql.to_s)
             stop_sym = system("sudo service SymmetricDS stop")
             run_sym = system("sudo service SymmetricDS start")
             if run_sym
diff --git a/app/models/license.rb b/app/models/license.rb
index 8c22f478..d025e349 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -1,7 +1,7 @@
 class License
   include HTTParty
 
-  base_uri "provision.zsai.ws/api"
+  base_uri "connect.smartsales.dev/api"
 
   attr_accessor :name, :address_1, :address_2, :township, :city, :country, :email, :phone, :fax, :logo, :subdomain,
   :plan_activation_date, :plan_next_renewal_date, :plan_max_products,:plan_max_customers, :plan_active_connections,
@@ -118,8 +118,11 @@ class License
 
       response =  create_license_file(@activate)
       if(response[:status])
-        sym_path = "/home/yan/symmetric/"
+        #sym_path = "/home/user/symmetric/"
+        sym_path  =  File.expand_path("~/symmetric/")
+
         response = create_symmetric_config(sym_path, db_host, db_schema, db_user, db_password)
+         
         if(response[:status])
           response = run_symmetric(sym_path)
         end
@@ -183,7 +186,7 @@ class License
 
     if File.exist?("config/license.yml")  
       File.open("config/license.yml").each do |line|
-        if line.include? (key_name)          
+        if line.include? (key_name)      
           decrypted_line_array = line.split(": ")                            
           decrypted_line = AESCrypt.decrypt_data(decode_str(decrypted_line_array[1]), decode_str(key), decode_str(iv), ENV['CIPHER_TYPE'])
         end
@@ -325,7 +328,7 @@ class License
     if File.directory? (sym_location)
       begin
         # sx properties create
-        f = File.open(sym_location + "engines/sx.properties", "w")
+        f = File.open(sym_location + "/engines/sx.properties", "w")
         f.write("engine.name=sx\n")
         f.write("db.driver=com.mysql.jdbc.Driver\n")
         f.write("db.url=jdbc:mysql://#{db_host}/#{db_schema}?tinyInt1isBit=false\n")
@@ -344,14 +347,15 @@ class License
         f.close 
 
         # read from license file 
-        shop_name = read_license_no_decrypt("shop_name")
+        # shop_name = read_license_no_decrypt("shop_name")
+        shop_name = "cloud"
         dbhost = read_license("dbhost")
         dbschema = read_license("dbschema")
         dbusername = read_license("dbusername")
         dbpassword = read_license("dbpassword")
 
         # shop properties create
-        f = File.open(sym_location + "engines/#{shop_name}.properties", "w")
+        f = File.open(sym_location + "/engines/#{shop_name}.properties", "w")
         f.write("engine.name=#{shop_name}\n")
         f.write("db.driver=com.mysql.jdbc.Driver\n")
         f.write("db.url=jdbc:mysql://#{dbhost}/#{dbschema}?tinyInt1isBit=false\n")
@@ -390,13 +394,13 @@ class License
     sym_run_status = check_sym_running(check_sym_proc_str, sym_path)
     if sym_run_status
       # Create Sym Table
-      check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables")
+      check_sym_table = system("sudo " + sym_path + "/bin/symadmin --engine sx create-sym-tables")
       if check_sym_table
         sym_sql = Rails.root + "db/sym_master.sql"
         
         if File.exist? (sym_sql)
           # Import Sym Sql to db and start sym
-          run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+          run_sym_sql = system("sudo " + sym_path + "/bin/dbimport --engine sx " + sym_sql.to_s)
           stop_sym = system("sudo service SymmetricDS stop")
           run_sym = system("sudo service SymmetricDS start")
           if run_sym
diff --git a/config/license.yml b/config/license.yml
deleted file mode 100644
index 8018a685..00000000
--- a/config/license.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-iv_key: Te5NfpxT9IjB5ulefoRdoQ==
-shop_name: bitp7
-email: devops@code2lab.com
-telephone: 9999999
-fax: 99999999
-address: Perl Condo
-dbhost: AAOoOhyuwUXWkBB7cev2vg==
-dbschema: nZtG9/bJ9BoQ3y8RvSsH1w==
-dbusername: Bahz/G6Xbn0kFw5vH/fS+Q==
-dbpassword: T45gSYq8IB2BL9o9spFmIg==
-api_token: DAJQdcHsSwXjxAbcvzWYjXTARdiAskWbw
-app_token: PsVJxxAhQHKjqLFGOnWdIIsBHoLsMdPBhZLpM
-plan_sku: W1evmpMVHjjXvXBLPW+jJA==
-renewable_date: 2bDU6cDr2LRMJpeeCM9ZvQ==
-plan_name: aaVvUh6fGhIbUDWoR3awq4qkDVk3rH2Fuydc0ZuKMqA=
diff --git a/config/shops.json b/config/shops.json
index f48d28c5..268c73f0 100644
--- a/config/shops.json
+++ b/config/shops.json
@@ -1,11 +1,3 @@
 {
-  "data": [
-    {
-      "lookup": "osaka1-7.zsai.ws",
-      "value": {
-        "key": "wwF9Zx9q/LfxSDqSNHYXvfu1eGsBqFEFXoXqGWrEirA=\n",
-        "iv": "l1rUEZFcPNHrTHWgaODkYQ==\n"
-      }
-    }
-  ]
+  "data": []
 }
diff --git a/db/sym_master.sql b/db/sym_master.sql
index 0e57b601..4a181439 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -117,6 +117,10 @@ delete from sym_node;
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
 	values('customers','customers','setting',current_timestamp,current_timestamp);
 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('tax_profiles','customers','setting',current_timestamp,current_timestamp);
+
 # Create Trigger for Dining Channel 
 
 	insert into sym_trigger 
@@ -279,6 +283,14 @@ delete from sym_node;
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
 	values('surveys','surveys','sale',current_timestamp,current_timestamp);
 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('card_sale_trans','card_sale_trans','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('card_settle_trans','card_settle_trans','sale',current_timestamp,current_timestamp);
+
 # Create Trigger for OQS Channel 
 
 	insert into sym_trigger 
@@ -351,6 +363,10 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('customers','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('tax_profiles','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
 # Setting Channel # From Master to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -380,6 +396,10 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('customers','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('tax_profiles','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
 #End Setting Channel
 
 # Dining Channel # From cloud to SX
@@ -661,6 +681,14 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('surveys','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_sale_trans','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_settle_trans','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
 # Sale Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -709,6 +737,15 @@ delete from sym_node;
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('surveys','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_sale_trans','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_settle_trans','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
 # End Sale Channel 
 
 # Oqs Channel # From cloud to Sx

From 1b1ab323287df876c72d1d8d9db0d22d29ca0ce5 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Feb 2018 16:55:28 +0630
Subject: [PATCH 208/651] update sym_master

---
 db/sym_master.sql | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/db/sym_master.sql b/db/sym_master.sql
index 0e57b601..4a181439 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -117,6 +117,10 @@ delete from sym_node;
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
 	values('customers','customers','setting',current_timestamp,current_timestamp);
 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('tax_profiles','customers','setting',current_timestamp,current_timestamp);
+
 # Create Trigger for Dining Channel 
 
 	insert into sym_trigger 
@@ -279,6 +283,14 @@ delete from sym_node;
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
 	values('surveys','surveys','sale',current_timestamp,current_timestamp);
 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('card_sale_trans','card_sale_trans','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('card_settle_trans','card_settle_trans','sale',current_timestamp,current_timestamp);
+
 # Create Trigger for OQS Channel 
 
 	insert into sym_trigger 
@@ -351,6 +363,10 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('customers','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('tax_profiles','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
 # Setting Channel # From Master to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -380,6 +396,10 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('customers','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('tax_profiles','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
 #End Setting Channel
 
 # Dining Channel # From cloud to SX
@@ -661,6 +681,14 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('surveys','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_sale_trans','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_settle_trans','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
 # Sale Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -709,6 +737,15 @@ delete from sym_node;
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('surveys','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_sale_trans','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_settle_trans','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
 # End Sale Channel 
 
 # Oqs Channel # From cloud to Sx

From 08e372cfb516d3df27898b243c100ae4716f18a7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 13:46:22 +0630
Subject: [PATCH 209/651] udpdate qs

---
 .../origami/addorders_controller.rb           | 20 +++++---
 app/models/order.rb                           | 17 +++++--
 app/models/sale.rb                            | 51 -------------------
 3 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 500e1ff8..9da6b7a6 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -102,9 +102,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       if !params["booking_id"].nil?
           # check booking id is already completed.
           booking = Booking.find(params[:booking_id])
-
+          if !params[:table_id].nil?
+            table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
+          else
+            table_status = true
+          end
           if booking
-              if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
+              if table_status && booking.booking_status != 'moved'
                 if !booking.sale_id.nil?
                   sale_status = check_order_with_booking(booking)
                   if sale_status
@@ -115,17 +119,21 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
                   @order.booking_id = params[:booking_id]
                 end
               else
+                if !params[:table_id].nil?
                   sale_status = check_order_with_table(params[:table_id])
                   if sale_status
                     return return_json_status_with_code(400, "bill requested")
                   end
+                end
               end
           end #booking exists
       else
-        sale_status = check_order_with_table(params[:table_id])
-        if sale_status
-          # return false , @message = "bill requested"
-          return return_json_status_with_code(400, "bill requested")
+        if !params[:table_id].nil?
+          sale_status = check_order_with_table(params[:table_id])
+          if sale_status
+            # return false , @message = "bill requested"
+            return return_json_status_with_code(400, "bill requested")
+          end
         end
       end
 
diff --git a/app/models/order.rb b/app/models/order.rb
index 0ca06316..5b022b57 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -25,23 +25,30 @@ class Order < ApplicationRecord
     booking = nil
 
     if self.new_booking
+      if !self.table_id.nil?
+        table_id = self.table_id
+      else
+        table_id = nil
+      end
       #add extra time
       if self.is_extra_time && self.extra_time
-        booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
+        booking = Booking.create({:dining_facility_id => table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
                                  :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
       else
-        booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
+        booking = Booking.create({:dining_facility_id => table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
       end
       #end extra time
      
+      if !self.table_id.nil?
+        table =  DiningFacility.find(self.table_id)
+        table.status = "occupied"
+        table.save
+      end
       
-      table =  DiningFacility.find(self.table_id)
-      table.status = "occupied"
-      table.save
     else
       booking = Booking.find(self.booking_id)
       #add extra time
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 6c6f5795..f42b62a0 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1225,57 +1225,6 @@ end
     return query
   end
 
-  def self.pending_order
-    query = Sale.all
-    query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
-                 .joins("join orders as orders on orders.order_id = sale_orders.order_id")
-    query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
-  end
-
-  def self.add_to_existing_pending_invoice(dining,sale_id)
-    puts sale_id
-    table = DiningFacility.find(dining)
-    existing_booking = Booking.find_by_sale_id(sale_id)
-    puts existing_booking.to_json
-      table.bookings.each do |booking|
-        # if !booking.checkout_at.nil?
-        #     existing_booking.update_attributes(checkout_at: checkout_at)
-        # end
-
-       if booking.sale_id.nil?
-         puts booking.to_json
-         booking.booking_orders.each do |booking_order|
-          
-             booking.booking_status = 'moved'
-             order = Order.find(booking_order.order_id)
-             order.status = 'billed'
-             order.order_items.each do |item|
-               item.order_item_status = 'billed'
-             end
-             #  create sale item
-             saleobj = Sale.find(sale_id)
-             puts "saleobj"
-             puts saleobj.to_json
-             order.order_items.each do |orer_item|
-               saleobj.add_item (orer_item)
-             end
-
-             # Re-compute for add
-             saleobj.compute
-             saleobj.save
-             order.save
-             booking.save
-         end
-         
-         booking_order = BookingOrder.where('booking_id=?',booking)
-         booking_order.each do |bo|
-           bo.booking_id = existing_booking.booking_id
-           bo.save
-         end
-      end
-    end
-  end
-
   private
 
   def generate_custom_id

From 086d5a730658b59c82442d3246cad0ed60cebb38 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 13:59:28 +0630
Subject: [PATCH 210/651] update symn for display images

---
 db/sym_master.sql | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/db/sym_master.sql b/db/sym_master.sql
index 4a181439..89abaf5b 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -121,6 +121,10 @@ delete from sym_node;
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
 	values('tax_profiles','customers','setting',current_timestamp,current_timestamp);
 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('display_images','customers','setting',current_timestamp,current_timestamp);
+
 # Create Trigger for Dining Channel 
 
 	insert into sym_trigger 
@@ -367,6 +371,10 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('tax_profiles','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('display_images','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
 # Setting Channel # From Master to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -400,6 +408,10 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('tax_profiles','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('display_images','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
 #End Setting Channel
 
 # Dining Channel # From cloud to SX

From f19fb769f62612526e9e139f91022369938cfb57 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Feb 2018 14:14:53 +0630
Subject: [PATCH 211/651] change split bill process

---
 README.md                                     |  2 +-
 app/controllers/origami/home_controller.rb    |  8 ++-
 app/controllers/origami/orders_controller.rb  | 19 +++++++
 app/controllers/origami/rooms_controller.rb   |  8 ++-
 .../origami/split_bill_controller.rb          | 52 +++++++++++++++++--
 app/views/origami/home/show.html.erb          | 43 ++++++---------
 app/views/origami/orders/show.html.erb        |  9 +++-
 app/views/origami/rooms/show.html.erb         | 37 +++++--------
 app/views/origami/split_bill/index.html.erb   | 31 ++++++-----
 9 files changed, 133 insertions(+), 76 deletions(-)

diff --git a/README.md b/README.md
index cb35bff4..b42782e7 100755
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ SQL Update after rake clear:data runned
 Change type in mysql
 	*run if you got font error for Myanmar, Chinese, etc...
 	=> ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table 
-	=> ALTER DATABASE [database_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci  #for database
+	=> ALTER DATABASE [database_name] CHARACTER SET utf8 COLLATE utf8_unicode_ci  #for database
 
 For split bill
 	1) settings/lookups => { type:split_bill, name:SplitBill, value:1 }
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 9c7ddda1..58f64a27 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -38,6 +38,8 @@ class Origami::HomeController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
@@ -47,6 +49,8 @@ class Origami::HomeController < BaseOrigamiController
           if sale.sale_status !='completed'
             if !@order_items_count.key?(booking.dining_facility_id)
               @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            else
+              @order_items_count[booking.dining_facility_id] += sale.sale_items.count
             end
           end
         end
@@ -116,9 +120,9 @@ class Origami::HomeController < BaseOrigamiController
     @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
     #for split bill
     lookup_spit_bill = Lookup.collection_of('split_bill')
-    @spit_bill = 0
+    @split_bill = 0
     if !lookup_spit_bill[0].nil?
-      @spit_bill = lookup_spit_bill[0][1]
+      @split_bill = lookup_spit_bill[0][1]
     end
   end
 
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index ea976ffd..b4d7baf0 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -13,6 +13,21 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
 
+    @orders.each do |order|
+      order.order_items.each_with_index do |item, index|
+        if !item.set_menu_items.nil?
+          instance_item_sets = JSON.parse(item.set_menu_items)
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+            item.price = item.price.to_f + instance_item["price"].to_f
+          end
+          order.order_items[index].set_menu_items = arr_instance_item_sets
+        end
+      end
+    end
+
     @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
@@ -24,6 +39,8 @@ class Origami::OrdersController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
@@ -33,6 +50,8 @@ class Origami::OrdersController < BaseOrigamiController
           if sale.sale_status !='completed'
             if !@order_items_count.key?(booking.dining_facility_id)
               @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            else
+              @order_items_count[booking.dining_facility_id] += sale.sale_items.count
             end
           end
         end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 3902354d..fd28230e 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -34,6 +34,8 @@ class Origami::RoomsController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
@@ -43,6 +45,8 @@ class Origami::RoomsController < BaseOrigamiController
           if sale.sale_status !='completed'
             if !@order_items_count.key?(booking.dining_facility_id)
               @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            else
+              @order_items_count[booking.dining_facility_id] += sale.sale_items.count
             end
           end
         end
@@ -119,9 +123,9 @@ class Origami::RoomsController < BaseOrigamiController
     # end
 
     lookup_spit_bill = Lookup.collection_of('split_bill')
-    @spit_bill = 0
+    @split_bill = 0
     if !lookup_spit_bill[0].nil?
-      @spit_bill = lookup_spit_bill[0][1]
+      @split_bill = lookup_spit_bill[0][1]
     end
   end
 
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 12f5780f..5d9cbec7 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -28,11 +28,40 @@ class Origami::SplitBillController < BaseOrigamiController
 							arr_instance_item_sets = Array.new
 							instance_item_sets.each do |instance_item|
 							  item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+							  item.price = item.price.to_f + instance_item["price"].to_f
 							  arr_instance_item_sets.push(item_instance_name)
 							end
 							item.set_menu_items = arr_instance_item_sets
 						end
-						@order_items.push(item)
+
+						arr_item = Hash.new
+						if item.qty.to_i > 1
+							i = 1
+							while i <= item.qty.to_i do 
+								arr_item = {'order_items_id' => item.order_items_id, 
+									'order_id' => item.order_id, 
+									'order_item_status' => item.order_item_status, 
+									'item_order_by' => item.item_order_by,
+									'item_code' => item.item_code,
+									'item_instance_code' => item.item_instance_code,
+									'item_name' => item.item_name,
+									'alt_name' => item.alt_name,
+									'account_id' => item.account_id,
+									'qty' => '1.0',
+									'price' => item.price,
+									'remark' => item.remark,
+									'options' => item.options,
+									'set_menu_items' => item.set_menu_items,
+									'taxable' => item.taxable,
+									'completed_by' => item.completed_by,
+									'created_at' => item.created_at,
+									'updated_at' => item.updated_at}
+								i += 1
+								@order_items.push({@order.order_id => arr_item})
+							end
+						else
+							@order_items.push({@order.order_id => item})
+						end
 					end
 		        end
 	      	end
@@ -186,8 +215,25 @@ class Origami::SplitBillController < BaseOrigamiController
 
 						    order_items.each do |order_item|
 						    	orderItem = OrderItem.find(order_item["id"])
-						    	orderItem.order_id = order.order_id
-						    	orderItem.save!
+						    	if orderItem.qty.to_f != order_item['qty'].to_f
+						    		OrderItem.processs_item(orderItem.item_code, 
+						    			orderItem.item_instance_code, 
+						    			orderItem.item_name, 
+						    			orderItem.alt_name, 
+						    			orderItem.account_id,
+										order_item['qty'],
+										orderItem.price, 
+										orderItem.options, 
+										orderItem.set_menu_items, 
+										orderItem.order_id,
+										orderItem.item_order_by, 
+										orderItem.taxable)
+
+						    		orderItem.qty = orderItem.qty.to_f - order_item['qty'].to_f
+						    	else
+							    	orderItem.order_id = order.order_id
+							    end
+							    orderItem.save!
 						    end
 						end
 					end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index fe7f9a7f..19f308a1 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -386,9 +386,9 @@
                           end
                         %>
                       </table>
-                      <button class='btn btn-primary' id='add_invoice'> Add to existing invoice</button>
+                      <button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice</button>
                       <% if !@spit_bill.nil? && @spit_bill == '1' %>
-                        <button class='btn btn-primary' id='split_bill'> Split Bill</button>
+                        <button class='btn btn-primary btn-block waves-effect' id='split_bill'> Split Bill</button>
                       <% end %>
                   <% end %>
                   <% if @sale_array.size > 1 %>
@@ -439,6 +439,11 @@
                   <!-- <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect" disabled>Charges</button> -->
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='move'>Move</button>
                   <button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
+                  <% if !@split_bill.nil? %>
+                    <% if @split_bill == '1' %>
+                      <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+                    <% end %>
+                  <% end %>
                   <!-- <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect" disabled>First Bill</button> -->
                   <!-- <button type="button" id="pay" class="btn btn-block bg-blue waves-effect" disabled>Pay</button> -->
                   <!-- <button type="button" class="btn btn-block bg-blue waves-effect" disabled> Void</button> -->
@@ -711,30 +716,6 @@
 
     // Bill Request
     $('#request_bills').click(function () {
-        var lookup_split_bill = '<%= @spit_bill %>';
-        if(lookup_split_bill == '1'){
-          swal({
-            title: "Information!",
-            text: "Do you want to Split bill?",
-            type: "success",
-            showCancelButton: true,
-            confirmButtonColor: "#009900",
-            confirmButtonText: "Yes, split it!",
-            closeOnConfirm: false
-          }, function (isConfirm) {
-            if (isConfirm) {
-              var dining_id = "<%= @dining.id %>";
-              window.location.href = '/origami/table/' + dining_id + "/split_bills";
-            }else{
-              requestBillProcess();
-            }
-          }); 
-        }else{
-          requestBillProcess();
-        }
-    });
-
-    function requestBillProcess(){
       var order_id = $('#save_order_id').attr('data-order');
       var ajax_url = "/origami/" + order_id + "/request_bills";
       $.ajax({
@@ -749,8 +730,14 @@
                 location.reload();
               }
           }
-      });
-    }
+      });   
+    });
+
+    //split bill process
+    $('#split_bills').click(function(){
+      var dining_id = "<%= @dining.id %>";
+      window.location.href = '/origami/table/' + dining_id + "/split_bills";
+    });    
 
     $('#move').on('click', function () {
         var dining_id = "<%= @dining.id %>";
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index d98e9bc2..a1a914fd 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -200,7 +200,14 @@
         %>
         <% unless sale_item.price <= 0 %>
         <tr>
-         <td class='item-name'><%= sale_item.item_name %></td>
+          <td class='item-name'>
+            <%= sale_item.item_name %>
+            <% if !sale_item.set_menu_items.nil?  
+              sale_item.set_menu_items.each do |item_instance| %> 
+              <br><span class="font-13"><%= item_instance %></span> 
+            <% end 
+            end %>
+          </td>
          <td class='item-attr'><%= sale_item.qty %></td>
          <td class='item-attr'><%= sale_item.price %></td>
        </tr>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 9c32b914..22affbdc 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -411,6 +411,11 @@
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
        <button type="button" class="btn bg-blue btn-block" id='move'>Move</button>
        <button type="button" id="request_bills" class="btn bg-blue btn-block">Req.Bill</button>
+        <% if !@split_bill.nil? %>
+          <% if @split_bill == '1' %>
+            <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+          <% end %>
+        <% end %>
        <!-- <button type="button" id="first_bill" class="btn bg-blue btn-block" disabled>First Bill</button> -->
        <!-- <button type="button" id="pay" class="btn bg-blue btn-block" disabled>Pay</button> -->
        <!-- <button type="button" class="btn bg-blue btn-block" disabled=""> Void </button> -->
@@ -714,30 +719,6 @@ $('#pay').on('click',function() {
 });
 // Bill Request
 $('#request_bills').click(function() {
-  var lookup_split_bill = '<%= @spit_bill %>';
-  if(lookup_split_bill == '1'){
-    swal({
-      title: "Information!",
-      text: "Do you want to Split bill?",
-      type: "success",
-      showCancelButton: true,
-      confirmButtonColor: "#009900",
-      confirmButtonText: "Yes, split it!",
-      closeOnConfirm: false
-    }, function (isConfirm) {
-      if (isConfirm) {
-        var dining_id = "<%= @room.id %>";
-        window.location.href = '/origami/room/' + dining_id + "/split_bills";
-      }else{
-        requestBillProcess();
-      }
-    }); 
-  }else{
-    requestBillProcess();
-  }
-});
-
-function requestBillProcess(){
   var order_id = $('#save_order_id').attr('data-order');
   var ajax_url = "/origami/" + order_id + "/request_bills";
   $.ajax({
@@ -753,7 +734,13 @@ function requestBillProcess(){
           }
       }
   });
-}
+});
+
+//split bill process
+$('#split_bills').click(function(){
+  var dining_id = "<%= @room.id %>";
+  window.location.href = '/origami/room/' + dining_id + "/split_bills";
+});
 
 $('#move').on('click',function(){
   var dining_id = "<%= @room.id %>"
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 4e9dda80..b0a0de04 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -59,32 +59,34 @@
 	 																</tr>
 	 															</thead>
 	 															<tbody>
-	 																<% if !order.order_items.nil? %>
+	 																<% if !@order_items.nil? %>
 	 																<% sub_total = 0 %>
-	 																<% order.order_items.each do |order_item| %>
+	 																<% @order_items.each do |order_item| %>
+	 																<% if order_item.include? (order.order_id.to_s) %>
 	 																<% 
-	 																sub_total += order_item.qty*order_item.price 
+	 																sub_total += order_item[order.order_id.to_s]['qty'].to_f * order_item[order.order_id.to_s]['price'].to_f 
 	 																%>
-	 																<tr class="item-row" id=<%= order_item.order_items_id %> >
+	 																<tr class="item-row" id=<%= order_item[order.order_id.to_s]['order_items_id'] %> >
 	 																	<td style="width:60%; text-align:left">
-	 																		<span id="item-order-id" class="hidden"><%=order_item.order_id%></span>
-	 																		<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
+	 																		<span id="item-order-id" class="hidden"><%=order_item[order.order_id.to_s]['order_id'] %></span>
+	 																		<span id="item-account-type" class="hidden"><%=order_item[order.order_id.to_s]['account_id'] %></span>
 	 																		<span id="item-name-price">
-	 																			<%=order_item.item_name%>
-	 																			<% if !order_item.set_menu_items.nil?  
-	 																				order_item.set_menu_items.each do |item_instance| %> 
+	 																			<%=order_item[order.order_id.to_s]['item_name'] %>
+	 																			<% if !order_item[order.order_id.to_s]['set_menu_items'].nil?  
+	 																				order_item[order.order_id.to_s]['set_menu_items'].each do |item_instance| %> 
 	 																				<br><span class="font-13"><%= item_instance %></span> 
 	 																				<% end 
 	 																				end %>
 	 																			</span>
 	 																		</td>
 	 																		<td style="width:20%; text-align:right">
-	 																			<span id="item-qty"><%=order_item.qty%></span>
+	 																			<span id="item-qty"><%=order_item[order.order_id.to_s]['qty']%></span>
 	 																		</td>
 	 																		<td style="width:20%; text-align:right">
-	 																			<span id="item-total-price"><%=(order_item.qty*order_item.price)%></span>
+	 																			<span id="item-total-price"><%=(order_item[order.order_id.to_s]['qty'].to_f * order_item[order.order_id.to_s]['price'].to_f)%></span>
 	 																		</td>
 	 																	</tr>
+	 																	<% end %>
 	 																	<%
 	 																end 
 	 																%>
@@ -148,9 +150,9 @@
  		<div class="col-lg-1 col-md-1 col-sm-1">
  			<!-- Action Panel -->
  			<div>
- 				<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
- 				<button id="order_split" class="btn btn-primary text-center action-btn" style="width:100%">Orders Split</button>
- 				<button id="order_item_split" class="btn btn-primary text-center action-btn">Order Items Split</button>
+ 				<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
+ 				<button id="order_split" class="btn btn-primary text-center action-btn waves-effect">By Order &nbsp;</button>
+ 				<button id="order_item_split" class="btn btn-primary text-center action-btn waves-effect">By Order Item</button>
  			</div>
  		</div>
  		<!-- Column Three -->
@@ -417,6 +419,7 @@ function get_selected_order_items(){
 		order_item.order_id = $(this).find('#item-order-id').text().trim();
 		order_item.name = $(this).find('#item-name-price').text().split('@')[0];
 		order_item.account_id = $(this).find('#item-account-type').text();
+		order_item.qty = $(this).find('#item-qty').text();
 		order_item.price = $(this).find('#item-total-price').text();
 		order_items.push(order_item);
 	});	

From 91aa21666624074459efaa69a0f22472e917d913 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Feb 2018 14:20:20 +0630
Subject: [PATCH 212/651] check booking sale id is null for all order

---
 app/controllers/origami/home_controller.rb   | 14 ++++++++++----
 app/controllers/origami/orders_controller.rb | 14 ++++++++++----
 app/controllers/origami/rooms_controller.rb  | 14 ++++++++++----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index bf4008a2..b4b63515 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -38,15 +38,21 @@ class Origami::HomeController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
           end
         else
-          sale = Sale.find(booking.sale_id)
-          if sale.sale_status !='completed'
-            if !@order_items_count.key?(booking.dining_facility_id)
-              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+          if !booking.sale_id.nil?
+            sale = Sale.find(booking.sale_id)
+            if sale.sale_status !='completed'
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] += sale.sale_items.count
+              end
             end
           end
         end
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index f4b11fc5..ec2f58ba 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -24,15 +24,21 @@ class Origami::OrdersController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
           end
         else
-          sale = Sale.find(booking.sale_id)
-          if sale.sale_status !='completed'
-            if !@order_items_count.key?(booking.dining_facility_id)
-              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+          if !booking.sale_id.nil?
+            sale = Sale.find(booking.sale_id)
+            if sale.sale_status !='completed'
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] += sale.sale_items.count
+              end
             end
           end
         end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 7ffac1f0..68cb8798 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -34,15 +34,21 @@ class Origami::RoomsController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
           end
         else
-          sale = Sale.find(booking.sale_id)
-          if sale.sale_status !='completed'
-            if !@order_items_count.key?(booking.dining_facility_id)
-              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+          if !booking.sale_id.nil?
+            sale = Sale.find(booking.sale_id)
+            if sale.sale_status !='completed'
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] += sale.sale_items.count
+              end
             end
           end
         end

From b2cec950641b986d640bbaae79965cbb7dc03110 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 14:26:36 +0630
Subject: [PATCH 213/651] test no table

---
 app/controllers/origami/addorders_controller.rb |  6 +++---
 app/controllers/origami/payments_controller.rb  |  2 ++
 app/models/order.rb                             | 17 +++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 9da6b7a6..ab481fc3 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -102,7 +102,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       if !params["booking_id"].nil?
           # check booking id is already completed.
           booking = Booking.find(params[:booking_id])
-          if !params[:table_id].nil?
+          if params[:table_id].to_i > 0
             table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
           else
             table_status = true
@@ -119,7 +119,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
                   @order.booking_id = params[:booking_id]
                 end
               else
-                if !params[:table_id].nil?
+                if params[:table_id].to_i > 0
                   sale_status = check_order_with_table(params[:table_id])
                   if sale_status
                     return return_json_status_with_code(400, "bill requested")
@@ -128,7 +128,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
               end
           end #booking exists
       else
-        if !params[:table_id].nil?
+        if params[:table_id].to_i > 0
           sale_status = check_order_with_table(params[:table_id])
           if sale_status
             # return false , @message = "bill requested"
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 8beede44..7b97ea45 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -220,6 +220,8 @@ class Origami::PaymentsController < BaseOrigamiController
       #end customer amount
 
       @sale_data.bookings.each do |sbk|
+        puts "sssssssssss"
+        puts sbk.dining_facility_id
         df = DiningFacility.find(sbk.dining_facility_id)
         @table_no = df.type + ' ' + df.name
         @checkin_time = sbk.checkin_at
diff --git a/app/models/order.rb b/app/models/order.rb
index 5b022b57..15ce56c3 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -23,9 +23,8 @@ class Order < ApplicationRecord
 
   def generate
     booking = nil
-
     if self.new_booking
-      if !self.table_id.nil?
+      if self.table_id.to_i > 0
         table_id = self.table_id
       else
         table_id = nil
@@ -43,7 +42,7 @@ class Order < ApplicationRecord
       end
       #end extra time
      
-      if !self.table_id.nil?
+      if self.table_id.to_i > 0
         table =  DiningFacility.find(self.table_id)
         table.status = "occupied"
         table.save
@@ -324,11 +323,13 @@ class Order < ApplicationRecord
 
   #send order items and send to order queue
   def send_order_broadcast(booking)
-    table = DiningFacility.find(booking.dining_facility_id)
-    type  = 'order'
-    #Send to background job for processing
-    # OrderBroadcastJob.perform_later(table,type)
-    ActionCable.server.broadcast "order_channel",table: table,type:type
+    if self.table_id.to_i > 0
+      table = DiningFacility.find(booking.dining_facility_id)
+      type  = 'order'
+      #Send to background job for processing
+      # OrderBroadcastJob.perform_later(table,type)
+      ActionCable.server.broadcast "order_channel",table: table,type:type
+    end
   end
 
   #Origami: Cashier : to view order Table

From 80ab7e7c1224f8c3e7a10a6ea4285b4dc421219c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 14:33:30 +0630
Subject: [PATCH 214/651] test no table

---
 app/controllers/origami/payments_controller.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 7b97ea45..2d3618b5 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -220,13 +220,17 @@ class Origami::PaymentsController < BaseOrigamiController
       #end customer amount
 
       @sale_data.bookings.each do |sbk|
-        puts "sssssssssss"
-        puts sbk.dining_facility_id
-        df = DiningFacility.find(sbk.dining_facility_id)
-        @table_no = df.type + ' ' + df.name
-        @checkin_time = sbk.checkin_at
-        @dining = df
-        break
+        if sbk.dining_facility_id.to_i >0
+          df = DiningFacility.find(sbk.dining_facility_id)
+          @table_no = df.type + ' ' + df.name
+          @checkin_time = sbk.checkin_at
+          @dining = df
+          break
+        else
+          @table_no = nil
+          @checkin_time = nil
+          @dining = nil
+        end
       end
 
         @sale_data.sale_payments.each do |spay|

From a4ec4bf7c766f2df7ae826d7d7dd246bd00d506f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Feb 2018 14:39:48 +0630
Subject: [PATCH 215/651] db/sym_master.sql

---
 db/sym_master.sql | 781 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 781 insertions(+)
 create mode 100755 db/sym_master.sql

diff --git a/db/sym_master.sql b/db/sym_master.sql
new file mode 100755
index 00000000..0e57b601
--- /dev/null
+++ b/db/sym_master.sql
@@ -0,0 +1,781 @@
+--
+-- Licensed to JumpMind Inc under one or more contributor
+-- license agreements.  See the NOTICE file distributed
+-- with this work for additional information regarding
+-- copyright ownership.  JumpMind Inc licenses this file
+-- to you under the GNU General Public License, version 3.0 (GPLv3)
+-- (the "License"); you may not use this file except in compliance
+-- with the License.
+--
+-- You should have received a copy of the GNU General Public License,
+-- version 3.0 (GPLv3) along with this library; if not, see
+-- <http://www.gnu.org/licenses/>.
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+------------------------------------------------------------------------------
+-- Sample Data
+------------------------------------------------------------------------------
+-- insert into item (item_id, name) values (11000001, 'Yummy Gum');
+-- insert into item_selling_price (item_id, cloud_id, price, cost) values (11000001, '001',0.20, 0.10);
+-- insert into item_selling_price (item_id, cloud_id, price, cost) values (11000001, '002',0.30, 0.20);
+
+-- insert into sale_transaction (tran_id, store_id, workstation, day, seq) 
+-- values (900, '001', '3', '2012-12-01', 90);
+-- insert into sale_return_line_item (tran_id, item_id, price, quantity, returned_quantity)
+-- values (900, 11000001, 0.20, 1, 0);
+
+------------------------------------------------------------------------------
+-- Sample Symmetric Configuration
+------------------------------------------------------------------------------
+
+delete from sym_trigger_router;
+delete from sym_trigger;
+delete from sym_router;
+delete from sym_channel where channel_id in ('orders', 'order_items');
+delete from sym_node_group_link;
+delete from sym_node_group;
+delete from sym_node_host;
+delete from sym_node_identity;
+delete from sym_node_security;
+delete from sym_node;
+
+
+# Create Channels for logically grouped tables
+	# For Initial Data Faster by bulk
+    update sym_channel set data_loader_type='mysql_bulk', max_batch_size=100000, max_data_to_route=100000
+     where channel_id = 'reload';
+
+	insert into sym_channel 
+	(channel_id, processing_order, max_batch_size, enabled, description)
+	values('setting', 1, 100000, 1, 'All Settings');
+
+	insert into sym_channel 
+	(channel_id, processing_order, max_batch_size, enabled, description)
+	values('dining', 1, 100000, 1, 'sale_transactional data from register and back office');
+
+	insert into sym_channel 
+	(channel_id, processing_order, max_batch_size, enabled, description)
+	values('commission', 1, 100000, 1, 'Commission ,Commissioners ,Products and Promotion');
+
+	insert into sym_channel 
+	(channel_id, processing_order, max_batch_size, enabled, description)
+	values('menu', 1, 100000, 1, 'Item and pricing data');
+
+	insert into sym_channel 
+	(channel_id, processing_order, max_batch_size, enabled, description)
+	values('order', 1, 100000, 1, 'Item and pricing data');
+
+	insert into sym_channel 
+	(channel_id, processing_order, max_batch_size, enabled, description)
+	values('sale', 1, 100000, 1, 'Sale data');
+
+	insert into sym_channel 
+	(channel_id, processing_order, max_batch_size, enabled, description)
+	values('oqs', 1, 100000, 1, 'OQS and cashier temenal');
+
+# Create Node Groups and Links
+	insert into sym_node_group (node_group_id) values ('sx');
+	insert into sym_node_group (node_group_id) values ('cloud');
+
+	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('sx', 'cloud', 'W');
+	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('cloud', 'sx', 'P');
+
+# Create Trigger for Setting Channel 
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('lookups','lookups','setting',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('membership_actions','membership_actions','setting',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('membership_settings','membership_settings','setting',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('payment_method_settings','payment_method_settings','setting',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('print_settings','print_settings','setting',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('shops','shops','setting',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('customers','customers','setting',current_timestamp,current_timestamp);
+
+# Create Trigger for Dining Channel 
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('zones','zones','dining',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('dining_charges','dining_charges','dining',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('dining_facilities','dining_facilities','dining',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('dining_queues','dining_queues','dining',current_timestamp,current_timestamp);
+
+# Create Trigger for Commission Channel 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('commissioners','commissioners','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('commissions','commissions','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('employees','employees','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('in_duties','in_duties','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('inventory_definitions','inventory_definitions','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('product_commissions','product_commissions','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('products','products','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('promotion_products','promotion_products','commission',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('promotions','promotions','commission',current_timestamp,current_timestamp);
+
+# Create Trigger for Menu Channel 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('accounts','accounts','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menu_item_attributes','menu_item_attributes','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menu_item_options','menu_item_options','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menus','menus','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menu_categories','menu_categories','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menu_items','menu_items','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menu_item_instances','menu_item_instances','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('item_sets','item_sets','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menu_item_sets','menu_item_sets','menu',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('menu_instance_item_sets','menu_instance_item_sets','menu',current_timestamp,current_timestamp);
+
+# Create Trigger for Order Channel 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('orders','orders','order',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('order_items','order_items','order',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('bookings','bookings','order',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('booking_orders','booking_orders','order',current_timestamp,current_timestamp);
+
+# Create Trigger for Sale Channel 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('sales','sales','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('sale_items','sale_items','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('sale_audits','sale_audits','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('sale_orders','sale_orders','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('sale_payments','sale_payments','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('sale_taxes','sale_taxes','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('payment_journals','payment_journals','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('shift_sales','shift_sales','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('stock_check_items','stock_check_items','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('stock_checks','stock_checks','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('stock_journals','stock_journals','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('surveys','surveys','sale',current_timestamp,current_timestamp);
+
+# Create Trigger for OQS Channel 
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('assigned_order_items','assigned_order_items','oqs',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('cashier_terminals','cashier_terminals','oqs',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('cashier_terminal_by_zones','cashier_terminal_by_zones','oqs',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('cashier_login_logs','cashier_login_logs','oqs',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('order_queue_process_by_zones','order_queue_process_by_zones','oqs',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('order_queue_stations','order_queue_stations','oqs',current_timestamp,current_timestamp);
+
+
+# Create Routers for Nodes
+	insert into sym_router 
+	(router_id,source_node_group_id,target_node_group_id,router_type,create_time,last_update_time)
+	values('sx_2_cloud', 'sx', 'cloud', 'default',current_timestamp, current_timestamp);
+
+	insert into sym_router 
+	(router_id,source_node_group_id,target_node_group_id,router_type,sync_on_delete,create_time,last_update_time)
+	values('cloud_2_sx', 'cloud', 'sx', 'default',0,current_timestamp, current_timestamp);
+
+-- insert into sym_router 
+-- (router_id,source_node_group_id,target_node_group_id,router_type,router_expression,create_time,last_update_time)
+-- values('sx_2_one_cloud', 'sx', 'cloud', 'column','cloud_ID=:EXTERNAL_ID or OLD_cloud_ID=:EXTERNAL_ID',current_timestamp, current_timestamp);
+
+
+# Add triggers for tables with router
+
+# Setting Channel # From cloud to Master
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('lookups','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('membership_actions','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('membership_settings','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('payment_method_settings','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('print_settings','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('shops','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('customers','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+# Setting Channel # From Master to cloud
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('lookups','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('membership_actions','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('membership_settings','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('payment_method_settings','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('print_settings','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('shops','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('customers','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+#End Setting Channel
+
+# Dining Channel # From cloud to SX
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('zones','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('dining_charges','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('dining_facilities','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('dining_queues','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+# Dining Channel # From SX to cloud
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('zones','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('dining_charges','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('dining_facilities','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('dining_queues','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+#end Dining Channel
+
+# Commission/Promotion/Product Channel # From cloud to SX
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('commissioners','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('commissions','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('employees','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('in_duties','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('inventory_definitions','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('product_commissions','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('products','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('promotion_products','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('promotions','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+# Commission/Promotion/Product Channel # From SX to cloud
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('commissioners','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('commissions','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('employees','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('in_duties','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('inventory_definitions','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('product_commissions','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('products','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('promotion_products','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('promotions','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+#end Commission/Promotion/Product Channel
+
+# Menu Channel # From cloud to SX
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('accounts','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_attributes','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_options','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menus','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_categories','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_items','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_instances','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('item_sets','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_sets','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_instance_item_sets','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+# Menu Channel # From SX to cloud
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('accounts','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_attributes','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_options','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menus','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_categories','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_items','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_instances','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('item_sets','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_item_sets','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('menu_instance_item_sets','sx_2_cloud', 100, current_timestamp, current_timestamp);
+#End Menu Channel
+
+# Order Channel # From cloud to Sx
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('orders','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('order_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('bookings','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('booking_orders','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+# Order Channel # From SX to cloud
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('orders','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('order_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('bookings','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('booking_orders','sx_2_cloud', 200, current_timestamp, current_timestamp);
+# End Order Channel 
+
+# Sale Channel # From cloud to Sx
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sales','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_audits','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_orders','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_payments','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_taxes','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('payment_journals','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('shift_sales','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('stock_check_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('stock_checks','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('stock_journals','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('surveys','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+# Sale Channel # From SX to cloud
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sales','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_audits','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_orders','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_payments','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('sale_taxes','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('payment_journals','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('shift_sales','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('stock_check_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('stock_checks','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('stock_journals','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('surveys','sx_2_cloud', 200, current_timestamp, current_timestamp);
+# End Sale Channel 
+
+# Oqs Channel # From cloud to Sx
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('assigned_order_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('cashier_terminals','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('cashier_terminal_by_zones','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('cashier_login_logs','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('order_queue_process_by_zones','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('order_queue_stations','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+# Oqs Channel # From SX to cloud
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('assigned_order_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('cashier_terminals','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('cashier_terminal_by_zones','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('cashier_login_logs','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('order_queue_process_by_zones','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('order_queue_stations','sx_2_cloud', 200, current_timestamp, current_timestamp);
+# End Oqs Channel
+
+
+insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) 
+ values ('000','sx','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
+insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) 
+ values ('001','cloud','001',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
+-- insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) 
+--  values ('002','cloud','002',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
+
+
+insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) 
+ values ('000','acd36ce830d1fda466eec921433f38',0,current_timestamp,1,current_timestamp,'000');
+insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) 
+ values ('001','acd36ce830d1fda466eec921433f38',1,null,1,null,'000');
+-- insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) 
+--  values ('002','acd36ce830d1fda466eec921433f38',1,null,1,null,'000');
+
+insert into sym_node_identity values ('000');

From a5c72b6540edf8c597bef1ad80448d776b9cfefa Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 14:40:28 +0630
Subject: [PATCH 216/651] test no table

---
 app/views/origami/payments/show.html.erb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c86c0284..c97e9abe 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -19,7 +19,8 @@
             <div class="row p-l-5 p-r-5">
               <div class="col-lg-6 col-md-6 col-sm-6"><strong>Customer :</strong> <%= @sale_data.customer.name%> <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
                 <span class="hidden" id="member_discount"><%= @member_discount%></span></div>
-              <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Checkin Time : </strong> <%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %></div>
+              <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Checkin Time : </strong> <%if !@checkin_time.nil?%><%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %>
+              <%end%></div>
             </div>
           </div>
         </div>
@@ -368,7 +369,9 @@ var cashier_type = "<%= @cashier_type %>";
     if (sale) {
       var sale_id = sale
     } else {
-      var sale_id = "<%= @dining.id %>";
+      if (cashier_type != "quick_service") {
+        var sale_id = "<%= @dining.id %>";
+      }
     }
     //var table_id = $('.tables').attr("data-id");            
      window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
@@ -425,7 +428,10 @@ var cashier_type = "<%= @cashier_type %>";
   });
 
   $('#edit').on('click', function () {
+    if (cashier_type != "quick_service") {
+      console.log(cashier_type)
     var dining_id = "<%= @dining.id %>"
+  }
     var sale_id = $('#sale_id').text();
     if ($(this).attr('active')=== "true") {
       window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";

From 867148a03885727772f9ee96d69d4b16e6f56f37 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Feb 2018 14:45:14 +0630
Subject: [PATCH 217/651] db/sym_master.sql

---
 db/sym_master.sql | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/db/sym_master.sql b/db/sym_master.sql
index 0e57b601..89abaf5b 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -117,6 +117,14 @@ delete from sym_node;
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
 	values('customers','customers','setting',current_timestamp,current_timestamp);
 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('tax_profiles','customers','setting',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('display_images','customers','setting',current_timestamp,current_timestamp);
+
 # Create Trigger for Dining Channel 
 
 	insert into sym_trigger 
@@ -279,6 +287,14 @@ delete from sym_node;
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
 	values('surveys','surveys','sale',current_timestamp,current_timestamp);
 
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('card_sale_trans','card_sale_trans','sale',current_timestamp,current_timestamp);
+
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('card_settle_trans','card_settle_trans','sale',current_timestamp,current_timestamp);
+
 # Create Trigger for OQS Channel 
 
 	insert into sym_trigger 
@@ -351,6 +367,14 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('customers','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('tax_profiles','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('display_images','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
 # Setting Channel # From Master to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -380,6 +404,14 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('customers','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('tax_profiles','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('display_images','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
 #End Setting Channel
 
 # Dining Channel # From cloud to SX
@@ -661,6 +693,14 @@ delete from sym_node;
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('surveys','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_sale_trans','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_settle_trans','cloud_2_sx', 200, current_timestamp, current_timestamp);
+
 # Sale Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -709,6 +749,15 @@ delete from sym_node;
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('surveys','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_sale_trans','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('card_settle_trans','sx_2_cloud', 200, current_timestamp, current_timestamp);
+
 # End Sale Channel 
 
 # Oqs Channel # From cloud to Sx

From a2e7ebd27a7cb906aa17065f79dc065fc23a0e69 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 15:00:16 +0630
Subject: [PATCH 218/651] update payment show

---
 app/views/origami/payments/show.html.erb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c97e9abe..b6d08ed0 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -13,6 +13,7 @@
             </div>
             <div class="row p-l-5 p-r-5">
               <div class="col-lg-6 col-md-6 col-sm-6"><strong>Table No :</strong> <%=@table_no%></div>
+              <span class="hidden" id="dining"><%if !@dining.nil?%><%= @dining.id%><%end%></span>
               <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Sale ID :</strong> <span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span></div>
             </div>
             
@@ -369,9 +370,7 @@ var cashier_type = "<%= @cashier_type %>";
     if (sale) {
       var sale_id = sale
     } else {
-      if (cashier_type != "quick_service") {
-        var sale_id = "<%= @dining.id %>";
-      }
+      var sale_id = $('#dining').text();
     }
     //var table_id = $('.tables').attr("data-id");            
      window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
@@ -428,10 +427,7 @@ var cashier_type = "<%= @cashier_type %>";
   });
 
   $('#edit').on('click', function () {
-    if (cashier_type != "quick_service") {
-      console.log(cashier_type)
-    var dining_id = "<%= @dining.id %>"
-  }
+    var dining_id = $('#dining').text();
     var sale_id = $('#sale_id').text();
     if ($(this).attr('active')=== "true") {
       window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";

From 8898ba597a31a121df1fa400fb1046e84abed45e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Feb 2018 17:07:33 +0630
Subject: [PATCH 219/651] change split bill

---
 app/controllers/application_controller.rb   | 10 +++++-----
 app/models/license.rb                       |  6 +++---
 app/views/origami/home/index.html.erb       |  4 ++--
 app/views/origami/split_bill/index.html.erb |  9 ++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4dafef41..3a35a15b 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 
diff --git a/app/models/license.rb b/app/models/license.rb
index d025e349..cdebdbdd 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -60,9 +60,9 @@ class License
         return true
       end
     else         
-      @license = Marshal.load(cache_license)
-      assign(aes_key, aes_iv)
-      Rails.logger.info 'API License'           
+      # @license = Marshal.load(cache_license)
+      # assign(aes_key, aes_iv)
+      # Rails.logger.info 'API License'           
       return true
     end
   end
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index f40cb3b3..77600370 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -247,8 +247,8 @@ $('#back').on('click',function(){
 
 function warnBeforeRedirect(linkURL) {
     swal({
-      title: "Oops", 
-      text: "Are you sure you want to Logout ?", 
+      title: "Alert!", 
+      text: "Are you sure you want to close cashier?", 
       type: "warning",
       showCancelButton: true
     }, function() {
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index b0a0de04..0963b2ca 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -26,12 +26,11 @@
  									<div class="row m-l-5">
  										<div class="col-lg-3 col-md-3 col-sm-3">
  											<ul class="nav nav-tabs tabs-left sideways">
+ 												<li class="active">
+													<a href="#all_order" data-toggle="tab">All</a>
+												</li>
  												<% @orders.each.with_index(0) do |order, order_index| %>
- 													<% active_class = "" %>
- 													<% if order_index == 0 %>
- 														<% active_class = "active" %>
- 													<% end %>
- 													<li class="order-row <%= active_class %>">
+ 													<li class="order-row">
  														<a href="#<%= order.order_id %>" data-toggle="tab"><%= order.order_id %></a>
  													</li>
  												<% end %>

From 4f1a6fefe75d394ef743db4514d7c1bef62ec788 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Feb 2018 17:32:34 +0630
Subject: [PATCH 220/651] check void for table status update

---
 app/controllers/application_controller.rb    | 10 +++++-----
 app/controllers/origami/home_controller.rb   |  7 +++++--
 app/controllers/origami/orders_controller.rb |  4 ++--
 app/controllers/origami/rooms_controller.rb  |  6 +++---
 app/controllers/origami/void_controller.rb   | 15 ++++++++++++---
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0966a573..e66d7700 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 096af4d3..b725c23e 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -27,9 +27,9 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -51,7 +51,7 @@ class Origami::HomeController < BaseOrigamiController
               if !@order_items_count.key?(booking.dining_facility_id)
                 @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
               else
-                @order_items_count[booking.dining_facility_id] += sale.sale_items.count
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
               end
             end
           end
@@ -59,6 +59,9 @@ class Origami::HomeController < BaseOrigamiController
       end
     end
 
+    puts "@order_items_count"
+    puts @order_items_count.to_json
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index ec2f58ba..91388e4d 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -13,9 +13,9 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
 
-    @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -37,7 +37,7 @@ class Origami::OrdersController < BaseOrigamiController
               if !@order_items_count.key?(booking.dining_facility_id)
                 @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
               else
-                @order_items_count[booking.dining_facility_id] += sale.sale_items.count
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
               end
             end
           end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 68cb8798..29b865a4 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -22,10 +22,10 @@ class Origami::RoomsController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-
-    @order_items_count = Hash.new
+    
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -47,7 +47,7 @@ class Origami::RoomsController < BaseOrigamiController
               if !@order_items_count.key?(booking.dining_facility_id)
                 @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
               else
-                @order_items_count[booking.dining_facility_id] += sale.sale_items.count
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
               end
             end
           end
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 52b2068c..aa36067b 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -40,16 +40,25 @@ class Origami::VoidController < BaseOrigamiController
       # end
 
       table_avaliable = true
+      table_count = 0
       table = sale.bookings[0].dining_facility
       table.bookings.each do |booking|
-        if !booking.sale.nil? 
-          if booking.sale.sale_status == 'new'
+        if booking.booking_status != 'moved'
+          if booking.sale_id
+            if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+              table_avaliable = false
+              table_count += 1
+            else
+              table_avaliable = true
+            end
+          else
             table_avaliable = false
+            table_count += 1
           end
         end
       end
 
-      if table_avaliable
+      if table_avaliable && table_count == 0
         table.status = 'available'
         table.save
       end

From 47ffc5fa51046173ef9c6a6b5b399ee67ea1b993 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 18:21:10 +0630
Subject: [PATCH 221/651] update no table quick srevice

---
 app/controllers/application_controller.rb     | 10 +--
 .../origami/customers_controller.rb           |  7 +-
 .../origami/other_charges_controller.rb       | 30 +++++--
 .../origami/payments_controller.rb            | 84 ++++++++++++-------
 app/controllers/origami/sales_controller.rb   |  9 +-
 app/controllers/origami/surveys_controller.rb | 15 +++-
 app/models/sale_payment.rb                    | 42 +++++-----
 app/pdf/receipt_bill_pdf.rb                   | 13 ++-
 app/views/origami/customers/index.html.erb    | 22 +++--
 .../origami/other_charges/index.html.erb      |  6 +-
 app/views/origami/surveys/_form.html.erb      | 16 +++-
 app/views/origami/surveys/new.html.erb        |  9 --
 12 files changed, 173 insertions(+), 90 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4dafef41..3a35a15b 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index b0056fb2..db89b1d0 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -53,7 +53,12 @@ class Origami::CustomersController < BaseOrigamiController
     
      if(@sale_id[0,3] == "SAL")
        @booking          = Booking.find_by_sale_id(@sale_id)
-       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+       if @booking.dining_facility_id.to_i > 0
+        @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+       else
+        @dining_facility  = nil  
+       end
+       
     else
        @booking_order    = BookingOrder.find_by_order_id(@sale_id)
        @booking          = Booking.find(@booking_order.booking_id)
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index 7ed087d4..d15edb5e 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -6,7 +6,12 @@ class Origami::OtherChargesController < BaseOrigamiController
 		@cashier_type = params[:type]
 	    if Sale.exists?(sale_id)
 	      @sale_data = Sale.find(sale_id)
-	      @table =  DiningFacility.find(@sale_data.bookings[0].dining_facility_id)
+	      if @sale_data.bookings[0].dining_facility_id.to_i > 0
+	      	@table =  DiningFacility.find(@sale_data.bookings[0].dining_facility_id)
+	      else
+	      	@table = nil
+	      end
+	      
 	    end
 	end
 
@@ -17,8 +22,14 @@ class Origami::OtherChargesController < BaseOrigamiController
 
 	    if Sale.exists?(sale_id)
 	      sale = Sale.find(sale_id)
-	      table_id = sale.bookings[0].dining_facility_id
-	      table = DiningFacility.find(table_id)
+	      if sale.bookings[0].dining_facility_id.to_i > 0
+	      	table_id = sale.bookings[0].dining_facility_id
+	        table = DiningFacility.find(table_id)
+		  else
+		  	  table_id = nil
+		      table = nil
+	      end
+	      
 
 	      # sale.total_amount = sub_total.to_f
 	      # sale.grand_total = sub_total.to_f + sale.total_tax;  
@@ -45,7 +56,12 @@ class Origami::OtherChargesController < BaseOrigamiController
 	          sale_item.save
 
 	          action_by = current_user.id
-		      remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->#{table.name}"
+	          if table.nil?
+	          	remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->"
+	          else
+	          	remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->#{table.name}"
+	          end
+		      
 		      sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_id, action_by,remark,"ADDOTHERCHARGES" )
 
 	        end                 
@@ -54,9 +70,11 @@ class Origami::OtherChargesController < BaseOrigamiController
 	      # Re-calc All Amount in Sale
 	      sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount)	      
 	    end	     
-
-	    dining = {:table_id => table_id, :table_type => table.type }
+	    if !table.nil?
+	    	dining = {:table_id => table_id, :table_type => table.type }
 	    render :json => dining.to_json
+		end
+	    
 	end
 
   #Shop Name in Navbor
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 2d3618b5..fe384a89 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -11,15 +11,21 @@ class Origami::PaymentsController < BaseOrigamiController
 
     # For Cashier by Zone
     bookings = Booking.where("sale_id='#{sale_id}'")
-    if bookings.count > 1 
-      # for Multiple Booking
-      table = DiningFacility.find(bookings[0].dining_facility_id)
-    else
-      table = DiningFacility.find(bookings[0].dining_facility_id)        
-    end
+    # if bookings.count > 1 
+    #   # for Multiple Booking
+    #   table = DiningFacility.find(bookings[0].dining_facility_id)
+    # else
+    #   table = DiningFacility.find(bookings[0].dining_facility_id)        
+    # end
 
-    cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-    cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+    if bookings[0].dining_facility_id.to_i > 0
+        table = DiningFacility.find(bookings[0].dining_facility_id)
+        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+        cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      else
+        shift = ShiftSale.find(saleObj.shift_sale_id)
+        cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+      end
 
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       # Print for First Bill to Customer
@@ -94,15 +100,21 @@ class Origami::PaymentsController < BaseOrigamiController
 
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")
-      if bookings.count > 1 
-        # for Multiple Booking
-        table = DiningFacility.find(bookings[0].dining_facility_id)
-      else
-        table = DiningFacility.find(bookings[0].dining_facility_id)        
-      end
+      # if bookings.count > 1 
+      #   # for Multiple Booking
+      #   table = DiningFacility.find(bookings[0].dining_facility_id)
+      # else
+      #   table = DiningFacility.find(bookings[0].dining_facility_id)        
+      # end
 
-      cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-      cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      if bookings[0].dining_facility_id.to_i > 0
+        table = DiningFacility.find(bookings[0].dining_facility_id)
+        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+        cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      else
+        shift = ShiftSale.find(saleObj.shift_sale_id)
+        cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+      end
 
       # For Print
       if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
@@ -264,15 +276,21 @@ class Origami::PaymentsController < BaseOrigamiController
 
     # For Cashier by Zone
     bookings = Booking.where("sale_id='#{sale_id}'")
-    if bookings.count > 1 
-      # for Multiple Booking
-      table = DiningFacility.find(bookings[0].dining_facility_id)
-    else
-      table = DiningFacility.find(bookings[0].dining_facility_id)        
-    end
+    # if bookings.count > 1 
+    #   # for Multiple Booking
+    #   table = DiningFacility.find(bookings[0].dining_facility_id)
+    # else
+    #   table = DiningFacility.find(bookings[0].dining_facility_id)        
+    # end
 
-    cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-    cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+    if bookings[0].dining_facility_id.to_i > 0
+        table = DiningFacility.find(bookings[0].dining_facility_id)
+        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+        cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+    else
+        shift = ShiftSale.find(saleObj.shift_sale_id)
+        cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+    end
 
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       unique_code = "ReceiptBillPdf"
@@ -333,15 +351,21 @@ class Origami::PaymentsController < BaseOrigamiController
 
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")
-      if bookings.count > 1 
-        # for Multiple Booking
+      # if bookings.count > 1 
+      #   # for Multiple Booking
+        # table = DiningFacility.find(bookings[0].dining_facility_id)
+      # else
+      #   table = DiningFacility.find(bookings[0].dining_facility_id)        
+      # end
+      if bookings[0].dining_facility_id.to_i > 0
         table = DiningFacility.find(bookings[0].dining_facility_id)
+        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+        cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
       else
-        table = DiningFacility.find(bookings[0].dining_facility_id)        
+        shift = ShiftSale.find(saleObj.shift_sale_id)
+        cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
       end
-
-      cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-      cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      
 
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index c522f9e7..513bdb2c 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -7,8 +7,13 @@ class Origami::SalesController < BaseOrigamiController
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
     @booking = BookingOrder.find_by_order_id(@order).booking_id
-    @table_id = Booking.find(@booking).dining_facility_id
-    @dining  = DiningFacility.find(@table_id)
+    if Booking.find(@booking).dining_facility_id.to_i>0
+      @table_id = Booking.find(@booking).dining_facility_id
+      @dining  = DiningFacility.find(@table_id)
+    else
+      @table_id = nil
+      @dining  = nil
+    end
   end
 
   def add_to_existing_invoice
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index d7f97a6e..4ecdf95f 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -9,8 +9,14 @@ class Origami::SurveysController < BaseOrigamiController
 	       @receipt_no       = @sale.receipt_no
 	       @grand_total      = @sale.grand_total
 	       @booking          = Booking.find_by_sale_id(@id)
-	       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
-	       @table_type       = @dining_facility.type
+	       if @booking.dining_facility_id.to_i>0
+	       	@dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+	        @table_type       = @dining_facility.type
+	       else
+	       	@dining_facility  = nil
+	        @table_type       = nil
+	       end
+	       
 	    else
 	       @dining_facility  = DiningFacility.find(@id)
 	       @table_type       = @dining_facility.type
@@ -20,8 +26,9 @@ class Origami::SurveysController < BaseOrigamiController
 	end
 
 	def create
-		@dining_facility   = DiningFacility.find(params[:table_id])
-		
+		if params[:table_id].to_i>0
+		  @dining_facility   = DiningFacility.find(params[:table_id])
+		end
 		@type = params[:cashier_type]
 		@sale_id = params[:sale_id]
 		if @type == "quick_service"
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 661eb57b..c2fce169 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -385,32 +385,34 @@ class SalePayment < ApplicationRecord
     sale_count = 0
     booking = Booking.find_by_sale_id(sale_obj.id)
     if booking
-      table = DiningFacility.find(booking.dining_facility_id)
-      bookings = table.bookings
-      bookings.each do |tablebooking|
-        if tablebooking.booking_status != 'moved'
-          if tablebooking.sale_id
-            if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' 
+      if booking.dining_facility_id.to_i > 0
+        table = DiningFacility.find(booking.dining_facility_id)
+        bookings = table.bookings
+        bookings.each do |tablebooking|
+          if tablebooking.booking_status != 'moved'
+            if tablebooking.sale_id
+              if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' 
+                status = false
+                sale_count += 1
+              else
+                status = true
+              end
+            else
               status = false
               sale_count += 1
-            else
-              status = true
             end
-          else
-            status = false
-            sale_count += 1
           end
         end
-      end
-      if status && sale_count == 0
-         table.status = "available"
-         table.save
-      end
+        if status && sale_count == 0
+           table.status = "available"
+           table.save
+        end
 
-      type  = 'payment'
-      #Send to background job for processing
-      # OrderBroadcastJob.perform_later(table,type)
-      ActionCable.server.broadcast "order_channel",table: table,type:type
+        type  = 'payment'
+        #Send to background job for processing
+        # OrderBroadcastJob.perform_later(table,type)
+        ActionCable.server.broadcast "order_channel",table: table,type:type
+      end
     end
   end
 
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index d2ad0260..dece55cb 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -104,9 +104,12 @@ class ReceiptBillPdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
             text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
         end
-        bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+          bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do
             text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
+         end
         end
+        
         move_down 5
 
         y_position = cursor
@@ -119,8 +122,14 @@ class ReceiptBillPdf < Prawn::Document
         move_down 5
 
         y_position = cursor
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+            time =sale_data.receipt_date.strftime('%d-%m-%Y') +"("+ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p')  +"-"+  sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p')+")"
+        else
+            time =  time = sale_data.receipt_date.strftime('%d-%m-%Y %H:%M %p')
+        end
+        
         bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do
-                text "Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left
+                text "Date : #{ time }",:size => self.item_font_size,:align => :left
         end
 
 
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 88f4646d..eebaabbf 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -32,7 +32,6 @@
                 <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
 
                  <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
-                 <!-- <input type="hidden" name="type" id="type" value="<%= @dining_facility.type %>"> -->
 
                </div>
                <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
@@ -115,8 +114,13 @@
 
           <span class="patch_method"></span>
           <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
+          <%if !@dining_facility.nil?%>
           <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
           <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
+          <%else%>
+            <input type="hidden" id="table_id" name="table_id" value="" />
+          <input type="hidden" id="type" name="type" value="" />
+          <%end%>
           <%= f.error_notification %>
           <%= f.hidden_field :id, :class => "form-control col-md-6 " %>    
           <div class="form-group">
@@ -417,6 +421,7 @@
     if(customer_name != ""){
       customer = '(' + customer_name + ')';
     }
+
     swal({
       title: "Confirmation !",
       text: 'Are You Sure to assign this customer' + customer + '!',
@@ -437,7 +442,6 @@
             var id       = $("#table_id").val();
             var type     = $("#type").val();
             if (cashier_type == "quick_service") {
-               window.location.href = '/origami/table/'+id
                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
             }else{
               if (type=="Table") {
@@ -458,11 +462,17 @@
   $('#back').on('click',function(){
     var id       = $("#table_id").val()
     var type     = $("#type").val()
-    if (type=="Table") {
-      window.location.href = '/origami/table/'+id
+    var sale_id  = $("#sale_id").val()
+    if (cashier_type == "quick_service") {
+      window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
     }else{
-     window.location.href = '/origami/room/'+id
-   }
+      if (type=="Table") {
+          window.location.href = '/origami/table/'+id
+        }else{
+         window.location.href = '/origami/room/'+id
+       }
+    }
+    
  })
 
 </script>
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index 9e3b7c3f..a194e03a 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -197,7 +197,11 @@
   <div class="col-lg-1 col-md-1 col-sm-1">
   	<!-- Action Panel -->
   	<div>
-  		<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/<%=@table.type.downcase%>/<%=@table.id%>'"><i class="material-icons">reply</i> Back </button>
+    <%if !@table.nil?%>
+  	<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/<%=@table.type.downcase%>/<%=@table.id%>'"><i class="material-icons">reply</i> Back </button>
+    <%else%>
+    <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%=@sale_data.sale_id%>/<%=@cashier_type%>/payment'"><i class="material-icons">reply</i> Back </button>
+    <%end%>
   		<button id="charge_other" class="btn bg-primary btn-block action-btn">Enter</button>
   	</div>
   </div>
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 9f2b5d06..47cb08d0 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -41,10 +41,18 @@
 
          </div>
 
-         <input type="hidden" name="table_id" value="<%=@dining_facility.id%>">
+          <%if !@dining_facility.nil?%>
+            <input type="hidden" name="table_id" value="<%= @dining_facility.id %>">
+            <input type="hidden" name="table_type" value="<%= @table_type %>">
+            <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
+          <%else%>
+          <input type="hidden" name="table_id" value="0">
+          <input type="hidden" name="table_type" value="0">
+          <%= f.input :dining_name, :as => :hidden, :input_html => { :value => 0 } %>
+          <%end%>
           <input type="hidden" name="sale_id" value="<%=@id%>">
           <input type="hidden" name="cashier_type" value="<%=@cashier_type%>">
-         <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
+         
          <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %>
          <%= f.input :receipt_no, :as => :hidden, :input_html => { :value => @receipt_no} %>
          <%= f.input :total_amount, :as => :hidden, :input_html => { :value => @grand_total } %>
@@ -228,8 +236,8 @@ var cashier_type = "<%= @cashier_type %>";
     });
     // click back button for redirect
     $('#back').on('click',function(){
-      table_type    = '<%=@table_type%>';
-      table_id      = '<%=@dining_facility.id%>';
+      table_type    = $('#table_type').val()
+      table_id      = $('#table_id').val()
 
       if (cashier_type == "quick_service") {
         window.location.href = '/origami/sale/<%= @id %>/<%= @cashier_type %>/payment/';
diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb
index bee0f843..ee4d9a57 100755
--- a/app/views/origami/surveys/new.html.erb
+++ b/app/views/origami/surveys/new.html.erb
@@ -1,12 +1,3 @@
-<!-- <div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= '/origami/table/@dining_facility.id' %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.survey") %></li>
 
-    <span class="float-right">
-      <%= link_to t('.back',:default => t("views.btn.back")),'/origami/table/'+@dining_facility.id.to_s %>
-    </span>
-  </ol>
-</div> -->
 
  <%= render 'form', survey: @survey %>

From 0d515d9c93f53874e087b99f497a208ffbc96774 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Feb 2018 10:27:00 +0630
Subject: [PATCH 222/651] paending order sale model

---
 app/models/sale.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f42b62a0..a5ffa8d9 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1225,6 +1225,13 @@ end
     return query
   end
 
+  def self.pending_order
+    query = Sale.all
+    query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
+                 .joins("join orders as orders on orders.order_id = sale_orders.order_id")
+    query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
+  end
+
   private
 
   def generate_custom_id

From 4a0b88cfb92625e81f21427ce2dae5a195381ada Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Feb 2018 10:42:02 +0630
Subject: [PATCH 223/651] update application for license

---
 app/controllers/application_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66d7700..0966a573 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end
   end
 

From a2bd8795ccec9c0b23132c08bfdc60f74e0b6ff4 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Feb 2018 11:23:40 +0630
Subject: [PATCH 224/651] update discount for qs

---
 .../origami/discounts_controller.rb           | 26 +++++++++++++++----
 app/views/origami/discounts/index.html.erb    |  6 +++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index bea6e381..1905fd9a 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -7,7 +7,11 @@ class Origami::DiscountsController < BaseOrigamiController
     @cashier_type = params[:type]
     if Sale.exists?(sale_id)
       @sale_data = Sale.find(sale_id)
-      @table =  DiningFacility.find(@sale_data.bookings[0].dining_facility_id)
+      if @sale_data.bookings[0].dining_facility_id.to_i > 0
+        @table =  DiningFacility.find(@sale_data.bookings[0].dining_facility_id)
+      else
+        @table = nil
+      end
     end
 
     @member_discount = MembershipSetting.find_by_discount(1)
@@ -23,8 +27,15 @@ class Origami::DiscountsController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find(sale_id)
-      table_id = sale.bookings[0].dining_facility_id
-      table = DiningFacility.find(table_id)
+      if sale.bookings[0].dining_facility_id.to_i > 0
+        table_id = sale.bookings[0].dining_facility_id
+        table = DiningFacility.find(table_id)
+      else
+        table = nil
+        table_id = nil
+      end
+
+      
       # sale.total_discount = overall_discount.to_f        
       # sale.total_amount = sub_total.to_f
       # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;  
@@ -34,7 +45,6 @@ class Origami::DiscountsController < BaseOrigamiController
         #save sale item for discount
         discount_items.each do |di|
           origin_sale_item = SaleItem.find(di["id"])
-          puts origin_sale_item.to_json
           sale_item = SaleItem.new
 
           sale_item.sale_id = sale_id
@@ -55,6 +65,7 @@ class Origami::DiscountsController < BaseOrigamiController
 
           action_by = current_user.id
           remark = "Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} "
+          
           sale_audit = SaleAudit.record_audit_discount(sale_item.sale_id,sale.cashier_id, action_by,remark,"ITEMDISCOUNT" )
     
         end                 
@@ -63,7 +74,12 @@ class Origami::DiscountsController < BaseOrigamiController
       # Re-calc All Amount in Sale
       if overall_discount.to_f > 0
         action_by = current_user.id
-        remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
+        if table.nil?
+          remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
+        else
+          remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
+        end
+        
         sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"OVERALLDISCOUNT" )
       end 
       sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f)   
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 33141666..ba03f8d7 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -13,8 +13,14 @@
       <div class="card-block">
       	<div class="card-title row">
       		<div class="col-lg-6 col-md-6 col-sm-6">
+      		<%if !@table.nil?%>
       		    <span class="hidden" id ="table_id" value="<%=@table.id%>"><%=@table.id%></span>
       		    <span class="hidden" id="table_type" value="<%=@table.type%>"><%=@table.type%></span>
+			<%else%>
+			    <span class="hidden" id ="table_id" value="<%=@table%>"><%=@table%></span>
+      		    <span class="hidden" id="table_type" value="<%=@table%>"><%=@table%></span>
+			<%end%>
+      		   
       			<p id="sale-id" class="hidden"><%=@sale_data.sale_id %></p>
       			<p class="m-l-10">Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p>
       			<!-- <p>Cashier:  <span id="cashier"><%=@sale_data.cashier_name rescue ' '%></span></p> -->

From a8fdf2ec30598815e073d0281afe2f121ce6f67f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Feb 2018 11:49:01 +0630
Subject: [PATCH 225/651] update discount for qs

---
 .../origami/discounts_controller.rb           | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 1905fd9a..4b8c18f0 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -75,7 +75,7 @@ class Origami::DiscountsController < BaseOrigamiController
       if overall_discount.to_f > 0
         action_by = current_user.id
         if table.nil?
-          remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
+          remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- no Table "
         else
           remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
         end
@@ -83,9 +83,17 @@ class Origami::DiscountsController < BaseOrigamiController
         sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"OVERALLDISCOUNT" )
       end 
       sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f)   
-      result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
+      if !table.nil?
+        result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
+      else
+        result = {:status=> "Success" }
+      end
     else 
-      result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type }
+      if !table.nil?
+        result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type }
+      else
+        result = {:status=> "Please, Check Again!" }
+      end
     end  
 
     
@@ -97,9 +105,15 @@ class Origami::DiscountsController < BaseOrigamiController
     sale_id = params[:sale_id]
     discount_items = JSON.parse(params[:discount_items])
     if Sale.exists?(sale_id)
-      sale = Sale.find(sale_id)    
-      table_id = sale.bookings[0].dining_facility_id
-      table = DiningFacility.find(table_id)
+      sale = Sale.find(sale_id)
+      if sale.bookings[0].dining_facility_id.to_i > 0
+        table_id = sale.bookings[0].dining_facility_id
+        table = DiningFacility.find(table_id)
+      else
+        table_id = nil
+        table = nil
+      end    
+      
               
       if discount_items.length > 0       
         #destroy sale item for discount
@@ -108,7 +122,11 @@ class Origami::DiscountsController < BaseOrigamiController
           sale.total_amount = (sale.total_amount + sale_item.price.abs)
 
            action_by = current_user.id
-           remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- #{table.name} "
+           if table.nil?
+            remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- No Table "
+           else
+           remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- #{table.name} "   
+           end
            sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEITEMDISCOUNT" )
       
           sale_item.destroy
@@ -119,9 +137,19 @@ class Origami::DiscountsController < BaseOrigamiController
       # sale.save
       # Re-calc All Amount in Sale
       sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount)  
-      result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
+      if table.nil?
+        result = {:status=> "Success"}
+      else
+        result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
+      end
+      
     else 
-      result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type }
+      if table.nil?
+        result = {:status=> "Please, Check Again!"}
+      else
+        result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type }
+      end
+      
     end  
 
     render :json => result.to_json

From d98f8782b167fad541ac45a9b8be7d743a7616cd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Feb 2018 11:51:51 +0630
Subject: [PATCH 226/651] update order summary pdf for before_qty_update

---
 app/pdf/order_summary_pdf.rb      | 2 +-
 app/pdf/order_summary_set_pdf.rb  | 2 +-
 app/pdf/order_summary_slim_pdf.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 9e9873d2..5211061e 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSummaryPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index baab15b8..619b81ab 100644
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSummarySetPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
index 87aba403..b4b850fa 100644
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSummarySlimPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0

From dff0a4798e56cfffcb162875f708a61103fc1c41 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Feb 2018 12:11:54 +0630
Subject: [PATCH 227/651] add new line

---
 app/models/printer/cashier_station_printer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index e62ab4d1..fd1dc0cd 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -30,6 +30,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
 
     pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+    
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
     pdf.render_file filename
     self.print(filename, cashier_terminal.printer_name)

From 35721cd9177b7244e0197e07b19df144a5781d9e Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Feb 2018 12:15:39 +0630
Subject: [PATCH 228/651] remove space line

---
 app/models/printer/cashier_station_printer.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index e62ab4d1..3c6dac88 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -34,6 +34,4 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     pdf.render_file filename
     self.print(filename, cashier_terminal.printer_name)
   end
-
-
 end

From d8d119edd6c7610664a6c7d8150c2cb4a50c017f Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Feb 2018 13:27:45 +0630
Subject: [PATCH 229/651] release_c1

---
 app/models/printer/cashier_station_printer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index 2577e8c1..fc79934d 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -35,4 +35,5 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     pdf.render_file filename
     self.print(filename, cashier_terminal.printer_name)
   end
+  #release_c1
 end

From 016d3f4187c91c5a9aaf94f8eda777f2dc2aa6f5 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Feb 2018 13:29:52 +0630
Subject: [PATCH 230/651] sqa

---
 app/models/printer/cashier_station_printer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index 3c6dac88..dc0d79d1 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -34,4 +34,5 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     pdf.render_file filename
     self.print(filename, cashier_terminal.printer_name)
   end
+  #sqa
 end

From cf644892c92094b61ba5e611c3090014562f6559 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Feb 2018 15:26:34 +0630
Subject: [PATCH 231/651] update pending and quick service

---
 .../origami/discounts_controller.rb           | 33 +++++++--
 .../origami/pending_order_controller.rb       | 11 ++-
 .../origami/quick_service_controller.rb       | 41 ++++++++---
 .../origami/sale_edit_controller.rb           |  7 +-
 app/models/sale.rb                            | 69 +++++++++++++++++++
 app/views/origami/addorders/detail.html.erb   |  7 +-
 app/views/origami/payments/show.html.erb      | 10 ++-
 app/views/origami/pending_order/show.html.erb | 11 ++-
 config/routes.rb                              |  2 +
 9 files changed, 164 insertions(+), 27 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 4b8c18f0..46dd65d0 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -161,9 +161,16 @@ class Origami::DiscountsController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find(sale_id)    
-      table_id = sale.bookings[0].dining_facility_id
-      dining = DiningFacility.find(table_id)
-      table_type = dining.type 
+      
+      if sale.bookings[0].dining_facility_id.to_i > 0
+        table_id = sale.bookings[0].dining_facility_id
+        table = DiningFacility.find(table_id)
+        table_type = table.type 
+      else
+        table_id = nil
+        table = nil
+        table_type = nil
+      end 
 
       discount_items = []                
       #destroy all discount sale item
@@ -182,14 +189,28 @@ class Origami::DiscountsController < BaseOrigamiController
       sale.sale_items.destroy(discount_items)
 
       action_by = current_user.id
-      remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{dining.name} "
+      if table.nil?
+        remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- No Table"
+      else
+        remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
+      end
       sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEALLDISCOUNT" )
       
       # Re-calc All Amount in Sale
       sale.compute_by_sale_items(sale_id, sale.sale_items, 0)
-      result = {:status=> "Success", :table_id => table_id, :dining => dining.name, :table_type => table_type }
+      if table.nil?
+        result = {:status=> "Success"}
+      else
+        result = {:status=> "Success", :table_id => table_id, :dining => table.name, :table_type => table_type }  
+      end
+      
     else 
-      result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => dining.name, :table_type => table_type }
+      if table.nil?
+        result = {:status=> "Please, Check Again!"}
+      else
+        result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => table.name, :table_type => table_type }  
+      end
+      
     end  
 
     render :json => result.to_json
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index 766c7e47..dd2f4cc7 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -9,8 +9,15 @@ class Origami::PendingOrderController < BaseOrigamiController
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
     @booking = BookingOrder.find_by_order_id(@order).booking_id
-    @table_id = Booking.find(@booking).dining_facility_id
-    @dining  = DiningFacility.find(@table_id)
+    puts "sssssssssss"
+    puts @booking
+    if Booking.find(@booking).dining_facility_id.to_i > 0
+      @table_id = Booking.find(@booking).dining_facility_id
+      @dining  = DiningFacility.find(@table_id)
+    else
+      @table_id = nil
+      @dining  = nil
+    end
   end
    helper_method :shop_detail
   def shop_detail
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 0c90530f..8dfc901c 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -16,10 +16,18 @@ class Origami::QuickServiceController < ApplicationController
 
   def modify_order
     @menu = MenuCategory.all.active
-    @table_id = params[:id]
+    if(params[:id][0,3] == "BKI")
+      @table_id = nil
+      @table = nil
+      @booking = Booking.find(params[:id])
+    else
+      @table_id = params[:id]
+      @table = DiningFacility.find(@table_id)
+      @booking = @table.get_booking
+    end
+    
     @sale_id = params[:sale_id]
-    @table = DiningFacility.find(@table_id)
-    @booking = @table.get_booking
+
     if @booking
       @booking_id = @booking.booking_id
       @order_items = Array.new
@@ -84,9 +92,13 @@ class Origami::QuickServiceController < ApplicationController
       if !params["booking_id"].nil?
           # check booking id is already completed.
           booking = Booking.find(params[:booking_id])
-
+          if params[:table_id].to_i > 0
+            table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
+          else
+            table_status = true
+          end
           if booking
-              if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
+              if table_status && booking.booking_status != 'moved'
                 if !booking.sale_id.nil?
                   sale_status = check_order_with_booking(booking)
                   if sale_status
@@ -97,17 +109,21 @@ class Origami::QuickServiceController < ApplicationController
                   @order.booking_id = params[:booking_id]
                 end
               else
+                if params[:table_id].to_i > 0
                   sale_status = check_order_with_table(params[:table_id])
                   if sale_status
                     return return_json_status_with_code(400, "bill requested")
                   end
+                end
               end
           end #booking exists
       else
-        sale_status = check_order_with_table(params[:table_id])
-        if sale_status
-          # return false , @message = "bill requested"
-          return return_json_status_with_code(400, "bill requested")
+        if params[:table_id].to_i > 0
+          sale_status = check_order_with_table(params[:table_id])
+          if sale_status
+            # return false , @message = "bill requested"
+            return return_json_status_with_code(400, "bill requested")
+          end
         end
       end
 
@@ -116,7 +132,12 @@ class Origami::QuickServiceController < ApplicationController
       if @status && @booking && @order.source == 'quick_service'
         if params[:sale_id]
           @sale = Sale.find(params[:sale_id])
-          update = Sale.add_to_existing_pending_invoice(@order.table_id,params[:sale_id])
+          if @order.table_id.to_i > 0
+            @table_id = @order.table_id
+          else
+            @table_id = nil
+          end
+          update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
         end
         
         result = {:status=> true, :data => @sale }
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index fa40e41f..f78c0f53 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -3,7 +3,12 @@ class Origami::SaleEditController < BaseOrigamiController
   # Index for sale item void OR edit
   def edit
     sale_id     = params[:sale_id]
-    @table_id   = params[:table_id]
+    if params[:table_id]
+      @table_id   = params[:table_id]
+    else
+      @table_id = nil
+    end
+    
     @cashier_type = params[:type]
     @saleobj    = Sale.find(sale_id)
   end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index a5ffa8d9..680f37b6 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1225,6 +1225,75 @@ end
     return query
   end
 
+  def self.add_to_existing_pending_invoice(dining,sale_id,booking)
+    table = DiningFacility.find(dining)
+    existing_booking = Booking.find_by_sale_id(sale_id)
+      if dining.to_i > 0
+          table.bookings.each do |booking|
+            # if !booking.checkout_at.nil?
+            #     existing_booking.update_attributes(checkout_at: checkout_at)
+            # end
+            if booking.sale_id.nil?
+               booking.booking_orders.each do |booking_order|
+                
+                   booking.booking_status = 'moved'
+                   order = Order.find(booking_order.order_id)
+                   order.status = 'billed'
+                   order.order_items.each do |item|
+                     item.order_item_status = 'billed'
+                   end
+                   #  create sale item
+                   saleobj = Sale.find(sale_id)
+                   order.order_items.each do |orer_item|
+                     saleobj.add_item (orer_item)
+                   end
+
+                   # Re-compute for add
+                   saleobj.compute
+                   saleobj.save
+                   order.save
+                   booking.save
+               end
+             
+               booking_order = BookingOrder.where('booking_id=?',booking)
+               booking_order.each do |bo|
+                 bo.booking_id = existing_booking.booking_id
+                 bo.save
+               end
+            end
+          end
+      else
+          if booking.sale_id.nil?
+               booking.booking_orders.each do |booking_order|
+                
+                   booking.booking_status = 'moved'
+                   order = Order.find(booking_order.order_id)
+                   order.status = 'billed'
+                   order.order_items.each do |item|
+                     item.order_item_status = 'billed'
+                   end
+                   #  create sale item
+                   saleobj = Sale.find(sale_id)
+                   order.order_items.each do |orer_item|
+                     saleobj.add_item (orer_item)
+                   end
+
+                   # Re-compute for add
+                   saleobj.compute
+                   saleobj.save
+                   order.save
+                   booking.save
+               end
+             
+               booking_order = BookingOrder.where('booking_id=?',booking)
+               booking_order.each do |bo|
+                 bo.booking_id = existing_booking.booking_id
+                 bo.save
+               end
+          end
+      end
+  end
+
   def self.pending_order
     query = Sale.all
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 8c6a5974..7c8d0324 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -11,6 +11,9 @@
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" id="ul-navbar">
+            <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
+              <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
+            </li>
             <% @menu.each do |menu| %>
               <% if !menu.valid_time.nil? %>
                 <% if menu.menu_category_id.nil? %>
@@ -52,9 +55,7 @@
               <% end %>
             <%end %>
             
-            <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
-              <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
-            </li>
+            
         </ul>
     </div>
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index b6d08ed0..8c275785 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -326,9 +326,10 @@ var cashier_type = "<%= @cashier_type %>";
         payment_type = '';
         
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+          console.log("ssssssssssss")
           payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
           if (member_id && member_discount) {
-
+console.log("fffffffffffff")
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
             } else{
@@ -430,7 +431,12 @@ var cashier_type = "<%= @cashier_type %>";
     var dining_id = $('#dining').text();
     var sale_id = $('#sale_id').text();
     if ($(this).attr('active')=== "true") {
-      window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
+      if (dining_id) {
+        window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
+      }else{
+        window.location.href = "/origami/table/sale/" + sale_id + "/"+cashier_type+"/edit";
+      }
+      
     }else{
       swal("Opps","You are not authorized for void","warning")
     }
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index 3b0aad83..c7233400 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -42,7 +42,7 @@
          </div>
          <div class="card-title row customer_detail p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-             Customer : <%= @sale.customer.name rescue "-" %>
+            &nbsp; Customer : <%= @sale.customer.name rescue "-" %>
 
            </div>
 
@@ -112,7 +112,6 @@
        </div>
      </div>
   </div>
-
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
@@ -136,7 +135,13 @@ $(document).ready(function(){
   });
   $('#addorder').on('click', function () {
     var table_id = "<%=@table_id%>";
-    window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val();
+    var booking_id = "<%=@booking%>";
+    if (table_id) {
+      window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val();
+    }else{
+      window.location.href = '/origami/quick_service/modify_order/'+ booking_id+"/" +$('#sale_id').val();
+    }
+    
   });
 });
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 141220a6..2b563b69 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -92,6 +92,7 @@ scope "(:locale)", locale: /en|mm/ do
     get "quick_service/pending_order/:sale_id" => "pending_order#show"
 
     get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order"
+    get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
     post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
     
 
@@ -104,6 +105,7 @@ scope "(:locale)", locale: /en|mm/ do
     end
     post 'moving' => "movetable#moving"
     get "/table/:table_id/sale/:sale_id/:type/edit" => "sale_edit#edit"
+    get "/table/sale/:sale_id/:type/edit" => "sale_edit#edit"
     post 'item_void' => "sale_edit#item_void"
     post 'item_foc' => "sale_edit#item_foc"
     post 'item_edit' => "sale_edit#item_edit"

From e50915aa3b38087da30b4f740b9461fbf75960a8 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Feb 2018 18:35:33 +0630
Subject: [PATCH 232/651] Add Dinein, Takeway, Change Total to Gross Sale,Grand
 Total

---
 app/controllers/application_controller.rb     |  14 +-
 app/controllers/origami/shifts_controller.rb  |   8 +-
 app/models/printer/cashier_station_printer.rb |   8 +-
 app/models/shift_sale.rb                      |  14 +
 app/pdf/close_cashier_customerize_pdf.rb      | 433 ++++++++++++++++++
 app/pdf/close_cashier_pdf.rb                  |   6 +-
 6 files changed, 467 insertions(+), 16 deletions(-)
 create mode 100644 app/pdf/close_cashier_customerize_pdf.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0966a573..505a38b3 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    else         
-      # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+    # else         
+    #   # check for license file
+    #   if check_license
+    #     current_license(ENV["SX_PROVISION_URL"])
+    #   else
+    #     redirect_to activate_path
+    #   end      
     end
   end
 
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index cb2cc830..8bb684e9 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -73,12 +73,15 @@ class Origami::ShiftsController < BaseOrigamiController
         @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)
+        @total_dinein               = ShiftSale.get_total_dinein(@shift).total_dinein_amount
+        @total_takeway              = ShiftSale.get_total_takeway(@shift).total_takeway_amount
+
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)
 
         printer = Printer::CashierStationPrinter.new(print_settings)
 
-        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
+        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway)
       end
     end
     Employee.logout(session[:session_token])
@@ -102,8 +105,7 @@ class Origami::ShiftsController < BaseOrigamiController
       # 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)
-
+      @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
     end
     
   end
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index fc79934d..400a0934 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -22,18 +22,18 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   # end
 
   #Bill Receipt Print
-  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway)
     #Use CUPS service
     #Generate PDF
     #Print
     cashier = shift_sale.employee.name
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
 
-    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
-    
+    pdf = CloseCashierCustomerizePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway)
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
     pdf.render_file filename
     self.print(filename, cashier_terminal.printer_name)
   end
-  #release_c1
+
+
 end
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index 57816948..0127bd5c 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -135,6 +135,20 @@ class ShiftSale < ApplicationRecord
      
   end  
 
+  def self.get_total_dinein(shift) 
+      query = Sale.select("sum(sales.grand_total) as total_dinein_amount")
+          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+          .where('shift_sale_id =? and sales.sale_status = "completed" and c.customer_type = "Dinein" and c.membership_id is null',shift.id)
+          .first()
+  end  
+
+  def self.get_total_takeway(shift) 
+      query = Sale.select("sum(sales.grand_total) as total_takeway_amount")
+          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+          .where('shift_sale_id =? and sales.sale_status = "completed" and c.customer_type = "Takeaway" and c.membership_id is null',shift.id)
+          .first()
+  end 
+
   def self.search(filter,from,to)
     if filter.blank?
         keyword = ''
diff --git a/app/pdf/close_cashier_customerize_pdf.rb b/app/pdf/close_cashier_customerize_pdf.rb
new file mode 100644
index 00000000..45834489
--- /dev/null
+++ b/app/pdf/close_cashier_customerize_pdf.rb
@@ -0,0 +1,433 @@
+class CloseCashierCustomerizePdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
+
+  def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway)
+    self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
+    self.page_height = printer_settings.page_height
+    self.margin = 5
+    self.price_width = 60
+    self.qty_width = 20
+    self.total_width = 40
+    self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
+    self.item_height = 15
+    self.item_description_width = (self.page_width-20) / 2
+    self.label_width = 100
+
+    self.text_width = (self.page_width - 80) - self.price_width / 3
+    # @item_width = self.page_width.to_i / 2
+    # @qty_width = @item_width.to_i / 3
+    # @double = @qty_width * 1.3
+    # @half_qty = @qty_width / 2
+    #setting page margin and width
+    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if printer_settings.font != ""
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+    # font "public/fonts/Zawgyi-One.ttf"
+    # font "public/fonts/padauk.ttf"
+    self.header_font_size = 10
+    self.item_font_size = 8
+
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+    #check delimiter
+    if printer_settings.delimiter
+        delimiter = ","
+    else
+        delimiter = ""
+    end
+
+    header( shop_details)
+
+    stroke_horizontal_rule
+
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_dinein,total_takeway) 
+  end
+
+  def header (shop_details)
+    move_down 7
+    text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
+    move_down 5
+    text "#{shop_details.address}", :size => self.item_font_size,:align => :center
+    # move_down self.item_height
+    move_down 5
+    text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
+    move_down 5
+
+    stroke_horizontal_rule
+  end
+
+  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_dinein,total_takeway)
+        move_down 7
+         y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Cashier : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.employee.name}" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Cashier Station : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.cashier_terminal.name}" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Opening Date : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Closing Date : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.shift_closed_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left
+        end
+        
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Opening Float : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Closing Float : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            # text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
+        end
+
+
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do
+         text "Shift Sale Summary", :size => self.header_font_size, :align => :center
+        end
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Received Amount :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Cash In :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{number_with_precision(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Cash Out :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        end
+
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        @total_grand_total = shift_sale.grand_total + @overall + @total_foc + shift_sale.total_void
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Grand Total :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Discount :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        end 
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total FOC :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+        end     
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Void :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "(#{shift_sale.total_void})", :size => self.item_font_size, :align => :right
+        end
+
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7       
+
+        @total_foc = 0
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Cash Payment :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{ number_with_precision(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Credit Payment :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
+        end
+        #start other payment details 
+        if shift_sale.other_sales > 0
+            other_payment.each do |other|
+              @total_foc = other.foc_amount.round(2)
+              y_position = cursor
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+               text "MPU Payment :", :size => self.item_font_size, :align => :right
+              end
+              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+               text "#{ number_with_precision(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+              end
+
+              y_position = cursor
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+               text "VISA Payment :", :size => self.item_font_size, :align => :right
+              end
+              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+               text "#{number_with_precision(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+              end
+
+              y_position = cursor
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+               text "Master Payment :", :size => self.item_font_size, :align => :right
+              end
+              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+               text "#{ number_with_precision(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+              end
+
+              y_position = cursor
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+               text "JCB Payment :", :size => self.item_font_size, :align => :right
+              end
+              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+               text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+              end
+
+              y_position = cursor
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+               text "Reedem Payment :", :size => self.item_font_size, :align => :right
+              end
+              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+               text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+              end
+            end
+        else
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+             text "Other Payment :", :size => self.item_font_size, :align => :right
+            end
+            bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+             text "#{ number_with_precision(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+            end
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Gross Sale :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
+        end
+
+        # end other payment details 
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        # start Dinein and Takeaway
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Dinein :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        text "#{ number_with_precision(total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+          
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Takeaway :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{ number_with_precision(total_takeway, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+          
+        end
+        # stop Dinein and Takeaway
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        #start service charges and commercial tax
+        sale_taxes.each do |tax|
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
+          end
+          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+           text "#{ number_with_precision(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+          end
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Taxes :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{ number_with_precision(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{number_with_precision(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
+        end
+        #end for service charges and commercial tax
+#COMMENTED FOR NO NEED AND NOT CORRECT WHEN OTHER CHARGES
+        # y_position = cursor
+        # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+        #  text "Total Sale :", :size => self.item_font_size, :align => :right
+        # end
+        # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        #  text "#{shift_sale.total_revenue}", :size => self.item_font_size, :align => :right
+        # end
+
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+        #start total amount by Account Like Food / Beverage /..
+        total_discount_by_account.each do |amount|
+        
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
+          end
+          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+          end
+        end
+        #end total amount by Account 
+
+        if total_member_discount[0].member_discount.present?
+          @member_discount = total_member_discount[0].member_discount rescue 0.0 
+          @overall = shift_sale.total_discounts - @member_discount
+                
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+             text "Total Member Discount :", :size => self.item_font_size, :align => :right
+            end
+            bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+            end
+        else 
+          @overall = shift_sale.total_discounts                   
+        end
+
+        # y_position = cursor
+        # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+        #  text "Grand Total :", :size => self.item_font_size, :align => :right
+        # end
+        # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        #  text "#{shift_sale.grand_total}", :size => self.item_font_size, :align => :right
+        # end
+  
+
+        #start total amount by Account Like Food / Beverage /..
+        total_amount_by_account.each do |amount|        
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right
+          end
+          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+           text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+          end
+        end
+        #end total amount by Account 
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Dine-in Count :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.dining_count}", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Takeaway Count :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.takeaway_count}", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Receipts :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.total_receipt}", :size => self.item_font_size, :align => :right
+        end
+
+        move_down 5
+        stroke_horizontal_rule
+        move_down 5
+		move_down 5
+  end
+end
+
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 35248b97..7bee4ed3 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -234,12 +234,14 @@ class CloseCashierPdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        # text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        text "#{ number_with_precision(shift_sale.total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+       
         end
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "Gross Sale :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right

From 5b354299bbd5f84b61138c2a4380bfa3a52371ee Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Fri, 16 Feb 2018 03:04:30 +0000
Subject: [PATCH 233/651] puma.rb.production edited by julian

---
 config/puma.rb.production | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/puma.rb.production b/config/puma.rb.production
index 4953a9b0..e88031af 100755
--- a/config/puma.rb.production
+++ b/config/puma.rb.production
@@ -1,7 +1,6 @@
-application_path = '/home/superuser/Application/production/sxrestaurant'
+application_path = '/home/superuser/Application/sxrestaurant'
 directory application_path
-environment ENV.fetch("RAILS_ENV") { "development" }
-daemonize true
+environment ENV.fetch("RAILS_ENV") { "production" }
 pidfile "#{application_path}/tmp/puma/pid"
 state_path "#{application_path}/tmp/puma/state"
 stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"

From cf7da9f25ce629e8517393aeda859d0bacbba6f6 Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Fri, 16 Feb 2018 03:05:10 +0000
Subject: [PATCH 234/651] secrets.yml edited online by julian

---
 config/secrets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index a0220639..73e4fc37 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -24,7 +24,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+  sx_provision_url: connect.smartsales.dev/api #192.168.1.147:3002/api
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From 2f7f412150a7da5c0f1410a47d10825efde1dde0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 16 Feb 2018 09:46:55 +0630
Subject: [PATCH 235/651] update addorder move + and box

---
 app/assets/javascripts/addorder.js          | 35 ++++++----
 app/models/sale.rb                          |  3 +-
 app/views/origami/addorders/detail.html.erb | 76 +++++++++++++--------
 3 files changed, 71 insertions(+), 43 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index bebc6f99..bc0b2721 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -164,29 +164,33 @@ $(function() {
               }else{
                 image_path = "/image/logo.png";
               }
+              if (menu_item_box == "set_item_box") {
+                add_icon = "set_item_box"
+              }else{
+                add_icon = "add_icon"
+              }
 
               row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
                        +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
                         +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
-                        +"<div class='col-md-3 add_icon' data-item-code='"
-                          + menu_items[field].code +"' data-name='"
-                          + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
-                          + price +"' data-instance-code = '"+ code +"' data-instance = '"
-                          + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
-                          + JSON.stringify(item_attributes) +"' data-options = '"
-                          + options +"' data-image='"+image_path+"'>"
-                        +"<i class='fa "+fa_plus+" '>"
-                        +add+ '</i>'
-                        +'</div>'
-                       +'</div>'
-
-                    +"<div class='"+menu_item_box+"'  data-item-code='"
+                        +"<div class='col-md-3 "+menu_item_box+"' data-item-code='"
                       + menu_items[field].code +"' data-instance = '"
                       +JSON.stringify(menu_items[field].instances)+"' data-id = '"
                       +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
                       +JSON.stringify(item_attributes)+"' data-option = '"
                       +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
-                      +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"'>"
+                      +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >"
+                        +"<i class='fa "+fa_plus+" '>"
+                        +add+ '</i>'
+                        +'</div>'
+                       +'</div>'
+                    +"<div class='"+add_icon+"' data-item-code='"
+                          + menu_items[field].code +"' data-name='"
+                          + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
+                          + price +"' data-instance-code = '"+ code +"' data-instance = '"
+                          + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
+                          + JSON.stringify(item_attributes) +"' data-options = '"
+                          + options +"' data-image='"+image_path+"' >"
 
                       +"<div class='card-block custom-card-block'>"
                         +"<img id='logo' height='125px' src='"+image_path+"'>"
@@ -434,7 +438,8 @@ $(function() {
 
     change_qty_plus_minus("count","plus","minus");
 
-    data =  $(this).parent().children().children('.add_icon');
+    // data =  $(this).parent().children().children('.add_icon');
+    data =  $(this).parent().siblings('.add_icon');
 
     $('#total_price').text(data.attr('data-price'));
     attributes         = $(this).data('id');
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 680f37b6..8979f452 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1226,9 +1226,10 @@ end
   end
 
   def self.add_to_existing_pending_invoice(dining,sale_id,booking)
-    table = DiningFacility.find(dining)
+    
     existing_booking = Booking.find_by_sale_id(sale_id)
       if dining.to_i > 0
+        table = DiningFacility.find(dining)
           table.bookings.each do |booking|
             # if !booking.checkout_at.nil?
             #     existing_booking.update_attributes(checkout_at: checkout_at)
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 7c8d0324..36f45b74 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -65,15 +65,28 @@
     </div>
 
     <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
-        <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
-          <i class="material-icons">reply</i>
-           Back
-        </button>
-        <% if type %>
-         <button type="button" class="btn btn-block btn-primary waves-effect" id='pending_order'>
-           Pending Order
-        </button>
-        <% end%>
+        
+        <% if type && modify_order%>
+          <button type="button" class="btn btn-lg btn-default waves-effect col-md-4" id='back'>
+           <!--  <i class="material-icons">reply</i> -->
+             Back
+          </button>
+           <button type="button" class="btn btn-lg btn-primary waves-effect col-md-7" id='pending_order'>Pending Order
+          </button>
+        <%elsif !modify_order && type%>
+            <button type="button" class="btn btn-lg btn-default waves-effect col-md-2" id='back' style="    padding: .5rem 0.15rem !important;">
+             <!--  <i class="material-icons">reply</i> -->
+               Back
+            </button>
+             <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="    padding: .5rem 0.15rem !important;">Pending Order
+            </button>
+            <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
+            <input type="hidden" name="table_id" value="" id="table_id">
+         <%else%>
+            <button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
+                <i class="material-icons">reply</i>Back
+            </button>
+         <%end%>
           <br>
         <div class="card-header" style="padding: 0.5rem 0.25rem">
           <% if type %>
@@ -81,19 +94,23 @@
                <div class="col-md-6 col-lg-6 col-sm-12">
                  <strong id="order-title" class="font-14">ORDER DETAILS </strong>
                </div>
+
                <% if modify_order %>
-                  <div class="col-md-6 col-lg-6 col-sm-6">Table : <%=@table.name%></div>
-                     <p class="hidden" id="table_id"><%=@table_id%></p>
-                     <p class="hidden" id="table_type"><%=@table.type%></p>
+                    <% if @table.nil? %>
+                       <div class="col-md-6 col-lg-6 col-sm-6">Table : </div>
+                       <p class="hidden" id="table_id"><%=@table_id%></p>
+                       <p class="hidden" id="table_type"></p>
+                    <% else%>
+                      <div class="col-md-6 col-lg-6 col-sm-6">Table : <%=@table.name%></div>
+                      <p class="hidden" id="table_id"><%=@table_id%></p>
+                      <p class="hidden" id="table_type"><%=@table.type%></p>
+                    <% end%>
+                     
                      <p class="hidden" id="booking_id"><%=@booking_id%></p>
                      <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
                      <p class="hidden" id="sale_id"><%=@sale_id%></p>
               <% else%>
-                <div class="col-md-2 col-lg-2 col-sm-6">Table</div> 
-                  <div class="col-md-4 col-lg-4 col-sm-6 m-t--5">
-                     <a class="btn btn-block bg-blue waves-effect select_table" data-toggle="modal" data-target="#TableModal">Select</a>
-                     <input type="hidden" name="table_id" value="" id="table_id">
-                  </div>
+                
               <% end%>
             </div>
           <% else %>
@@ -123,23 +140,28 @@
                  </tbody>
                </table>
             </div>
-            <div class="card-footer custom-card-footer">
+            <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
             
-               <table class="table" id="order-charges-table" border="0">
+               <!-- <table class="table" id="order-charges-table" border="0">
                  <tr>
                    <td class="charges-name"><strong>Sub Total:</strong></td>
                    <td class="item-attr"><strong id="sub_total">0.00</strong></td>
                  </tr>
-               </table>
-
-                <% if type %>
+               </table> -->
+               <% if type && modify_order%>
                   <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
                   
-                  <button type="button" class="btn btn-primary btn-block create" id="create_pay_order" disabled="disabled"><%if modify_order%>Update Order & Pay<%else%>Create Order & Pay<%end%></button>
-                <% end %>
-                <% if !modify_order %>
-               <button type="button" class="btn btn-primary btn-block create m-t-5" id="create_order" disabled="disabled">Create Order</button>
-               <% end %>
+                    <button type="button" class="btn btn-primary btn-lg create col-md-10" id="create_pay_order" disabled="disabled">Update Order & Pay</button>
+              <%elsif !modify_order && type%>
+                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
+                  
+                    <button type="button" class="btn btn-primary btn-lg create col-md-6" id="create_pay_order" disabled="disabled">Create & Pay</button>
+                    <button type="button" class="btn btn-primary btn-lg create col-md-5" id="create_order" disabled="disabled">Create Order</button>
+               <%else%>
+               <button type="button" class="btn btn-primary btn-lg create col-md-10" id="create_order" disabled="disabled">Create Order</button>
+               <%end%>
+
+                
             </div>
         </div>
     </div>

From 0ddaee7444a65962ca9d8e001f496708e2ad03d7 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Feb 2018 12:13:35 +0630
Subject: [PATCH 236/651] equal split and order split in order tab'

---
 app/controllers/origami/orders_controller.rb  |  32 ++-
 .../origami/payments_controller.rb            |  18 +-
 .../origami/split_bill_controller.rb          |  27 +-
 app/controllers/origami/surveys_controller.rb |  27 ++
 .../origami/table_invoices_controller.rb      |   6 +
 app/controllers/origami/void_controller.rb    |   4 +-
 app/models/printer/receipt_printer.rb         |   8 +-
 app/pdf/receipt_bill_a5_pdf.rb                |  53 +++-
 app/pdf/receipt_bill_pdf.rb                   |  24 +-
 app/views/origami/home/show.html.erb          |  16 +-
 app/views/origami/orders/show.html.erb        |  59 ++++-
 app/views/origami/rooms/show.html.erb         |   2 +-
 app/views/origami/split_bill/index.html.erb   | 240 ++++++++++++++++--
 .../origami/table_invoices/show.html.erb      |  48 ++--
 config/routes.rb                              |   1 +
 lib/tasks/clear_data.rake                     |   1 +
 16 files changed, 481 insertions(+), 85 deletions(-)

diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index bb1a8752..fced3d02 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -5,6 +5,16 @@ class Origami::OrdersController < BaseOrigamiController
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @order = Order.find(params[:order_id])
+    booking = Booking.select('bookings.booking_id, bookings.dining_facility_id')
+              .joins(" JOIN booking_orders as bo on bo.booking_id = bookings.booking_id")
+              .where("bo.order_id='#{params[:order_id]}'").first()
+
+    @booking = Array.new
+    if !booking.nil?
+      dining_facilities = DiningFacility.find_by_id(booking.dining_facility_id)
+      @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => dining_facilities.type})
+    end
+
     sale_order = SaleOrder.find_by_order_id(@order.order_id)
     if sale_order
       unless sale_order.sale_id.nil?
@@ -12,19 +22,17 @@ class Origami::OrdersController < BaseOrigamiController
         @sale_status = sale.sale_status
       end
     end
-
-    @orders.each do |order|
-      order.order_items.each_with_index do |item, index|
-        if !item.set_menu_items.nil?
-          instance_item_sets = JSON.parse(item.set_menu_items)
-          arr_instance_item_sets = Array.new
-          instance_item_sets.each do |instance_item|
-            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-            arr_instance_item_sets.push(item_instance_name)
-            item.price = item.price.to_f + instance_item["price"].to_f
-          end
-          order.order_items[index].set_menu_items = arr_instance_item_sets
+    
+    @order.order_items.each_with_index do |item, order_item_index|
+      if !item.set_menu_items.nil?
+        instance_item_sets = JSON.parse(item.set_menu_items)
+        arr_instance_item_sets = Array.new
+        instance_item_sets.each do |instance_item|
+          item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+          arr_instance_item_sets.push(item_instance_name)
+          item.price = item.price.to_f + instance_item["price"].to_f
         end
+        @order.order_items[order_item_index].set_menu_items = arr_instance_item_sets
       end
     end
 
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index adb67963..978d424f 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -8,7 +8,8 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(sale_id)
     sale_items = SaleItem.where("sale_id=?",sale_id)
     member_info = nil
-
+    survey = Survey.find_by_receipt_no(sale_data.receipt_no)
+    
     # For Cashier by Zone
     bookings = Booking.where("sale_id='#{sale_id}'")
     if bookings.count > 1 
@@ -60,7 +61,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       printer = Printer::ReceiptPrinter.new(print_settings)
 
-      printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil)    
+      printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil,survey)    
     end
   end
 
@@ -72,6 +73,7 @@ class Origami::PaymentsController < BaseOrigamiController
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
+      survey = Survey.find_by_receipt_no(saleObj.receipt_no)
       # rounding adjustment
       if shop_details.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
@@ -139,7 +141,7 @@ class Origami::PaymentsController < BaseOrigamiController
         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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+        printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data,survey)
       end
     end    
   end
@@ -245,7 +247,8 @@ class Origami::PaymentsController < BaseOrigamiController
     member_info = nil
 
     saleObj = Sale.find(sale_id)
-
+    survey = Survey.find_by_receipt_no(saleObj.receipt_no)
+    
     # For Cashier by Zone
     bookings = Booking.where("sale_id='#{sale_id}'")
     if bookings.count > 1 
@@ -292,7 +295,7 @@ class Origami::PaymentsController < BaseOrigamiController
       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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data)
+      printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data,survey)
     end
   end
 
@@ -306,7 +309,8 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
-         
+      survey = Survey.find_by_receipt_no(saleObj.receipt_no)
+
       if saleObj.discount_type == "member_discount"
         saleObj.update_attributes(rounding_adjustment: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
@@ -344,7 +348,7 @@ class Origami::PaymentsController < BaseOrigamiController
         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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)   
+        printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil,survey)   
       end
     end    
   end
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index f2284e15..dd8dd990 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -18,10 +18,10 @@ class Origami::SplitBillController < BaseOrigamiController
 
 		if @booking
 	      	@booking.booking_orders.each do |booking_order|
+	      		arr_order_items = Array.new
 	        	@order = Order.find(booking_order.order_id)
 		        if (@order.status == "new")
 		        	@orders.push(@order)
-		        	@order_items.push({'all_order' => @order.order_items})
 
 					@order.order_items.each do |item|
 						if !item.set_menu_items.nil?
@@ -59,19 +59,19 @@ class Origami::SplitBillController < BaseOrigamiController
 									'updated_at' => item.updated_at}
 								i += 1
 								@order_items.push({@order.order_id => arr_item})
+								arr_order_items.push(arr_item)
 							end
 						else
+							arr_order_items.push(item)
 							@order_items.push({@order.order_id => item})
 						end
 					end
+					@order_items.push({'all_order' => arr_order_items})
 		        end
 	      	end
 	    else
 	      @booking = nil
 	    end
-
-	    puts "@order_items"
-	    puts @order_items.to_json
 	end
 
 	def create
@@ -160,19 +160,19 @@ class Origami::SplitBillController < BaseOrigamiController
 							if !updated_order_id.empty?
 								order_ids.each do |odr_id|
 									unless updated_order_id.include?(odr_id)
-										BookingOrder.find_by_order_id(odr_id).delete
+										# BookingOrder.find_by_order_id(odr_id).delete
 										BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
 									end
 								end
 
 								order_items.each do |order_item|
 									if updated_order_id.include?(order_item["order_id"])
-								       	update_order_item(order_item)
+								       	update_order_item(order_id, order_item)
 								    end
 							    end
 							else
 								order_ids.each do |odr_id|
-									BookingOrder.find_by_order_id(odr_id).delete
+									# BookingOrder.find_by_order_id(odr_id).delete
 									BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
 								end
 							end
@@ -181,12 +181,15 @@ class Origami::SplitBillController < BaseOrigamiController
 							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
 							
 							order_items.each do |order_item|
-								update_order_item(order_item)
+								update_order_item(order_id, order_item)
 						    end
 						end
 					else
 						if order_ids.count == 1 && order_id_count > 0 && order_item_count == 1
 							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
+							order_items.each do |order_item|
+								update_order_item(order_ids[0], order_item)
+						    end
 						else
 							customer = Customer.find(params[:customer_id])
 							order_type = "dine_in"
@@ -214,7 +217,7 @@ class Origami::SplitBillController < BaseOrigamiController
 						    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
 						    order_items.each do |order_item|
-						    	update_order_item(order_item)
+						    	update_order_item(order.id, order_item)
 						    end
 						end
 					end
@@ -239,7 +242,7 @@ class Origami::SplitBillController < BaseOrigamiController
 	    end
 	end
 
-	def update_order_item(order_item)
+	def update_order_item(order_id, order_item)
 		orderItem = OrderItem.find(order_item["id"])
     	if orderItem.qty.to_f != order_item['qty'].to_f
     		OrderItem.processs_item(orderItem.item_code, 
@@ -251,13 +254,13 @@ class Origami::SplitBillController < BaseOrigamiController
 				orderItem.price, 
 				orderItem.options, 
 				orderItem.set_menu_items, 
-				orderItem.order_id,
+				order_id,
 				orderItem.item_order_by, 
 				orderItem.taxable)
 
     		orderItem.qty = orderItem.qty.to_f - order_item['qty'].to_f
     	else
-	    	orderItem.order_id = order.order_id
+	    	orderItem.order_id = order_id
 	    end
     	orderItem.save!
 	end
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 90ff4c08..f7d637d6 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -30,6 +30,33 @@ class Origami::SurveysController < BaseOrigamiController
 		  end
 		# end
 	end
+
+	def create_survey
+		if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+			dining_facility   = DiningFacility.find(params[:dining_id])
+			cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
+		    shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+			
+			survey = Survey.find_by_receipt_no(params[:receipt_no])
+			
+			if survey.nil?
+				survey = Survey.new
+				survey.dining_name = dining_facility.name
+				survey.receipt_no = params[:receipt_no]
+				survey.shift_id = shift_by_terminal.id
+				survey.created_by = current_user.name
+				survey.total_customer = params[:total_customer]
+				survey.total_amount = params[:total_amount]
+				survey.save!
+			else
+				survey.total_customer = params[:total_customer]
+				survey.save!
+			end
+			render :json => {status: true}
+		else
+			render :json => { status: false, error_message: 'No Current Open Shift!'}
+		end
+	end
 	
 	private
 
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index a9d5d340..f2dd132a 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -59,6 +59,12 @@ class Origami::TableInvoicesController < BaseOrigamiController
     @date = @sale.created_at
     @status_sale = 'sale'
     @customer = @sale.customer
+    #for split bill
+    lookup_spit_bill = Lookup.collection_of('split_bill')
+    @split_bill = 0
+    if !lookup_spit_bill[0].nil?
+      @split_bill = lookup_spit_bill[0][1]
+    end
   end
 
   #Shop Name in Navbor
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index f9fbe55a..8fb7c0ae 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -6,6 +6,8 @@ class Origami::VoidController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
+      survey = Survey.find_by_receipt_no(sale.receipt_no)
+
       if sale.discount_type == "member_discount"
         sale.update_attributes(total_discount: 0)
         sale.compute_by_sale_items(sale_id, sale.sale_items,0)
@@ -107,7 +109,7 @@ class Origami::VoidController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
         printer = Printer::ReceiptPrinter.new(print_settings)
-        printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
+        printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,survey)   
       end
       
       #end print
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 0cf6526f..c60fcc35 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -173,19 +173,19 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Bill Receipt Print
-  def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data)
+  def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data,survey)
     #Use CUPS service
     #Generate PDF
     #Print
-    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,survey)
     receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
     if !receipt_bill_a5_pdf.empty?
       receipt_bill_a5_pdf.each do |receipt_bilA5|
         if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
           if receipt_bilA5[1] == '1'
-            pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
+            pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,survey)
           else
-            pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
+            pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,survey)
           end
         end
       end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 2dde9c93..898b8cf3 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -1,7 +1,7 @@
 class ReceiptBillA5Pdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 15
@@ -65,6 +65,12 @@ class ReceiptBillA5Pdf < Prawn::Document
 
     customer(customer_name)
 
+    #start card sale trans data
+    if card_data != nil
+        card_sale_data(card_data)
+    end
+    #end card sale trans data
+
     if discount_price_by_accounts.length > 0 && shop_details.show_account_info
         discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
     end
@@ -73,6 +79,12 @@ class ReceiptBillA5Pdf < Prawn::Document
        items_account(item_price_by_accounts,printer_settings.precision,delimiter)
     end
 
+    #start for individual payment
+    if !survey.nil?
+        individual_payment(sale_data, survey, printer_settings.precision, delimiter)
+    end
+    #end for individual payment
+
     sign(sale_data)
 
     footer(printed_status)
@@ -459,6 +471,22 @@ class ReceiptBillA5Pdf < Prawn::Document
         end
     end
 
+    #individual payment per person
+    def individual_payment(sale_data, survey, precision, delimiter)
+        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+        move_down 5
+        stroke_horizontal_rule
+        move_down 5
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width) do
+            text "Individual amount", :size => self.item_font_size,:align => :left
+        end
+
+        bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
+            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)} per person", :size => self.item_font_size,:align => :right
+        end
+    end
+
     def sign(sale_data)
         SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment|        
             if payment.payment_method == "creditnote"
@@ -513,6 +541,29 @@ class ReceiptBillA5Pdf < Prawn::Document
         move_down 10
     end
 
+    #start card sale trans data
+    def card_sale_data(card_data)
+        if card_data != nil && !card_data.empty?
+            move_down 5
+            stroke_horizontal_rule
+            move_down 5
+
+            y_position = cursor
+            card_data.each do |data|
+                if data['app'] == 'CUP'
+                    data['app'] = 'UNIONPAY'
+                elsif data['app'] == 'MASTERCARD'
+                    data['app'] = 'MASTER'
+                end
+                text "DATE/TIME: #{data['res_date']}    #{data['res_time']} ", :size => @item_font_size, :align => :left
+                text "BATCH NUM: #{data['batch_no']}                          TRACE#: #{data['trace']}",:size => @item_font_size, :align => :left
+                text "RREF NUM: #{data['ref_no']}             APPR CODE: #{data['app_code']} ",:size => @item_font_size, :align => :left
+                text "TID: #{data['tid']} ",:size => @item_font_size, :align => :left
+                text "#{data['app']}    #{data['pan']} ",:size => @item_font_size, :align => :left
+            end
+        end
+    end
+
     #check ReceiptBillAltName included
     def show_alt_name
         bill_alt_name = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index d2ad0260..e8ca4bb2 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -1,7 +1,7 @@
 class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 0
@@ -79,6 +79,12 @@ class ReceiptBillPdf < Prawn::Document
        items_account(item_price_by_accounts,printer_settings.precision,delimiter)
     end
 
+    #start for individual payment
+    if !survey.nil?
+        individual_payment(sale_data, survey, printer_settings.precision, delimiter)
+    end
+    #end for individual payment
+
     sign(sale_data)
 
     footer(printed_status)
@@ -465,6 +471,22 @@ class ReceiptBillPdf < Prawn::Document
         end
     end
 
+    #individual payment per person
+    def individual_payment(sale_data, survey, precision, delimiter)
+        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+        move_down 5
+        stroke_horizontal_rule
+        move_down 5
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width) do
+            text "Individual amount", :size => self.item_font_size,:align => :left
+        end
+
+        bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
+            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)} per person", :size => self.item_font_size,:align => :right
+        end
+    end
+
     def sign(sale_data)
         SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment|        
             if payment.payment_method == "creditnote"
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 19f308a1..28094ee8 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -386,9 +386,14 @@
                           end
                         %>
                       </table>
-                      <button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice</button>
-                      <% if !@spit_bill.nil? && @spit_bill == '1' %>
-                        <button class='btn btn-primary btn-block waves-effect' id='split_bill'> Split Bill</button>
+                      
+                      <% if !@split_bill.nil? %> 
+                        <% if @split_bill == '1' %>
+                          <button class='btn btn-primary waves-effect' id='add_invoice'> Add to existing invoice</button>
+                          <button class='btn btn-primary waves-effect' id='split_bill'> Split Bill</button>
+                        <% else %>
+                          <button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice</button>
+                        <% end %>
                       <% end %>
                   <% end %>
                   <% if @sale_array.size > 1 %>
@@ -407,6 +412,11 @@
                                     <button class='btn btn-sm btn-primary invoicedetails' id="<%= sale.sale_id %>">Show
                                       Detail
                                     </button>
+                                    <% if !@split_bill.nil? %> 
+                                      <% if @split_bill == '1' %>
+                                        <button class='btn btn-sm btn-primary waves-effect' id='split_bill'> Split Bill</button>
+                                      <% end %>
+                                    <% end %>
                                   </td>
                                 </tr>
                               </table>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index a1a914fd..4e9d09b1 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -240,7 +240,8 @@
 
 <!-- Column Three -->
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
+ <button type="button" class="btn bg-default btn-block waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
+ <button type="button" class="btn bg-blue btn-block waves-effect" id='by_order'>By Order</button>
  <% if @sale_status != 'completed' %>
  <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
  <% end %>
@@ -285,5 +286,59 @@
   })
   $('#move').on('click',function(){
 
-  })
+  });
+
+  //order_split
+  $('#by_order').on('click',function () {
+    swal({
+      title: "Alert",
+      text: "Are you sure, you want to Split?",
+      type: "warning",
+      showCancelButton: true,
+      confirmButtonColor: "#DD6B55",
+      confirmButtonText: "Yes, split it!",
+      closeOnConfirm: false
+    }, function (isConfirm) {
+      if(isConfirm){
+        orderSplitBillProcess();
+      }
+    });
+  });
+
+  /* function for order items split bill process */
+  function orderSplitBillProcess(){
+    var booking = JSON.parse('<%= @booking.to_json.html_safe %>');
+    var orders = JSON.parse('<%= @orders.to_json.html_safe %>');
+    var order = JSON.parse('<%= @order.to_json.html_safe %>');
+    var arr_order = [];
+    arr_order.push({id : order.order_id});
+    
+    var dining_id       = booking[0].dining_facility_id || 0;
+    var type       = booking[0].type || '';
+    var customer_id     = order.customer_id || '';
+    var booking_id = "";
+    if(orders.length == 1){
+      booking_id = booking[0].booking_id;
+    }
+    
+    var ajax_url = "/origami/split_bills";
+    $.ajax({
+      type: "POST",
+      url: ajax_url,
+      dataType: 'JSON',
+      data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(arr_order)},
+      success: function (result) {
+        if (!result.status) {
+          swal("Information!", result.error_message);
+        }
+        else{
+            if(type=='Table'){
+              window.location.href = '/origami/table/' + dining_id;
+            }else{
+              window.location.href = '/origami/room/' + dining_id;
+            }
+          }
+        }
+      });
+  }
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 22affbdc..b367f212 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -365,7 +365,7 @@
                    %>
                      </table>
                     <button class='btn bg-primary' id='add_invoice'> Add to existing invoice </button>
-                    <% if !@spit_bill.nil? && @spit_bill == '1' %>
+                    <% if !@split_bill.nil? && @split_bill == '1' %>
                       <button class='btn btn-primary' id='split_bill'> Split Bill</button>
                     <% end %>
                    <% end %>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 70d9f147..216507ea 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -20,18 +20,18 @@
  					</div>
  					<div id="split-order-slimscroll" data-height="70">
  						<div class="card-text dining">
- 							<% if !@orders.nil? %>
+ 							<% if !@orders.empty? %>
  							<div class="row">
  								<div class="col-lg-12 col-md-12 col-sm-12">
  									<div class="row m-l-5">
  										<div class="col-lg-3 col-md-3 col-sm-3">
  											<ul class="nav nav-tabs tabs-left sideways">
  												<li class="order-row active">
-													<a href="#all_order" data-toggle="tab">All</a>
+													<a href="#all_order" data-toggle="tab"><strong>All</strong></a>
 												</li>
  												<% @orders.each.with_index(0) do |order, order_index| %>
  													<li class="order-row">
- 														<a href="#<%= order.order_id %>" data-toggle="tab"><%= order.order_id %></a>
+ 														<a href="#<%= order.order_id %>" data-toggle="tab"><strong><%= order.order_id %></strong></a>
  													</li>
  												<% end %>
  											</ul>
@@ -188,13 +188,28 @@
  					</div>
  					<div id="split-receipt-slimscroll" data-height="150">
  						<div class="card-text dining">
- 							<% if !@sale_data.nil? %>
+ 							<% if !@sale_data.empty? %>
  							<table class="table table-default">
+ 								<thead>
+ 									<th>#</th>
+ 									<th>Receipt No.</th>
+ 									<th>Total</th>
+ 									<th>Action</th>
+ 								</thead>
  								<tbody>
- 									<% @sale_data.each do |sale_data| %>
-	 									<% if sale_data.sale_status != 'completed' %>
-	 									<tr class="receipt_row" id=<%= sale_data.sale_id %> >
-	 										<td>Receipt No. - <span id="receipt_no"><%= sale_data.receipt_no %></span></td>
+ 									<% @sale_data.each_with_index do |sale_data, sale_index| %>
+	 									<% if sale_data.sale_status != 'completed' && sale_data.sale_status != 'void' %>
+	 									<% checked = "" %>
+	 									<% if sale_index == 0 %>
+	 										<% checked = "checked" %>
+	 									<% end %>
+	 									<tr class="receipt-row" id=<%= sale_data.receipt_no %> data=<%= sale_data.grand_total %> >
+	 										<td><input type="radio" name="rdn_receipt" id="rdn_receipt" value="<%= sale_data.sale_id %>" <%= checked %>></td>
+	 										<td><span id="receipt_no"><%= sale_data.receipt_no %></span></td>
+	 										<td><span id="grand_total"><%= sale_data.grand_total %></span></td>
+	 										<td>
+	 											<button type="button" class="btn btn-block waves-effect btn-primary btn_pay" id=<%= sale_data.sale_id %> >Pay</button>
+	 										</td>
 	 									</tr>
 	 									<% end %>
  									<% end %>
@@ -213,16 +228,94 @@
  			<!-- Action Panel -->
  			<div>
  				<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
- 				<button id="equal_split" class="btn btn-primary text-center action-btn waves-effect">= Split </button>
- 				<button id="order_split" class="btn btn-primary text-center action-btn waves-effect">By Order &nbsp;</button>
- 				<button id="order_item_split" class="btn btn-primary text-center action-btn waves-effect">By Order Item</button>
+ 				<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
+ 				<button id="order_split" class="btn btn-block waves-effect bg-blue">By Order</button>
+ 				<button id="order_item_split" class="btn btn-block waves-effect bg-blue">By Order Item</button>
  			</div>
  		</div>
  		<!-- Column Three -->
  	</div>
+
+ 	<!-- modal for equal person -->
+	<div class="modal fade" id="equal_split_modal" tabindex="-1" role="dialog" aria-labelledby="equal_split_modal_label" aria-hidden="true">
+	  <div class="modal-dialog" role="document">
+	    <div class="modal-content">
+	      <div class="modal-header">
+	        <h5 class="modal-title" id="equal_split_modal_label">Equal Split (per person)</h5>
+	        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+	          <span aria-hidden="true">&times;</span>
+	        </button>
+	      </div>
+	      <div class="modal-body">
+				<div class="form-horizontal">
+					<div class="col-lg-12 col-md-12 col-sm-12">	
+						<div class="form-group">	
+							<input type="text" id="per_person" name="per_person" class="form-control" onkeypress="return isNumberKey(event);"/>
+						</div>					
+					</div>
+				</div>
+
+				<hr />
+				<div class="p-l-50">
+					<div class="row">
+					<div class="col-lg-12 col-md-12 col-sm-12">
+						<div class="row bottom">
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" data-value="1" data-type="num" style="margin-left: 6px;">1</div>
+									<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
+									<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="row bottom clearfix">
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" data-value="4" data-type="num" style="margin-left: 6px;">4</div>
+									<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
+									<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="row bottom">
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" data-value="7" data-type="num" style="margin-left: 6px;">7</div>
+									<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
+									<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="row bottom">
+							<div class="col-md-9">
+								<div class="row">
+									<div class="col-md-3 cashier_number" style="margin-left: 6px;"></div>
+									<div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
+									<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					</div>	
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn bg-default" data-dismiss="modal">Close</button> &nbsp;&nbsp;
+				<button type="button" class="btn bg-blue btn_per_person">Split Bill</button>
+			</div>
+	    </div>
+	  </div>
+	</div>
+ 	<!-- modal for equal person -->
  </div>
 
  <script type="text/javascript">
+ 	var split_sale_id = "";
+ 	var split_receipt_no = "";
+ 	var split_total_amount = 0;
  	$(document).ready(function(){
 
  		$('#back').on('click',function(){
@@ -236,28 +329,28 @@
  				var input_type = $(this).attr("data-type");
  				switch (input_type) {
  					case 'num':
- 					var input_value = $(this).attr("data-value");
- 					if (original_value == "0"){
- 						$('#per_person').val(input_value);						
- 					}
- 					else{
- 						$('#per_person').val(original_value + '' + input_value);						
- 					}
+	 					var input_value = $(this).attr("data-value");
+	 					if (original_value == "0"){
+	 						$('#per_person').val(input_value);						
+	 					}
+	 					else{
+	 						$('#per_person').val(original_value + '' + input_value);						
+	 					}
  					break;
 
  					case 'add':
- 					var input_value = $(this).attr("data-value");
- 					amount = parseInt(input_value);
- 					$('#per_person').val(amount);										
+	 					var input_value = $(this).attr("data-value");
+	 					amount = parseInt(input_value);
+	 					$('#per_person').val(amount);										
  					break;
 
  					case 'del' :
- 					var discount_text=$('#per_person').val();
- 					$('#per_person').val(discount_text.substr(0,discount_text.length-1));		
+	 					var discount_text=$('#per_person').val();
+	 					$('#per_person').val(discount_text.substr(0,discount_text.length-1));		
  					break;
 
  					case 'clr':
- 					$('#per_person').val("0");	            
+ 						$('#per_person').val("");	            
  					break;
  				}
  				event.handled = true;
@@ -307,6 +400,21 @@
 
 	// Selected Order 
 	$('.order-row').on('click',function(){
+		var orders = JSON.parse('<%= @orders.to_json.html_safe %>');
+		var check_order_id = $(this).find('a').attr('href').substr(1);
+		
+		if(check_order_id == 'all_order'){
+			if(orders.length > 0){
+				$.each(orders, function(key,value){
+					if($("a[href$='#"+value.order_id+"']").parent().hasClass('selected-split-item')){
+						$("a[href$='#"+value.order_id+"']").parent().removeClass('selected-split-item');
+					}
+				});
+			}
+		}else{
+			$("a[href$='#all_order']").parent().removeClass('selected-split-item');
+		}
+
 		if($(this).hasClass('selected-split-item') == true){
 			$(this).removeClass('selected-split-item');
 		}
@@ -319,7 +427,17 @@
 	$('#order_split').on('click',function () {
 		var cnt_orders = "<%= @orders.count %>";
 		var orders = get_selected_orders();// Selected Order Items
-		var cnt_odrs = parseInt(cnt_orders) - parseInt(orders.length);
+		var cnt_odrs = 0;
+		if(orders.length == 1){
+			if(orders[0].id == 'all_order'){
+				cnt_odrs = 0;
+			}else{
+				cnt_odrs = parseInt(cnt_orders) - parseInt(orders.length);
+			}
+		}else{
+			cnt_odrs = parseInt(cnt_orders) - parseInt(orders.length);
+		}
+
 		if (orders.length > 0){
 			// if(cnt_odrs > 0){
 				swal({
@@ -345,12 +463,82 @@
 	});
 
 	//selected receipt row click
-	$('.receipt_row').on('click',function(){
+	$('.btn_pay').on('click',function(){
 		var dining_id       = $("#table_id").text();
 		var sale_id = $(this).attr('id').substr(0,16);
 		window.location = '/origami/table/' + dining_id + "/table_invoice/" + sale_id;
 	});
 
+	//equal split process
+	$('#equal_split').on('click', function(){
+		split_sale_id = $("input[type='radio'][name='rdn_receipt']:checked").val();
+		split_receipt_no = $("input[type='radio'][name='rdn_receipt']:checked").parent().parent().attr('id');
+		split_total_amount = $("input[type='radio'][name='rdn_receipt']:checked").parent().parent().attr('data');
+		if(split_sale_id != undefined && split_sale_id != ""){
+			$('#equal_split_modal').modal({backdrop: 'static', keyboard: true, show: true});
+		}
+		else{
+			swal("Opps","Please select one receipt!","warning");
+		}
+	});
+
+	$('.btn_per_person').on('click', function(){
+		$('#equal_split_modal').modal('hide');
+		var person = parseInt($('#per_person').val());
+		if(person > 1){
+			var ajax_url = "/origami/split_bills/surveys";
+			var dining_id       = $("#table_id").text();
+			var type     = $("#table_type").text();
+			
+			$.ajax({
+				type: "POST",
+				url: ajax_url,
+				dataType: 'JSON',
+				data: {'dining_id':dining_id, 'sale_id':split_sale_id, 'receipt_no':split_receipt_no, 'total_customer': person, 'total_amount':split_total_amount  },
+				success: function (result) {
+					console.log(result);
+					if(result.status){
+						var ajax_url = "/origami/sale/" + split_sale_id + "/first_bill";
+				        $.ajax({
+				            type: "GET",
+				            url: ajax_url,
+				            success: function (result) {
+				              	if((split_receipt_no!=undefined) && (split_receipt_no!=""))
+				                	createReceiptNoInFirstBillData(split_receipt_no,"");
+				            	
+				            	location.reload();
+				            	// if(type=='Table'){
+				            	// 	window.location.href = '/origami/table/' + dining_id;
+				            	// }else{
+				            	// 	window.location.href = '/origami/room/' + dining_id;
+				            	// }
+				            }
+				        }); 
+					}
+		        }
+		    });
+		}else{
+			var ajax_url = "/origami/sale/" + split_sale_id + "/first_bill";
+	        $.ajax({
+	            type: "GET",
+	            url: ajax_url,
+	            success: function (result) {
+	              	if((split_receipt_no!=undefined) && (split_receipt_no!=""))
+	                	createReceiptNoInFirstBillData(split_receipt_no,"");
+	            	
+	            	location.reload();
+	            	// if(type=='Table'){
+	            	// 	window.location.href = '/origami/table/' + dining_id;
+	            	// }else{
+	            	// 	window.location.href = '/origami/room/' + dining_id;
+	            	// }
+	            }
+	        });
+		}
+	});
+
+	//equal split process
+
 	//slimscroll for order, order items, reciept
 	var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
 
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index b70c2ffc..f87fcdc4 100755
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -142,7 +142,7 @@
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
-   <button type="button" id="void" class="btn bg-danger btn-block"> Void </button>
+   <button type="button" id="void" class="btn bg-danger btn-block" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true" > Void </button>
  </div>
 </div>
 </div>
@@ -173,22 +173,40 @@ $('#pay').on('click',function() {
    window.location.href = '/origami/sale/'+ sale_id + "/payment";
 });
 $('#back').on('click',function(){
-  window.location.href = '/origami/table/<%= @table.id %>';
+  var lookup_split_bill = '<%= @split_bill %>';
+  if(lookup_split_bill == '1'){
+    window.location.href = '/origami/table/<%= @table.id %>/split_bills';
+  }else{
+    window.location.href = '/origami/table/<%= @table.id %>';
+  }
+  
 });
-$('#void').on('click',function () {
-    var sure = confirm("Are you sure want to Void");
-    if (sure == true) {
-        var sale_id = $('#sale_id').val();
-        var ajax_url = "/origami/sale/" + sale_id + '/void';
-        $.ajax({
-            type: 'POST',
-            url: ajax_url,
-            success: function () {
-                window.location.href = '/origami/';
-            }
-        })
-    } else {
 
+$('#void').on('click',function () {
+    if ($(this).attr('active')=== "true") {
+      swal({
+          title: "Alert",
+          text: "Are you sure want to Void?",
+          type: "warning",
+          showCancelButton: true,
+          confirmButtonColor: "#DD6B55",
+          confirmButtonText: "Yes, void it!",
+          closeOnConfirm: false
+      }, function (isConfirm) {
+        if (isConfirm) {
+          var sale_id = $('#sale_id').val();
+          var ajax_url = "/origami/sale/" + sale_id + '/void';
+          $.ajax({
+              type: 'POST',
+              url: ajax_url,
+              success: function () {
+                  window.location.href = '/origami/';
+              }
+          });
+        }
+      }); 
+    }else{
+      swal("Opps","You are not authorized for void","warning")
     }
 });
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index f37c6895..0b21460f 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -224,6 +224,7 @@ scope "(:locale)", locale: /en|mm/ do
     get '/table/:dining_id/split_bills' => 'split_bill#index'
     get '/room/:dining_id/split_bills' => 'split_bill#index'
     post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
+    post '/split_bills/surveys', to: 'surveys#create_survey'
   end
 
   #--------- Waiter/Ordering Station ------------#
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 126d8db7..17dcde74 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -14,6 +14,7 @@ namespace :clear do
     SalePayment.delete_all
     ShiftSale.delete_all
     PaymentJournal.delete_all
+    Survey.delete_all
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
     puts "Clear Data Done."

From 941204afc1a64871d852c8882e4ce6b9163849a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 16 Feb 2018 14:30:53 +0630
Subject: [PATCH 237/651] update add order

---
 app/assets/javascripts/addorder.js            |  76 ++++++-----
 .../origami/quick_service_controller.rb       |   2 +-
 app/views/origami/addorders/detail.html.erb   | 123 ++++++------------
 3 files changed, 89 insertions(+), 112 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index bc0b2721..91c02552 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -123,8 +123,10 @@ $(function() {
               if (JSON.stringify(menu_items[field].item_sets)!='[]') {
                 fa_plus = '';
                 add = '';
-                menu_item_box = 'set_item_box';
+                menu_item_box = 'add_icon';
                 data_target = 'sx_item_set_detailModal';
+                data_modal = 'modal'
+                add_icon = "set_item_box"
                    code            =  menu_items[field].code;
                    name            =  menu_items[field].name;
                    instances       =  menu_items[field].instances;
@@ -144,6 +146,8 @@ $(function() {
                 add = 'add'
                 menu_item_box = 'menu_item_box';
                 data_target = 'sx_item_detailModal';
+                data_modal  = ''
+                add_icon = "add_icon"
 
                 $(instances).each(function(i){
                   if (instances[i].is_default === true) {
@@ -164,11 +168,11 @@ $(function() {
               }else{
                 image_path = "/image/logo.png";
               }
-              if (menu_item_box == "set_item_box") {
-                add_icon = "set_item_box"
-              }else{
-                add_icon = "add_icon"
-              }
+              // if (menu_item_box == "set_item_box") {
+                
+              // }else{
+                
+              // }
 
               row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
                        +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
@@ -190,7 +194,10 @@ $(function() {
                           + price +"' data-instance-code = '"+ code +"' data-instance = '"
                           + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
                           + JSON.stringify(item_attributes) +"' data-options = '"
-                          + options +"' data-image='"+image_path+"' >"
+                          + options +"' data-image='"+image_path+"' data-toggle='"
+                          +data_modal+"' data-target='."+data_target+"' data-item-sets = '"
+                      +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
+                      +JSON.stringify(menu_items[field].instances)+"'>"
 
                       +"<div class='card-block custom-card-block'>"
                         +"<img id='logo' height='125px' src='"+image_path+"'>"
@@ -218,10 +225,12 @@ $(function() {
     $('.set_change_qty').val(1);
     change_qty_plus_minus("set_count","set_plus","set_minus");
     data =  $(this).parent().children().children('.add_icon');
-
-    instances          = $(this).data('instance');
+    // data =  $(this).parent().siblings('.add_icon');
+    //instances          = $(this).data('instance');
     item_sets          = $(this).data('item-sets');
-
+    instances          = $(this).data('instances');
+    // item_sets          = $(data).attr('data-item-sets');
+console.log(instances)
     for(var field in item_sets) { 
 
       $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
@@ -274,11 +283,11 @@ $(function() {
 
     $('#set_change_qty').val(1);
     $('#set_item_instances').text(instances);
-    $('#set_name').text(data.attr('data-name'));
-    $('#set_item_code').text(data.attr('data-item-code'));
-     $('#set_total_price').text(data.attr('data-price'));
+    $('#set_name').text($(this).attr('data-name'));
+    $('#set_item_code').text($(this).attr('data-item-code'));
+     $('#set_total_price').text($(this).attr('data-price'));
     // $('#set_total_price').text(0);
-    $('#set_unit_price').text(data.attr('data-price'));
+    $('#set_unit_price').text($(this).attr('data-price'));
     // $('#set_unit_price').text(0);
   });
   // click instance for add item set 
@@ -735,7 +744,7 @@ $(function() {
     if (type == 'true') {
       type = 'cashier'
 
-      var table_type = $('#table_id').find("option:selected").data('type');
+      var table_type = $('#table_type').text();
       var table_id    = $('#table_id').val();
       var customer_id = $('#customer_id').val();
       var booking_id  = $('#booking_id').text();
@@ -762,21 +771,28 @@ $(function() {
                   'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
                   'order_items': order_items };
-    $.ajax({
-      type: "POST",
-      url: ajax_url,
-      data: params,
-      dataType: "json",
-       success:function(result){         
-          
-            if(table_type == "Table"){
-              window.location.href = "/origami/table/" + table_id
-            }
-            else {
-              window.location.href = "/origami/room/" + table_id
-            }                
-       }
-    });
+    if (table_id.length>0) {
+      $.ajax({
+        type: "POST",
+        url: ajax_url,
+        data: params,
+        dataType: "json",
+         success:function(result){         
+            
+              if(table_type == "Table"){
+                window.location.href = "/origami/table/" + table_id
+              }
+              else {
+                window.location.href = "/origami/room/" + table_id
+              }                
+         }
+      });
+    }else{
+      $(this).removeAttr('disabled', '');
+      $("#oqs_loading_wrapper").hide();
+
+      swal("Opps","Please Select Table or Room","warning");
+    }
   });
 
 
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 8dfc901c..c6ad1383 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -3,7 +3,7 @@ class Origami::QuickServiceController < ApplicationController
 
   def index
     @menu   = MenuCategory.all.active
-    @dining   = DiningFacility.all.active
+    @zone   = Zone.all
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 36f45b74..2ec7ad24 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -78,10 +78,11 @@
              <!--  <i class="material-icons">reply</i> -->
                Back
             </button>
-             <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="    padding: .5rem 0.15rem !important;">Pending Order
+             <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
             </button>
             <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
             <input type="hidden" name="table_id" value="" id="table_id">
+
          <%else%>
             <button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
                 <i class="material-icons">reply</i>Back
@@ -110,7 +111,7 @@
                      <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
                      <p class="hidden" id="sale_id"><%=@sale_id%></p>
               <% else%>
-                
+                <p class="hidden" id="table_type"></p>
               <% end%>
             </div>
           <% else %>
@@ -361,92 +362,46 @@
              <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
           </div>
           <div class="modal-body" style="margin-top: -0.75rem;padding-top:5px">
-            <h5>Table</h5>
+          <%@zone.each do |zone| %>
+            <h5>Zone : <%=zone.name%></h5>
             <div class="card-columns" style="column-count: 7;">
-              <% @tables.each do |table| %>       
-                <% if table.status == 'occupied' %>
-                  <% if table.get_booking.nil? %>
-                    <% if table.get_checkout_booking.nil? %>
-                      <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                    <% else %>                            
-                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                    <% end %>                         
-                      <div class="card-block">
-                        <%= table.name %>
-                          <!-- <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
-                          <div style="font-size:12px;"></div> -->
-                      </div>
-                      </div>
-                  <% else %>         
-                    <% if table.get_checkout_booking.nil? %>
-                       <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                    <% else %>                       
-                      <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                    <% end %>                   
-                      <div class="card-block">
-                        <%= table.name %>
-                        <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
-                      </div>
-                    </div>
-                  <% end %>
-                  <% else %>
-                      <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                      <div class="card-block">
-                        <%= table.name %>
-                        <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
-                      </div>
-                    </div>
-                   <% end %>
-                  <% end %>
-              </div>
-                <hr style="margin: 5px 20px">
-                <h5>Room</h5>
-                <div class="card-columns" style="column-count: 7;">
-                  <% @rooms.each do |table| %>       
-                    <% if table.status == 'occupied' %>
-                      <% if table.get_booking.nil? %>
-                        <% if table.get_checkout_booking.nil? %>
-                          <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                        <% else %>                            
-                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                        <% end %>                         
-                          <div class="card-block">
-                            <%= table.name %>
-                              <!-- <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
-                              <div style="font-size:12px;"></div> -->
-                          </div>
-                          </div>
-                      <% else %>         
-                        <% if table.get_checkout_booking.nil? %>
-                           <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                        <% else %>                       
-                          <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                        <% end %>                   
-                          <div class="card-block">
-                            <%= table.name %>
-                            <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
-                          </div>
-                        </div>
-                      <% end %>
+              <%zone.tables.each do |table| %>
+                 <% if table.status == 'occupied' %>
+                          <% if table.get_booking.nil? %>
+                            <% if table.get_checkout_booking.nil? %>
+                              <%  color="red"%>
+                            <% else %>                            
+                              <%  color="orange"%>
+                            <% end %>                         
+                                
+                          <% else %>         
+                            <% if table.get_checkout_booking.nil? %>
+                              <%  color="blue"%>
+                            <% else %>                       
+                              <%  color="orange"%>
+                            <% end %>
+                          <% end %>
                       <% else %>
-                          <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>" data-name="<%= table.name %>" style="margin-bottom: .5rem;">
-                          <div class="card-block">
-                            <%= table.name %>
-                            <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
-                          </div>
-                        </div>
-                       <% end %>
+                         <%  color="green"%>
                       <% end %>
+                <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
+                  <div class="card-block">
+                    <%= table.name %>
+                    
                   </div>
-              </div>
-          <div class="modal-footer  p-r-30">
-            <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
-            &nbsp;  &nbsp;
-            <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
-          </div>
+                </div>
+              <%end%>
+           </div>
+        <%end%>
+         <div class="modal-footer  p-r-30">
+              <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+              &nbsp;  &nbsp;
+              <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
         </div>
       </div>
     </div>
+    </div>
+    </div>
     <% end %>
 <script>
     $(document).ready(function () {
@@ -455,18 +410,24 @@
         $('.tables').removeClass('purple')
         var dining_id = $(this).attr("data-id");
         var name = $(this).attr("data-name");
+        var type = $(this).attr("data-type");
         $(this).css('background-color','purple');
         $(this).addClass('purple')
         $('.confirm_table').attr("data-id",dining_id)
         $('.confirm_table').attr("data-name",name)
+        $('.confirm_table').attr("data-type",type)
 
     });
     $(".confirm_table").on('click', function () {
         var dining_id = $(this).attr("data-id");
         var name      = $(this).attr("data-name");
+        var type      = $(this).attr("data-type");
         $('#table_id').val(dining_id)
+        $('#table_type').text(type)
         $('.select_table').text(name)
 
+        console.log(type)
+
     });
     $('#pending_order').on('click', function () {
       window.location.href = '/origami/quick_service/pending_order';

From d459a6e2a3fe1f5b2a6297f0a3a5c661cd71b21b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Feb 2018 15:11:16 +0630
Subject: [PATCH 238/651] check order item split process

---
 app/controllers/origami/orders_controller.rb  |   7 ++
 .../origami/split_bill_controller.rb          | 107 ++++++++++++++--
 app/pdf/receipt_bill_a5_pdf.rb                |   8 +-
 app/pdf/receipt_bill_pdf.rb                   |   8 +-
 app/views/origami/home/show.html.erb          |  19 +--
 app/views/origami/orders/show.html.erb        |   4 +-
 app/views/origami/rooms/show.html.erb         |  10 +-
 app/views/origami/split_bill/index.html.erb   | 117 ++++++++++--------
 8 files changed, 199 insertions(+), 81 deletions(-)

diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index fced3d02..fb8f68b9 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -15,6 +15,13 @@ class Origami::OrdersController < BaseOrigamiController
       @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => dining_facilities.type})
     end
 
+    #for split bill
+    lookup_spit_bill = Lookup.collection_of('split_bill')
+    @split_bill = 0
+    if !lookup_spit_bill[0].nil?
+      @split_bill = lookup_spit_bill[0][1]
+    end
+
     sale_order = SaleOrder.find_by_order_id(@order.order_id)
     if sale_order
       unless sale_order.sale_id.nil?
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index dd8dd990..037f3f6c 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -149,6 +149,8 @@ class Origami::SplitBillController < BaseOrigamiController
 
 					if !order_id.nil?
 						if order_id_count > 1
+							puts "order_id_count > 1"
+
 							updated_order_id = Array.new
 							order_ids.each do |odr_id|
 								odr = Order.find(odr_id)
@@ -157,10 +159,13 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 							end
 
+							puts "updated_order_id"
+							puts updated_order_id
+
 							if !updated_order_id.empty?
 								order_ids.each do |odr_id|
 									unless updated_order_id.include?(odr_id)
-										# BookingOrder.find_by_order_id(odr_id).delete
+										BookingOrder.find_by_order_id(odr_id).delete
 										BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
 									end
 								end
@@ -172,16 +177,102 @@ class Origami::SplitBillController < BaseOrigamiController
 							    end
 							else
 								order_ids.each do |odr_id|
-									# BookingOrder.find_by_order_id(odr_id).delete
-									BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
+									new_order_status = true
+									order_items.each do |order_item|
+										orderItem = OrderItem.find_by_order_id(odr_id)
+										if !orderItem.nil?
+											if order_item["id"] == orderItem.order_items_id
+												if orderItem.qty.to_f != order_item['qty'].to_f
+													new_order_status = false
+												end
+											end
+										end
+								    end
+
+									if new_order_status
+								    	BookingOrder.find_by_order_id(odr_id).delete
+										BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
+								    else
+								    	customer = Customer.find(params[:customer_id])
+										order_type = "dine_in"
+										if !customer.nil?
+											if customer.customer_type == "Takeaway"
+												order_type = "takeaway"
+											elsif customer.customer_type == "Delivery"
+												order_type = "delivery"
+											end
+										end
+
+										# begin
+									    order = Order.new
+									    order.source = "cashier"
+									    order.order_type = order_type
+									    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+									    order.item_count = order_items.count
+									    order.status = "new"
+									    order.table_id = params[:dining_id]  # this is dining facilities's id
+									    order.waiters = current_user.name
+									    order.employee_name = current_user.name
+									    order.guest_info = nil
+									    order.save!
+
+									    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+
+									    order_items.each do |order_item|
+									    	update_order_item(order.order_id, order_item)
+									    end
+								    end
 								end
 							end
 						else
-							BookingOrder.find_by_order_id(order_id).delete
-							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
-							
+							puts "order_id_count < 1"
+							new_order_status = true
 							order_items.each do |order_item|
-								update_order_item(order_id, order_item)
+								orderItem = OrderItem.find_by_order_id(order_id)
+								if !orderItem.nil?
+									if order_item["id"] == orderItem.order_items_id
+										if orderItem.qty.to_f != order_item['qty'].to_f
+											new_order_status = false
+										end
+									end
+								end
+						    end
+
+						    if new_order_status
+						    	BookingOrder.find_by_order_id(order_id).delete
+								BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
+						    	order_items.each do |order_item|
+									update_order_item(order_id, order_item)
+							    end
+						    else
+						    	customer = Customer.find(params[:customer_id])
+								order_type = "dine_in"
+								if !customer.nil?
+									if customer.customer_type == "Takeaway"
+										order_type = "takeaway"
+									elsif customer.customer_type == "Delivery"
+										order_type = "delivery"
+									end
+								end
+
+								# begin
+							    order = Order.new
+							    order.source = "cashier"
+							    order.order_type = order_type
+							    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+							    order.item_count = order_items.count
+							    order.status = "new"
+							    order.table_id = params[:dining_id]  # this is dining facilities's id
+							    order.waiters = current_user.name
+							    order.employee_name = current_user.name
+							    order.guest_info = nil
+							    order.save!
+
+							    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+
+							    order_items.each do |order_item|
+							    	update_order_item(order.order_id, order_item)
+							    end
 						    end
 						end
 					else
@@ -217,7 +308,7 @@ class Origami::SplitBillController < BaseOrigamiController
 						    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
 						    order_items.each do |order_item|
-						    	update_order_item(order.id, order_item)
+						    	update_order_item(order.order_id, order_item)
 						    end
 						end
 					end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 898b8cf3..6125078b 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -478,11 +478,17 @@ class ReceiptBillA5Pdf < Prawn::Document
         stroke_horizontal_rule
         move_down 5
         y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width+50) do
+            text "Individual amount for #{survey.total_customer} persons", :size => self.item_font_size+1,:align => :left
+        end
+
         bounding_box([0,y_position], :width =>self.label_width) do
-            text "Individual amount", :size => self.item_font_size,:align => :left
+            move_down 15
+            text "Total", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
+            move_down 15
             text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)} per person", :size => self.item_font_size,:align => :right
         end
     end
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index e8ca4bb2..a2a6ce5a 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -478,11 +478,17 @@ class ReceiptBillPdf < Prawn::Document
         stroke_horizontal_rule
         move_down 5
         y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width+50) do
+            text "Individual amount for #{survey.total_customer} persons", :size => self.item_font_size+1,:align => :left
+        end
+
         bounding_box([0,y_position], :width =>self.label_width) do
-            text "Individual amount", :size => self.item_font_size,:align => :left
+            move_down 15
+            text "Total", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
+            move_down 15
             text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)} per person", :size => self.item_font_size,:align => :right
         end
     end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 28094ee8..0c047e56 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -387,14 +387,7 @@
                         %>
                       </table>
                       
-                      <% if !@split_bill.nil? %> 
-                        <% if @split_bill == '1' %>
-                          <button class='btn btn-primary waves-effect' id='add_invoice'> Add to existing invoice</button>
-                          <button class='btn btn-primary waves-effect' id='split_bill'> Split Bill</button>
-                        <% else %>
-                          <button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice</button>
-                        <% end %>
-                      <% end %>
+                      <button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice</button>
                   <% end %>
                   <% if @sale_array.size > 1 %>
                       <br><br>
@@ -412,11 +405,6 @@
                                     <button class='btn btn-sm btn-primary invoicedetails' id="<%= sale.sale_id %>">Show
                                       Detail
                                     </button>
-                                    <% if !@split_bill.nil? %> 
-                                      <% if @split_bill == '1' %>
-                                        <button class='btn btn-sm btn-primary waves-effect' id='split_bill'> Split Bill</button>
-                                      <% end %>
-                                    <% end %>
                                   </td>
                                 </tr>
                               </table>
@@ -476,6 +464,11 @@
                       <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
                     <%end%> 
                   <% end %> 
+                  <% if !@split_bill.nil? %>
+                    <% if @split_bill == '1' %>
+                      <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+                    <% end %>
+                  <% end %>
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   
               <% end %>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 4e9d09b1..4ffe9de6 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -241,7 +241,9 @@
 <!-- Column Three -->
 <div class="col-lg-1 col-md-1 col-sm-1">
  <button type="button" class="btn bg-default btn-block waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
+ <% if !@split_bill.nil? && @split_bill == '1' %>
  <button type="button" class="btn bg-blue btn-block waves-effect" id='by_order'>By Order</button>
+ <% end %>
  <% if @sale_status != 'completed' %>
  <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
  <% end %>
@@ -312,7 +314,7 @@
     var order = JSON.parse('<%= @order.to_json.html_safe %>');
     var arr_order = [];
     arr_order.push({id : order.order_id});
-    
+
     var dining_id       = booking[0].dining_facility_id || 0;
     var type       = booking[0].type || '';
     var customer_id     = order.customer_id || '';
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index b367f212..f9523e3f 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -364,10 +364,7 @@
                    end
                    %>
                      </table>
-                    <button class='btn bg-primary' id='add_invoice'> Add to existing invoice </button>
-                    <% if !@split_bill.nil? && @split_bill == '1' %>
-                      <button class='btn btn-primary' id='split_bill'> Split Bill</button>
-                    <% end %>
+                    <button class='btn bg-primary btn-block' id='add_invoice'> Add to existing invoice </button>
                    <% end %>
                    <% if @sale_array.size > 1 %>
                    <br><br>
@@ -440,6 +437,11 @@
             <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
          <%end%>
          <%end%>
+         <% if !@split_bill.nil? %>
+          <% if @split_bill == '1' %>
+            <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+          <% end %>
+        <% end %>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
        <!--  <button type="button" id="void" class="btn bg-blue btn-block" > Void </button> -->
      <% end %>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 216507ea..31e6a5d0 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -200,7 +200,7 @@
  									<% @sale_data.each_with_index do |sale_data, sale_index| %>
 	 									<% if sale_data.sale_status != 'completed' && sale_data.sale_status != 'void' %>
 	 									<% checked = "" %>
-	 									<% if sale_index == 0 %>
+	 									<% if sale_index == 1 %>
 	 										<% checked = "checked" %>
 	 									<% end %>
 	 									<tr class="receipt-row" id=<%= sale_data.receipt_no %> data=<%= sale_data.grand_total %> >
@@ -250,7 +250,8 @@
 				<div class="form-horizontal">
 					<div class="col-lg-12 col-md-12 col-sm-12">	
 						<div class="form-group">	
-							<input type="text" id="per_person" name="per_person" class="form-control" onkeypress="return isNumberKey(event);"/>
+							<input type="text" id="per_person" name="per_person" class="form-control" onkeypress="return isNumberKey(event);"/><br>
+							<span id="per_personErr" style="color:red;"></span>
 						</div>					
 					</div>
 				</div>
@@ -304,7 +305,7 @@
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn bg-default" data-dismiss="modal">Close</button> &nbsp;&nbsp;
-				<button type="button" class="btn bg-blue btn_per_person">Split Bill</button>
+				<button type="button" class="btn bg-blue btn_per_person">= Split</button>
 			</div>
 	    </div>
 	  </div>
@@ -483,58 +484,68 @@
 	});
 
 	$('.btn_per_person').on('click', function(){
-		$('#equal_split_modal').modal('hide');
-		var person = parseInt($('#per_person').val());
-		if(person > 1){
-			var ajax_url = "/origami/split_bills/surveys";
-			var dining_id       = $("#table_id").text();
-			var type     = $("#table_type").text();
-			
-			$.ajax({
-				type: "POST",
-				url: ajax_url,
-				dataType: 'JSON',
-				data: {'dining_id':dining_id, 'sale_id':split_sale_id, 'receipt_no':split_receipt_no, 'total_customer': person, 'total_amount':split_total_amount  },
-				success: function (result) {
-					console.log(result);
-					if(result.status){
-						var ajax_url = "/origami/sale/" + split_sale_id + "/first_bill";
-				        $.ajax({
-				            type: "GET",
-				            url: ajax_url,
-				            success: function (result) {
-				              	if((split_receipt_no!=undefined) && (split_receipt_no!=""))
-				                	createReceiptNoInFirstBillData(split_receipt_no,"");
-				            	
-				            	location.reload();
-				            	// if(type=='Table'){
-				            	// 	window.location.href = '/origami/table/' + dining_id;
-				            	// }else{
-				            	// 	window.location.href = '/origami/room/' + dining_id;
-				            	// }
-				            }
-				        }); 
-					}
-		        }
-		    });
+		var person = $('#per_person').val();
+
+		if((person!=undefined) && (person!="")){
+			$("#per_personErr").html('');
+			$('#equal_split_modal').modal('hide');
+			if(person > 1){
+				var ajax_url = "/origami/split_bills/surveys";
+				var dining_id       = $("#table_id").text();
+				var type     = $("#table_type").text();
+				
+				$.ajax({
+					type: "POST",
+					url: ajax_url,
+					dataType: 'JSON',
+					data: {'dining_id':dining_id, 'sale_id':split_sale_id, 'receipt_no':split_receipt_no, 'total_customer': person, 'total_amount':split_total_amount  },
+					success: function (result) {
+						console.log(result);
+						if(result.status){
+							var ajax_url = "/origami/sale/" + split_sale_id + "/first_bill";
+					        $.ajax({
+					            type: "GET",
+					            url: ajax_url,
+					            success: function (result) {
+					              	if((split_receipt_no!=undefined) && (split_receipt_no!=""))
+					                	createReceiptNoInFirstBillData(split_receipt_no,"");
+					            	
+					            	// location.reload();
+					            	// if(type=='Table'){
+					            	// 	window.location.href = '/origami/table/' + dining_id;
+					            	// }else{
+					            	// 	window.location.href = '/origami/room/' + dining_id;
+					            	// }
+
+	        						window.location.href = '/origami/sale/' + split_sale_id + "/payment";
+					            }
+					        }); 
+						}
+			        }
+			    });
+			}else{
+				var ajax_url = "/origami/sale/" + split_sale_id + "/first_bill";
+		        $.ajax({
+		            type: "GET",
+		            url: ajax_url,
+		            success: function (result) {
+		              	if((split_receipt_no!=undefined) && (split_receipt_no!=""))
+		                	createReceiptNoInFirstBillData(split_receipt_no,"");
+		            	
+		            	// location.reload();
+		            	// if(type=='Table'){
+		            	// 	window.location.href = '/origami/table/' + dining_id;
+		            	// }else{
+		            	// 	window.location.href = '/origami/room/' + dining_id;
+		            	// }
+		            	window.location.href = '/origami/sale/' + split_sale_id + "/payment";
+		            }
+		        });
+			}
 		}else{
-			var ajax_url = "/origami/sale/" + split_sale_id + "/first_bill";
-	        $.ajax({
-	            type: "GET",
-	            url: ajax_url,
-	            success: function (result) {
-	              	if((split_receipt_no!=undefined) && (split_receipt_no!=""))
-	                	createReceiptNoInFirstBillData(split_receipt_no,"");
-	            	
-	            	location.reload();
-	            	// if(type=='Table'){
-	            	// 	window.location.href = '/origami/table/' + dining_id;
-	            	// }else{
-	            	// 	window.location.href = '/origami/room/' + dining_id;
-	            	// }
-	            }
-	        });
+			$("#per_personErr").html("can't be blank");
 		}
+		
 	});
 
 	//equal split process

From 80729e686f60a66d94f67a958ef67c528e08e7b0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Feb 2018 16:58:55 +0630
Subject: [PATCH 239/651] change survey update function

---
 app/controllers/origami/surveys_controller.rb | 44 ++++++++++++++-----
 app/views/origami/home/show.html.erb          |  2 +-
 app/views/origami/surveys/_form.html.erb      |  1 +
 config/routes.rb                              |  2 +-
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index f7d637d6..d009ed90 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -1,6 +1,5 @@
 class Origami::SurveysController < BaseOrigamiController
 	def new
-		@survey = Survey.new
 		@id             = params[:id]
 
 	    if(@id[0,3] == "SAL")
@@ -10,25 +9,50 @@ class Origami::SurveysController < BaseOrigamiController
 	       @booking          = Booking.find_by_sale_id(@id)
 	       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
 	       @table_type       = @dining_facility.type
+	       @survey  		 = Survey.new()
+	       # @survey  		 = Survey.find_by_dining_name_and_receipt_no(@dining_facility.name, @receipt_no)
 	    else
 	       @dining_facility  = DiningFacility.find(@id)
 	       @table_type       = @dining_facility.type
 	       @receipt_no       = nil
 	       @grand_total      = nil
+	       @survey  		 = Survey.find_by_dining_name(@dining_facility.name)
 	    end 
 	end
 
 	def create
 		@dining_facility   = DiningFacility.find(params[:table_id])
 		@url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id]
-
-		@survey = Survey.new(survey_params)
-		@survey.foreigner = params["survey"]["foreigner"].to_json
-		# respond_to do |format|
-		  if @survey.save
-		     redirect_to @url
-		  end
-		# end
+		cashier_zone = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id)
+		shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+		
+		if request.post?
+			@survey = Survey.new(survey_params)
+			@survey.shift_id = shift_by_terminal.id
+			@survey.foreigner = params["survey"]["foreigner"].to_json
+			# respond_to do |format|
+			  if @survey.save
+			     redirect_to @url
+			  end
+			# end
+		else
+			survey = Survey.find_by_id(params[:survey_id])
+			survey.child = params["survey"]["child"]
+			survey.adult = params["survey"]["adult"]
+			survey.male = params["survey"]["male"]
+			survey.female = params["survey"]["female"]
+			survey.local = params["survey"]["local"]
+			survey.dining_name = params["survey"]["dining_name"]
+			survey.receipt_no = params["survey"]["receipt_no"]
+			survey.shift_id = shift_by_terminal.id
+			survey.created_by = params["survey"]["created_by"]
+			survey.total_customer = params["survey"]["total_customer"]
+			survey.total_amount = params["survey"]["total_amount"]
+			survey.foreigner = params["survey"]["foreigner"].to_json
+			if survey.save!
+				redirect_to @url
+			end
+		end
 	end
 
 	def create_survey
@@ -62,7 +86,7 @@ class Origami::SurveysController < BaseOrigamiController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def survey_params
-      params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, :dining_name,:receipt_no,:shift_id,:created_by,:total_customer,:total_amount)
+      params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, :dining_name,:receipt_no,:shift_id,:created_by,:total_customer,:total_amount,:survey_id)
     end
 
   #Shop Name in Navbor
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0c047e56..3cff783e 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -578,7 +578,7 @@
         $("#survey").on('click', function () {
             var sale = $('#sale_id').val();
             if (sale) {
-                var sale_id = sale
+                var sale_id = sale;
             } else {
                 var sale_id = "<%= @dining.id %>";
             }
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index b5e9e8e4..443efea2 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -41,6 +41,7 @@
 
          </div>
 
+         <input type="hidden" name="survey_id" value="<%=@survey.id%>">
          <input type="hidden" name="table_id" value="<%=@dining_facility.id%>">
          <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
          <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %>
diff --git a/config/routes.rb b/config/routes.rb
index 0b21460f..3442997f 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -193,7 +193,7 @@ scope "(:locale)", locale: /en|mm/ do
     post '/:sale_id/get_customer' => "customers#get_customer"
 
     get '/:id/surveys', to: "surveys#new"
-    post '/:id/create_survey' => "surveys#create", :as => "create_surveys"
+    match '/:id/create_survey', to: "surveys#create", as: "create_surveys", via: [:post, :patch, :put]
 
     get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
     get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }

From 74310797db0412b43976df332a759ee1b138ebc9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Feb 2018 17:18:49 +0630
Subject: [PATCH 240/651] remove order item count in origami

---
 app/controllers/origami/home_controller.rb   | 60 +++++++++----------
 app/controllers/origami/orders_controller.rb | 62 ++++++++++----------
 app/controllers/origami/rooms_controller.rb  | 60 +++++++++----------
 3 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index b725c23e..93a83be2 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -27,37 +27,37 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    bookings = Booking.all
-    if !bookings.nil?
+    # bookings = Booking.all
+    # if !bookings.nil?
       @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
-    end
+    #   bookings.each do |booking|
+    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
+    #       if !booking.booking_orders.empty?
+    #         booking.booking_orders.each do |booking_order|
+    #           order = Order.find(booking_order.order_id)
+    #           if !order.order_items.empty?
+    #             if !@order_items_count.key?(booking.dining_facility_id)
+    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+    #             else
+    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
+    #             end
+    #           end
+    #         end
+    #       end
+    #     else
+    #       if !booking.sale_id.nil?
+    #         sale = Sale.find(booking.sale_id)
+    #         if sale.sale_status !='completed'
+    #           if !@order_items_count.key?(booking.dining_facility_id)
+    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+    #           else
+    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+    #           end
+    #         end
+    #       end
+    #     end
+    #   end
+    # end
 
     puts "@order_items_count"
     puts @order_items_count.to_json
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 91388e4d..8e31c32b 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -13,36 +13,36 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
 
-    bookings = Booking.all
-    if !bookings.nil?
-      @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
-    end
+    # bookings = Booking.all
+    # if !bookings.nil?
+    #   @order_items_count = Hash.new
+    #   bookings.each do |booking|
+    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
+    #       if !booking.booking_orders.empty?
+    #         booking.booking_orders.each do |booking_order|
+    #           order = Order.find(booking_order.order_id)
+    #           if !order.order_items.empty?
+    #             if !@order_items_count.key?(booking.dining_facility_id)
+    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+    #             else
+    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
+    #             end
+    #           end
+    #         end
+    #       end
+    #     else
+    #       if !booking.sale_id.nil?
+    #         sale = Sale.find(booking.sale_id)
+    #         if sale.sale_status !='completed'
+    #           if !@order_items_count.key?(booking.dining_facility_id)
+    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+    #           else
+    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+    #           end
+    #         end
+    #       end
+    #     end
+    #   end
+    # end
   end
 end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 29b865a4..124479aa 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -23,37 +23,37 @@ class Origami::RoomsController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     
-    bookings = Booking.all
-    if !bookings.nil?
+    # bookings = Booking.all
+    # if !bookings.nil?
       @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
-    end
+    #   bookings.each do |booking|
+    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
+    #       if !booking.booking_orders.empty?
+    #         booking.booking_orders.each do |booking_order|
+    #           order = Order.find(booking_order.order_id)
+    #           if !order.order_items.empty?
+    #             if !@order_items_count.key?(booking.dining_facility_id)
+    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+    #             else
+    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
+    #             end
+    #           end
+    #         end
+    #       end
+    #     else
+    #       if !booking.sale_id.nil?
+    #         sale = Sale.find(booking.sale_id)
+    #         if sale.sale_status !='completed'
+    #           if !@order_items_count.key?(booking.dining_facility_id)
+    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+    #           else
+    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+    #           end
+    #         end
+    #       end
+    #     end
+    #   end
+    # end
     
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'

From 8291a0a99278be8d67679f3681ece7e5d1862a2a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 16 Feb 2018 17:20:32 +0630
Subject: [PATCH 241/651] update addorder view

---
 app/assets/javascripts/addorder.js          | 18 +++++++++---------
 app/assets/stylesheets/addorder.scss        |  6 ++++--
 app/views/origami/addorders/detail.html.erb |  5 ++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 91c02552..ac582ab1 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -166,7 +166,7 @@ $(function() {
               if (menu_items[field].image) {
                 image_path = menu_items[field].image;
               }else{
-                image_path = "/image/logo.png";
+                image_path = "image/logo.png";
               }
               // if (menu_item_box == "set_item_box") {
                 
@@ -174,8 +174,8 @@ $(function() {
                 
               // }
 
-              row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
-                       +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+              row = '<div class="card custom-card testimonial-card animated fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+                       +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
                         +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
                         +"<div class='col-md-3 "+menu_item_box+"' data-item-code='"
                       + menu_items[field].code +"' data-instance = '"
@@ -188,7 +188,7 @@ $(function() {
                         +add+ '</i>'
                         +'</div>'
                        +'</div>'
-                    +"<div class='"+add_icon+"' data-item-code='"
+                    +"<div  class='"+add_icon+" p-t-50 m-r--5' data-item-code='"
                           + menu_items[field].code +"' data-name='"
                           + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
                           + price +"' data-instance-code = '"+ code +"' data-instance = '"
@@ -199,11 +199,11 @@ $(function() {
                       +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
                       +JSON.stringify(menu_items[field].instances)+"'>"
 
-                      +"<div class='card-block custom-card-block'>"
-                        +"<img id='logo' height='125px' src='"+image_path+"'>"
-                      +"</div>"
+                      // +"<div class='card-block custom-card-block'>"
+                      //   +"<img id='logo' height='' src='"+image_path+"'>"
+                      // +"</div>"
 
-                      +'<div class="card-footer custom-card-footer">'
+                      +'<div class="card-footer custom-card-footer" style="opacity:0.5">'
                         +'<span>'+ price +'</span>'
                       +'</div>'
                     +'</div>'; 
@@ -230,7 +230,7 @@ $(function() {
     item_sets          = $(this).data('item-sets');
     instances          = $(this).data('instances');
     // item_sets          = $(data).attr('data-item-sets');
-console.log(instances)
+
     for(var field in item_sets) { 
 
       $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 368f21c9..9cc5e7d7 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -3,9 +3,11 @@ section .content{
 }
 .custom-card-head{
     height: 40px;
-    background-color: #54A5AF;
+    #background-color: #54A5AF;
+    background-color: #2196f3;
+    opacity: 0.5;
     padding:5px;
-    color :#fff;
+    color :#111;
 
 }
 .custom-card {
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 2ec7ad24..f26409fe 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -10,7 +10,8 @@
 <input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
-        <ul class="nav nav-tabs flex-column" role="tablist" id="ul-navbar">
+        
+        <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
             </li>
@@ -54,8 +55,6 @@
                 <% end%>
               <% end %>
             <%end %>
-            
-            
         </ul>
     </div>
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">

From 4b185f21d3c822dc1d15799186e234c9e73c2bd1 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 16 Feb 2018 17:41:26 +0630
Subject: [PATCH 242/651] update addorder view

---
 app/assets/javascripts/addorder.js   | 2 +-
 app/assets/stylesheets/addorder.scss | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index ac582ab1..b9237887 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -188,7 +188,7 @@ $(function() {
                         +add+ '</i>'
                         +'</div>'
                        +'</div>'
-                    +"<div  class='"+add_icon+" p-t-50 m-r--5' data-item-code='"
+                    +"<div  class='"+add_icon+" p-t-60 m-r--5' data-item-code='"
                           + menu_items[field].code +"' data-name='"
                           + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
                           + price +"' data-instance-code = '"+ code +"' data-instance = '"
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 9cc5e7d7..9634c050 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -4,10 +4,10 @@ section .content{
 .custom-card-head{
     height: 40px;
     #background-color: #54A5AF;
-    background-color: #2196f3;
+    background-color: #a1aade;
     opacity: 0.5;
     padding:5px;
-    color :#111;
+    color :#000000;
 
 }
 .custom-card {

From 032e085b6e0ba3b5e8f17609f8b247ff1eff2ca8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Feb 2018 17:47:34 +0630
Subject: [PATCH 243/651] change query for origami

---
 app/controllers/origami/home_controller.rb   | 80 +++++++++-----------
 app/controllers/origami/orders_controller.rb | 62 +++++++--------
 app/controllers/origami/rooms_controller.rb  | 60 +++++++--------
 app/models/booking.rb                        |  1 +
 4 files changed, 98 insertions(+), 105 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index b6986d68..0e3eef26 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -27,40 +27,37 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    # bookings = Booking.all
-    # if !bookings.nil?
+    bookings = Booking.all
+    if !bookings.today.nil?
       @order_items_count = Hash.new
-    #   bookings.each do |booking|
-    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
-    #       if !booking.booking_orders.empty?
-    #         booking.booking_orders.each do |booking_order|
-    #           order = Order.find(booking_order.order_id)
-    #           if !order.order_items.empty?
-    #             if !@order_items_count.key?(booking.dining_facility_id)
-    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-    #             else
-    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
-    #             end
-    #           end
-    #         end
-    #       end
-    #     else
-    #       if !booking.sale_id.nil?
-    #         sale = Sale.find(booking.sale_id)
-    #         if sale.sale_status !='completed'
-    #           if !@order_items_count.key?(booking.dining_facility_id)
-    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-    #           else
-    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-    #           end
-    #         end
-    #       end
-    #     end
-    #   end
-    # end
-
-    puts "@order_items_count"
-    puts @order_items_count.to_json
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
+                end
+              end
+            end
+          end
+        else
+          if !booking.sale_id.nil?
+            sale = Sale.find(booking.sale_id)
+            if sale.sale_status !='completed'
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+              end
+            end
+          end
+        end
+      end
+    end
 
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
@@ -126,12 +123,12 @@ class Origami::HomeController < BaseOrigamiController
     #for bank integration
     @checkout_time = Lookup.collection_of('checkout_time')
     @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
-    #for split bill
-    lookup_spit_bill = Lookup.collection_of('split_bill')
-    @split_bill = 0
-    if !lookup_spit_bill[0].nil?
-      @split_bill = lookup_spit_bill[0][1]
-    end
+  end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
   end
 
 private
@@ -140,9 +137,4 @@ def set_dining
    @dining = DiningFacility.find(params[:dining_id])
 end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index cc155c92..f5b71bf8 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -43,37 +43,37 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
 
-    # bookings = Booking.all
-    # if !bookings.nil?
-    #   @order_items_count = Hash.new
-    #   bookings.each do |booking|
-    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
-    #       if !booking.booking_orders.empty?
-    #         booking.booking_orders.each do |booking_order|
-    #           order = Order.find(booking_order.order_id)
-    #           if !order.order_items.empty?
-    #             if !@order_items_count.key?(booking.dining_facility_id)
-    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-    #             else
-    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
-    #             end
-    #           end
-    #         end
-    #       end
-    #     else
-    #       if !booking.sale_id.nil?
-    #         sale = Sale.find(booking.sale_id)
-    #         if sale.sale_status !='completed'
-    #           if !@order_items_count.key?(booking.dining_facility_id)
-    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-    #           else
-    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-    #           end
-    #         end
-    #       end
-    #     end
-    #   end
-    # end
+    bookings = Booking.all
+    if !bookings.today.nil?
+      @order_items_count = Hash.new
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
+                end
+              end
+            end
+          end
+        else
+          if !booking.sale_id.nil?
+            sale = Sale.find(booking.sale_id)
+            if sale.sale_status !='completed'
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+              end
+            end
+          end
+        end
+      end
+    end
   end
 
   #Shop Name in Navbor
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 2d4acc43..03e864fa 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -23,37 +23,37 @@ class Origami::RoomsController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     
-    # bookings = Booking.all
-    # if !bookings.nil?
+    bookings = Booking.all
+    if !bookings.today.nil?
       @order_items_count = Hash.new
-    #   bookings.each do |booking|
-    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
-    #       if !booking.booking_orders.empty?
-    #         booking.booking_orders.each do |booking_order|
-    #           order = Order.find(booking_order.order_id)
-    #           if !order.order_items.empty?
-    #             if !@order_items_count.key?(booking.dining_facility_id)
-    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-    #             else
-    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
-    #             end
-    #           end
-    #         end
-    #       end
-    #     else
-    #       if !booking.sale_id.nil?
-    #         sale = Sale.find(booking.sale_id)
-    #         if sale.sale_status !='completed'
-    #           if !@order_items_count.key?(booking.dining_facility_id)
-    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-    #           else
-    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-    #           end
-    #         end
-    #       end
-    #     end
-    #   end
-    # end
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
+                end
+              end
+            end
+          end
+        else
+          if !booking.sale_id.nil?
+            sale = Sale.find(booking.sale_id)
+            if sale.sale_status !='completed'
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+              end
+            end
+          end
+        end
+      end
+    end
     
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
diff --git a/app/models/booking.rb b/app/models/booking.rb
index 826d585d..7e5470d0 100755
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -9,6 +9,7 @@ class Booking < ApplicationRecord
   has_many :booking_orders
   has_many :orders, :through => :booking_orders
   scope :active, -> {where("booking_status != 'moved'")}
+  scope :today, -> {where("created_at >= #{Time.now.utc}")}
 
   def self.update_dining_facility(booking_arr, newd, old)
     table = DiningFacility.find(newd)

From 4743ab655852e5f83a6aa447f2691a415387a708 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 16 Feb 2018 18:07:33 +0630
Subject: [PATCH 244/651] update addorderjs

---
 app/assets/javascripts/addorder.js | 33 ++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index b9237887..6f7c772a 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -164,15 +164,20 @@ $(function() {
               }
 
               if (menu_items[field].image) {
-                image_path = menu_items[field].image;
+                if (modify_order) {
+                  image_path = "../../"+menu_items[field].image;
+                }else{
+                  image_path = menu_items[field].image;
+                }
+                
               }else{
-                image_path = "image/logo.png";
+                if (modify_order) {
+                  image_path = "../../image/logo.png";
+                }else{
+                  image_path = "image/logo.png";
+                }
               }
-              // if (menu_item_box == "set_item_box") {
-                
-              // }else{
-                
-              // }
+              
 
               row = '<div class="card custom-card testimonial-card animated fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                        +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
@@ -457,9 +462,19 @@ $(function() {
     item_options       = $(this).data('option');
 
     if (data.attr('data-image')) {
-      image = "<img id='' width='200px' src='"+data.attr('data-image')+"'>";
+      if (modify_order) {
+        image = "<img id='' width='200px' src='../../"+data.attr('data-image')+"'>";
+      }else{
+        image = "<img id='' width='200px' src='"+data.attr('data-image')+"'>";
+      }
+      
     }else{
-       image = "<img id='' width='200px' src='/image/logo.png'>";
+      if (modify_order) {
+        image = "<img id='' width='200px' src='../../image/logo.png'>";
+      }else{
+        image = "<img id='' width='200px' src='/image/logo.png'>";
+      }
+       
     }
     
     $('#modal_box_img').append(image);

From 0504a9505b01b65857b7d47b6a8fa299ded8be06 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Feb 2018 09:12:51 +0630
Subject: [PATCH 245/651] update menu category

---
 .../origami/addorders_controller.rb           |  17 ++-
 app/controllers/origami/home_controller.rb    |  62 +++++-----
 .../origami/quick_service_controller.rb       |  10 +-
 app/models/menu.rb                            |   2 +-
 app/views/origami/addorders/detail.html.erb   | 111 +++++++++++++++++-
 .../origami/addorders/get_menu.json.jbuilder  |   1 +
 config/routes.rb                              |   1 +
 7 files changed, 168 insertions(+), 36 deletions(-)
 create mode 100644 app/views/origami/addorders/get_menu.json.jbuilder

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index ab481fc3..add3065b 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -9,7 +9,10 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   end
 
   def detail
-  	@menu = MenuCategory.all.active
+  	today = DateTime.now
+    day = Date.today.wday
+    @menus    = Menu.all
+    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     @table_id = params[:id]
     @table = DiningFacility.find(@table_id)
     @booking = @table.get_booking
@@ -44,6 +47,18 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     end
   end
 
+  def get_menu()
+    if (params[:id])
+      puts params[:id]
+      #Pull this menu
+      @menu = Menu.find_by_id(params[:id])
+      @menu_category = MenuCategory.where("menu_id='#{@menu.id}'").order("order_by asc")
+      # puts @menu.menu_items[1].item_attributes.to_json
+      return @menu
+    else
+      Menu.current_menu
+    end
+  end
 
   def get_menu_sub_category ()
     id = params[:id]
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 429813a1..129735a6 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -27,37 +27,37 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    bookings = Booking.all
-    if !bookings.nil?
-      @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
-    end
+    # bookings = Booking.all
+    # if !bookings.nil?
+    #   @order_items_count = Hash.new
+    #   bookings.each do |booking|
+    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
+    #       if !booking.booking_orders.empty?
+    #         booking.booking_orders.each do |booking_order|
+    #           order = Order.find(booking_order.order_id)
+    #           if !order.order_items.empty?
+    #             if !@order_items_count.key?(booking.dining_facility_id)
+    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+    #             else
+    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
+    #             end
+    #           end
+    #         end
+    #       end
+    #     else
+    #       if !booking.sale_id.nil?
+    #         sale = Sale.find(booking.sale_id)
+    #         if sale.sale_status !='completed'
+    #           if !@order_items_count.key?(booking.dining_facility_id)
+    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+    #           else
+    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+    #           end
+    #         end
+    #       end
+    #     end
+    #   end
+    # end
 
     puts "@order_items_count"
     puts @order_items_count.to_json
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index c6ad1383..ef170480 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -2,7 +2,10 @@ class Origami::QuickServiceController < ApplicationController
   # before_action :set_dining, only: [:detail]
 
   def index
-    @menu   = MenuCategory.all.active
+    today = DateTime.now
+    day = Date.today.wday
+    @menus    = Menu.all
+    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     @zone   = Zone.all
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
@@ -15,7 +18,10 @@ class Origami::QuickServiceController < ApplicationController
   end
 
   def modify_order
-    @menu = MenuCategory.all.active
+    today = DateTime.now
+    day = Date.today.wday
+    @menus    = Menu.all
+    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     if(params[:id][0,3] == "BKI")
       @table_id = nil
       @table = nil
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 65d00d90..b96fe03a 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -4,7 +4,7 @@ class Menu < ApplicationRecord
   validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
   # validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
   #Default Scope to pull the active version only
-  default_scope { where(is_active: true).order("created_at desc") }
+  default_scope { where(is_active: true).order("created_at asc") }
 
   def self.current_menu
     today = DateTime.now
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index f26409fe..a4f27bc7 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -10,7 +10,16 @@
 <input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
-        
+        <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 
+            <span class="main_menu p-l-15 p-t-20" id="main_menu"><%= @menus[0].name %></span>
+        </a>
+        <ul class="dropdown-menu menu_list" style="width:90%">
+           <% @menus.each do |menu| %>
+              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>">
+                   <a class="nav-link" data-toggle="tab" href="" role="tab"><%=menu.name%></a>
+              </li>
+           <%end%>
+        </ul>   
         <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
@@ -60,6 +69,43 @@
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
       <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 10px;">
          <!-- append data -->
+         <% @menu.each do |menu| %>
+              <% if !menu.valid_time.nil? %>
+                <% if menu.menu_category_id.nil? %>
+                <!--if type quick_service or cashier for table -->
+                  <% if type %>
+                    <% if !menu.code.include? "SPL" %>
+                      <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                        <div class='card-block custom-card-block'>
+                          <p><%=menu.name%> <p>
+                          <p><%=menu.code%> <p>
+                        </div>
+                      </div>
+                    <% end%>
+                  <!-- else quick_service or cashier for table -->
+                  <% else %>
+                    <% if @table.get_current_checkout_booking.nil? %>
+                      <% if !menu.code.include? "SPL" %>
+                        <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                          <div class='card-block custom-card-block'>
+                            <p><%=menu.name%> <p>
+                            <p><%=menu.code%> <p>
+                          </div>
+                       </div>
+                      <% end%>
+                    <% else %>
+                      <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                        <div class='card-block custom-card-block'>
+                          <p><%=menu.name%> <p>
+                          <p><%=menu.code%> <p>
+                        </div>
+                      </div>
+                    <% end%>
+                    <!-- end quick_service or cashier for table -->
+                  <% end %>
+                <% end%>
+              <% end %>
+            <%end %>
       </div>
     </div>
 
@@ -428,8 +474,71 @@
         console.log(type)
 
     });
+
     $('#pending_order').on('click', function () {
       window.location.href = '/origami/quick_service/pending_order';
     });
+
+    $(document).on('click', '.menu_click', function(event){
+      var menu_id = $(this).attr("data-id");
+      var name = $(this).attr("data-name");
+      var url = "get_menu/"+menu_id;
+      show_menu_cat_list(name, url); 
+    }); 
+  //End menu category Click
+
+    //show menu item list when click menu category
+    function show_menu_cat_list(name, url_item){ 
+      var menu_list = $('.menu_items_list');
+      menu_list.empty();
+
+      var menu_cat = $('.category_list');
+      menu_cat.empty();
+
+      $(".main_menu").text(name)
+      if (modify_order=="true" && type =="true") {
+         url_item = '../../../addorders/'+url_item;
+       }if(modify_order=="false" && type =="true"){
+         url_item = 'addorders/'+url_item
+       }else{
+         url_item = url_item;
+       }
+
+      //Start Ajax
+      $.ajax({      
+        type: "GET",         
+        url: url_item, 
+        data: {},
+        dataType: "json",
+        success: function(data) {
+
+          for(var i in data) {  
+            if (data[i].is_available == true) {
+              
+              row = '<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="'+ data[i].id +'">'
+                       +' <div class="card-block custom-card-block">'
+                         +'  <p>'+ data[i].name +'<p>'
+                         +'  <p>'+ data[i].code +' <p>'
+                       +'  </div>'
+                    +'   </div>';
+              $('.menu_items_list').append(row);
+
+              list = '<li class="nav-item menu_category sub_click" data-id="'+ data[i].id +'">'
+                        +'<p class="hidden menu-id">'+ data[i].id +'</p> '
+                          +'<a class="nav-link" data-toggle="tab" href="" role="tab"> '+ data[i].name +''
+                           +'<ul class=" sub_category_list hidden fadeInTop animated"' 
+                           +'id="sub_category_list">'
+                          +'</ul>'
+                        +'</a>'
+                      +'</li>';
+              $('.category_list').append(list);
+            }
+            
+          }
+        }
+      });
+      //end Ajax 
+    }
+    //end show list function
   });
 </script>
\ No newline at end of file
diff --git a/app/views/origami/addorders/get_menu.json.jbuilder b/app/views/origami/addorders/get_menu.json.jbuilder
new file mode 100644
index 00000000..bbe18fff
--- /dev/null
+++ b/app/views/origami/addorders/get_menu.json.jbuilder
@@ -0,0 +1 @@
+json.array! @menu_category
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 2b563b69..bee3538e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -207,6 +207,7 @@ scope "(:locale)", locale: /en|mm/ do
     get '/:id/:type/surveys', to: "surveys#new"
     post '/:id/create_survey' => "surveys#create", :as => "create_surveys"
 
+    get '/addorders/get_menu/:id' => "addorders#get_menu",:as => "get_menu", :defaults => { :format => 'json' }
     get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
     get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
     get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }

From 9594689f1ccfb4fe7ca07800ddd6f8bb4e0fdc3d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 10:23:15 +0630
Subject: [PATCH 246/651] add survey update function

---
 app/controllers/origami/surveys_controller.rb | 19 ++--
 app/views/origami/surveys/_form.html.erb      | 96 +++++++++++++------
 2 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index d009ed90..b49359e0 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -1,6 +1,7 @@
 class Origami::SurveysController < BaseOrigamiController
 	def new
-		@id             = params[:id]
+		@survey  		 = Survey.new()
+		@id              = params[:id]
 
 	    if(@id[0,3] == "SAL")
 	       @sale             = Sale.find(@id)
@@ -9,14 +10,17 @@ class Origami::SurveysController < BaseOrigamiController
 	       @booking          = Booking.find_by_sale_id(@id)
 	       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
 	       @table_type       = @dining_facility.type
-	       @survey  		 = Survey.new()
-	       # @survey  		 = Survey.find_by_dining_name_and_receipt_no(@dining_facility.name, @receipt_no)
+	       @survey_data  	 = Survey.find_by_dining_name(@dining_facility.name)
+	       survey_process  	 = Survey.find_by_receipt_no(@receipt_no)
+	       if !survey_process.nil?
+	       		@survey_data = survey_process
+	       end
 	    else
 	       @dining_facility  = DiningFacility.find(@id)
 	       @table_type       = @dining_facility.type
 	       @receipt_no       = nil
 	       @grand_total      = nil
-	       @survey  		 = Survey.find_by_dining_name(@dining_facility.name)
+	       @survey_data  	 = Survey.find_by_dining_name(@dining_facility.name)
 	    end 
 	end
 
@@ -25,8 +29,8 @@ class Origami::SurveysController < BaseOrigamiController
 		@url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id]
 		cashier_zone = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id)
 		shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
-		
-		if request.post?
+
+		if params[:survey_id].nil? || params[:survey_id] == ""
 			@survey = Survey.new(survey_params)
 			@survey.shift_id = shift_by_terminal.id
 			@survey.foreigner = params["survey"]["foreigner"].to_json
@@ -61,7 +65,7 @@ class Origami::SurveysController < BaseOrigamiController
 			cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
 		    shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
 			
-			survey = Survey.find_by_receipt_no(params[:receipt_no])
+			survey = Survey.find_by_dining_name(dining_facility.name)
 			
 			if survey.nil?
 				survey = Survey.new
@@ -73,6 +77,7 @@ class Origami::SurveysController < BaseOrigamiController
 				survey.total_amount = params[:total_amount]
 				survey.save!
 			else
+				survey.receipt_no = params[:receipt_no]
 				survey.total_customer = params[:total_customer]
 				survey.save!
 			end
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 443efea2..459975ff 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -5,43 +5,79 @@
         <%= simple_form_for(@survey, :url => origami_create_surveys_path) do |f| %>
         <%= f.error_notification %>
         <div class="form-inputs p-l-10">
+          <% if !@survey_data.nil? %>
+            <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10' }%>
+            <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10' }%>
+            <%= f.input :male , input_html: { value: @survey_data.male, class: 'col-md-10' }%>
+            <%= f.input :female , input_html: { value: @survey_data.female, class: 'col-md-10' }%>
+            <%= f.input :total_customer, input_html: { value: @survey_data.total_customer, class: 'col-md-10'} %>
+            <%= f.input :local , input_html: { value: @survey_data.local, class: 'col-md-10' }%>
 
-          <%= f.input :child , input_html: { class: 'col-md-10' }%>
-          <%= f.input :adult , input_html: { class: 'col-md-10' }%>
-          <%= f.input :male , input_html: { class: 'col-md-10' }%>
-          <%= f.input :female , input_html: { class: 'col-md-10' }%>
-          <%= f.input :total_customer, input_html: { class: 'col-md-10'} %>
-          <%= f.input :local , input_html: { class: 'col-md-10' }%>
-
-          <div class="row clearfix">
-            <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
-              <div class="form-group p-l-10 p-r-10">
-               <label class="p-l-10">Foreigner</label>
-               <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
-               <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
-                <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
-                <option value="<%= ct.value %>">
-                  <%= ct.name %></option>
-                  <%end %>
-                </select>
+            <div class="row clearfix">
+              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+                <div class="form-group p-l-10 p-r-10">
+                 <label class="p-l-10">Foreigner</label>
+                 <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
+                 <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
+                  <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
+                  <option value="<%= ct.value %>">
+                    <%= ct.name %></option>
+                    <%end %>
+                  </select>
+                </div>
               </div>
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
-              <div class="form-group p-l-10 p-r-10">
-                <label class="p-l-10">Number</label>
-                <input type="number"  name="survey[foreigner][]" class="form-control">
+              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+                <div class="form-group p-l-10 p-r-10">
+                  <label class="p-l-10">Number</label>
+                  <input type="number"  name="survey[foreigner][]" class="form-control">
+                </div>
               </div>
-            </div>
-            <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
-             <br>
-             <button type="button" class="btn btn-success" id="addForeigner">Add</button>
+              <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
+               <br>
+               <button type="button" class="btn btn-success" id="addForeigner">Add</button>
+             </div>
            </div>
-         </div>
+          <% else %>
+            <%= f.input :child , input_html: { class: 'col-md-10' }%>
+            <%= f.input :adult , input_html: { class: 'col-md-10' }%>
+            <%= f.input :male , input_html: { class: 'col-md-10' }%>
+            <%= f.input :female , input_html: { class: 'col-md-10' }%>
+            <%= f.input :total_customer, input_html: { class: 'col-md-10'} %>
+            <%= f.input :local , input_html: { class: 'col-md-10' }%>
+
+            <div class="row clearfix">
+              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+                <div class="form-group p-l-10 p-r-10">
+                 <label class="p-l-10">Foreigner</label>
+                 <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
+                 <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
+                  <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
+                  <option value="<%= ct.value %>">
+                    <%= ct.name %></option>
+                    <%end %>
+                  </select>
+                </div>
+              </div>
+              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+                <div class="form-group p-l-10 p-r-10">
+                  <label class="p-l-10">Number</label>
+                  <input type="number"  name="survey[foreigner][]" class="form-control">
+                </div>
+              </div>
+              <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
+               <br>
+               <button type="button" class="btn btn-success" id="addForeigner">Add</button>
+             </div>
+           </div>
+          <% end %>
          <div class="hidden" id="newTemplate" >
 
          </div>
-
-         <input type="hidden" name="survey_id" value="<%=@survey.id%>">
+         <% if !@survey_data.nil? %>
+          <input type="hidden" name="survey_id" value=<%= @survey_data.id %> />
+         <% else %>
+          <input type="hidden" name="survey_id" />
+         <% end %>
          <input type="hidden" name="table_id" value="<%=@dining_facility.id%>">
          <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
          <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %>

From 150ff664461f69b11e2b56bc455added4e0157e6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 10:49:24 +0630
Subject: [PATCH 247/651] change slae item query

---
 app/models/sale.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f42b62a0..efdc8d30 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -743,7 +743,7 @@ def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
                      "i.remark as status_type,"+
-                     " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
@@ -754,7 +754,7 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name")
+  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name,i.unit_price")
                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
 end
 

From dc5cd84f5cf6b98b4262a6e2c2e385be520a3663 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 13:46:08 +0630
Subject: [PATCH 248/651] show cashier dashboard view

---
 app/controllers/application_controller.rb |   2 +
 app/controllers/home_controller.rb        |  36 +--
 app/models/sale.rb                        | 349 +++++++++++++++++++---
 app/views/home/dashboard.html.erb         |  31 +-
 config/locales/en.yml                     |   1 +
 config/locales/mm.yml                     |   1 +
 6 files changed, 351 insertions(+), 69 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66d7700..eaf89c34 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -89,6 +89,8 @@ class ApplicationController < ActionController::Base
   end
 
   def current_user
+    puts "session"
+    puts session[:session_token]
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 25fb0d70..db843aca 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -77,42 +77,42 @@ class HomeController < ApplicationController
                     .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
     @inventories    = StockJournal.inventory_balances(today).sum(:balance)
 
-    @total_sale     = Sale.total_sale(today)
-    @total_count    = Sale.total_count(today)
-    @total_card     = Sale.total_card_sale(today)
-    @total_credit   = Sale.credit_payment(today)
+    @total_sale     = Sale.total_sale(today,current_user)
+    @total_count    = Sale.total_count(today,current_user)
+    @total_card     = Sale.total_card_sale(today,current_user)
+    @total_credit   = Sale.credit_payment(today,current_user)
 
     @sale_data = Array.new
-    @total_payment_methods = Sale.total_payment_methods(today)
+    @total_payment_methods = Sale.total_payment_methods(today,current_user)
 
     @total_payment_methods.each do |payment|
       if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
-        pay = Sale.payment_sale('card', today)
+        pay = Sale.payment_sale('card', today, current_user)
         @sale_data.push({'card' => pay.payment_amount})
       else 
-        pay = Sale.payment_sale(payment.payment_method, today)
+        pay = Sale.payment_sale(payment.payment_method, today, current_user)
         @sale_data.push({payment.payment_method => pay.payment_amount})
       end
     end
-    @summ_sale              = Sale.summary_sale_receipt(today)
-    @total_customer         = Sale.total_customer(today)
-    @total_dinein           = Sale.total_dinein(today)
-    @total_takeaway         = Sale.total_takeaway(today)
-    @total_other_customer   = Sale.total_other_customer(today)
-    @total_membership       = Sale.total_membership(today)
+    @summ_sale              = Sale.summary_sale_receipt(today,current_user)
+    @total_customer         = Sale.total_customer(today,current_user)
+    @total_dinein           = Sale.total_dinein(today,current_user)
+    @total_takeaway         = Sale.total_takeaway(today,current_user)
+    @total_other_customer   = Sale.total_other_customer(today,current_user)
+    @total_membership       = Sale.total_membership(today,current_user)
 
-    @total_order            = Sale.total_order(today)
-    @total_accounts         = Sale.total_account(today)
+    @total_order            = Sale.total_order(today,current_user)
+    @total_accounts         = Sale.total_account(today,current_user)
     @account_data = Array.new
     @total_accounts.each do |account|
-      acc = Sale.account_data(account.account_id, today)
+      acc = Sale.account_data(account.account_id, today,current_user)
       if !acc.nil?
         @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
       end
     end
 
-    @top_items         = Sale.top_items(today)
-    @total_foc_items   = Sale.total_foc_items(today) 
+    @top_items         = Sale.top_items(today,current_user)
+    @total_foc_items   = Sale.total_foc_items(today,current_user) 
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
diff --git a/app/models/sale.rb b/app/models/sale.rb
index efdc8d30..3c97dbf8 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1088,60 +1088,158 @@ end
                 .order("e.name")
   end
 
-  def self.total_sale(today)
-  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
-
+  def self.total_sale(today,current_user=nil)
+    if current_user.nil?
+      total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+    else
+      if current_user.role == 'administrator'
+        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+                .sum("grand_total")
+        end
+      end
+    end
   end
 
-  def self.total_count(today)
-  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+  def self.total_count(today,current_user=nil)
+    if current_user.nil?
+      total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+    else
+      if current_user.role == 'administrator'
+        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id = ?',today,shift.id).count
+        end
+      end
+    end
   end
 
-  def self.total_card_sale(today)
-    payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' or payment_method = 'unionpay' "
-    # query        = Sale.select("SUM(tax_payable_amount) AS st_amount,tax_name")
-    #                 .where('sale_status = "completed" #{payment_type} and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-    #                 .joins("join sale_payments on sale_id = sales.sale_id")
-    #                 .group("sales.sale_id")
-
-    query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+  def self.total_card_sale(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
             .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
             .sum("sp.payment_amount")
-
+    else
+      if current_user.role == 'administrator'
+        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+            .sum("sp.payment_amount")
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
+            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+            .sum("sp.payment_amount")
+        end
+      end
+    end
   end
 
-  def self.credit_payment(today)
-    query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+  def self.credit_payment(today,current_user=nil)
+    if current_user.nil?
+      query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
             .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
             .sum("payment_amount")
+    else
+      if current_user.role == 'administrator'
+        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+            .sum("payment_amount")
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ? and s.shift_sale_id=?',today,shift.id)
+            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+            .sum("payment_amount")
+        end
+      end
+    end
   end
 
-  def self.summary_sale_receipt(today)
-    query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+  def self.summary_sale_receipt(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
           .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
           .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+          .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+          .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+            .first()
+        end
+      end
+    end
   end
 
-  def self.total_payment_methods(today)
-    query = Sale.select("distinct sp.payment_method")
+  def self.total_payment_methods(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("distinct sp.payment_method")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
           .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        end
+      end
+    end
   end
 
-  def self.payment_sale(payment_method, today)
-    query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+  def self.payment_sale(payment_method, today, current_user=nil)
+    if current_user.nil?
+      query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
           if payment_method == 'card'
             query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
           else
             query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           end
           query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          if payment_method == 'card'
+            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+          else
+            query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          end
+          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        end
+      end
+    end
   end
 
-  def self.total_customer(today)
-    dinein_cnt = self.total_dinein(today)
-    takeaway_cnt = self.total_takeaway(today)
-    membership_cnt = self.total_membership(today)
+  def self.total_customer(today,current_user=nil)
+    dinein_cnt = self.total_dinein(today,current_user)
+    takeaway_cnt = self.total_takeaway(today,current_user)
+    membership_cnt = self.total_membership(today,current_user)
 
     total_cus = 0
     if !dinein_cnt.nil? || !takeaway_cnt.nil? || !membership_cnt.nil?
@@ -1151,69 +1249,226 @@ end
     return total_cus
   end
 
-  def self.total_dinein(today)
-    query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+  def self.total_dinein(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("count(sales.customer_id) as total_dinein_cus")
           .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
           .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
+            .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .first()
+        end
+      end
+    end
   end
 
-  def self.total_takeaway(today)
-    query = Sale.select("count(sales.customer_id) as total_take_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
-          .first()
+  def self.total_takeaway(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("count(sales.customer_id) as total_take_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+            .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("count(sales.customer_id) as total_take_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+            .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("count(sales.customer_id) as total_take_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+            .first()
+        end
+      end
+    end
   end
 
-  def self.total_membership(today)
-    query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+  def self.total_membership(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
           .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
           .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+          .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',today,shift.id)
+            .first()
+        end
+      end
+    end
   end
 
-  def self.total_other_customer(today)
-    query = Sale.select("count(sales.customer_id) as total_cus")
+  def self.total_other_customer(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("count(sales.customer_id) as total_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
+            .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("count(sales.customer_id) as total_cus")
           .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
           .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("count(sales.customer_id) as total_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+            .first()
+        end
+      end
+    end
   end
 
-  def self.total_order(today)
-    query = Sale.select("count(distinct a.order_id) as total_order")
+  def self.total_order(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("count(distinct a.order_id) as total_order")
           .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
           .joins("JOIN orders as b ON b.order_id = a.order_id")
           .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
           .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("count(distinct a.order_id) as total_order")
+          .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+          .joins("JOIN orders as b ON b.order_id = a.order_id")
+          .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+          .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+            .first()
+        end
+      end
+    end
   end
 
-  def self.total_account(today)
-    query = Sale.select("distinct b.id as account_id, b.title as title")
+  def self.total_account(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("distinct b.id as account_id, b.title as title")
           .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
           .joins("JOIN accounts as b ON b.id = a.account_id")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("distinct b.id as account_id, b.title as title")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN accounts as b ON b.id = a.account_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("distinct b.id as account_id, b.title as title")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN accounts as b ON b.id = a.account_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+        end
+      end
+    end
   end
 
-  def self.account_data(account_id, today)
-    query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+  def self.account_data(account_id, today, current_user=nil)
+    if current_user.nil?
+      query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
           .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
           .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+            .first()
+        end
+      end
+    end
   end
 
-  def self.top_items(today)
-    query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+  def self.top_items(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
           .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
           .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           .group("a.product_code")
           .order("SUM(a.qty) DESC")
           .first()
+    else
+      if current_user.role == 'administrator'
+        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .group("a.product_code")
+            .order("SUM(a.qty) DESC")
+            .first()
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+            .group("a.product_code")
+            .order("SUM(a.qty) DESC")
+            .first()
+        end
+      end
+    end
   end
 
-  def self.total_foc_items(today)
-    query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+  def self.total_foc_items(today,current_user=nil)
+    if current_user.nil?
+      query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
           .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           .sum("a.qty")
+    else
+      if current_user.role == 'administrator'
+        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .sum("a.qty")
+      else
+        shift = ShiftSale.current_open_shift(current_user.id)
+        if !shift.nil?
+          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .sum("a.qty")
+        end
+      end
+    end
   end
 
   #card sale trans data
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 104c4c67..4056e064 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -1,6 +1,7 @@
 <div class="container-fluid">
   <div class="block-header">
-    <h2><%= t :dashboard %></h2>
+    <!-- <h2><%= t :dashboard %></h2> -->
+    <h2><%= t :date_time %> : <%= Time.zone.now.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %></h2>
   </div>
   <% if @print_settings.precision.to_i > 0
       precision = @print_settings.precision
@@ -14,6 +15,7 @@
       delimiter = ""
     end
   %> 
+  <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
   <!-- Widgets -->
   <div class="row clearfix">
     <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
@@ -62,11 +64,12 @@
       </div>
     </div>
   </div>
+  <% end %>
   <!-- #END# Widgets -->
   <!-- CPU Usage -->
 
-  <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
   <div class="row">
+    <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
     <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -122,10 +125,18 @@
         </div>
       </div>
     </div>
-    <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+    <% end %>
+    <% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'cashier' %>
     <% if !@summ_sale.nil? %>
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+      <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+      <% else %>
+      <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+        <div class="row">
+          <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+      <% end %>
           <div class="card">
             <div class="body">
               <h6><%= t :sale %></h6>
@@ -184,11 +195,17 @@
             </div>
           </div>
         </div>
+        <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       </div>
       <% end %>
+      <% end %>
 
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+      <% else %>
+        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+      <% end %>
           <div class="card">
             <div class="body">
               <h6><%= t :customer %></h6>
@@ -227,10 +244,16 @@
             </div>
           </div>
         </div>
+        <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       </div>
+      <% end %>
 
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+      <% else %>
+        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+      <% end %>
           <div class="card">
             <div class="body">
               <h6><%= t("views.right_panel.detail.order") %></h6>
@@ -274,6 +297,6 @@
         </div>
       </div>    
     </div>
+    <% end %>
   </div>
-  <% end %>
 </div>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d4dc8005..6d562366 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -71,6 +71,7 @@ en:
   bottom: "Bottom"
   payment: "Payment"
   backend: "Backend"
+  date_time: "DateTime"
 
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 2d35b1bf..06756c1c 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -66,6 +66,7 @@ mm:
   bottom: "အရောင်းအနဲဆုံး"
   payment: "ငွေပေး�ျေမှု"
   backend: "Backend"
+  date_time: "DateTime"
   
   views:
     btn:       

From 476f7425a22c4cf31a088d295d47373107065f09 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Feb 2018 13:53:36 +0630
Subject: [PATCH 249/651] update add order for menu and void foc for no table

---
 app/assets/stylesheets/addorder.scss        | 32 +++++++++++
 app/controllers/origami/void_controller.rb  | 60 +++++++++++++--------
 app/views/origami/addorders/detail.html.erb | 22 ++++++--
 3 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 9634c050..028b9002 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -209,3 +209,35 @@ i.logout_icon{
 .blue{
   background-color: blue;
 }
+
+/*For Menu List*/
+.dropdown-toggle:after{
+  margin-left:30px;
+}
+.my-toggle{
+  padding: 15px 35px 10px 20px;
+  line-height:2;
+  border-bottom: 1px solid #fff;
+}
+.list-menu{
+  list-style: none;
+  margin-top:5px;
+  background-color: #eee;
+}
+.menu_list{
+  display: block;
+  background-color: #eeeeee;
+  border-bottom: .214rem solid #fff;
+  border-left: 1px solid #54A5AF;
+  border-right: 1px solid #54A5AF;
+  margin-bottom: -1px;
+  margin-top: 5px
+}
+.menu_click{
+  list-style: none;
+  margin-left:-40px;
+  border-bottom: .014rem solid #fff;
+}
+.list-menu > a:hover{
+  text-decoration: none;
+}
\ No newline at end of file
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index f9fbe55a..d535c767 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -39,33 +39,41 @@ class Origami::VoidController < BaseOrigamiController
       #   end
       # end
 
-      table_avaliable = true
-      table_count = 0
-      table = sale.bookings[0].dining_facility
-      table.bookings.each do |booking|
-        if booking.booking_status != 'moved'
-          if booking.sale_id
-            if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+      if sale.bookings[0].dining_facility_id.to_i > 0
+        table_avaliable = true
+        table_count = 0
+        table = sale.bookings[0].dining_facility
+        table.bookings.each do |booking|
+          if booking.booking_status != 'moved'
+            if booking.sale_id
+              if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+                table_avaliable = false
+                table_count += 1
+              else
+                table_avaliable = true
+              end
+            else
               table_avaliable = false
               table_count += 1
-            else
-              table_avaliable = true
             end
-          else
-            table_avaliable = false
-            table_count += 1
           end
         end
-      end
 
-      if table_avaliable && table_count == 0
-        table.status = 'available'
-        table.save
+        if table_avaliable && table_count == 0
+          table.status = 'available'
+          table.save
+        end
+      else
+        table = nil
       end
 
       # FOr Sale Audit 
       action_by = current_user.id
-      remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
+     if table.nil?
+        remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table -> nil"
+      else
+        remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
+     end
       sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" )
 
       # For Print 
@@ -78,13 +86,21 @@ class Origami::VoidController < BaseOrigamiController
       bookings = Booking.where("sale_id='#{sale_id}'")
       if bookings.count > 1 
         # for Multiple Booking
-        table = DiningFacility.find(bookings[0].dining_facility_id)
-      else
-        table = DiningFacility.find(bookings[0].dining_facility_id)        
+        if bookings[0].dining_facility_id.to_i>0
+          table = DiningFacility.find(bookings[0].dining_facility_id)
+        end
+        
+
       end
 
-      cashier_zone     = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-      cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      if bookings[0].dining_facility_id.to_i > 0
+        cashier_zone     = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+        cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      else
+        shift = ShiftSale.find(sale.shift_sale_id)
+        cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+      end
+      
 
       if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
         unique_code = "ReceiptBillPdf"
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index a4f27bc7..ff72d2bc 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -1,3 +1,4 @@
+
 <%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
 <div id="oqs_loading_wrapper" style="display:none;">
@@ -10,8 +11,9 @@
 <input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
-        <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 
-            <span class="main_menu p-l-15 p-t-20" id="main_menu"><%= @menus[0].name %></span>
+        <!-- <a href="javascript:void(0);" class="dropdown-toggle waves-block p-t-15 p-l-15 p-b-15" data-toggle="dropdown" aria-haspopup="" aria-expanded="true" style="background-color: #eeeeee;border-bottom: .214rem solid #fff;border-left: 1px solid #54A5AF;
+    border-right: 1px solid #54A5AF;"> 
+            <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
         </a>
         <ul class="dropdown-menu menu_list" style="width:90%">
            <% @menus.each do |menu| %>
@@ -19,7 +21,21 @@
                    <a class="nav-link" data-toggle="tab" href="" role="tab"><%=menu.name%></a>
               </li>
            <%end%>
-        </ul>   
+        </ul>  -->  
+        <li class="list-menu">
+        <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
+          
+          <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
+         <!--  <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
+        </a>
+        <ul class="ml-menu menu_list aria-hidden " style="">
+          <% @menus.each do |menu| %>
+              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
+                   <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
+              </li>
+           <%end%>
+        </ul>
+      </li> 
         <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>

From d134e3f67d8393bd4cbd90b3ca04edc300eef98a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 14:43:34 +0630
Subject: [PATCH 250/651] add survey for waiter

---
 app/models/sale.rb                    |  4 ++--
 app/views/home/dashboard.html.erb     | 10 ++++++++--
 app/views/origami/home/show.html.erb  |  4 +++-
 app/views/origami/rooms/show.html.erb |  4 ++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 3c97dbf8..af2df171 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1060,7 +1060,7 @@ end
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(10)
+                .order("SUM(i.qty) DESC").limit(20)
   end
 
   def self.bottom_products(today)
@@ -1070,7 +1070,7 @@ end
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) ASC").limit(10)
+                .order("SUM(i.qty) ASC").limit(20)
   end
 
   def self.hourly_sales(today)
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 4056e064..f935522b 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -15,7 +15,6 @@
       delimiter = ""
     end
   %> 
-  <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
   <!-- Widgets -->
   <div class="row clearfix">
     <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
@@ -64,10 +63,17 @@
       </div>
     </div>
   </div>
-  <% end %>
   <!-- #END# Widgets -->
   <!-- CPU Usage -->
 
+  <!-- Date range for dashboard -->
+  <div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+      
+    </div>
+  </div>
+  <!-- Date range for dashboard -->
+
   <div class="row">
     <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
     <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6e1f7128..386a142f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -411,8 +411,10 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
-          <% if current_login_employee.role != "waiter" %>
+          <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
+          <% end %>
+          <% if current_login_employee.role != "waiter" %>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 17674fff..de774e2b 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -382,7 +382,10 @@
    <!-- Waiter Buttons -->
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i> Back</button>
    <button type="button" id="add_order" class="btn btn-block btn- bg-blue waves-effect">Add Order</button>
+   <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
    <button type="button" id="survey" class="btn btn-block bg-blue waves-effect">Survey</button>
+   <% end %>
+   <% if current_login_employee.role != "waiter" %>
    <% if @room.bookings.length >= 1 %>
      <% if @status_order == 'order' && @status_sale != 'sale' %>
        <!-- <button type="button" class="btn bg-blue btn-block" >Add Order</button> -->
@@ -453,6 +456,7 @@
 
    <!-- <button type="button" id="re-print" class="btn bg-blue btn-block" >Re.Print</button> -->
    <% end %>
+   <% end %>
  </div>
 </div>
 </div>

From 9f2bab7187d4d7d854c1ebfcb886aa7d5377b08c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 14:49:46 +0630
Subject: [PATCH 251/651] check customer tax profiles in origami

---
 app/controllers/origami/home_controller.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 93a83be2..31fea079 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -88,14 +88,17 @@ class Origami::HomeController < BaseOrigamiController
                   end
                   @order_items.push(item)
                 end
-                accounts = @customer.tax_profiles
-                puts accounts.to_json
-                puts "sssssssssss"
-                puts @customer.tax_profiles
-                @account_arr =[]
-                accounts.each do |acc|
-                  account = TaxProfile.find(acc)
-                  @account_arr.push(account)
+                @account_arr = Array.new
+                if @customer.tax_profiles
+                  accounts = @customer.tax_profiles
+                  puts accounts.to_json
+                  puts "sssssssssss"
+                  puts @customer.tax_profiles
+                  @account_arr =[]
+                  accounts.each do |acc|
+                    account = TaxProfile.find(acc)
+                    @account_arr.push(account)
+                  end
                 end
               end
             end

From 48c33f68c2cade36daebb2ff6a25d33160df94eb Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Feb 2018 14:50:38 +0630
Subject: [PATCH 252/651] fixed for survey for cashier and quick_ser

---
 app/controllers/origami/surveys_controller.rb | 46 +++++++++++++++----
 app/views/origami/surveys/_form.html.erb      | 15 +++---
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 09f97bfd..b84d72b9 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -35,18 +35,25 @@ class Origami::SurveysController < BaseOrigamiController
 	end
 
 	def create
-		if params[:table_id].to_i>0
-		  @dining_facility   = DiningFacility.find(params[:table_id])
-		end
 		@type = params[:cashier_type]
 		@sale_id = params[:sale_id]
+
+		if params[:table_id].to_i>0
+		  @dining_facility  = DiningFacility.find(params[:table_id])
+		  cashier_zone      = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id)
+		  shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+		else
+		  sale     = Sale.find(@sale_id)
+          shift = ShiftSale.find(sale.shift_sale_id)
+		  shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(shift.cashier_terminal_id,nil)
+		end
+		
 		if @type == "quick_service"
 			@url = "/origami/sale/"+@sale_id+"/"+@type+"/payment"
 		else
 			@url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id]
 		end
-		cashier_zone = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id)
-		shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+		
 
 		if params[:survey_id].nil? || params[:survey_id] == ""
 			@survey = Survey.new(survey_params)
@@ -79,15 +86,34 @@ class Origami::SurveysController < BaseOrigamiController
 
 	def create_survey
 		if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
-			dining_facility   = DiningFacility.find(params[:dining_id])
-			cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
-		    shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+			@type    = params[:cashier_type]
+		    @sale_id = params[:sale_id]
+		    sale     = Sale.find(@sale_id)
+
+			if @type != "quick_service"
+			  dining_facility   = DiningFacility.find(params[:dining_id])
+			  cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
+			  cashier_zone = cashier_zone.cashier_terminal_id
+			else
+				shift = ShiftSale.find(sale.shift_sale_id)
+                cashier_zone = shift.cashier_terminal_id
+			end
+			
+		    shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_terminal_id,nil)
+			
+			if @type != "quick_service"
+				survey = Survey.find_by_dining_name(dining_facility.name)
+			else
+				survey = nil
+			end
 			
-			survey = Survey.find_by_dining_name(dining_facility.name)
 			
 			if survey.nil?
 				survey = Survey.new
-				survey.dining_name = dining_facility.name
+				if @type != "quick_service"
+					survey.dining_name = dining_facility.name
+				end
+				
 				survey.receipt_no = params[:receipt_no]
 				survey.shift_id = shift_by_terminal.id
 				survey.created_by = current_user.name
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 16c3888f..cccda50a 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -74,13 +74,13 @@
 
          </div>
           <%if !@dining_facility.nil?%>
-            <input type="hidden" name="table_id" value="<%= @dining_facility.id %>">
-            <input type="hidden" name="table_type" value="<%= @table_type %>">
-            <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
+             <input type="hidden" name="table_id" value="<%= @dining_facility.id %>">
+             <input type="hidden" name="table_type" value="<%= @table_type %>">
+             <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
           <%else%>
-          <input type="hidden" name="table_id" value="0">
-          <input type="hidden" name="table_type" value="0">
-          <%= f.input :dining_name, :as => :hidden, :input_html => { :value => 0 } %>
+            <input type="hidden" name="table_id" value="0">
+            <input type="hidden" name="table_type" value="0">
+            <%= f.input :dining_name, :as => :hidden, :input_html => { :value => 0 } %>
           <%end%>
           <input type="hidden" name="sale_id" value="<%=@id%>">
           <input type="hidden" name="cashier_type" value="<%=@cashier_type%>">
@@ -90,8 +90,7 @@
          <% else %>
           <input type="hidden" name="survey_id" />
          <% end %>
-         <input type="hidden" name="table_id" value="<%=@dining_facility.id%>">
-         <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
+         
 
          <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %>
          <%= f.input :receipt_no, :as => :hidden, :input_html => { :value => @receipt_no} %>

From 521b4d897b82ff19f352bc3da1296f3f72c40ddd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 15:43:27 +0630
Subject: [PATCH 253/651] change migration file

---
 app/controllers/application_controller.rb     | 10 +++++-----
 app/controllers/home_controller.rb            | 19 +++++++++++++++++++
 app/views/home/dashboard.html.erb             | 16 +++++++++++++---
 db/migrate/20170403155230_create_employees.rb |  1 +
 db/migrate/20170622050926_create_customers.rb |  1 +
 .../20170825090115_create_commissioners.rb    |  1 +
 ...80213050551_add_image_path_to_employees.rb |  9 ---------
 ...80213050631_add_image_path_to_customers.rb |  9 ---------
 ...3052206_add_image_path_to_commissioners.rb |  9 ---------
 9 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100644 db/migrate/20180213050551_add_image_path_to_employees.rb
 delete mode 100644 db/migrate/20180213050631_add_image_path_to_customers.rb
 delete mode 100644 db/migrate/20180213052206_add_image_path_to_commissioners.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 67f6cb46..eaf89c34 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index db843aca..99c6d5f6 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -62,6 +62,9 @@ class HomeController < ApplicationController
   end
 
   def dashboard
+    # puts "date range =>"
+    # puts get_date_range_from_params
+    
     @shop = Shop.first
 
     today = DateTime.now.strftime('%Y-%m-%d')
@@ -162,4 +165,20 @@ class HomeController < ApplicationController
         redirect_to reports_dailysale_index_path
     end
   end
+
+  def get_date_range_from_params
+      from = params[:from]
+      to = params[:to]   
+
+      if from.present? && to.present?
+        f_date = DateTime.parse(from)
+        t_date = DateTime.parse(to)
+        f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
+        t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
+        from   = f_time.beginning_of_day.utc.getlocal
+        to     = t_time.end_of_day.utc.getlocal  
+      end
+
+    return from, to 
+  end
 end
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index f935522b..d1a13775 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -67,11 +67,21 @@
   <!-- CPU Usage -->
 
   <!-- Date range for dashboard -->
-  <div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-      
+  <!-- <div class="row clearfix">
+    <div class="col-lg-4 col-md-4 col-sm-4">
+      <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
+    </div>
+    <div class="col-lg-4 col-md-4 col-sm-4">
+      <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
+    </div>
+    <div class="col-lg-2 col-md-2 col-sm-2">
+      <label></label><br>
+      <input type="button" value="Generate" class='btn btn-primary btn_generate'>
     </div>
   </div>
+  <br> -->
   <!-- Date range for dashboard -->
 
   <div class="row">
diff --git a/db/migrate/20170403155230_create_employees.rb b/db/migrate/20170403155230_create_employees.rb
index c4bf65ac..4270b265 100755
--- a/db/migrate/20170403155230_create_employees.rb
+++ b/db/migrate/20170403155230_create_employees.rb
@@ -9,6 +9,7 @@ class CreateEmployees < ActiveRecord::Migration[5.1]
       t.datetime :session_expiry
       t.datetime :session_last_login
       t.string :created_by
+      t.string :image_path
       t.timestamps
     end
   end
diff --git a/db/migrate/20170622050926_create_customers.rb b/db/migrate/20170622050926_create_customers.rb
index cb370bc1..b01362fe 100755
--- a/db/migrate/20170622050926_create_customers.rb
+++ b/db/migrate/20170622050926_create_customers.rb
@@ -18,6 +18,7 @@ class CreateCustomers < ActiveRecord::Migration[5.1]
       t.string :membership_authentication_code
       t.string :customer_type, :default => "Dinein"
       t.json   :tax_profiles
+      t.string :image_path
     end
   end
 end
diff --git a/db/migrate/20170825090115_create_commissioners.rb b/db/migrate/20170825090115_create_commissioners.rb
index 1794b5c7..a89920d5 100755
--- a/db/migrate/20170825090115_create_commissioners.rb
+++ b/db/migrate/20170825090115_create_commissioners.rb
@@ -9,6 +9,7 @@ class CreateCommissioners < ActiveRecord::Migration[5.1]
       t.datetime :joined_date
       t.datetime :resigned_date
       t.boolean :is_active, default: true
+      t.string :image_path
       t.timestamps
     end
   end
diff --git a/db/migrate/20180213050551_add_image_path_to_employees.rb b/db/migrate/20180213050551_add_image_path_to_employees.rb
deleted file mode 100644
index bb26e888..00000000
--- a/db/migrate/20180213050551_add_image_path_to_employees.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddImagePathToEmployees < ActiveRecord::Migration[5.1]
-  def change
-    add_column :employees, :image_path, :string
-  end
-
-  def down
-  	remove_column :image_path
-  end
-end
diff --git a/db/migrate/20180213050631_add_image_path_to_customers.rb b/db/migrate/20180213050631_add_image_path_to_customers.rb
deleted file mode 100644
index 11eecdc0..00000000
--- a/db/migrate/20180213050631_add_image_path_to_customers.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddImagePathToCustomers < ActiveRecord::Migration[5.1]
-  def change
-    add_column :customers, :image_path, :string
-  end
-
-  def down
-  	remove_column :image_path
-  end
-end
diff --git a/db/migrate/20180213052206_add_image_path_to_commissioners.rb b/db/migrate/20180213052206_add_image_path_to_commissioners.rb
deleted file mode 100644
index f61dce61..00000000
--- a/db/migrate/20180213052206_add_image_path_to_commissioners.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddImagePathToCommissioners < ActiveRecord::Migration[5.1]
-  def change
-    add_column :commissioners, :image_path, :string
-  end
-
-  def down
-  	remove_column :image_path
-  end
-end

From 510e76b3c47b07d246fa26e4d1b2bc1f231bea12 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Feb 2018 15:47:53 +0630
Subject: [PATCH 254/651] update add order js & css

---
 app/assets/javascripts/addorder.js   | 4 ++--
 app/assets/stylesheets/addorder.scss | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 6f7c772a..237bf321 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -193,7 +193,7 @@ $(function() {
                         +add+ '</i>'
                         +'</div>'
                        +'</div>'
-                    +"<div  class='"+add_icon+" p-t-60 m-r--5' data-item-code='"
+                    +"<div  class='"+add_icon+" p-t-65 m-r--5' data-item-code='"
                           + menu_items[field].code +"' data-name='"
                           + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
                           + price +"' data-instance-code = '"+ code +"' data-instance = '"
@@ -208,7 +208,7 @@ $(function() {
                       //   +"<img id='logo' height='' src='"+image_path+"'>"
                       // +"</div>"
 
-                      +'<div class="card-footer custom-card-footer" style="opacity:0.5">'
+                      +'<div class="card-footer custom-card-footer" style="opacity:0.7">'
                         +'<span>'+ price +'</span>'
                       +'</div>'
                     +'</div>'; 
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 028b9002..a1590087 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -5,7 +5,7 @@ section .content{
     height: 40px;
     #background-color: #54A5AF;
     background-color: #a1aade;
-    opacity: 0.5;
+    opacity: 0.8;
     padding:5px;
     color :#000000;
 
@@ -212,10 +212,10 @@ i.logout_icon{
 
 /*For Menu List*/
 .dropdown-toggle:after{
-  margin-left:30px;
+  margin-left:20px;
 }
 .my-toggle{
-  padding: 15px 35px 10px 20px;
+  padding: 15px 25px 10px 20px;
   line-height:2;
   border-bottom: 1px solid #fff;
 }

From eef54320923d9785bf933484a06452590c9f1dd5 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Feb 2018 15:57:01 +0630
Subject: [PATCH 255/651] update add order css

---
 app/assets/stylesheets/addorder.scss | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index a1590087..7b29dcd4 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -212,17 +212,18 @@ i.logout_icon{
 
 /*For Menu List*/
 .dropdown-toggle:after{
-  margin-left:20px;
+  margin-left:15px;
 }
 .my-toggle{
-  padding: 15px 25px 10px 20px;
+  padding: 15px 20px 10px 10px;
   line-height:2;
-  border-bottom: 1px solid #fff;
+ 
 }
 .list-menu{
   list-style: none;
   margin-top:5px;
   background-color: #eee;
+   border-bottom: 1px solid #fff;
 }
 .menu_list{
   display: block;

From 6ae451f2bc8717a6f51d488e3c80f929b74df26a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 17:23:39 +0630
Subject: [PATCH 256/651] check split bill

---
 app/controllers/origami/home_controller.rb    | 6 ++++++
 app/controllers/origami/surveys_controller.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 0e3eef26..3a7501e6 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -123,6 +123,12 @@ class Origami::HomeController < BaseOrigamiController
     #for bank integration
     @checkout_time = Lookup.collection_of('checkout_time')
     @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
+
+    lookup_spit_bill = Lookup.collection_of('split_bill')
+    @split_bill = 0
+    if !lookup_spit_bill[0].nil?
+      @split_bill = lookup_spit_bill[0][1]
+    end
   end
 
   #Shop Name in Navbor
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index b49359e0..0baec650 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -71,7 +71,7 @@ class Origami::SurveysController < BaseOrigamiController
 				survey = Survey.new
 				survey.dining_name = dining_facility.name
 				survey.receipt_no = params[:receipt_no]
-				survey.shift_id = shift_by_terminal.id
+				survey.shift_id   = shift_by_terminal.id 
 				survey.created_by = current_user.name
 				survey.total_customer = params[:total_customer]
 				survey.total_amount = params[:total_amount]

From a15025c8a0de0179c434a29f488a8b020988f125 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Feb 2018 17:45:30 +0630
Subject: [PATCH 257/651] update add orderjs and origami js

---
 app/assets/javascripts/addorder.js          | 5 +++--
 app/assets/javascripts/origami.js           | 5 +++--
 app/views/origami/addorders/detail.html.erb | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 237bf321..94d52bbf 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -697,7 +697,8 @@ $(function() {
     
     qty           = parseInt(data.attr('data-qty'));
     append        = 0;
-    price         = parseFloat(data.attr('data-price')).toFixed(2);
+    price         = data.attr('data-price');
+
     instance_name = data.attr('data-instance');
     if (instance_name == "undefined"){
       instance = '';
@@ -720,7 +721,7 @@ $(function() {
         }
         
         $(item_row[i]).children('#item_qty').text(qty);
-        parseFloat($(item_row[i]).children('#item_price').text(price*qty)).toFixed(2);
+        parseFloat($(item_row[i]).children('#item_price').text(parseFloat(price*qty).toFixed(2)));
         append =1;
       }else{
         if (qty > 1) {            
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index d2359593..d7afc4db 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -148,13 +148,14 @@ $(document).on('turbolinks:load', function() {
 function checkReceiptNoInFirstBillData(receipt_no,payment) {
 	// localStorage.removeItem('receipt_lists');
 	var status = false;
+	var json_data = [];
 	if((receipt_no!=undefined) && (receipt_no!="")){
 		if(localStorage.hasOwnProperty("receipt_lists")===true){
 			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 			if (payment) {
-				var json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+				json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
 			}else{
-				var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+				json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
 			}
 
 			if((arr_data.length) > (json_data.length)){
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index ff72d2bc..a49300d2 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -154,7 +154,7 @@
           <% if type %>
             <div class="row clearfix">
                <div class="col-md-6 col-lg-6 col-sm-12">
-                 <strong id="order-title" class="font-14">ORDER DETAILS </strong>
+                 <strong id="order-title" class="font-13">ORDER DETAILS </strong>
                </div>
 
                <% if modify_order %>

From 8ccf45d06f31e70b45d7eb678683bec91a6cb253 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Feb 2018 18:05:30 +0630
Subject: [PATCH 258/651] check some function

---
 app/controllers/origami/surveys_controller.rb |  4 ++--
 app/views/origami/split_bill/index.html.erb   |  4 ++--
 app/views/origami/surveys/_form.html.erb      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 5e33fde9..02ec9795 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -93,10 +93,10 @@ class Origami::SurveysController < BaseOrigamiController
 			if @type != "quick_service"
 			  dining_facility   = DiningFacility.find(params[:dining_id])
 			  cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
-			  cashier_zone = cashier_zone.cashier_terminal_id
+			  cashier_terminal_id = cashier_zone.cashier_terminal_id
 			else
 				shift = ShiftSale.find(sale.shift_sale_id)
-                cashier_zone = shift.cashier_terminal_id
+                cashier_terminal_id = shift.cashier_terminal_id
 			end
 			
 		    shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_terminal_id,nil)
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 31e6a5d0..f246e98c 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -517,7 +517,7 @@
 					            	// 	window.location.href = '/origami/room/' + dining_id;
 					            	// }
 
-	        						window.location.href = '/origami/sale/' + split_sale_id + "/payment";
+	        						window.location.href = '/origami/sale/' + split_sale_id + "/cashier/payment";
 					            }
 					        }); 
 						}
@@ -538,7 +538,7 @@
 		            	// }else{
 		            	// 	window.location.href = '/origami/room/' + dining_id;
 		            	// }
-		            	window.location.href = '/origami/sale/' + split_sale_id + "/payment";
+		            	window.location.href = '/origami/sale/' + split_sale_id + "/cashier/payment";
 		            }
 		        });
 			}
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index cccda50a..82b7c12a 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -73,13 +73,13 @@
          <div class="hidden" id="newTemplate" >
 
          </div>
-          <%if !@dining_facility.nil?%>
-             <input type="hidden" name="table_id" value="<%= @dining_facility.id %>">
-             <input type="hidden" name="table_type" value="<%= @table_type %>">
+          <%if !@dining_facility.nil? %>
+             <input type="hidden" name="table_id" id="table_id" value="<%= @dining_facility.id %>">
+             <input type="hidden" name="table_type" id="table_type" value="<%= @table_type %>">
              <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
           <%else%>
-            <input type="hidden" name="table_id" value="0">
-            <input type="hidden" name="table_type" value="0">
+            <input type="hidden" name="table_id" id="table_id" value="0">
+            <input type="hidden" name="table_type" id="table_type" value="0">
             <%= f.input :dining_name, :as => :hidden, :input_html => { :value => 0 } %>
           <%end%>
           <input type="hidden" name="sale_id" value="<%=@id%>">
@@ -275,17 +275,17 @@ var cashier_type = "<%= @cashier_type %>";
     });
     // click back button for redirect
     $('#back').on('click',function(){
-      table_type    = $('#table_type').val()
-      table_id      = $('#table_id').val()
+      var table_type    = $('#table_type').val();
+      var table_id      = $('#table_id').val();
 
       if (cashier_type == "quick_service") {
         window.location.href = '/origami/sale/<%= @id %>/<%= @cashier_type %>/payment/';
       }else{
         if(table_type == "Table"){
-          window.location.href = "/origami/table/" + table_id
+          window.location.href = "/origami/table/" + table_id;
         }
         else {
-          window.location.href = "/origami/room/" + table_id
+          window.location.href = "/origami/room/" + table_id;
         }
       }
     });

From a2d0aee1ab7a66aba0b1260d84e50e8a3e109cc7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 09:37:30 +0630
Subject: [PATCH 259/651] update applicaton contro and request bill

---
 app/controllers/application_controller.rb           | 5 +++++
 app/controllers/origami/request_bills_controller.rb | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3a35a15b..9abc8990 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+   #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_company
     begin
      return Company.first
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index c076a820..44d6f784 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -6,6 +6,7 @@ class Origami::RequestBillsController < ApplicationController
     sale_order=SaleOrder.new
 
     if shift = ShiftSale.current_open_shift(current_user.id)
+    # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
@@ -14,7 +15,7 @@ class Origami::RequestBillsController < ApplicationController
         # Create Sale if it doesn't exist
         # 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)
+        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user)
         @sale_data = Sale.find_by_sale_id(@sale_id)
         @sale_items = SaleItem.where("sale_id=?",@sale_id)
       else

From 6d7da7f99754ed54eb5582eaa6df6c0ab165e207 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 11:07:00 +0630
Subject: [PATCH 260/651] update request bill controller

---
 app/controllers/origami/request_bills_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 44d6f784..83208b31 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -6,7 +6,6 @@ class Origami::RequestBillsController < ApplicationController
     sale_order=SaleOrder.new
 
     if shift = ShiftSale.current_open_shift(current_user.id)
-    # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)

From 31adc0e993e3fbf9d77d496f3d47a05852d74b1d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 11:13:49 +0630
Subject: [PATCH 261/651] update request bill for another role in
 request_bill_con and sale.rb

---
 .../origami/request_bills_controller.rb        | 17 +++++++++++------
 app/models/sale.rb                             | 18 +++++++++++++++---
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index e0f1d06c..c4c50420 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -5,16 +5,15 @@ class Origami::RequestBillsController < ApplicationController
     @sale = Sale.new
     sale_order=SaleOrder.new
 
-    if shift = ShiftSale.current_open_shift(current_user.id)
+    # if shift = ShiftSale.current_open_shift(current_user.id)
+    if get_cashier.count>0
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       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
-        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil)
+        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user)
         @sale_data = Sale.find_by_sale_id(@sale_id)
         @sale_items = SaleItem.where("sale_id=?",@sale_id)
       else
@@ -23,8 +22,8 @@ class Origami::RequestBillsController < ApplicationController
       end
 
       # Bind shift sale id to sale
-      @sale_data.shift_sale_id = shift.id
-      @sale_data.save
+      # @sale_data.shift_sale_id = shift.id
+      # @sale_data.save
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
@@ -55,4 +54,10 @@ class Origami::RequestBillsController < ApplicationController
 
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f42b62a0..976b2e3c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -78,12 +78,24 @@ class Sale < ApplicationRecord
       self.tax_type = "exclusive"
 
       # set cashier
-      if cashier != nil
+      open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+      shift = ShiftSale.current_open_shift(cashier.id)
+
+      # set cashier
+      if shift != nil
         self.cashier_id = cashier.id
         self.cashier_name = cashier.name
+        self.shift_sale_id = shift.id
       else
-        self.cashier_id = requested_by.id
-        self.cashier_name = requested_by.name
+        if open_cashier.nil?
+          self.cashier_id   = requested_by.id
+          self.cashier_name = requested_by.name
+          self.shift_sale_id = open_cashier[0].id
+        else
+          self.cashier_id   = open_cashier[0].id
+          self.cashier_name = open_cashier[0].name
+          self.shift_sale_id = open_cashier[0].id
+        end
       end
 
       # set waiter

From a5640877a307a569a5bb9f592bce18b2c707f6aa Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 11:59:57 +0630
Subject: [PATCH 262/651] update request bill

---
 app/controllers/application_controller.rb           | 5 +++++
 app/controllers/origami/request_bills_controller.rb | 4 +++-
 app/models/sale.rb                                  | 9 +++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66d7700..9d947cc1 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_company
     begin
      return Company.first
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index c4c50420..39296119 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -6,7 +6,9 @@ class Origami::RequestBillsController < ApplicationController
     sale_order=SaleOrder.new
 
     # if shift = ShiftSale.current_open_shift(current_user.id)
-    if get_cashier.count>0
+    puts ShiftSale.current_shift
+    puts "sssssssssss"
+    if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 976b2e3c..4646f469 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -79,6 +79,7 @@ class Sale < ApplicationRecord
 
       # set cashier
       open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+      current_shift = ShiftSale.current_shift
       shift = ShiftSale.current_open_shift(cashier.id)
 
       # set cashier
@@ -90,11 +91,11 @@ class Sale < ApplicationRecord
         if open_cashier.nil?
           self.cashier_id   = requested_by.id
           self.cashier_name = requested_by.name
-          self.shift_sale_id = open_cashier[0].id
+          self.shift_sale_id = current_shift.id
         else
-          self.cashier_id   = open_cashier[0].id
-          self.cashier_name = open_cashier[0].name
-          self.shift_sale_id = open_cashier[0].id
+          self.cashier_id   = current_shift.employee_id
+          self.cashier_name = Employee.find(current_shift.employee_id).name
+          self.shift_sale_id = current_shift.id
         end
       end
 

From 4bfb5842bfb09c4727609a06056d76e3ac893d5e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 20 Feb 2018 13:33:59 +0630
Subject: [PATCH 263/651] split bill process

---
 .../origami/payments_controller.rb            | 14 ++++-
 app/controllers/origami/surveys_controller.rb | 59 +++++++++++++++----
 app/pdf/receipt_bill_a5_pdf.rb                |  2 +-
 app/pdf/receipt_bill_pdf.rb                   |  2 +-
 app/views/origami/payments/show.html.erb      |  8 +++
 app/views/origami/split_bill/index.html.erb   | 20 ++++++-
 config/routes.rb                              |  1 +
 7 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 82761dd1..28a82d83 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -186,9 +186,21 @@ class Origami::PaymentsController < BaseOrigamiController
       @table_no = ''
       @dining  = ''
 
-      @shop        =  Shop::ShopDetail  
+      @shop        =  Shop::ShopDetail  #show shop info 
 
       saleObj = Sale.find(sale_id)
+
+      #total customer with individual total amount
+      survey = nil
+      @individual_total = Array.new
+      if !@sale_data.nil?
+        survey = Survey.find_by_receipt_no(@sale_data.receipt_no)
+        if !survey.nil?
+          per_person_amount = saleObj.grand_total.to_f / survey.total_customer.to_i
+          @individual_total.push({'total_customer' => survey.total_customer, 'per_person_amount' => per_person_amount.to_f })
+        end
+      end
+
       # rounding adjustment
       if @shop.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 02ec9795..12d6d543 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -86,9 +86,10 @@ class Origami::SurveysController < BaseOrigamiController
 
 	def create_survey
 		if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
-			@type    = params[:cashier_type]
-		    @sale_id = params[:sale_id]
-		    sale     = Sale.find(@sale_id)
+			@type      = params[:cashier_type]
+		    @sale_id   = params[:sale_id]
+		    sale       = Sale.find(@sale_id)
+		    receipt_no = params[:receipt_no]
 
 			if @type != "quick_service"
 			  dining_facility   = DiningFacility.find(params[:dining_id])
@@ -102,27 +103,43 @@ class Origami::SurveysController < BaseOrigamiController
 		    shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_terminal_id,nil)
 			
 			if @type != "quick_service"
-				survey = Survey.find_by_dining_name(dining_facility.name)
+				survey = Survey.find_by_dining_name_and_receipt_no(dining_facility.name,receipt_no)
 			else
 				survey = nil
 			end
 			
 			
 			if survey.nil?
-				survey = Survey.new
 				if @type != "quick_service"
-					survey.dining_name = dining_facility.name
+					survey = Survey.find_by_dining_name_and_receipt_no(dining_facility.name,nil)
+					if survey.nil?
+						survey = Survey.new
+						survey.dining_name = dining_facility.name
+						survey.receipt_no = params[:receipt_no]
+						survey.shift_id   = shift_by_terminal.id 
+						survey.created_by = current_user.name
+						survey.total_customer = params[:total_customer]
+						survey.total_amount = params[:total_amount]
+						survey.save!
+					else
+						survey.receipt_no = params[:receipt_no]
+						survey.total_customer = params[:total_customer]
+						survey.total_amount = params[:total_amount]
+						survey.save!
+					end
+				else
+					survey = Survey.new
+					survey.receipt_no = params[:receipt_no]
+					survey.shift_id   = shift_by_terminal.id 
+					survey.created_by = current_user.name
+					survey.total_customer = params[:total_customer]
+					survey.total_amount = params[:total_amount]
+					survey.save!
 				end
-				
-				survey.receipt_no = params[:receipt_no]
-				survey.shift_id   = shift_by_terminal.id 
-				survey.created_by = current_user.name
-				survey.total_customer = params[:total_customer]
-				survey.total_amount = params[:total_amount]
-				survey.save!
 			else
 				survey.receipt_no = params[:receipt_no]
 				survey.total_customer = params[:total_customer]
+				survey.total_amount = params[:total_amount]
 				survey.save!
 			end
 			render :json => {status: true}
@@ -131,6 +148,22 @@ class Origami::SurveysController < BaseOrigamiController
 		end
 	end
 	
+	def get_survey
+		dining_id  = params[:dining_id]
+		receipt_no = params[:receipt_no]
+		table 	   = DiningFacility.find_by_id(dining_id)
+		survey = Survey.find_by_dining_name_and_receipt_no(table.name,receipt_no)
+		if survey.nil?
+			survey = Survey.find_by_dining_name_and_receipt_no(table.name,nil)
+		end
+		
+		if !survey.nil?
+			render :json => { status: true, survey: survey }
+		else
+			render :json => { status: false }
+		end
+	end
+
 	private
 
     # Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 6125078b..5655cc38 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -484,7 +484,7 @@ class ReceiptBillA5Pdf < Prawn::Document
 
         bounding_box([0,y_position], :width =>self.label_width) do
             move_down 15
-            text "Total", :size => self.item_font_size,:align => :left
+            text "Total Amount", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 2f7fa0eb..64348fe8 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -493,7 +493,7 @@ class ReceiptBillPdf < Prawn::Document
 
         bounding_box([0,y_position], :width =>self.label_width) do
             move_down 15
-            text "Total", :size => self.item_font_size,:align => :left
+            text "Total Amount", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 8c275785..9cb9f397 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -107,6 +107,14 @@
               <td class="item-attr"><strong><span><%=@balance%></span></strong></td>
             </tr>
             <% end %>
+            <% if !@individual_total.nil? %>
+              <tr>
+                  <td class="charges-name">
+                    <strong>Individual amount for <%= @individual_total[0]['total_customer'] %> persons</strong>
+                  </td>
+                  <td class="item-attr"><strong><span><%=@individual_total[0]['per_person_amount']%></span></strong></td>
+              </tr>
+            <% end %>
           </tfooter>
         </table>
       </div>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index f246e98c..a423f298 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -249,7 +249,7 @@
 	      <div class="modal-body">
 				<div class="form-horizontal">
 					<div class="col-lg-12 col-md-12 col-sm-12">	
-						<div class="form-group">	
+						<div class="form-group">
 							<input type="text" id="per_person" name="per_person" class="form-control" onkeypress="return isNumberKey(event);"/><br>
 							<span id="per_personErr" style="color:red;"></span>
 						</div>					
@@ -318,7 +318,6 @@
  	var split_receipt_no = "";
  	var split_total_amount = 0;
  	$(document).ready(function(){
-
  		$('#back').on('click',function(){
  			backToOrigami();
  		})
@@ -472,9 +471,26 @@
 
 	//equal split process
 	$('#equal_split').on('click', function(){
+		var dining_id = $("#table_id").text();
 		split_sale_id = $("input[type='radio'][name='rdn_receipt']:checked").val();
 		split_receipt_no = $("input[type='radio'][name='rdn_receipt']:checked").parent().parent().attr('id');
 		split_total_amount = $("input[type='radio'][name='rdn_receipt']:checked").parent().parent().attr('data');
+
+		$.ajax({
+			type: "POST",
+			url: "/origami/split_bills/get_survey",
+			dataType: 'JSON',
+			data: {'dining_id':dining_id, 'receipt_no':split_receipt_no },
+			success: function (result) { 
+				if(result.status){
+					if(parseInt(result.survey.total_customer) > 0){
+						$("#per_person").val(parseInt(result.survey.total_customer));
+					}else{
+						$("#per_person").val("");
+					}
+				}
+			}
+		});
 		if(split_sale_id != undefined && split_sale_id != ""){
 			$('#equal_split_modal').modal({backdrop: 'static', keyboard: true, show: true});
 		}
diff --git a/config/routes.rb b/config/routes.rb
index ee09b593..c823676e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -239,6 +239,7 @@ scope "(:locale)", locale: /en|mm/ do
     post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
 
     post '/split_bills/surveys', to: 'surveys#create_survey'
+    post '/split_bills/get_survey', to: 'surveys#get_survey'
 
   end
 

From 9ae1fb1084ffe4271d7f1f0d5f71fd031d1cfa00 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 14:00:18 +0630
Subject: [PATCH 264/651] update requset bill for api

---
 app/controllers/api/bill_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 4b58e52d..c12eb596 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -6,7 +6,8 @@ class Api::BillController < Api::ApiController
     @status = false
     @error_message = "Order ID or Booking ID is require to request for a bill."
 
-    if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+    # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+    if !ShiftSale.current_shift.nil?
     #create Bill by Booking ID
       table = 0
       if (params[:booking_id])
@@ -41,8 +42,8 @@ class Api::BillController < Api::ApiController
       end
     
       # Bind shift sale id to sale
-      @sale_data.shift_sale_id = shift_by_terminal.id
-      @sale_data.save
+      # @sale_data.shift_sale_id = shift_by_terminal.id
+      # @sale_data.save
 
       Promotion.promo_activate(@sale)
 

From 20103a54a5bc90b70839f327421abaadd55357d9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 14:33:36 +0630
Subject: [PATCH 265/651] update sale for request

---
 app/models/sale.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 417e4204..5cdd7dd1 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -157,7 +157,7 @@ class Sale < ApplicationRecord
     @sale = Sale.new
         sale_order=SaleOrder.new
 
-        if shift = ShiftSale.current_open_shift(current_user.id)
+        if !ShiftSale.current_shift.nil?
           order_id = order.order_id # order_id
           bk_order = BookingOrder.find_by_order_id(order_id)
           check_booking = Booking.find_by_booking_id(bk_order.booking_id)
@@ -166,7 +166,7 @@ class Sale < ApplicationRecord
             # Create Sale if it doesn't exist
             # 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)
+            @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user)
             @sale_data = Sale.find_by_sale_id(@sale_id)
             @sale_items = SaleItem.where("sale_id=?",@sale_id)
           else
@@ -175,8 +175,8 @@ class Sale < ApplicationRecord
           end
 
           # Bind shift sale id to sale
-          @sale_data.shift_sale_id = shift.id
-          @sale_data.save
+          # @sale_data.shift_sale_id = shift.id
+          # @sale_data.save
 
           # Promotion Activation
           Promotion.promo_activate(@sale)

From b0cc934625b8b98c91d1a8813107cffc956274b4 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 15:29:19 +0630
Subject: [PATCH 266/651] update quick service for split bill

---
 app/controllers/origami/orders_controller.rb  |  9 +++++++--
 .../origami/pending_order_controller.rb       |  2 --
 .../origami/split_bill_controller.rb          | 20 +++++++++++--------
 app/views/origami/orders/show.html.erb        | 11 +++++++---
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index f5b71bf8..13f5b684 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -11,8 +11,13 @@ class Origami::OrdersController < BaseOrigamiController
 
     @booking = Array.new
     if !booking.nil?
-      dining_facilities = DiningFacility.find_by_id(booking.dining_facility_id)
-      @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => dining_facilities.type})
+      if booking.dining_facility_id.to_i > 0
+        dining_facilities = DiningFacility.find_by_id(booking.dining_facility_id)
+        @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => dining_facilities.type})
+      else
+        @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => nil})
+      end
+      
     end
 
     #for split bill
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index dd2f4cc7..a1942a27 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -9,8 +9,6 @@ class Origami::PendingOrderController < BaseOrigamiController
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
     @booking = BookingOrder.find_by_order_id(@order).booking_id
-    puts "sssssssssss"
-    puts @booking
     if Booking.find(@booking).dining_facility_id.to_i > 0
       @table_id = Booking.find(@booking).dining_facility_id
       @dining  = DiningFacility.find(@table_id)
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 037f3f6c..4c74d4a7 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -86,18 +86,22 @@ class Origami::SplitBillController < BaseOrigamiController
 		end
 
 		status = false
-		if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+		if !ShiftSale.current_shift.nil?
 	    	#create Bill by Booking ID
 	      	table = 0
 	    	if !params[:booking_id].empty?
 		        booking  = Booking.find(params[:booking_id])
 		        # for Multiple Cashier by Zone
-		        table = DiningFacility.find(booking.dining_facility_id)
+		        if booking.dining_facility_id.to_i>0
+		        	table = DiningFacility.find(booking.dining_facility_id)
+		            cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+		        else
+		        	table = nil
+		        end
 
-		        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-
-		        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
-		        get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id)
+		        # shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+		        # get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id)
+		        get_cashier_by_terminal = current_user
 
 				if booking
 					if booking.sale_id.nil?
@@ -320,8 +324,8 @@ class Origami::SplitBillController < BaseOrigamiController
 	    	end
 
 	    	# Bind shift sale id to sale
-			sale_data.shift_sale_id = shift_by_terminal.id
-			sale_data.save
+			# sale_data.shift_sale_id = shift_by_terminal.id
+			# sale_data.save
 
 			Promotion.promo_activate(sale)
 
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 4ffe9de6..57a55597 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -334,11 +334,16 @@
           swal("Information!", result.error_message);
         }
         else{
-            if(type=='Table'){
-              window.location.href = '/origami/table/' + dining_id;
+            if (dining_id == 0) {
+              window.location.href = '/origami';
             }else{
-              window.location.href = '/origami/room/' + dining_id;
+              if(type=='Table'){
+              window.location.href = '/origami/table/' + dining_id;
+              }else{
+                window.location.href = '/origami/room/' + dining_id;
+              }
             }
+            
           }
         }
       });

From 98c4737a2affcbe638218d8748f9fd4f42f59597 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 16:09:11 +0630
Subject: [PATCH 267/651] fixed minor issuse

---
 app/assets/javascripts/addorder.js                  | 2 +-
 app/controllers/origami/request_bills_controller.rb | 4 +---
 app/views/origami/payments/show.html.erb            | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index cefa64fb..b9b03c3e 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -102,7 +102,7 @@ $(function() {
             instances = menu_items[field].instances ;
 
             if (!instances.length > 0) {
-              swal("Hello Please Check!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning");
+              swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning");
             }
             if (instances.length > 0) {
               qty = 1;
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 39296119..39ef789a 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -5,9 +5,7 @@ class Origami::RequestBillsController < ApplicationController
     @sale = Sale.new
     sale_order=SaleOrder.new
 
-    # if shift = ShiftSale.current_open_shift(current_user.id)
-    puts ShiftSale.current_shift
-    puts "sssssssssss"
+    # if shift = ShiftSale.current_open_shift(current_user.id)SSS
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 96f69da9..1dbe960f 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -396,7 +396,7 @@
           var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
           var total = $('#amount_due').text();
           var amt = parseFloat(total) - parseFloat(othertotal);
-          $('#cash').text(parseFloat(amt).toFixed(2));
+          $('#cash').text(parseFloat(amt).toFixed(1));
           update_balance();
         break;
       }
@@ -485,7 +485,7 @@
                 $( "#loading_wrapper" ).hide();
                 if($('#balance').text() < 0){
                   swal({
-                    title: "Information!",
+                    title: "Payment Successful!",
                     text: 'Changed amount  ' + $('#balance').text() * (-1),
                     html: true,
                     closeOnConfirm: false,
@@ -497,7 +497,7 @@
                 }else{         
                   $('#pay').text("Pay");
                   swal({
-                   title: "Information!",
+                   title: "Payment Successful!",
                    text: 'Thank You !',
                    html: true,
                    closeOnConfirm: false, 

From 51a243ea7cc00d50855e37dce2966929cd328b93 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 20 Feb 2018 17:35:54 +0630
Subject: [PATCH 268/651] To update close cashier

---
 app/controllers/application_controller.rb     |  14 +-
 app/controllers/origami/shifts_controller.rb  |   3 +-
 app/models/printer/cashier_station_printer.rb |   4 +-
 app/models/shift_sale.rb                      |   7 +
 ..._pdf.rb => close_cashier_customise_pdf.rb} | 144 ++++++++++++------
 5 files changed, 116 insertions(+), 56 deletions(-)
 rename app/pdf/{close_cashier_customerize_pdf.rb => close_cashier_customise_pdf.rb} (84%)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 505a38b3..0966a573 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    # else         
-    #   # check for license file
-    #   if check_license
-    #     current_license(ENV["SX_PROVISION_URL"])
-    #   else
-    #     redirect_to activate_path
-    #   end      
+    else         
+      # check for license file
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end
   end
 
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 8bb684e9..e05922fd 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -75,13 +75,14 @@ class Origami::ShiftsController < BaseOrigamiController
         @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
         @total_dinein               = ShiftSale.get_total_dinein(@shift).total_dinein_amount
         @total_takeway              = ShiftSale.get_total_takeway(@shift).total_takeway_amount
+        @total_other_charges        = ShiftSale.get_total_other_charges(@shift).total_other_charges_amount
 
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)
 
         printer = Printer::CashierStationPrinter.new(print_settings)
 
-        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway)
+        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges)
       end
     end
     Employee.logout(session[:session_token])
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index 400a0934..b1cab253 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -22,14 +22,14 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   # end
 
   #Bill Receipt Print
-  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
     #Use CUPS service
     #Generate PDF
     #Print
     cashier = shift_sale.employee.name
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
 
-    pdf = CloseCashierCustomerizePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway)
+    pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
     pdf.render_file filename
     self.print(filename, cashier_terminal.printer_name)
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index 0127bd5c..10b2de38 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -149,6 +149,13 @@ class ShiftSale < ApplicationRecord
           .first()
   end 
 
+  def self.get_total_other_charges(shift) 
+      query = SaleItem.select("sum(sale_items.qty * sale_items.unit_price) as total_other_charges_amount")
+          .joins("JOIN sales as s ON s.sale_id = sale_items.sale_id")
+          .where('shift_sale_id =? and s.sale_status = "completed" and sale_items.product_code = "Other Charges" and sale_items.item_instance_code is null',shift.id)
+          .first()
+  end 
+
   def self.search(filter,from,to)
     if filter.blank?
         keyword = ''
diff --git a/app/pdf/close_cashier_customerize_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
similarity index 84%
rename from app/pdf/close_cashier_customerize_pdf.rb
rename to app/pdf/close_cashier_customise_pdf.rb
index 45834489..902fede4 100644
--- a/app/pdf/close_cashier_customerize_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -1,8 +1,8 @@
-class CloseCashierCustomerizePdf < Prawn::Document
+class CloseCashierCustomisePdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
-  def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway)
+  def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges)
     self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
     self.margin = 5
@@ -54,7 +54,7 @@ class CloseCashierCustomerizePdf < Prawn::Document
 
     stroke_horizontal_rule
 
-    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_dinein,total_takeway) 
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_dinein,total_takeway,total_other_charges) 
   end
 
   def header (shop_details)
@@ -70,7 +70,7 @@ class CloseCashierCustomerizePdf < Prawn::Document
     stroke_horizontal_rule
   end
 
-  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_dinein,total_takeway)
+  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_dinein,total_takeway,total_other_charges)
         move_down 7
          y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
@@ -159,27 +159,76 @@ class CloseCashierCustomerizePdf < Prawn::Document
         stroke_horizontal_rule
         move_down 7
 
-        @total_grand_total = shift_sale.grand_total + @overall + @total_foc + shift_sale.total_void
+        #start total amount by Account Like Food / Beverage /..
+        total_discount_account = 0
+        total_discount_by_account.each do |amount|
+
+          total_discount_account = total_discount_account.to_f + amount.total_price.to_f
+        end
+        #end total amount by Account 
+
+        #start total FOC amount
+        @total_foc = 0
+        other_payment.each do |other|
+          @total_foc = other.foc_amount.round(2)
+        end
+
+        #end total FOC amount      
+        total_grand_total = shift_sale.grand_total + shift_sale.total_discounts + @total_foc.to_f + shift_sale.total_void.to_f - total_discount_account.to_f
+        # @total_grand_total = @shift_sale.grand_total + @overall + @total_foc + @shift_sale.total_void
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Grand Total :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(total_grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Discount :", :size => self.item_font_size, :align => :right
+        #start total amount by Account Like Food / Beverage /..
+        total_discount_by_account.each do |amount|
+        
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
+          end
+          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+          end
         end
-        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        #end total amount by Account 
+
+        if total_member_discount[0].member_discount.present?
+          @member_discount = total_member_discount[0].member_discount rescue 0.0 
+          @overall = shift_sale.total_discounts - @member_discount
+                
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+             text "Total Member Discount :", :size => self.item_font_size, :align => :right
+            end
+            bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+            end
+        else 
+          @overall = shift_sale.total_discounts                   
+        end
+        
+        if @overall > 0
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total Overall Discount :", :size => self.item_font_size, :align => :right
+          end
+          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+           text "-#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+          end 
         end 
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Total FOC :", :size => self.item_font_size, :align => :right
         end
+        if @total_foc.nil?
+          @total_foc = 0
+        end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end     
@@ -248,13 +297,13 @@ class CloseCashierCustomerizePdf < Prawn::Document
                text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
-              y_position = cursor
-              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-               text "Reedem Payment :", :size => self.item_font_size, :align => :right
-              end
-              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-              end
+              # y_position = cursor
+              # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+              #  text "Reedem Payment :", :size => self.item_font_size, :align => :right
+              # end
+              # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+              #  text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+              # end
             end
         else
             y_position = cursor
@@ -287,26 +336,32 @@ class CloseCashierCustomerizePdf < Prawn::Document
         move_down -5
         stroke_horizontal_rule
         move_down 7
-
+    
         # start Dinein and Takeaway
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Total Dinein :", :size => self.item_font_size, :align => :right
         end
+        if total_dinein.nil?
+          total_dinein = 0
+        end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-        text "#{ number_with_precision(total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-          
+          text "#{ number_with_precision(total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right        
         end
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Total Takeaway :", :size => self.item_font_size, :align => :right
         end
+        if total_takeway.nil?
+          total_takeway = 0
+        end  
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "#{ number_with_precision(total_takeway, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-          
         end
+         
+
         # stop Dinein and Takeaway
         move_down -5
         stroke_horizontal_rule
@@ -352,33 +407,18 @@ class CloseCashierCustomerizePdf < Prawn::Document
         stroke_horizontal_rule
         move_down 7
         #start total amount by Account Like Food / Beverage /..
-        total_discount_by_account.each do |amount|
+        # total_discount_by_account.each do |amount|
         
-          y_position = cursor
-          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-           text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
-          end
-          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
-          end
-        end
+        #   y_position = cursor
+        #   bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+        #    text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
+        #   end
+        #   bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        #    text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+        #   end
+        # end
         #end total amount by Account 
 
-        if total_member_discount[0].member_discount.present?
-          @member_discount = total_member_discount[0].member_discount rescue 0.0 
-          @overall = shift_sale.total_discounts - @member_discount
-                
-            y_position = cursor
-            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-             text "Total Member Discount :", :size => self.item_font_size, :align => :right
-            end
-            bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-            end
-        else 
-          @overall = shift_sale.total_discounts                   
-        end
-
         # y_position = cursor
         # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
         #  text "Grand Total :", :size => self.item_font_size, :align => :right
@@ -400,6 +440,18 @@ class CloseCashierCustomerizePdf < Prawn::Document
         end
         #end total amount by Account 
 
+        #start total other charges amount
+        if total_other_charges > 0
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total Other Charges :", :size => self.item_font_size, :align => :right
+          end
+          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+            text "#{ number_with_precision(total_other_charges, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right        
+          end
+        end  
+        #end total other charges amount
+
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Total Dine-in Count :", :size => self.item_font_size, :align => :right

From 098ea8e9317b630969ed3bce4d36375d51f4d5a6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 18:15:55 +0630
Subject: [PATCH 269/651] update edit form

---
 app/assets/stylesheets/addorder.scss      |   3 +
 app/views/origami/sale_edit/edit.html.erb | 115 ++++++++++++++++++----
 2 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index bf09f726..be126395 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -62,6 +62,9 @@ section .content{
 .nav-tabs {
    background-color: #eeeeee;
 }
+.nav-tabs .nav-link {
+  padding: 0.7286rem 0.2575
+}
 .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link {
     background-color: #fff;
     border-left: 6px solid #111;
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 1aaa02ca..7372e116 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
   <!-- Column Two -->
-  <div class="col-lg-10 col-md-10 col-sm-10">
+  <div class="col-lg-8 col-md-8 col-sm-8">
     <div class="card">
       <div class="card-header">
         <div><strong id="order-title">INVOICE DETAILS </strong></div>
@@ -29,12 +29,12 @@
           <table class="table " id="order-items-table">
             <thead>
             <tr>
-              <th width="4%">#</th>
+              <th width="2%">#</th>
               <th class="" width="20%">Items</th>
-              <th style="" width="13%">QTY
-              </td>
-              <th class="" width="13%">Price
-              </td>
+              <th style="" width="5%">QTY
+              </th>
+              <th class="" width="10%">Price
+              </th>
               <!-- <th class='' width="17%"> Total </th> -->
               <th class='' width="20%"> Action</th>
             </tr>
@@ -53,46 +53,46 @@
                   unless sale_item.price == 0
                 %>
                     <tr>
-                      <td width="4%"><%= count %></td>
-                      <td class='' width="20%">
+                      <td class="p-1" width="2%"><%= count %></td>
+                      <td class="p-2" width="20%">
                         <%= sale_item.product_name %>
                       </td>
                       <% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %>
-                          <td class='' width="10%">
+                          <td class="p-1" width="5%">
                             <input id="<%= sale_item.id %>_qty" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
                           </td>
-                          <td class='' width="13%">
+                          <td class="p-1" width="10%">
                             <input id="<%= sale_item.id %>_price" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
                           </td>
                           <!-- <td class='' width="17%">
                         <input id="<%= sale_item.id %>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control"/>
                     </td> -->
-                          <td class='' width="25%">
+                          <td class="p-1" width="25%">
                             <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-blue waves-effect update'>Update</button>
                             <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-danger waves-effect void'>Void</button>
                             <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-red waves-effect foc'>FOC</button>
                           </td>
 
                       <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
-                          <td class='' width="10%">
+                          <td class="p-1" width="5%">
                             <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
                           </td>
-                          <td class='' width="13%">
+                          <td class='' width="10%">
                             <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control" disabled/>
                           </td>
                           <!-- <td class='' width="17%">
                     <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
                  </td> -->
-                          <td class='' width="25%">
+                          <td class="p-1" width="25%">
                             <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-danger waves-effect cancel'>Cancel
                               Void/Update
                             </button>
                           </td>
                       <% else %>
-                          <td class='' width="13%">
+                          <td class="p-1" width="5%">
                             <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
                           </td>
-                          <td class='' width="13%">
+                          <td class="p-1" width="10%">
                             <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
                           </td>
                           <td></td>
@@ -108,7 +108,7 @@
         <div class="card-footer">
           <table class="table" id="order-charges-table" border="0">
             <tr>
-              <td width="50%"><strong>Sub Total:</strong></td>
+              <td class="p-1" width="50%"><strong>Sub Total:</strong></td>
               <td><strong id="order-sub-total"><%= sub_total %></strong></td>
             </tr>
             <tr class="rebate_amount"></tr>
@@ -117,12 +117,42 @@
       </div>
     </div>
   </div>
-
+  <div class="col-md-3">
+    <div class="card p-l-15 p-r-15">
+      <div class="card-block">
+        <div class="row bottom">
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="1" data-type="num">1</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="2" data-type="num">2</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="3" data-type="num">3</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="4" data-type="num">4</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="5" data-type="num">5</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="6" data-type="num">6</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="7" data-type="num">7</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="8" data-type="num">8</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="9" data-type="num">9</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="0" data-type="num">0</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="." data-type="num">.</div>
+         <div class="col-md-4 cashier_number border-top border- border-left" data-value="00" data-type="num">00</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number border-top border- border-left green" data-type="nett">Nett</div>
+         <div class="col-md-4 cashier_number border-top border- border-left red" data-type="del">Del</div>
+         <div class="col-md-4 cashier_number border-top border- border-left orange" data-type="clr">Clr</div>
+       </div>  
+     </div>   
+   </div>  
+ </div>
   <!-- Column Three -->
-  <div class="col-lg-2 col-md-2 col-sm-2">
+  <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- Waiter Buttons -->
     <button type="button" class="btn btn-block btn-lg bg-default waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
-    <button type="button" class="btn btn-block btn-lg bg-danger waves-effect" id='cancel_all_void'>Cancel All Void</button>
+    <button type="button" class="btn btn-danger btn- action-btn" id='cancel_all_void'>Cancel All Void</button>
     <button type="button" class="btn btn-block btn-lg bg-blue waves-effect" id='apply'>Apply</button>
   </div>
 </div>
@@ -225,4 +255,49 @@
             }
         });
     })
+
+    $( "input" ).focusin(function() {
+      $('.addfocus').removeClass('addfocus'); 
+      $( this ).addClass('addfocus');
+    });
+
+    $(".cashier_number").on('click', function(event){
+      if(event.handled !== true) {
+        
+        var original_value='';
+        // original_value = $('.addfocus').val();
+
+        var input_type = $(this).attr("data-type");
+
+        switch (input_type) {
+          case 'num':
+          var input_value = $(this).attr("data-value");         
+          if (original_value == "0.0"){
+            $('.addfocus').val(input_value);            
+          }
+          else{
+            $('.addfocus').val(original_value + '' + input_value);            
+          }
+          break;
+
+          case 'add':
+          var input_value = $(this).attr("data-value");
+          amount = parseInt(input_value);
+          $('.addfocus').val(amount);                   
+          break;
+
+          case 'del' :
+          var discount_text=$('.addfocus').val();
+          $('.addfocus').val(discount_text.substr(0,discount_text.length-1));   
+          break;
+
+          case 'clr':
+          $('.addfocus').val("");              
+          break;
+        }
+        event.handled = true;
+      } else {
+        return false;
+      }
+    });
 </script>

From 84c0a60c0876d8cf081e07396bf898e6f5fe10db Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 09:15:41 +0630
Subject: [PATCH 270/651] add filter for dashboard

---
 app/controllers/application_controller.rb |   2 -
 app/controllers/home_controller.rb        |  51 +-
 app/models/sale.rb                        | 847 ++++++++++++++++------
 app/models/stock_journal.rb               |  12 +-
 app/views/home/dashboard.html.erb         |  47 +-
 5 files changed, 703 insertions(+), 256 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index eaf89c34..e66d7700 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -89,8 +89,6 @@ class ApplicationController < ActionController::Base
   end
 
   def current_user
-    puts "session"
-    puts session[:session_token]
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 99c6d5f6..97ac4051 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -62,60 +62,59 @@ class HomeController < ApplicationController
   end
 
   def dashboard
-    # puts "date range =>"
-    # puts get_date_range_from_params
-    
+    @from, @to = get_date_range_from_params
+
     @shop = Shop.first
 
     today = DateTime.now.strftime('%Y-%m-%d')
     @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
     @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
 
-    @top_products = Sale.top_products(today).sum('i.qty')
-    @bottom_products = Sale.bottom_products(today).sum('i.qty')
-    @hourly_sales = Sale.hourly_sales(today).sum(:grand_total)
+    @top_products = Sale.top_products(today,@from,@to).sum('i.qty')
+    @bottom_products = Sale.bottom_products(today,@from,@to).sum('i.qty')
+    @hourly_sales = Sale.hourly_sales(today,@from,@to).sum(:grand_total)
     # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
     # .sum(:grand_total)
-    @employee_sales = Sale.employee_sales(today)
+    @employee_sales = Sale.employee_sales(today,@from,@to)
                     .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
-    @inventories    = StockJournal.inventory_balances(today).sum(:balance)
+    @inventories    = StockJournal.inventory_balances(today,@from,@to).sum(:balance)
 
-    @total_sale     = Sale.total_sale(today,current_user)
-    @total_count    = Sale.total_count(today,current_user)
-    @total_card     = Sale.total_card_sale(today,current_user)
-    @total_credit   = Sale.credit_payment(today,current_user)
+    @total_sale     = Sale.total_sale(today,current_user,@from,@to)
+    @total_count    = Sale.total_count(today,current_user,@from,@to)
+    @total_card     = Sale.total_card_sale(today,current_user,@from,@to)
+    @total_credit   = Sale.credit_payment(today,current_user,@from,@to)
 
     @sale_data = Array.new
-    @total_payment_methods = Sale.total_payment_methods(today,current_user)
+    @total_payment_methods = Sale.total_payment_methods(today,current_user,@from,@to)
 
     @total_payment_methods.each do |payment|
       if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
-        pay = Sale.payment_sale('card', today, current_user)
+        pay = Sale.payment_sale('card', today, current_user,@from,@to)
         @sale_data.push({'card' => pay.payment_amount})
       else 
-        pay = Sale.payment_sale(payment.payment_method, today, current_user)
+        pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to)
         @sale_data.push({payment.payment_method => pay.payment_amount})
       end
     end
-    @summ_sale              = Sale.summary_sale_receipt(today,current_user)
-    @total_customer         = Sale.total_customer(today,current_user)
-    @total_dinein           = Sale.total_dinein(today,current_user)
-    @total_takeaway         = Sale.total_takeaway(today,current_user)
-    @total_other_customer   = Sale.total_other_customer(today,current_user)
-    @total_membership       = Sale.total_membership(today,current_user)
+    @summ_sale              = Sale.summary_sale_receipt(today,current_user,@from,@to)
+    @total_customer         = Sale.total_customer(today,current_user,@from,@to)
+    @total_dinein           = Sale.total_dinein(today,current_user,@from,@to)
+    @total_takeaway         = Sale.total_takeaway(today,current_user,@from,@to)
+    @total_other_customer   = Sale.total_other_customer(today,current_user,@from,@to)
+    @total_membership       = Sale.total_membership(today,current_user,@from,@to)
 
-    @total_order            = Sale.total_order(today,current_user)
-    @total_accounts         = Sale.total_account(today,current_user)
+    @total_order            = Sale.total_order(today,current_user,@from,@to)
+    @total_accounts         = Sale.total_account(today,current_user,@from,@to)
     @account_data = Array.new
     @total_accounts.each do |account|
-      acc = Sale.account_data(account.account_id, today,current_user)
+      acc = Sale.account_data(account.account_id, today,current_user,@from,@to)
       if !acc.nil?
         @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
       end
     end
 
-    @top_items         = Sale.top_items(today,current_user)
-    @total_foc_items   = Sale.total_foc_items(today,current_user) 
+    @top_items         = Sale.top_items(today,current_user,@from,@to)
+    @total_foc_items   = Sale.total_foc_items(today,current_user,@from,@to) 
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
diff --git a/app/models/sale.rb b/app/models/sale.rb
index af2df171..3e9bbdaa 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1053,193 +1053,376 @@ end
      return tax
   end
 
-  def self.top_products(today)
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.top_products(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
+                      "and payment_status='paid' and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) DESC").limit(20)
+    else
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) DESC").limit(20)
+    end
   end
 
-  def self.bottom_products(today)
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.bottom_products(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
+                      "and payment_status='paid' and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) ASC").limit(20)
+    else
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) ASC").limit(20)
+    end
   end
 
-  def self.hourly_sales(today)
-    query= Sale.select("grand_total")
+  def self.hourly_sales(today,from,to)
+    if !from.nil? && !to.nil?
+      query= Sale.select("grand_total")
+            .where('payment_status="paid" and sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+            .order('receipt_date')
+    else
+      query= Sale.select("grand_total")
             .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
             .order('receipt_date')
+    end
   end
 
-  def self.employee_sales(today)
-    query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+  def self.employee_sales(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between '#{from}' and '#{to}'")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .order("e.name")
+    else
+      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
                 .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
+    end
   end
 
-  def self.total_sale(today,current_user=nil)
-    if current_user.nil?
-      total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+  def self.total_sale(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and sales.receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
+                  .sum("grand_total")
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
-                .sum("grand_total")
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+                  .sum("grand_total")
+          end
         end
       end
     end
   end
 
-  def self.total_count(today,current_user=nil)
-    if current_user.nil?
-      total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+  def self.total_count(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id = ?',from,to,shift.id).count
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id = ?',today,shift.id).count
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id = ?',today,shift.id).count
+          end
         end
       end
     end
   end
 
-  def self.total_card_sale(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-            .sum("sp.payment_amount")
+  def self.total_card_sale(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-            .sum("sp.payment_amount")
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
-            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-            .sum("sp.payment_amount")
+        if current_user.role == 'administrator'
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+          end
         end
       end
     end
   end
 
-  def self.credit_payment(today,current_user=nil)
-    if current_user.nil?
-      query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
-            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-            .sum("payment_amount")
+  def self.credit_payment(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ? and s.shift_sale_id=?',from,to,shift.id)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
-            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-            .sum("payment_amount")
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
-          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ? and s.shift_sale_id=?',today,shift.id)
-            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-            .sum("payment_amount")
+        if current_user.role == 'administrator'
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ? and s.shift_sale_id=?',today,shift.id)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+          end
         end
       end
     end
   end
 
-  def self.summary_sale_receipt(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-          .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
-    else
-      if current_user.role == 'administrator'
+  def self.summary_sale_receipt(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
         query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-          .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
-      else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
-          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
             .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+              .first()
+          end
         end
       end
     end
   end
 
-  def self.total_payment_methods(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("distinct sp.payment_method")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+  def self.total_payment_methods(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = Sale.select("distinct sp.payment_method")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("distinct sp.payment_method")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
-            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          end
         end
       end
     end
   end
 
-  def self.payment_sale(payment_method, today, current_user=nil)
-    if current_user.nil?
-      query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-          if payment_method == 'card'
-            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-          else
-            query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          end
-          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-    else
-      if current_user.role == 'administrator'
+  def self.payment_sale(payment_method, today, current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
         query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-          if payment_method == 'card'
-            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-          else
-            query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          end
-          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-      else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
-          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
+              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
             else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+              if payment_method == 'card'
+                query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
+              else
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              end
+              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+              if payment_method == 'card'
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
+              else
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              end
+              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          end
         end
       end
     end
   end
 
-  def self.total_customer(today,current_user=nil)
-    dinein_cnt = self.total_dinein(today,current_user)
-    takeaway_cnt = self.total_takeaway(today,current_user)
-    membership_cnt = self.total_membership(today,current_user)
+  def self.total_customer(today,current_user=nil,from,to)
+    dinein_cnt = self.total_dinein(today,current_user,from,to)
+    takeaway_cnt = self.total_takeaway(today,current_user,from,to)
+    membership_cnt = self.total_membership(today,current_user,from,to)
 
     total_cus = 0
     if !dinein_cnt.nil? || !takeaway_cnt.nil? || !membership_cnt.nil?
@@ -1249,187 +1432,379 @@ end
     return total_cus
   end
 
-  def self.total_dinein(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
-          .first()
+  def self.total_dinein(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+                .first()
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = Sale.select("count(sales.customer_id) as total_dinein_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
             .first()
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
               .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+                .first()
+          end
         end
       end
     end
   end
 
-  def self.total_takeaway(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("count(sales.customer_id) as total_take_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
-            .first()
-    else
-      if current_user.role == 'administrator'
+  def self.total_takeaway(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
         query = Sale.select("count(sales.customer_id) as total_take_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
-            .first()
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("count(sales.customer_id) as total_take_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
-            .first()
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
         end
       end
     end
   end
 
-  def self.total_membership(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
-          .first()
-    else
-      if current_user.role == 'administrator'
+  def self.total_membership(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
         query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
-          .first()
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+            .first()
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',today,shift.id)
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
             .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
         end
       end
     end
   end
 
-  def self.total_other_customer(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("count(sales.customer_id) as total_cus")
+  def self.total_other_customer(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
             .first()
-    else
-      if current_user.role == 'administrator'
-        query = Sale.select("count(sales.customer_id) as total_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
-          .first()
-      else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
-          query = Sale.select("count(sales.customer_id) as total_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
-            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
         end
       end
     end
   end
 
-  def self.total_order(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("count(distinct a.order_id) as total_order")
-          .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-          .joins("JOIN orders as b ON b.order_id = a.order_id")
-          .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
-    else
-      if current_user.role == 'administrator'
+  def self.total_order(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
         query = Sale.select("count(distinct a.order_id) as total_order")
-          .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-          .joins("JOIN orders as b ON b.order_id = a.order_id")
-          .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
+            .first()
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("count(distinct a.order_id) as total_order")
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
-            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
             .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct a.order_id) as total_order")
+              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN orders as b ON b.order_id = a.order_id")
+              .where('b.status = "billed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct a.order_id) as total_order")
+              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN orders as b ON b.order_id = a.order_id")
+              .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
         end
       end
     end
   end
 
-  def self.total_account(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("distinct b.id as account_id, b.title as title")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .joins("JOIN accounts as b ON b.id = a.account_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+  def self.total_account(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("distinct b.id as account_id, b.title as title")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN accounts as b ON b.id = a.account_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = Sale.select("distinct b.id as account_id, b.title as title")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .joins("JOIN accounts as b ON b.id = a.account_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("distinct b.id as account_id, b.title as title")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN accounts as b ON b.id = a.account_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+          end
         end
       end
     end
   end
 
-  def self.account_data(account_id, today, current_user=nil)
-    if current_user.nil?
-      query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .first()
+  def self.account_data(account_id, today, current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              .first()
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             .first()
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
-            .first()
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .first()
+          end
         end
       end
     end
   end
 
-  def self.top_items(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .group("a.product_code")
-          .order("SUM(a.qty) DESC")
-          .first()
+  def self.top_items(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
+            .group("a.product_code")
+            .order("SUM(a.qty) DESC")
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
@@ -1437,35 +1812,65 @@ end
             .order("SUM(a.qty) DESC")
             .first()
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
-            .group("a.product_code")
-            .order("SUM(a.qty) DESC")
-            .first()
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+          end
         end
       end
     end
   end
 
-  def self.total_foc_items(today,current_user=nil)
-    if current_user.nil?
-      query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .sum("a.qty")
+  def self.total_foc_items(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
+            .sum("a.qty")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
+              .sum("a.qty")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+                .sum("a.qty")
+          end
+        end
+      end
     else
-      if current_user.role == 'administrator'
+      if current_user.nil?
         query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             .sum("a.qty")
       else
-        shift = ShiftSale.current_open_shift(current_user.id)
-        if !shift.nil?
+        if current_user.role == 'administrator'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
               .sum("a.qty")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+                .sum("a.qty")
+          end
         end
       end
     end
diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb
index 35bebca2..c2a12f4a 100755
--- a/app/models/stock_journal.rb
+++ b/app/models/stock_journal.rb
@@ -36,12 +36,20 @@ class StockJournal < ApplicationRecord
     journal.save
   end
 
-  def self.inventory_balances(today)
-    query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
+  def self.inventory_balances(today,from,to)
+    if !from.nil? && !to.nil?
+      query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
+            .joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
+            .where("stock_journals.created_at between '#{from}' and '#{to}'")
+            .group("mii.item_instance_name")
+            .order("mii.item_instance_name ASC")
+    else
+      query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
             .joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
             .where("DATE_FORMAT(stock_journals.created_at,'%Y-%m-%d') = '#{today}'")
             .group("mii.item_instance_name")
             .order("mii.item_instance_name ASC")
+    end
   end
 
 end
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index d1a13775..85fe9630 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -67,21 +67,23 @@
   <!-- CPU Usage -->
 
   <!-- Date range for dashboard -->
-  <!-- <div class="row clearfix">
+  <div class="row clearfix">
     <div class="col-lg-4 col-md-4 col-sm-4">
       <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
+      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" value="<%= Time.now.utc.strftime('%d-%m-%Y') %>" placeholder="From date" style="height: 35px;">
+      <span id="fromErr" style="color:red;"></span>
     </div>
     <div class="col-lg-4 col-md-4 col-sm-4">
       <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
+      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" value="<%= Time.now.utc.strftime('%d-%m-%Y') %>" placeholder="To date" style="height: 35px;">
+      <span id="toErr" style="color:red;"></span>
     </div>
     <div class="col-lg-2 col-md-2 col-sm-2">
       <label></label><br>
       <input type="button" value="Generate" class='btn btn-primary btn_generate'>
     </div>
   </div>
-  <br> -->
+  <br>
   <!-- Date range for dashboard -->
 
   <div class="row">
@@ -315,4 +317,39 @@
     </div>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+  $(document).ready(function(){
+    var from = '<%= @from.strftime('%d-%m-%Y') rescue '' %>';
+    var to = '<%= @to.strftime('%d-%m-%Y') rescue '' %>';
+    
+    if((from!=undefined) && (from != null) && (from != '')){
+      $('#from').val(from);
+    }
+    if((to!=undefined) && (to != null) && (to != '')){
+      $('#to').val(to);
+    }
+  });
+
+  $('.btn_generate').on('click',function(){
+    var from = $("#from").val();
+    var to = $("#to").val();
+    if((from=='') && (to=='')){
+      $('#fromErr').html("can't be blank");
+      $('#toErr').html("can't be blank");
+    }else if((from!='') && (to=='')){
+      $('#fromErr').html("");
+      $('#toErr').html("can't be blank");
+    }else if((from=='') && (to!='')){
+      $('#fromErr').html("can't be blank");
+      $('#toErr').html("");
+    }else{
+      $('#fromErr').html("");
+      $('#toErr').html("");
+    }
+    if((from!='') && (to!='')){
+      window.location.href = '/dashboard?from='+from+'&to='+to;
+    }
+  });
+</script>
\ No newline at end of file

From cd95d1d5c9e82c52ec3a43d831e8d6fd8104b917 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 21 Feb 2018 10:12:05 +0630
Subject: [PATCH 271/651] license test

---
 app/controllers/application_controller.rb      | 13 +++++++------
 app/controllers/concerns/login_verification.rb |  6 +++---
 app/models/license.rb                          |  2 +-
 config/secrets.yml                             |  4 ++--
 config/shops.json                              | 17 ++++++++++++++++-
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0966a573..36d3ab43 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,8 +27,9 @@ class ApplicationController < ActionController::Base
       from = request.subdomain.downcase  + "." + request.domain.downcase    
       @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
       if (!@license.nil?)
-        # logger.info "Location - " + @license.name
+        # logger.info "Location - " + @license.name        
         ActiveRecord::Base.establish_connection(website_connection(@license))
+        authentication
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
       else
         # reconnect_default_db
@@ -38,11 +39,11 @@ class ApplicationController < ActionController::Base
       end
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index ab5823de..6e9cff8d 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -2,7 +2,7 @@ module LoginVerification
   extend ActiveSupport::Concern
 
   included do
-    before_action :authenticate
+    # before_action :authenticate
     helper_method :current_company,:current_login_employee
 
   end
@@ -10,7 +10,7 @@ module LoginVerification
 
   protected
   # Authenticate the user with token based authentication
-  def authenticate
+  def authenticate    
     authenticate_session_token || render_unauthorized
   end
 
@@ -18,7 +18,7 @@ module LoginVerification
     token = session[:session_token]
     if (token)
       #@current_user = User.find_by(api_key: token)
-      Rails.logger.debug "token - " + token.to_s
+      #Rails.logger.debug "token - " + token.to_s
 
       @user = Employee.authenticate_by_token(token)
       if @user
diff --git a/app/models/license.rb b/app/models/license.rb
index d025e349..ddb9a8c0 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -33,7 +33,7 @@ class License
     ##Get redis connection from connection pool
     redis = Redis.new
     cache_license = redis.get(cache_key)    
-
+    
     Rails.logger.info "Cache key - " + cache_key.to_s
     if cache_license.nil?
       ##change the d/e key
diff --git a/config/secrets.yml b/config/secrets.yml
index a0220639..286c1ade 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,8 +12,8 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
+  sx_provision_url: 192.168.1.125:3002/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 
diff --git a/config/shops.json b/config/shops.json
index 268c73f0..dc0e3b46 100644
--- a/config/shops.json
+++ b/config/shops.json
@@ -1,3 +1,18 @@
 {
-  "data": []
+  "data": [
+    {
+      "lookup": "chromis-1.zsai.ws",
+      "value": {
+        "key": "877eY5iPvpVzaYnIkc2FgIy0U85FtqpTpQGqoM/RCG0=\n",
+        "iv": "qSVQaKzOm3TYmRP3DhHdig==\n"
+      }
+    },
+    {
+      "lookup": "gw2a-13.zsai.dev",
+      "value": {
+        "key": "R0uRkGlvCD5DGaPV4SkhGlwaMR0ohYBBmNna+tpRXMc=\n",
+        "iv": "AP5iuLM36oJmnvLsWCo9+Q==\n"
+      }
+    }
+  ]
 }

From 317a79446f240cf9b6f77bb71c03957c2a6049dd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 11:17:25 +0630
Subject: [PATCH 272/651] add precision in payment page

---
 .../origami/payments_controller.rb            |  4 +-
 app/views/origami/payments/show.html.erb      | 86 ++++++++++++-------
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 28a82d83..ebdb80b0 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -217,7 +217,9 @@ class Origami::PaymentsController < BaseOrigamiController
         @rounding_adj = @sale_data.rounding_adjustment
       end
       #end rounding adjustment
-      
+
+      # get printer info
+      @print_settings = PrintSetting.get_precision_delimiter()
 
       #get customer amount
       @customer = Customer.find(@sale_data.customer_id)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index eb8ed1ee..fa4167b2 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -2,6 +2,21 @@
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
+  <% if !@print_settings.nil? %>
+    <% if @print_settings.precision.to_i > 0
+        precision = @print_settings.precision
+      else
+        precision = 0
+      end
+      #check delimiter
+      if @print_settings.delimiter
+        delimiter = ","
+      else
+        delimiter = ""
+      end
+    %>
+  <% end %>
+
   <div class="row clearfix">
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
       <div class="card">
@@ -56,9 +71,9 @@
                     <% sub_total += sale_item.price%>
                     <tr>
                       <td><%= count %></td>
-                      <td class="item-name"><%=sale_item.product_name%>@<%=sale_item.unit_price%></td>
+                      <td class="item-name"><%=sale_item.product_name%>@<%=number_with_precision( sale_item.unit_price, precision: precision.to_i )%></td>
                      <td class="item-attr"><%=sale_item.qty%></td>
-                    <td class="item-attr"><%=(sale_item.price)%></td>
+                    <td class="item-attr"><%=(number_with_precision(sale_item.price, precision: precision.to_i ))%></td>
                  </tr>
                  <%end %>
                </tbody>
@@ -71,7 +86,7 @@
           <tfooter>
             <tr>
               <td class="charges-name"><strong>Sub Total</strong></td>
-              <td class="item-attr"><strong><span id="sub-total"><%=sub_total%></span></strong></td>
+              <td class="item-attr"><strong><span id="sub-total"><%=number_with_precision(sub_total, precision: precision.to_i)%></span></strong></td>
             </tr>
             <tr>
               <%if @sale_data.discount_type == 'member_discount'%>
@@ -79,7 +94,7 @@
               <%else%>
               <td class="charges-name"><strong>(Discount)</strong></td>
               <%end%>
-              <td class="item-attr"><strong><span>(<%=@sale_data.total_discount rescue 0%>)</span></strong></td>
+              <td class="item-attr"><strong><span>(<%= number_with_precision(@sale_data.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>)</span></strong></td>
             </tr>
             <tr>
               <td class="charges-name"><strong>Tax
@@ -91,28 +106,28 @@
              <%end%>
               <%end %>)
               </strong></td>
-              <td class="item-attr"><strong><span><%=@sale_data.total_tax rescue 0%></span></strong></td>
+              <td class="item-attr"><strong><span><%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></span></strong></td>
             </tr>
             <tr>
               <td class="charges-name"><strong>Rounding Adj:</strong></td>
-              <td class="item-attr"><strong><%= @sale_data.rounding_adjustment rescue 0%></strong></td>
+              <td class="item-attr"><strong><%= number_with_precision(@sale_data.rounding_adjustment, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></strong></td>
             </tr>
             <tr>
               <td class="charges-name"><strong>Grand Total</strong></td>
-              <td class="item-attr"><strong><span><%=@sale_data.grand_total rescue 0%></span></strong></td>
+              <td class="item-attr"><strong><span><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></span></strong></td>
             </tr>
             <%if @balance > 0%>
             <tr>
               <td class="charges-name"><strong><%= @accountable_type %></strong></td>
-              <td class="item-attr"><strong><span><%=@balance%></span></strong></td>
+              <td class="item-attr"><strong><span><%=number_with_precision(@balance, precision: precision.to_i )%></span></strong></td>
             </tr>
             <% end %>
-            <% if !@individual_total.nil? %>
+            <% if !@individual_total[0].nil? %>
               <tr>
                   <td class="charges-name">
                     <strong>Individual amount for <%= @individual_total[0]['total_customer'] %> persons</strong>
                   </td>
-                  <td class="item-attr"><strong><span><%=@individual_total[0]['per_person_amount']%></span></strong></td>
+                  <td class="item-attr"><strong><span><%= number_with_precision(@individual_total[0]['per_person_amount'], precision: precision.to_i )%></span></strong></td>
               </tr>
             <% end %>
           </tfooter>
@@ -132,24 +147,24 @@
         <div class="col-md-8"><strong>Amount Due</strong></div>
         <div class="col-md-4">
           <strong>
-            <span id="grand_total" class="hidden"><%= @sale_data.grand_total rescue 0%></span>
-            <span id="amount_due"><%= @sale_data.grand_total rescue 0%></span></strong>
+            <span id="grand_total" class="hidden"><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%></span>
+            <span id="amount_due"><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong>
         </div>
       </div>
      
       <div class="row payment cash-color p-l-5 p-r-5">
         <div class="col-md-8">Cash</div>
-        <div class="col-md-4" id="cash" ><%= @cash %></div>
+        <div class="col-md-4" id="cash" ><%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
       </div>
 
       <div class="row payment credit-color p-l-5 p-r-5" id="credit_payment" >
         <div class="col-md-8">Credit</div>
-        <div class="col-md-4" id="credit"><%= @credit %></div>
+        <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
       </div>
       <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%>
       <div class="row payment other-payment-color" id="card_payment" >
         <div class="col-md-8">Other Payments</div>
-        <div class="col-md-4" id="others"><%= @other %></div>
+        <div class="col-md-4" id="others"><%= number_with_precision(@other, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
       </div>
       <% else %>
       <div class="row payment other-payment-color" id="card_payment"  >
@@ -164,13 +179,13 @@
         <div class="row payment others-color">
           <div class="col-md-5"></div>
           <div class="col-md-3">MPU</div>
-          <div class="col-md-4 mpu is_card" id="others"><%= @other %></div>
+          <div class="col-md-4 mpu is_card" id="others"><%= number_with_precision(@other, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
           <div class="col-md-3">MPU</div>
-          <div class="col-md-4" id="others">0.0</div>
+          <div class="col-md-4" id="others"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
         <!-- paypar -->
@@ -178,13 +193,13 @@
         <div class="row payment others-color">
           <div class="col-md-5"></div>
           <div class="col-md-3">Redeem</div>
-          <div class="col-md-4" id="ppamount"><%= @ppamount %></div>
+          <div class="col-md-4" id="ppamount"><%= number_with_precision(@ppamount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
           <div class="col-md-3">Redeem</div>
-          <div class="col-md-4" id="ppamount">0.0</div>
+          <div class="col-md-4" id="ppamount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
         <!-- Visa -->
@@ -192,13 +207,13 @@
         <div class="row payment others-color">
           <div class="col-md-5"></div>
           <div class="col-md-3">VISA</div>
-          <div class="col-md-4 visa is_card" id="visacount"><%= @visacount %></div>
+          <div class="col-md-4 visa is_card" id="visacount"><%= number_with_precision(@visacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
           <div class="col-md-3">VISA</div>
-          <div class="col-md-4" id="visacount">0.0</div>
+          <div class="col-md-4" id="visacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
         <!-- JCB -->
@@ -206,13 +221,13 @@
         <div class="row payment others-color">
           <div class="col-md-5"></div>
           <div class="col-md-3">JCB</div>
-          <div class="col-md-4 jcb is_card" id="jcbcount"><%= @jcbcount %></div>
+          <div class="col-md-4 jcb is_card" id="jcbcount"><%= number_with_precision(@jcbcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
           <div class="col-md-3">JCB</div>
-          <div class="col-md-4" id="jcbcount">0.0</div>
+          <div class="col-md-4" id="jcbcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
         <!-- Master -->
@@ -220,13 +235,13 @@
         <div class="row payment others-color">
           <div class="col-md-5"></div>
           <div class="col-md-3">MASTER</div>
-          <div class="col-md-4 master is_card" id="mastercount"><%= @mastercount %></div>
+          <div class="col-md-4 master is_card" id="mastercount"><%= number_with_precision(@mastercount, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
           <div class="col-md-3">MASTER</div>
-          <div class="col-md-4" id="mastercount">0.0</div>
+          <div class="col-md-4" id="mastercount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
         <!-- <br> -->
@@ -235,18 +250,18 @@
         <div class="row payment others-color">
           <div class="col-md-5"></div>
           <div class="col-md-3">UNIONPAY</div>
-          <div class="col-md-4 master is_card" id="unionpaycount"><%= @unionpaycount %></div>
+          <div class="col-md-4 master is_card" id="unionpaycount"><%= number_with_precision(@unionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
           <div class="col-md-3">UNIONPAY</div>
-          <div class="col-md-4" id="unionpaycount">0.0</div>
+          <div class="col-md-4" id="unionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
-          <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total rescue 0 %></span></strong></div>
+          <div class="col-md-4"><strong><span id='balance'><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong></div>
         </div>
         <!-- <br> -->
       </div>
@@ -496,8 +511,13 @@ console.log("fffffffffffff")
           var unionpay1 = $('#unionpaycount').text();
           var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
           var total = $('#amount_due').text();
-          var amt = parseFloat(total) - parseFloat(othertotal);
-          $('#cash').text(parseFloat(amt).toFixed(1));
+          var amt = 0;
+          <% if precision.to_i > 0 %>;
+            amt = parseFloat(parseFloat(total) - parseFloat(othertotal)).toFixed(<%= precision %>);
+          <% else %>
+            amt = parseFloat(parseFloat(total) - parseFloat(othertotal));
+          <% end %>
+          $('#cash').text(amt);
           update_balance();
         break;
       }
@@ -662,7 +682,11 @@ console.log("fffffffffffff")
     var amount_due = $('#amount_due').text();
     var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay)
     var result = parseFloat(amount_due) - parseFloat(total);
-    $('#balance').text(result.toFixed(2));
+    <% if precision.to_i > 0 %>
+      $('#balance').text(parseFloat(result).toFixed(<%= precision %>));
+    <% else %>
+      $('#balance').text(parseFloat(result));
+    <% end %>
   }
 
   $('#foc').click(function() {

From 4455b03e8aaed7d0b6a0d236c45c6370b2f5199b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Feb 2018 12:34:03 +0630
Subject: [PATCH 273/651] update print pay in qs

---
 app/assets/stylesheets/addorder.scss          |  5 +-
 .../origami/payments_controller.rb            |  8 +-
 app/jobs/order_queue_processor_job.rb         |  4 +-
 app/models/order.rb                           |  4 +-
 app/models/order_queue_station.rb             | 96 ++++++++++---------
 app/views/origami/addorders/detail.html.erb   | 10 +-
 6 files changed, 73 insertions(+), 54 deletions(-)

diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 7b29dcd4..9a0a7d54 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -225,10 +225,13 @@ i.logout_icon{
   background-color: #eee;
    border-bottom: 1px solid #fff;
 }
+.list-menu > a:focus{
+  background-color:initial;
+}
 .menu_list{
   display: block;
   background-color: #eeeeee;
-  border-bottom: .214rem solid #fff;
+  border-bottom: .014rem solid #fff;
   border-left: 1px solid #54A5AF;
   border-right: 1px solid #54A5AF;
   margin-bottom: -1px;
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 82761dd1..cd32b418 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -157,8 +157,14 @@ class Origami::PaymentsController < BaseOrigamiController
 
         if params[:type] == "quick_service"
           booking = Booking.find_by_sale_id(sale_id)
+          if booking.dining_facility_id.to_i>0
+            table_id = booking.dining_facility_id
+          else
+            table_id = 0
+          end
+          
           booking.booking_orders.each do |order|
-          Order.pay_process_order_queue(order.order_id,booking.dining_facility_id)
+          Order.pay_process_order_queue(order.order_id,table_id,sale_id)
         end
     end
       end
diff --git a/app/jobs/order_queue_processor_job.rb b/app/jobs/order_queue_processor_job.rb
index 18fdc2dd..12fbff3a 100755
--- a/app/jobs/order_queue_processor_job.rb
+++ b/app/jobs/order_queue_processor_job.rb
@@ -1,7 +1,7 @@
 class OrderQueueProcessorJob < ApplicationJob
   queue_as :default
 
-  def perform(order_id, table_id)
+  def perform(order_id, table_id,sale_id=nil)
     # Do something later
     #Order ID     
     order = Order.find(order_id)    
@@ -9,7 +9,7 @@ class OrderQueueProcessorJob < ApplicationJob
     #Execute orders and send to order stations
     if order
       oqs = OrderQueueStation.new
-      oqs.process_order(order, table_id)
+      oqs.process_order(order, table_id,sale_id)
     end
 
     assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
diff --git a/app/models/order.rb b/app/models/order.rb
index 15ce56c3..72bbf60e 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -309,9 +309,9 @@ class Order < ApplicationRecord
   end
 
   #Process order items and send to order queue
-  def self.pay_process_order_queue(id,table_id)
+  def self.pay_process_order_queue(id,table_id,sale_id=nil)
     #Send to background job for processing
-      OrderQueueProcessorJob.perform_later(id, table_id)
+      OrderQueueProcessorJob.perform_later(id, table_id,sale_id)
   end
   
   def check_cup_status(status)
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 2be68fb3..fd7c3420 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -13,46 +13,22 @@ class OrderQueueStation < ApplicationRecord
   # validations
   validates_presence_of :station_name, :printer_name
 
-  def process_order (order, table_id)    
+  def process_order (order, table_id,sale_id=nil)    
 
     oqs_stations = OrderQueueStation.active
-    dining=DiningFacility.find(table_id)    
-    # oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id)
+    
 
     order_items = order.order_items
 
-    # get dining    
-    booking = Booking.find_by_dining_facility_id(dining.id)    
-   
-    #Assign OQS id to order Items
-    # oqs_stations.each do |oqs|  
-    #   is_auto_printed = false  
-    #   oqs_order_items = []
-    #   #Get List of items -
-    #   pq_items = JSON.parse(oqs.processing_items)      
-      
-    #   #Loop through the processing items
-    #   pq_items.each do |pq_item|
-    #     #Processing through the looping items
-    #     order_items.each  do |order_item|
-    #       if (pq_item == order_item.item_code)
-    #         # if oqs.id == oqpbz.order_queue_station_id
-    #         #   #Same Order_items can appear in two location.
-    #         #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
-    #         # else
-                          
-    #           if (order_item.price != 0)
-    #             AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
-    #             oqs_order_items.push(order_item)
-    #           end
-    #         # end                                           
-    #       end
-    #     end
-    #   end
+    if table_id > 0
+      # get dining    
+      dining=DiningFacility.find(table_id)    
+      oqs_by_zones = OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}")
+      booking = Booking.find_by_dining_facility_id(dining.id)    
              
       # ToDo per item per printer
 
-      OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}").find_each do |oqpbz|
+      oqs_by_zones.each do |oqpbz|
         oqs = OrderQueueStation.find(oqpbz.order_queue_station_id)
         is_auto_printed = false  
         oqs_order_items = []
@@ -86,17 +62,51 @@ class OrderQueueStation < ApplicationRecord
             end
           end 
         end
-        # if oqs.id == oqpbz.order_queue_station_id          
-        #   # Auto Printing
-        #   if oqs.auto_print 
-        #     if oqs_order_items.length > 0     
-        #       print_slip(oqs, order, oqs_order_items)
-        #       is_auto_printed = true
-        #     end
-        #   end 
-        # end  
-      end   
-    # end
+      end
+    else
+      # get dining    
+      sale = Sale.find(sale_id).shift_sale_id  
+      terminal_by_zones = CashierTerminalByZones.where("cashier_terminal_id=#{shift.cashier_terminal_id}") 
+             
+      # ToDo per item per printer
+      terminal_by_zones.each do |tbz|
+        OrderQueueProcessByZone.where("zone_id=#{tbz.zone_id}").find_each do |oqpbz|
+          oqs = OrderQueueStation.find(oqpbz.order_queue_station_id)
+          is_auto_printed = false  
+          oqs_order_items = []
+
+          if oqs.is_active
+            #Get List of items -
+            pq_items = JSON.parse(oqs.processing_items)
+            #Loop through the processing items
+            pq_items.each do |pq_item|
+              #Processing through the looping items
+              order_items.each  do |order_item|
+                if (pq_item == order_item.item_code)
+                  # if oqs.id == oqpbz.order_queue_station_id
+                  #   #Same Order_items can appear in two location.
+                  #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
+                  # else
+                                
+                    # if (order_item.price != 0)
+                      AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                      oqs_order_items.push(order_item)
+                    # end
+                  # end                                           
+                end
+              end
+            end
+            
+            if oqs.auto_print 
+              if oqs_order_items.length > 0     
+                print_slip(oqs, order, oqs_order_items)
+                is_auto_printed = true
+              end
+            end 
+          end
+        end
+      end
+    end #end else  
   end
 
   private
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index a49300d2..67d90ffd 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -28,7 +28,7 @@
           <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
          <!--  <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
         </a>
-        <ul class="ml-menu menu_list aria-hidden " style="">
+        <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
           <% @menus.each do |menu| %>
               <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
                    <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
@@ -213,14 +213,14 @@
                <% if type && modify_order%>
                   <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
                   
-                    <button type="button" class="btn btn-primary btn-lg create col-md-10" id="create_pay_order" disabled="disabled">Update Order & Pay</button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-10" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
               <%elsif !modify_order && type%>
                   <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
                   
-                    <button type="button" class="btn btn-primary btn-lg create col-md-6" id="create_pay_order" disabled="disabled">Create & Pay</button>
-                    <button type="button" class="btn btn-primary btn-lg create col-md-5" id="create_order" disabled="disabled">Create Order</button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-6" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create & Pay</button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-5" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%else%>
-               <button type="button" class="btn btn-primary btn-lg create col-md-10" id="create_order" disabled="disabled">Create Order</button>
+               <button type="button" class="btn btn-primary action-btn create col-md-10" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%end%>
 
                 

From ebdf838b520ac37346b061ab24beae69375e0786 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Feb 2018 13:12:41 +0630
Subject: [PATCH 274/651] update request sale for another role

---
 app/models/sale.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f07a8a2f..f0166491 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -82,16 +82,17 @@ class Sale < ApplicationRecord
       current_shift = ShiftSale.current_shift
       shift = ShiftSale.current_open_shift(cashier.id)
 
-      # set cashier
+       # set cashier
       if shift != nil
         self.cashier_id = cashier.id
         self.cashier_name = cashier.name
         self.shift_sale_id = shift.id
       else
-        if open_cashier.nil?
-          self.cashier_id   = requested_by.id
-          self.cashier_name = requested_by.name
-          self.shift_sale_id = current_shift.id
+        if open_cashier.count>0
+          self.cashier_id   = open_cashier[0].id
+          self.cashier_name = open_cashier[0].name
+          shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
+          self.shift_sale_id = shift_id.id
         else
           self.cashier_id   = current_shift.employee_id
           self.cashier_name = Employee.find(current_shift.employee_id).name
@@ -99,6 +100,7 @@ class Sale < ApplicationRecord
         end
       end
 
+
       # set waiter
       self.requested_by = requested_by.name
 

From f206df7c384d43eae2f8454a72a7cb87efc391d3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Feb 2018 13:16:47 +0630
Subject: [PATCH 275/651] update edit form

---
 app/views/origami/sale_edit/edit.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 7372e116..940b497a 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
   <!-- Column Two -->
-  <div class="col-lg-8 col-md-8 col-sm-8">
+  <div class="col-lg-10 col-md-10 col-sm-10">
     <div class="card">
       <div class="card-header">
         <div><strong id="order-title">INVOICE DETAILS </strong></div>
@@ -117,7 +117,7 @@
       </div>
     </div>
   </div>
-  <div class="col-md-3">
+  <!-- <div class="col-md-3">
     <div class="card p-l-15 p-r-15">
       <div class="card-block">
         <div class="row bottom">
@@ -147,7 +147,7 @@
        </div>  
      </div>   
    </div>  
- </div>
+ </div> -->
   <!-- Column Three -->
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- Waiter Buttons -->
@@ -265,7 +265,7 @@
       if(event.handled !== true) {
         
         var original_value='';
-        // original_value = $('.addfocus').val();
+        original_value = $('.addfocus').val();
 
         var input_type = $(this).attr("data-type");
 

From c9780ebffc3b933895943dc708e2609a2e35f006 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 13:41:37 +0630
Subject: [PATCH 276/651] split bill process

---
 .../origami/split_bill_controller.rb          | 69 +++++++++----------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 4c74d4a7..cb01cbfd 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -97,11 +97,11 @@ class Origami::SplitBillController < BaseOrigamiController
 		            cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
 		        else
 		        	table = nil
+		        	cashier_zone = nil
 		        end
 
 		        # shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
 		        # get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id)
-		        get_cashier_by_terminal = current_user
 
 				if booking
 					if booking.sale_id.nil?
@@ -208,17 +208,7 @@ class Origami::SplitBillController < BaseOrigamiController
 										end
 
 										# begin
-									    order = Order.new
-									    order.source = "cashier"
-									    order.order_type = order_type
-									    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-									    order.item_count = order_items.count
-									    order.status = "new"
-									    order.table_id = params[:dining_id]  # this is dining facilities's id
-									    order.waiters = current_user.name
-									    order.employee_name = current_user.name
-									    order.guest_info = nil
-									    order.save!
+										create_order(params,order_type,order_items.count,current_user)
 
 									    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
@@ -260,17 +250,7 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 
 								# begin
-							    order = Order.new
-							    order.source = "cashier"
-							    order.order_type = order_type
-							    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-							    order.item_count = order_items.count
-							    order.status = "new"
-							    order.table_id = params[:dining_id]  # this is dining facilities's id
-							    order.waiters = current_user.name
-							    order.employee_name = current_user.name
-							    order.guest_info = nil
-							    order.save!
+								create_order(params,order_type,order_items.count,current_user)
 
 							    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
@@ -297,17 +277,7 @@ class Origami::SplitBillController < BaseOrigamiController
 							end
 
 							# begin
-						    order = Order.new
-						    order.source = "cashier"
-						    order.order_type = order_type
-						    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-						    order.item_count = order_items.count
-						    order.status = "new"
-						    order.table_id = params[:dining_id]  # this is dining facilities's id
-						    order.waiters = current_user.name
-						    order.employee_name = current_user.name
-						    order.guest_info = nil
-						    order.save!
+							create_order(params,order_type,order_items.count,current_user)
 
 						    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
@@ -319,7 +289,7 @@ class Origami::SplitBillController < BaseOrigamiController
 				end
 
 				sale = Sale.new
-				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, get_cashier_by_terminal)
+				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, current_user)
 				sale_data = Sale.find_by_sale_id(sale_id)
 	    	end
 
@@ -337,9 +307,36 @@ class Origami::SplitBillController < BaseOrigamiController
 	    end
 	end
 
+	def create_order(params,order_type,items_count,current_user)
+		order = Order.new
+	    order.source = "cashier"
+	    order.order_type = order_type
+	    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+	    order.item_count = items_count
+	    order.status = "new"
+	    order.table_id = params[:dining_id]  # this is dining facilities's id
+	    order.waiters = current_user.name
+	    order.employee_name = current_user.name
+	    order.guest_info = nil
+	    order.save!
+	end
+
 	def update_order_item(order_id, order_item)
 		orderItem = OrderItem.find(order_item["id"])
     	if orderItem.qty.to_f != order_item['qty'].to_f
+    		set_menu_items_obj = Array.new
+    		if !orderItem.set_menu_items.nil?
+	    		instance_item_sets = JSON.parse(orderItem.set_menu_items)
+	    		instance_item_sets.each_with_index do |instance_item, instance_index|
+	    			instance_item_sets[instance_index]["quantity"] = (instance_item["quantity"].to_i - order_item['qty'].to_i).to_s
+	    			"[{\"item_instance_code\":\"psi002in001\",\"quantity\":\"2\",\"price\":\"5500.0\"}]"
+	    			set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'], 'price' => instance_item["price"]})
+	    		end
+	    		orderItem.set_menu_items = instance_item_sets.to_json
+	    	else
+	    		set_menu_items_obj = nil
+	    	end
+
     		OrderItem.processs_item(orderItem.item_code, 
     			orderItem.item_instance_code, 
     			orderItem.item_name, 
@@ -348,7 +345,7 @@ class Origami::SplitBillController < BaseOrigamiController
 				order_item['qty'],
 				orderItem.price, 
 				orderItem.options, 
-				orderItem.set_menu_items, 
+				set_menu_items_obj.to_json, 
 				order_id,
 				orderItem.item_order_by, 
 				orderItem.taxable)

From 2849a47171baeba28d31143d6ae208825550a138 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 13:59:55 +0630
Subject: [PATCH 277/651] check shift sale process

---
 app/controllers/origami/split_bill_controller.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index cb01cbfd..d16e3519 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -290,13 +290,8 @@ class Origami::SplitBillController < BaseOrigamiController
 
 				sale = Sale.new
 				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, current_user)
-				sale_data = Sale.find_by_sale_id(sale_id)
 	    	end
 
-	    	# Bind shift sale id to sale
-			# sale_data.shift_sale_id = shift_by_terminal.id
-			# sale_data.save
-
 			Promotion.promo_activate(sale)
 
 			BillBroadcastJob.perform_later(table)

From 3534a887fce122d0ce02f8306bd87da1ae5673f1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 14:01:29 +0630
Subject: [PATCH 278/651] remove Job for bill_channel

---
 app/controllers/origami/split_bill_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index d16e3519..6aedd516 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -294,7 +294,7 @@ class Origami::SplitBillController < BaseOrigamiController
 
 			Promotion.promo_activate(sale)
 
-			BillBroadcastJob.perform_later(table)
+			ActionCable.server.broadcast "bill_channel",table: table
 
 			render :json => { status: status }
 	    else

From 0392854f9042ae36c6563a52f868854d34efe532 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 14:18:37 +0630
Subject: [PATCH 279/651] change create order

---
 app/controllers/origami/split_bill_controller.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 6aedd516..88828d1b 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -208,7 +208,7 @@ class Origami::SplitBillController < BaseOrigamiController
 										end
 
 										# begin
-										create_order(params,order_type,order_items.count,current_user)
+										order = create_order(params,order_type,order_items.count,current_user)
 
 									    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
@@ -250,7 +250,7 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 
 								# begin
-								create_order(params,order_type,order_items.count,current_user)
+								order = create_order(params,order_type,order_items.count,current_user)
 
 							    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
@@ -277,7 +277,7 @@ class Origami::SplitBillController < BaseOrigamiController
 							end
 
 							# begin
-							create_order(params,order_type,order_items.count,current_user)
+							order = create_order(params,order_type,order_items.count,current_user)
 
 						    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
 
@@ -314,6 +314,8 @@ class Origami::SplitBillController < BaseOrigamiController
 	    order.employee_name = current_user.name
 	    order.guest_info = nil
 	    order.save!
+
+	    return order
 	end
 
 	def update_order_item(order_id, order_item)
@@ -325,11 +327,9 @@ class Origami::SplitBillController < BaseOrigamiController
 	    		instance_item_sets.each_with_index do |instance_item, instance_index|
 	    			instance_item_sets[instance_index]["quantity"] = (instance_item["quantity"].to_i - order_item['qty'].to_i).to_s
 	    			"[{\"item_instance_code\":\"psi002in001\",\"quantity\":\"2\",\"price\":\"5500.0\"}]"
-	    			set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'], 'price' => instance_item["price"]})
+	    			set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'].to_i, 'price' => instance_item["price"]})
 	    		end
 	    		orderItem.set_menu_items = instance_item_sets.to_json
-	    	else
-	    		set_menu_items_obj = nil
 	    	end
 
     		OrderItem.processs_item(orderItem.item_code, 

From 8c0f379a4fad6034f32797f1a111526a4b91abb0 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 21 Feb 2018 14:39:33 +0630
Subject: [PATCH 280/651] Edit Close Cashier Customise Pdf

---
 app/controllers/application_controller.rb | 14 ++---
 app/pdf/close_cashier_customise_pdf.rb    | 62 +++++++++++++----------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0966a573..505a38b3 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    else         
-      # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+    # else         
+    #   # check for license file
+    #   if check_license
+    #     current_license(ENV["SX_PROVISION_URL"])
+    #   else
+    #     redirect_to activate_path
+    #   end      
     end
   end
 
diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index 902fede4..cd9d7b3b 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -174,7 +174,7 @@ class CloseCashierCustomisePdf < Prawn::Document
         end
 
         #end total FOC amount      
-        total_grand_total = shift_sale.grand_total + shift_sale.total_discounts + @total_foc.to_f + shift_sale.total_void.to_f - total_discount_account.to_f
+        total_grand_total = shift_sale.grand_total + @total_foc.to_f + shift_sale.total_void.to_f - total_discount_account.to_f
         # @total_grand_total = @shift_sale.grand_total + @overall + @total_foc + @shift_sale.total_void
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
@@ -197,31 +197,6 @@ class CloseCashierCustomisePdf < Prawn::Document
         end
         #end total amount by Account 
 
-        if total_member_discount[0].member_discount.present?
-          @member_discount = total_member_discount[0].member_discount rescue 0.0 
-          @overall = shift_sale.total_discounts - @member_discount
-                
-            y_position = cursor
-            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-             text "Total Member Discount :", :size => self.item_font_size, :align => :right
-            end
-            bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-            end
-        else 
-          @overall = shift_sale.total_discounts                   
-        end
-        
-        if @overall > 0
-          y_position = cursor
-          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-           text "Total Overall Discount :", :size => self.item_font_size, :align => :right
-          end
-          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "-#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-          end 
-        end 
-
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Total FOC :", :size => self.item_font_size, :align => :right
@@ -452,6 +427,41 @@ class CloseCashierCustomisePdf < Prawn::Document
         end  
         #end total other charges amount
 
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        #start total over all discount
+         if total_member_discount[0].member_discount.present?
+          @member_discount = total_member_discount[0].member_discount rescue 0.0 
+          @overall = shift_sale.total_discounts - @member_discount
+                
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+             text "Total Member Discount :", :size => self.item_font_size, :align => :right
+            end
+            bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+            end
+        else 
+          @overall = shift_sale.total_discounts                   
+        end
+        
+        if @overall > 0
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total Overall Discount :", :size => self.item_font_size, :align => :right
+          end
+          bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+           text "-#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+          end 
+        end 
+        #end total over all discount
+
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Total Dine-in Count :", :size => self.item_font_size, :align => :right

From f93f7a0a2c9e397a8320e2a3418ea013fb712ab1 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 21 Feb 2018 14:42:09 +0630
Subject: [PATCH 281/651] Add License

---
 app/controllers/application_controller.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 505a38b3..0966a573 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    # else         
-    #   # check for license file
-    #   if check_license
-    #     current_license(ENV["SX_PROVISION_URL"])
-    #   else
-    #     redirect_to activate_path
-    #   end      
+    else         
+      # check for license file
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end
   end
 

From 0302bb408bbadd524d91d9e553f5c4396cedb05c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Feb 2018 16:11:05 +0630
Subject: [PATCH 282/651] update no table oqs print

---
 .../origami/payments_controller.rb            |  2 +-
 app/jobs/order_queue_processor_job.rb         |  4 +-
 app/models/order.rb                           |  4 +-
 app/models/order_queue_station.rb             | 70 ++++++++-----------
 app/pdf/order_item_pdf.rb                     |  8 ++-
 app/pdf/order_summary_pdf.rb                  |  8 ++-
 6 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index cd32b418..a9546c43 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -164,7 +164,7 @@ class Origami::PaymentsController < BaseOrigamiController
           end
           
           booking.booking_orders.each do |order|
-          Order.pay_process_order_queue(order.order_id,table_id,sale_id)
+          Order.pay_process_order_queue(order.order_id,table_id)
         end
     end
       end
diff --git a/app/jobs/order_queue_processor_job.rb b/app/jobs/order_queue_processor_job.rb
index 12fbff3a..18fdc2dd 100755
--- a/app/jobs/order_queue_processor_job.rb
+++ b/app/jobs/order_queue_processor_job.rb
@@ -1,7 +1,7 @@
 class OrderQueueProcessorJob < ApplicationJob
   queue_as :default
 
-  def perform(order_id, table_id,sale_id=nil)
+  def perform(order_id, table_id)
     # Do something later
     #Order ID     
     order = Order.find(order_id)    
@@ -9,7 +9,7 @@ class OrderQueueProcessorJob < ApplicationJob
     #Execute orders and send to order stations
     if order
       oqs = OrderQueueStation.new
-      oqs.process_order(order, table_id,sale_id)
+      oqs.process_order(order, table_id)
     end
 
     assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
diff --git a/app/models/order.rb b/app/models/order.rb
index 72bbf60e..15ce56c3 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -309,9 +309,9 @@ class Order < ApplicationRecord
   end
 
   #Process order items and send to order queue
-  def self.pay_process_order_queue(id,table_id,sale_id=nil)
+  def self.pay_process_order_queue(id,table_id)
     #Send to background job for processing
-      OrderQueueProcessorJob.perform_later(id, table_id,sale_id)
+      OrderQueueProcessorJob.perform_later(id, table_id)
   end
   
   def check_cup_status(status)
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index fd7c3420..5e9a2b56 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -13,16 +13,16 @@ class OrderQueueStation < ApplicationRecord
   # validations
   validates_presence_of :station_name, :printer_name
 
-  def process_order (order, table_id,sale_id=nil)    
+  def process_order (order, table_id)    
 
     oqs_stations = OrderQueueStation.active
     
 
     order_items = order.order_items
 
-    if table_id > 0
+    if table_id.to_i > 0
       # get dining    
-      dining=DiningFacility.find(table_id)    
+      dining = DiningFacility.find(table_id)    
       oqs_by_zones = OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}")
       booking = Booking.find_by_dining_facility_id(dining.id)    
              
@@ -64,46 +64,38 @@ class OrderQueueStation < ApplicationRecord
         end
       end
     else
-      # get dining    
-      sale = Sale.find(sale_id).shift_sale_id  
-      terminal_by_zones = CashierTerminalByZones.where("cashier_terminal_id=#{shift.cashier_terminal_id}") 
-             
-      # ToDo per item per printer
-      terminal_by_zones.each do |tbz|
-        OrderQueueProcessByZone.where("zone_id=#{tbz.zone_id}").find_each do |oqpbz|
-          oqs = OrderQueueStation.find(oqpbz.order_queue_station_id)
-          is_auto_printed = false  
-          oqs_order_items = []
+      oqs_stations.each do |oqs|
+        is_auto_printed = false  
+        oqs_order_items = []
 
-          if oqs.is_active
-            #Get List of items -
-            pq_items = JSON.parse(oqs.processing_items)
-            #Loop through the processing items
-            pq_items.each do |pq_item|
-              #Processing through the looping items
-              order_items.each  do |order_item|
-                if (pq_item == order_item.item_code)
-                  # if oqs.id == oqpbz.order_queue_station_id
-                  #   #Same Order_items can appear in two location.
-                  #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
-                  # else
-                                
-                    # if (order_item.price != 0)
-                      AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
-                      oqs_order_items.push(order_item)
-                    # end
-                  # end                                           
-                end
+        if oqs.is_active
+          #Get List of items -
+          pq_items = JSON.parse(oqs.processing_items)
+          #Loop through the processing items
+          pq_items.each do |pq_item|
+            #Processing through the looping items
+            order_items.each  do |order_item|
+              if (pq_item == order_item.item_code)
+                # if oqs.id == oqpbz.order_queue_station_id
+                #   #Same Order_items can appear in two location.
+                #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
+                # else
+                              
+                  # if (order_item.price != 0)
+                    AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                    oqs_order_items.push(order_item)
+                  # end
+                # end                                           
               end
             end
-            
-            if oqs.auto_print 
-              if oqs_order_items.length > 0     
-                print_slip(oqs, order, oqs_order_items)
-                is_auto_printed = true
-              end
-            end 
           end
+          
+          if oqs.auto_print 
+            if oqs_order_items.length > 0     
+              print_slip(oqs, order, oqs_order_items)
+              is_auto_printed = true
+            end
+          end 
         end
       end
     end #end else  
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 26253b6e..379e919c 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -37,8 +37,12 @@ class OrderItemPdf < Prawn::Document
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"     
-
-    text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    if order_item.dining.to_i > 0
+      text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    else
+      text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    end
+    
     stroke_horizontal_rule
     move_down 3
 
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 5211061e..6c8dacac 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -36,8 +36,12 @@ class OrderSummaryPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-
-    text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    if order[0].dining.to_i > 0
+      text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    else
+      text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    end
+    
     stroke_horizontal_rule
     move_down 5
 

From 5f67a91fd6ce67f2f28541a28aa52615e7e459d7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Feb 2018 16:25:01 +0630
Subject: [PATCH 283/651] update all pdf for no table

---
 app/pdf/order_item_slim_pdf.rb    |  8 ++++++--
 app/pdf/order_set_item_pdf.rb     |  7 +++++--
 app/pdf/order_summary_set_pdf.rb  |  8 ++++++--
 app/pdf/order_summary_slim_pdf.rb |  8 ++++++--
 app/pdf/receipt_bill_a5_pdf.rb    | 14 +++++++++++---
 app/pdf/receipt_bill_pdf.rb       |  4 ++--
 6 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index f419f185..09cce4d1 100644
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -37,8 +37,12 @@ class OrderItemSlimPdf < Prawn::Document
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"     
-
-    text "#{ order_item_slim.type + '-' + order_item_slim.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    if order_item_slim.dining.to_i > 0
+      text "#{ order_item_slim.type + '-' + order_item_slim.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    else
+      text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    end
+    
     stroke_horizontal_rule
     move_down 1
 
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 8f915ad0..6aa6efc4 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -37,8 +37,11 @@ class OrderSetItemPdf < Prawn::Document
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"     
-
-    text "#{ order_set_item.type + '-' + order_set_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    if order_set_item.dining.to_i > 0
+      text "#{ order_set_item.type + '-' + order_set_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    else
+      text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    end
     stroke_horizontal_rule
     move_down 3
 
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index 619b81ab..8828ea43 100644
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -36,8 +36,12 @@ class OrderSummarySetPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-
-    text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    if order[0].dining.to_i > 0
+      text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    else
+      text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    end
+    
     stroke_horizontal_rule
     move_down 5
 
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
index b4b850fa..73023278 100644
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -36,8 +36,12 @@ class OrderSummarySlimPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-
-    text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    if order[0].dining.to_i > 0
+      text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    else
+      text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    end
+    
     stroke_horizontal_rule
     move_down 1
 
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 5655cc38..0f7ea468 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -110,9 +110,12 @@ class ReceiptBillA5Pdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
             text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
         end
-        bounding_box([self.item_description_width, y_position], :width => self.item_description_width, :height => self.item_height) do
-            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+            bounding_box([self.item_description_width, y_position], :width => self.item_description_width, :height => self.item_height) do
+                text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
+            end
         end
+        
         move_down 10
 
         y_position = cursor
@@ -125,8 +128,13 @@ class ReceiptBillA5Pdf < Prawn::Document
         move_down 10
 
         y_position = cursor
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+            time =sale_data.receipt_date.strftime('%d-%m-%Y') +"("+ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p')  +"-"+  sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p')+")"
+        else
+            time =  time = sale_data.receipt_date.strftime('%d-%m-%Y %H:%M %p')
+        end
         bounding_box([0,y_position], :width =>self.page_width - 20, :height => self.item_height) do
-                text "Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left
+                text "Date : #{ time }",:size => self.item_font_size,:align => :left
         end
 
 
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 64348fe8..31317c0e 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -129,9 +129,9 @@ class ReceiptBillPdf < Prawn::Document
 
         y_position = cursor
         if sale_data.bookings[0].dining_facility_id.to_i > 0
-            time =sale_data.receipt_date.strftime('%d-%m-%Y') +"("+ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p')  +"-"+  sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p')+")"
+            time = sale_data.receipt_date.strftime('%d-%m-%Y') +"("+ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p')  +"-"+  sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p')+")"
         else
-            time =  time = sale_data.receipt_date.strftime('%d-%m-%Y %H:%M %p')
+            time = sale_data.receipt_date.strftime('%d-%m-%Y %H:%M %p')
         end
         
         bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do

From 3d2d304654e86f5a986e2beb0e3b231be5b86086 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 21 Feb 2018 16:30:14 +0630
Subject: [PATCH 284/651] license update for token

---
 app/controllers/application_controller.rb     | 75 +----------------
 app/controllers/base_crm_controller.rb        |  2 +-
 app/controllers/base_inventory_controller.rb  |  2 +-
 app/controllers/base_oqs_controller.rb        |  2 +-
 app/controllers/base_origami_controller.rb    |  2 +-
 app/controllers/base_report_controller.rb     |  2 +-
 app/controllers/base_waiter_controller.rb     |  2 +-
 .../concerns/license_verification.rb          | 83 +++++++++++++++++++
 .../concerns/login_verification.rb            |  9 +-
 app/controllers/home_controller.rb            |  4 +-
 10 files changed, 101 insertions(+), 82 deletions(-)
 create mode 100644 app/controllers/concerns/license_verification.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9eb08f5f..3c061feb 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,10 +1,11 @@
 class ApplicationController < ActionController::Base
-  include LoginVerification
+  include LicenseVerification
+  
   #before_action :check_installation
   protect_from_forgery with: :exception
 
   # lookup domain for db from  provision
-  before_action :lookup_domain, :set_locale
+  before_action :set_locale
 
   helper_method :current_company,:current_login_employee,:current_user
    # alias_method :current_user, :current_login_employee,:current_user
@@ -22,68 +23,6 @@ class ApplicationController < ActionController::Base
     { locale: I18n.locale }
   end
 
-  def lookup_domain 
-    if request.subdomain.present? && request.subdomain != "www" 
-      from = request.subdomain.downcase  + "." + request.domain.downcase    
-      @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
-      if (!@license.nil?)
-        # logger.info "Location - " + @license.name        
-        ActiveRecord::Base.establish_connection(website_connection(@license))
-        authentication
-        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else
-        # reconnect_default_db
-        logger.info 'License is nil'
-        # redirect_to root_url(:host => request.domain) + "store_error"
-         render :json => [{ status: false, message: 'Invalid Access!'}]
-      end
-    else         
-      # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
-    end
-  end
-
-  def current_license(url)  
-    @license = License.new(url)
-    flag = @license.detail_with_local_file()
-    if (flag == 0)
-      flash[:notice] = 'Expired or No License!'      
-    elsif (flag == 2)
-      flash[:notice] = 'Expiring! Please, License extend...'      
-    else
-      puts "RUN SAY BYAR"
-    end
-  end
-
-  def cache_license(url, lookup)    
-    @license = License.new(url, lookup)        
-
-    if (@license.detail_with_local_cache(lookup) == true)
-      return @license
-    else
-      return nil
-    end
-  end
-
-  def website_connection(license)
-    default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
-    :username => license.dbusername, :password => license.dbpassword)
-
-  end
-
-  def reconnect_default_db
-    ActiveRecord::Base.establish_connection(Rails.env)
-  end
-
-  # Regular database.yml configuration hash
-  def default_connection
-    @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
-  end
-
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     redirect_to root_path
@@ -112,14 +51,6 @@ class ApplicationController < ActionController::Base
       @employee = Employee.find_by_token_session(session[:session_token])
     end
   end
-
-  private
-  def check_license
-    if License.check_license_file
-      return true
-    end
-    return false
-  end
 end
 
 
diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index e66c67b9..ff44bbbf 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -1,5 +1,5 @@
 class BaseCrmController < ActionController::Base
-	include LoginVerification
+	include LicenseVerification
 	layout "CRM"
 
   #before_action :check_installation
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index 4059ac25..0ef47129 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -1,5 +1,5 @@
 class BaseInventoryController < ActionController::Base
-	include LoginVerification
+	include LicenseVerification
 	layout "inventory"
 
   #before_action :check_installation
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index db9f8231..4fc58402 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -1,5 +1,5 @@
 class BaseOqsController < ActionController::Base
-  include LoginVerification
+  include LicenseVerification
   layout "OQS"
 
   #before_action :check_installation
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index ec415bad..318c40f2 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,5 +1,5 @@
 class BaseOrigamiController < ActionController::Base
-  include LoginVerification
+  include LicenseVerification
   layout "origami"
 
   # before_action :checkin_process
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index af9ec4fc..a164c499 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -1,5 +1,5 @@
 class BaseReportController < ActionController::Base
-	include LoginVerification
+	include LicenseVerification
 	layout "application" 
 
 	#before_action :check_installation
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index e86433dc..38749af0 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,5 +1,5 @@
 class BaseWaiterController < ActionController::Base
-  include LoginVerification
+  include LicenseVerification
   layout "waiter"
 
   #before_action :check_installation
diff --git a/app/controllers/concerns/license_verification.rb b/app/controllers/concerns/license_verification.rb
new file mode 100644
index 00000000..bfa40f03
--- /dev/null
+++ b/app/controllers/concerns/license_verification.rb
@@ -0,0 +1,83 @@
+module LicenseVerification
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :lookup_domain    
+  end
+
+  protected 
+  def lookup_domain 
+    if request.subdomain.present? && request.subdomain != "www" 
+      from = request.subdomain.downcase  + "." + request.domain.downcase    
+      @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
+      if (!@license.nil?)
+        # logger.info "Location - " + @license.name        
+        ActiveRecord::Base.establish_connection(website_connection(@license))    
+        authenticate_session_token    
+        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
+      else
+        # reconnect_default_db
+        logger.info 'License is nil'
+        # redirect_to root_url(:host => request.domain) + "store_error"
+         render :json => [{ status: false, message: 'Invalid Access!'}]
+      end      
+    else         
+      # check for license file
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
+    end
+  end
+
+  def authenticate_session_token
+    token = session[:session_token]
+    if (token)
+      #@current_user = User.find_by(api_key: token)
+      #Rails.logger.debug "token - " + token.to_s
+
+      @user = Employee.authenticate_by_token(token)
+      if !@user      
+        flash[:notice] = 'Invalid Access!'
+      end
+    end
+  end
+
+  def current_license(url)  
+    @license = License.new(url)
+    flag = @license.detail_with_local_file()
+    if (flag == 0)
+      flash[:notice] = 'Expired or No License!'      
+    elsif (flag == 2)
+      flash[:notice] = 'Expiring! Please, License extend...'      
+    else
+      puts "RUN SAY BYAR"
+    end
+  end
+
+  def cache_license(url, lookup)    
+    @license = License.new(url, lookup)        
+
+    if (@license.detail_with_local_cache(lookup) == true)
+      return @license
+    else
+      return nil
+    end
+  end
+
+  def website_connection(license)
+    default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
+    :username => license.dbusername, :password => license.dbpassword)
+
+  end
+
+  def reconnect_default_db
+    ActiveRecord::Base.establish_connection(Rails.env)
+  end
+
+  # Regular database.yml configuration hash
+  def default_connection
+    @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index 6e9cff8d..7ddf3cec 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -2,9 +2,8 @@ module LoginVerification
   extend ActiveSupport::Concern
 
   included do
-    # before_action :authenticate
+    before_action :authenticate
     helper_method :current_company,:current_login_employee
-
   end
 
 
@@ -24,6 +23,8 @@ module LoginVerification
       if @user
         return true
         #Maybe log - login?
+      else 
+        flash[:notice] = 'Invalid Access!'
       end
     end
   end
@@ -50,6 +51,10 @@ module LoginVerification
   end
 
   private
+  def check_license
+    License.check_license_file 
+  end
+
   def check_installation
     if current_company.nil?
       redirect_to install_path
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 25fb0d70..5afd383a 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,6 @@
-class HomeController < ApplicationController
+class HomeController < ApplicationController  
   # layout "application", except: [:index, :show]
-  skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]  
+  skip_before_action only: [:index, :show, :create, :update, :destroy]  
 
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")

From 4552a4a9acec353a55bf522826d84e91cface31f Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 21 Feb 2018 16:42:19 +0630
Subject: [PATCH 285/651] license update, base controllers extends app
 controller

---
 app/controllers/base_crm_controller.rb       | 3 +--
 app/controllers/base_inventory_controller.rb | 3 +--
 app/controllers/base_oqs_controller.rb       | 3 +--
 app/controllers/base_origami_controller.rb   | 3 +--
 app/controllers/base_report_controller.rb    | 3 +--
 app/controllers/base_waiter_controller.rb    | 5 +----
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index ff44bbbf..5c412fcf 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -1,5 +1,4 @@
-class BaseCrmController < ActionController::Base
-	include LicenseVerification
+class BaseCrmController < ApplicationController
 	layout "CRM"
 
   #before_action :check_installation
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index 0ef47129..f44747d3 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -1,5 +1,4 @@
-class BaseInventoryController < ActionController::Base
-	include LicenseVerification
+class BaseInventoryController < ApplicationController
 	layout "inventory"
 
   #before_action :check_installation
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index 4fc58402..f1f2831a 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -1,5 +1,4 @@
-class BaseOqsController < ActionController::Base
-  include LicenseVerification
+class BaseOqsController < ApplicationController
   layout "OQS"
 
   #before_action :check_installation
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 318c40f2..58d9b801 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,5 +1,4 @@
-class BaseOrigamiController < ActionController::Base
-  include LicenseVerification
+class BaseOrigamiController < ApplicationController
   layout "origami"
 
   # before_action :checkin_process
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index a164c499..f7551f22 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -1,5 +1,4 @@
-class BaseReportController < ActionController::Base
-	include LicenseVerification
+class BaseReportController < ApplicationController
 	layout "application" 
 
 	#before_action :check_installation
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index 38749af0..248e32a6 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,9 +1,6 @@
-class BaseWaiterController < ActionController::Base
-  include LicenseVerification
+class BaseWaiterController < ApplicationController  
   layout "waiter"
 
   #before_action :check_installation
   protect_from_forgery with: :exception
-
-
 end

From 643a9d71bea9e532dc73f5f4f9844a8726cdde94 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 21 Feb 2018 17:04:45 +0630
Subject: [PATCH 286/651] remove skip before action in home controller

---
 app/controllers/home_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 5afd383a..ea411fa0 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,6 @@
 class HomeController < ApplicationController  
   # layout "application", except: [:index, :show]
-  skip_before_action only: [:index, :show, :create, :update, :destroy]  
+  # skip_before_action only: [:index, :show, :create, :update, :destroy]  
 
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")

From bc1007f193c183a60897b20c212f73a3356703e6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 17:09:18 +0630
Subject: [PATCH 287/651] check booking order delete for order

---
 app/controllers/origami/split_bill_controller.rb | 8 ++++++--
 app/views/origami/split_bill/index.html.erb      | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 88828d1b..e7265a7a 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -106,7 +106,7 @@ class Origami::SplitBillController < BaseOrigamiController
 				if booking
 					if booking.sale_id.nil?
 					  sale = Sale.new
-					  status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, get_cashier_by_terminal)
+					  status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, current_user)
 					  sale_data = Sale.find_by_sale_id(sale_id)
 					else
 					  status = true
@@ -127,6 +127,7 @@ class Origami::SplitBillController < BaseOrigamiController
 
 				if !orders.nil?
 					orders.each do |order|
+						BookingOrder.find_by_order_id(order["id"]).delete
 						BookingOrder.create({:booking_id => booking.booking_id, :order_id => order["id"]})
 					end
 				elsif !order_items.nil?
@@ -193,6 +194,8 @@ class Origami::SplitBillController < BaseOrigamiController
 										end
 								    end
 
+								    puts new_order_status
+
 									if new_order_status
 								    	BookingOrder.find_by_order_id(odr_id).delete
 										BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
@@ -232,6 +235,8 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 						    end
 
+						    puts new_order_status
+
 						    if new_order_status
 						    	BookingOrder.find_by_order_id(order_id).delete
 								BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
@@ -326,7 +331,6 @@ class Origami::SplitBillController < BaseOrigamiController
 	    		instance_item_sets = JSON.parse(orderItem.set_menu_items)
 	    		instance_item_sets.each_with_index do |instance_item, instance_index|
 	    			instance_item_sets[instance_index]["quantity"] = (instance_item["quantity"].to_i - order_item['qty'].to_i).to_s
-	    			"[{\"item_instance_code\":\"psi002in001\",\"quantity\":\"2\",\"price\":\"5500.0\"}]"
 	    			set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'].to_i, 'price' => instance_item["price"]})
 	    		end
 	    		orderItem.set_menu_items = instance_item_sets.to_json
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index a423f298..72f08c83 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -229,8 +229,10 @@
  			<div>
  				<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
  				<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
- 				<button id="order_split" class="btn btn-block waves-effect bg-blue">By Order</button>
- 				<button id="order_item_split" class="btn btn-block waves-effect bg-blue">By Order Item</button>
+ 				<% if !@orders.empty? %>
+	 				<button id="order_split" class="btn btn-block waves-effect bg-blue">By Order</button>
+	 				<button id="order_item_split" class="btn btn-block waves-effect bg-blue">By Order Item</button>
+ 				<% end %>
  			</div>
  		</div>
  		<!-- Column Three -->

From a07d46facc0abfe28086b05418277a4718fc66f5 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Feb 2018 17:15:29 +0630
Subject: [PATCH 288/651] update addorder details

---
 app/views/origami/addorders/detail.html.erb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 67d90ffd..5867cc1a 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -204,21 +204,23 @@
             </div>
             <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
             
-               <!-- <table class="table" id="order-charges-table" border="0">
+               <table class="table" id="order-charges-table" border="0">
                  <tr>
-                   <td class="charges-name"><strong>Sub Total:</strong></td>
-                   <td class="item-attr"><strong id="sub_total">0.00</strong></td>
+                   <td style="padding:2px;" width="5%"></td>
+                   <td style="padding:2px;" width="15%"></td>
+                   <td style="padding:2px; text-align:" class="charges-name" width="25%"><strong>Total:</strong></td>
+                   <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total">0.00</strong></td>
                  </tr>
-               </table> -->
+               </table>
                <% if type && modify_order%>
                   <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
                   
-                    <button type="button" class="btn btn-primary action-btn create col-md-10" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
               <%elsif !modify_order && type%>
                   <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
                   
-                    <button type="button" class="btn btn-primary action-btn create col-md-6" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create & Pay</button>
-                    <button type="button" class="btn btn-primary action-btn create col-md-5" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%else%>
                <button type="button" class="btn btn-primary action-btn create col-md-10" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%end%>

From ac2b1d76c767044f313821e4f5824cd41b85a541 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 17:23:15 +0630
Subject: [PATCH 289/651] change split bill btn

---
 app/views/origami/home/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8454f726..3acbe738 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -464,12 +464,12 @@
                       <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
                     <%end%> 
                   <% end %> 
+                  <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   <% if !@split_bill.nil? %>
                     <% if @split_bill == '1' %>
                       <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
                     <% end %>
                   <% end %>
-                  <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   
               <% end %>
               <!-- Cashier Buttons -->

From e2903075b2cba33dd9063279345d75c568475efc Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 18:24:04 +0630
Subject: [PATCH 290/651] change split bill equal person flow

---
 .../origami/payments_controller.rb            | 22 ++---
 .../origami/split_bill_controller.rb          | 30 ++++---
 app/controllers/origami/surveys_controller.rb | 80 -------------------
 app/controllers/origami/void_controller.rb    |  3 +-
 app/models/ability.rb                         |  1 +
 app/models/printer/receipt_printer.rb         |  8 +-
 app/pdf/receipt_bill_a5_pdf.rb                | 12 +--
 app/pdf/receipt_bill_pdf.rb                   | 12 +--
 app/views/origami/split_bill/index.html.erb   | 29 ++-----
 config/routes.rb                              |  3 +-
 db/migrate/20170701101420_create_sales.rb     |  1 +
 11 files changed, 52 insertions(+), 149 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 33596e1e..e7786b05 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -8,7 +8,6 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(sale_id)
     sale_items = SaleItem.where("sale_id=?",sale_id)
     member_info = nil
-    survey = Survey.find_by_receipt_no(sale_data.receipt_no)
     
     # For Cashier by Zone
     bookings = Booking.where("sale_id='#{sale_id}'")
@@ -67,7 +66,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       printer = Printer::ReceiptPrinter.new(print_settings)
 
-      printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil,survey)    
+      printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil)    
     end
   end
 
@@ -79,7 +78,6 @@ class Origami::PaymentsController < BaseOrigamiController
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
-      survey = Survey.find_by_receipt_no(saleObj.receipt_no)
       # rounding adjustment
       if shop_details.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
@@ -153,7 +151,7 @@ class Origami::PaymentsController < BaseOrigamiController
         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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data,survey)
+        printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
 
         if params[:type] == "quick_service"
           booking = Booking.find_by_sale_id(sale_id)
@@ -197,14 +195,10 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj = Sale.find(sale_id)
 
       #total customer with individual total amount
-      survey = nil
       @individual_total = Array.new
-      if !@sale_data.nil?
-        survey = Survey.find_by_receipt_no(@sale_data.receipt_no)
-        if !survey.nil?
-          per_person_amount = saleObj.grand_total.to_f / survey.total_customer.to_i
-          @individual_total.push({'total_customer' => survey.total_customer, 'per_person_amount' => per_person_amount.to_f })
-        end
+      if !saleObj.equal_persons.nil?
+          per_person_amount = saleObj.grand_total.to_f / saleObj.equal_persons.to_i
+          @individual_total.push({'total_customer' => saleObj.equal_persons.to_i, 'per_person_amount' => per_person_amount.to_f })
       end
 
       # rounding adjustment
@@ -295,7 +289,6 @@ class Origami::PaymentsController < BaseOrigamiController
     member_info = nil
 
     saleObj = Sale.find(sale_id)
-    survey = Survey.find_by_receipt_no(saleObj.receipt_no)
     
     # For Cashier by Zone
     bookings = Booking.where("sale_id='#{sale_id}'")
@@ -349,7 +342,7 @@ class Origami::PaymentsController < BaseOrigamiController
       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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data,survey)
+      printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data)
     end
   end
 
@@ -363,7 +356,6 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
-      survey = Survey.find_by_receipt_no(saleObj.receipt_no)
 
       if saleObj.discount_type == "member_discount"
         saleObj.update_attributes(rounding_adjustment: 0)
@@ -408,7 +400,7 @@ class Origami::PaymentsController < BaseOrigamiController
         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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil,survey)   
+        printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)   
       end
     end    
   end
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index e7265a7a..987f68e7 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -146,15 +146,15 @@ class Origami::SplitBillController < BaseOrigamiController
 						end
 					end
 
-					puts order_id
-					puts order_ids.count
-					puts order_id_count
-					puts order_items.count
-					puts order_item_count
+					# puts order_id
+					# puts order_ids.count
+					# puts order_id_count
+					# puts order_items.count
+					# puts order_item_count
 
 					if !order_id.nil?
 						if order_id_count > 1
-							puts "order_id_count > 1"
+							# puts "order_id_count > 1"
 
 							updated_order_id = Array.new
 							order_ids.each do |odr_id|
@@ -164,8 +164,8 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 							end
 
-							puts "updated_order_id"
-							puts updated_order_id
+							# puts "updated_order_id"
+							# puts updated_order_id
 
 							if !updated_order_id.empty?
 								order_ids.each do |odr_id|
@@ -194,7 +194,7 @@ class Origami::SplitBillController < BaseOrigamiController
 										end
 								    end
 
-								    puts new_order_status
+								    # puts new_order_status
 
 									if new_order_status
 								    	BookingOrder.find_by_order_id(odr_id).delete
@@ -222,7 +222,7 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 							end
 						else
-							puts "order_id_count < 1"
+							# puts "order_id_count < 1"
 							new_order_status = true
 							order_items.each do |order_item|
 								orderItem = OrderItem.find_by_order_id(order_id)
@@ -235,7 +235,7 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 						    end
 
-						    puts new_order_status
+						    # puts new_order_status
 
 						    if new_order_status
 						    	BookingOrder.find_by_order_id(order_id).delete
@@ -356,6 +356,14 @@ class Origami::SplitBillController < BaseOrigamiController
     	orderItem.save!
 	end
 
+	def update_sale
+		sale = Sale.find(params[:sale_id])
+		sale.equal_persons = params[:total_customer].to_i
+		sale.save!
+
+		render :json => { status: true }
+	end
+
 	#Shop Name in Navbor
 	helper_method :shop_detail
 	def shop_detail
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 12d6d543..47b7e8fd 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -84,86 +84,6 @@ class Origami::SurveysController < BaseOrigamiController
 		end
 	end
 
-	def create_survey
-		if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
-			@type      = params[:cashier_type]
-		    @sale_id   = params[:sale_id]
-		    sale       = Sale.find(@sale_id)
-		    receipt_no = params[:receipt_no]
-
-			if @type != "quick_service"
-			  dining_facility   = DiningFacility.find(params[:dining_id])
-			  cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
-			  cashier_terminal_id = cashier_zone.cashier_terminal_id
-			else
-				shift = ShiftSale.find(sale.shift_sale_id)
-                cashier_terminal_id = shift.cashier_terminal_id
-			end
-			
-		    shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_terminal_id,nil)
-			
-			if @type != "quick_service"
-				survey = Survey.find_by_dining_name_and_receipt_no(dining_facility.name,receipt_no)
-			else
-				survey = nil
-			end
-			
-			
-			if survey.nil?
-				if @type != "quick_service"
-					survey = Survey.find_by_dining_name_and_receipt_no(dining_facility.name,nil)
-					if survey.nil?
-						survey = Survey.new
-						survey.dining_name = dining_facility.name
-						survey.receipt_no = params[:receipt_no]
-						survey.shift_id   = shift_by_terminal.id 
-						survey.created_by = current_user.name
-						survey.total_customer = params[:total_customer]
-						survey.total_amount = params[:total_amount]
-						survey.save!
-					else
-						survey.receipt_no = params[:receipt_no]
-						survey.total_customer = params[:total_customer]
-						survey.total_amount = params[:total_amount]
-						survey.save!
-					end
-				else
-					survey = Survey.new
-					survey.receipt_no = params[:receipt_no]
-					survey.shift_id   = shift_by_terminal.id 
-					survey.created_by = current_user.name
-					survey.total_customer = params[:total_customer]
-					survey.total_amount = params[:total_amount]
-					survey.save!
-				end
-			else
-				survey.receipt_no = params[:receipt_no]
-				survey.total_customer = params[:total_customer]
-				survey.total_amount = params[:total_amount]
-				survey.save!
-			end
-			render :json => {status: true}
-		else
-			render :json => { status: false, error_message: 'No Current Open Shift!'}
-		end
-	end
-	
-	def get_survey
-		dining_id  = params[:dining_id]
-		receipt_no = params[:receipt_no]
-		table 	   = DiningFacility.find_by_id(dining_id)
-		survey = Survey.find_by_dining_name_and_receipt_no(table.name,receipt_no)
-		if survey.nil?
-			survey = Survey.find_by_dining_name_and_receipt_no(table.name,nil)
-		end
-		
-		if !survey.nil?
-			render :json => { status: true, survey: survey }
-		else
-			render :json => { status: false }
-		end
-	end
-
 	private
 
     # Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index e4190cf7..4c9aa0c1 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -6,7 +6,6 @@ class Origami::VoidController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
-      survey = Survey.find_by_receipt_no(sale.receipt_no)
 
       if sale.discount_type == "member_discount"
         sale.update_attributes(total_discount: 0)
@@ -125,7 +124,7 @@ class Origami::VoidController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
         printer = Printer::ReceiptPrinter.new(print_settings)
-        printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,survey)   
+        printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
       end
       
       #end print
diff --git a/app/models/ability.rb b/app/models/ability.rb
index f0091ef7..7afb6bc4 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -136,6 +136,7 @@ class Ability
         #ability for split_bill
         can :index, :split_bill
         can :create, :split_bill
+        can :update_sale, :split_bill
                                                
     elsif user.role == "account"
 
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index c60fcc35..0cf6526f 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -173,19 +173,19 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Bill Receipt Print
-  def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data,survey)
+  def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data)
     #Use CUPS service
     #Generate PDF
     #Print
-    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,survey)
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
     receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
     if !receipt_bill_a5_pdf.empty?
       receipt_bill_a5_pdf.each do |receipt_bilA5|
         if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
           if receipt_bilA5[1] == '1'
-            pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,survey)
+            pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
           else
-            pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,survey)
+            pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
           end
         end
       end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 0f7ea468..c4666963 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -1,7 +1,7 @@
 class ReceiptBillA5Pdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 15
@@ -80,8 +80,8 @@ class ReceiptBillA5Pdf < Prawn::Document
     end
 
     #start for individual payment
-    if !survey.nil?
-        individual_payment(sale_data, survey, printer_settings.precision, delimiter)
+    if !sale_data.equal_persons.nil?
+        individual_payment(sale_data, printer_settings.precision, delimiter)
     end
     #end for individual payment
 
@@ -480,14 +480,14 @@ class ReceiptBillA5Pdf < Prawn::Document
     end
 
     #individual payment per person
-    def individual_payment(sale_data, survey, precision, delimiter)
-        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+    def individual_payment(sale_data, precision, delimiter)
+        per_person = sale_data.grand_total.to_f / sale_data.equal_persons.to_i
         move_down 5
         stroke_horizontal_rule
         move_down 5
         y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width+50) do
-            text "Individual amount for #{survey.total_customer} persons", :size => self.item_font_size+1,:align => :left
+            text "Individual amount for #{sale_data.equal_persons} persons", :size => self.item_font_size+1,:align => :left
         end
 
         bounding_box([0,y_position], :width =>self.label_width) do
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 31317c0e..aef26a9d 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -1,7 +1,7 @@
 class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 0
@@ -80,8 +80,8 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     #start for individual payment
-    if !survey.nil?
-        individual_payment(sale_data, survey, printer_settings.precision, delimiter)
+    if !sale_data.equal_persons.nil?
+        individual_payment(sale_data, printer_settings.precision, delimiter)
     end
     #end for individual payment
 
@@ -481,14 +481,14 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     #individual payment per person
-    def individual_payment(sale_data, survey, precision, delimiter)
-        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+    def individual_payment(sale_data, precision, delimiter)
+        per_person = sale_data.grand_total.to_f / sale_data.equal_persons.to_i
         move_down 5
         stroke_horizontal_rule
         move_down 5
         y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width+50) do
-            text "Individual amount for #{survey.total_customer} persons", :size => self.item_font_size+1,:align => :left
+            text "Individual amount for #{sale_data.equal_persons} persons", :size => self.item_font_size+1,:align => :left
         end
 
         bounding_box([0,y_position], :width =>self.label_width) do
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 72f08c83..5750bc2f 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -318,7 +318,6 @@
  <script type="text/javascript">
  	var split_sale_id = "";
  	var split_receipt_no = "";
- 	var split_total_amount = 0;
  	$(document).ready(function(){
  		$('#back').on('click',function(){
  			backToOrigami();
@@ -396,7 +395,7 @@
 			// 	orderItemSplitBillProcess(cnt_items);
 			// }
 		}else{
-			swal("Opps","Please select at least one item!","warning");
+			swal("Oops","Please select at least one item!","warning");
 		}
 	});
 
@@ -460,7 +459,7 @@
 			// 	orderSplitBillProcess(cnt_odrs);
 			// }
 		}else{
-			swal("Opps","Please select at least one order!","warning");
+			swal("Oops","Please select at least one order!","warning");
 		}
 	});
 
@@ -476,28 +475,12 @@
 		var dining_id = $("#table_id").text();
 		split_sale_id = $("input[type='radio'][name='rdn_receipt']:checked").val();
 		split_receipt_no = $("input[type='radio'][name='rdn_receipt']:checked").parent().parent().attr('id');
-		split_total_amount = $("input[type='radio'][name='rdn_receipt']:checked").parent().parent().attr('data');
 
-		$.ajax({
-			type: "POST",
-			url: "/origami/split_bills/get_survey",
-			dataType: 'JSON',
-			data: {'dining_id':dining_id, 'receipt_no':split_receipt_no },
-			success: function (result) { 
-				if(result.status){
-					if(parseInt(result.survey.total_customer) > 0){
-						$("#per_person").val(parseInt(result.survey.total_customer));
-					}else{
-						$("#per_person").val("");
-					}
-				}
-			}
-		});
 		if(split_sale_id != undefined && split_sale_id != ""){
 			$('#equal_split_modal').modal({backdrop: 'static', keyboard: true, show: true});
 		}
 		else{
-			swal("Opps","Please select one receipt!","warning");
+			swal("Oops","Please select one receipt!","warning");
 		}
 	});
 
@@ -508,15 +491,15 @@
 			$("#per_personErr").html('');
 			$('#equal_split_modal').modal('hide');
 			if(person > 1){
-				var ajax_url = "/origami/split_bills/surveys";
-				var dining_id       = $("#table_id").text();
+				var ajax_url = "/origami/split_bills/equal_person";
+				var dining_id = $("#table_id").text();
 				var type     = $("#table_type").text();
 				
 				$.ajax({
 					type: "POST",
 					url: ajax_url,
 					dataType: 'JSON',
-					data: {'dining_id':dining_id, 'sale_id':split_sale_id, 'receipt_no':split_receipt_no, 'total_customer': person, 'total_amount':split_total_amount  },
+					data: { 'sale_id':split_sale_id, 'total_customer': person },
 					success: function (result) {
 						console.log(result);
 						if(result.status){
diff --git a/config/routes.rb b/config/routes.rb
index c823676e..dae341c0 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -238,8 +238,7 @@ scope "(:locale)", locale: /en|mm/ do
     get '/room/:dining_id/split_bills' => 'split_bill#index'
     post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
 
-    post '/split_bills/surveys', to: 'surveys#create_survey'
-    post '/split_bills/get_survey', to: 'surveys#get_survey'
+    post '/split_bills/equal_person', to: 'split_bill#update_sale'
 
   end
 
diff --git a/db/migrate/20170701101420_create_sales.rb b/db/migrate/20170701101420_create_sales.rb
index d0e70287..381e11a0 100755
--- a/db/migrate/20170701101420_create_sales.rb
+++ b/db/migrate/20170701101420_create_sales.rb
@@ -24,6 +24,7 @@ class CreateSales < ActiveRecord::Migration[5.1]
       t.integer :shift_sale_id
       t.decimal :old_grand_total
       t.string :rebate_status
+      t.integer :equal_persons
       t.timestamps
     end
   end

From 950f479da68a0231fbfd67d4f2f8ba316a6c9f74 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Feb 2018 18:42:00 +0630
Subject: [PATCH 291/651] check qty update in edit

---
 app/views/origami/sale_edit/edit.html.erb | 55 ++++++++++++++++-------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 8c1144e5..3f65a8ad 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -59,7 +59,8 @@
                       </td>
                       <% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %>
                           <td class="p-1" width="5%">
-                            <input id="<%= sale_item.id %>_qty" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
+                            <input id="<%= sale_item.id %>_qty" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control " onkeyup="checkQuantity(this.value,'<%= sale_item.id %>');" onkeypress="return isNumberKey(event);" />
+                            <span id="<%= sale_item.id %>_qtyErr" style="color:red;"></span>
                           </td>
                           <td class="p-1" width="10%">
                             <input id="<%= sale_item.id %>_price" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
@@ -166,21 +167,27 @@ var cashier_type = "<%= @cashier_type %>";
             var sale_item_id = $(this).attr('data-id');
             var qty          = $('#' + sale_item_id + "_qty").val();
             var price        = $('#' + sale_item_id + "_price").val();
-            console.log(qty + "|" + price)
-            var ajax_url      = "/origami/item_edit";
-            $.ajax({
-                type: "POST",
-                url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price,
-                success: function (result) {
-                    swal({
-                        title: "Information!",
-                        text: "Qty and Price was successfully Updated",
-                    }, function () {
-                       location.reload();
-                    });
-                }
-            });
+            console.log(qty + "|" + price);
+            if(qty > 0){
+              $('#' + sale_item_id + "_qtyErr").html("");
+              var ajax_url      = "/origami/item_edit";
+              $.ajax({
+                  type: "POST",
+                  url: ajax_url,
+                  data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price,
+                  success: function (result) {
+                      swal({
+                          title: "Information!",
+                          text: "Qty and Price was successfully Updated",
+                      }, function () {
+                         location.reload();
+                      });
+                  }
+              });
+            }else{
+              $('#' + sale_item_id + "_qtyErr").html("can't be blank");
+            }
+            
         });
 
         $('.void').on('click', function () {
@@ -311,4 +318,20 @@ var cashier_type = "<%= @cashier_type %>";
         return false;
       }
     });
+
+  //check for isNumber
+  function isNumberKey(evt) {
+    var charCode = (evt.which) ? evt.which : event.keyCode;
+    if (charCode > 31 && (charCode < 48 || charCode > 57)) {
+      return false;
+    } else {
+      return true;
+    }      
+  }
+
+  function checkQuantity(obj_value,sale_item_id) {
+      if(obj_value == '0'){
+        $("#"+sale_item_id+"_qty").val('1');
+      }
+  }
 </script>

From 7d144b030727566794999fb6cd5511575f9acea0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 22 Feb 2018 09:37:14 +0630
Subject: [PATCH 292/651] update edit sale for qs

---
 app/controllers/origami/sale_edit_controller.rb | 12 ++++++++++++
 app/models/printer/order_queue_printer.rb       |  6 +++---
 app/pdf/order_summary_pdf.rb                    |  2 +-
 app/views/origami/addorders/detail.html.erb     |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index f78c0f53..4c8bfd87 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -32,6 +32,18 @@ class Origami::SaleEditController < BaseOrigamiController
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
 
+    
+    order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
+    order = Order.find(order_id)
+    puts saleitemObj.to_json
+    order.order_items.each do |o|
+      if saleitemObj.product_code == o.item_code
+        o.qty = saleitemObj.qty * -1
+        o.price = saleitemObj.price * -1
+        o.save
+      end
+    end
+
     action_by = current_user.id
     remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
     sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" )
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 4a8b1653..4d6371d7 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -242,7 +242,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id
                 left join menu_items as item ON item.item_code = order_items.item_code")
-        .where("order_items.order_items_id = '#{ id }'")
+        .where("order_items.order_items_id = '#{ id }' and order_items.qty > 0")
         .group("order_items.item_code")
     elsif type == "order_summary"                                
       OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
@@ -252,7 +252,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id
                 left join menu_items as item ON item.item_code = order_items.item_code")
-        .where("orders.order_id = '#{ id }'")
+        .where("orders.order_id = '#{ id }'  and order_items.qty > 0")
         .group("order_items.order_items_id")
     else 
       # order summary for booking
@@ -263,7 +263,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id
                 left join menu_items as item ON item.item_code = order_items.item_code")
-        .where("b.booking_id = '#{ id }'")                      
+        .where("b.booking_id = '#{ id }' and order_items.qty > 0")                      
     end
 
   end
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 6c8dacac..d33ecec8 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -36,7 +36,7 @@ class OrderSummaryPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    if order[0].dining.to_i > 0
+    if order[0].dining.present?
       text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 5867cc1a..94902672 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -222,7 +222,7 @@
                     <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
                     <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%else%>
-               <button type="button" class="btn btn-primary action-btn create col-md-10" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
+               <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%end%>
 
                 

From 38bedf6129dfe9a8d08a08a60637f3ecc36a9c74 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Feb 2018 09:42:55 +0630
Subject: [PATCH 293/651] change split bill btn

---
 app/views/origami/home/show.html.erb  | 11 +++++------
 app/views/origami/rooms/show.html.erb | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 3acbe738..8f17c2c4 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -454,6 +454,11 @@
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true"> Void</button>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
+                  <% if !@split_bill.nil? %>
+                    <% if @split_bill == '1' %>
+                      <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+                    <% end %>
+                  <% end %>
                    <!-- first bill not used in cloud -->
                   <% if ENV["SERVER_MODE"] == "cloud" %>
                     <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
@@ -465,12 +470,6 @@
                     <%end%> 
                   <% end %> 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
-                  <% if !@split_bill.nil? %>
-                    <% if @split_bill == '1' %>
-                      <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
-                    <% end %>
-                  <% end %>
-                  
               <% end %>
               <!-- Cashier Buttons -->
 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 74c81b77..4434d45d 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -427,6 +427,11 @@
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
+        <% if !@split_bill.nil? %>
+          <% if @split_bill == '1' %>
+            <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+          <% end %>
+        <% end %>
          <!-- first bill not used in cloud -->
          <% if ENV["SERVER_MODE"] == "cloud" %>
          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
@@ -437,11 +442,6 @@
             <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
          <%end%>
          <%end%>
-         <% if !@split_bill.nil? %>
-          <% if @split_bill == '1' %>
-            <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
-          <% end %>
-        <% end %>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
        <!--  <button type="button" id="void" class="btn bg-blue btn-block" > Void </button> -->
      <% end %>

From 2cb13f9a6294224a7a5b29726343be5e820e12d9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Feb 2018 10:10:20 +0630
Subject: [PATCH 294/651] change dashboard query

---
 app/models/sale.rb                |  4 ++--
 app/views/home/dashboard.html.erb | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 6dea5db3..2265a135 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1375,7 +1375,7 @@ end
             if payment_method == 'card'
               query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
             else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
       else
@@ -1384,7 +1384,7 @@ end
             if payment_method == 'card'
               query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
             else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
         else
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 85fe9630..91cce7e3 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -165,19 +165,19 @@
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.grand_total") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
               </table>
               <table class="table">
@@ -190,7 +190,7 @@
                           <td align="right">
                             <% @sale_data.each do |data| %>
                               <% pay_mth = payment.payment_method %>
-                              <%= data[""+pay_mth+""] %>
+                              <%= number_with_precision(data[""+pay_mth+""], precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
                             <% end %>
                           </td>
                         </tr>
@@ -203,7 +203,7 @@
                       <tr>
                         <td><%= t("views.right_panel.detail.card_sale") %> : </td>
                         <td align="right">
-                            <%= total_card["card"].to_f %>
+                            <%= number_with_precision(total_card["card"], precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
                         </td>
                       </tr>
                   <% end %>

From ce644e304cc1ee203722d4d5449f11d30ac78c4a Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 22 Feb 2018 16:43:53 +0630
Subject: [PATCH 295/651] Validate required for reference no: in other payment
 amount

---
 app/views/origami/jcb/index.html.erb      | 92 +++++++++++----------
 app/views/origami/master/index.html.erb   | 92 +++++++++++----------
 app/views/origami/mpu/index.html.erb      | 99 ++++++++++++-----------
 app/views/origami/unionpay/index.html.erb | 96 ++++++++++++----------
 app/views/origami/visa/index.html.erb     | 96 ++++++++++++----------
 5 files changed, 257 insertions(+), 218 deletions(-)

diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 837c9f43..1fe49080 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -51,7 +51,8 @@
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label>Reference Number</label>
-							<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+							<input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+							<br><span id="reference_no_Err" style="color:red;"></span>
 						</div>
 						<hr>
 					</div>
@@ -194,53 +195,60 @@ $(document).on('click', '.cashier_number', function(event){
 
 $('#jcb_pay').on('click',function(){
 	var amount = $('#amount').text();
+	var reference_no = $('#reference_no').val();
 	var sale_id = "<%= @sale_id %>";
 	var receipt_no = "<%= @receipt_no %>";
 	var bank_integration = "<%= @bank_integration %>";
-	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-		$(this).off("click");
-		  //start member discount 5% by pay card	
-			// var sub_total = $('#sub-total').text();
-			// var member_id = $('#membership_id').text();
-			// var member_discount = $('#member_discount').text();
-			// if (member_id && member_discount) {
-			// 	$.ajax({
-			// 		type: "POST",
-			// 		url: "/origami/" + sale_id + "/member_discount",
-			// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-	        //       success:function(result){           
-	        //           }
-	        //         });
-			// }
-	    //end member discount
-	    if(bank_integration == '1'){
-		    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+	$("#reference_no_Err").html("");
+	if(reference_no.length > 0){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+			$(this).off("click");
+			  //start member discount 5% by pay card	
+				// var sub_total = $('#sub-total').text();
+				// var member_id = $('#membership_id').text();
+				// var member_discount = $('#member_discount').text();
+				// if (member_id && member_discount) {
+				// 	$.ajax({
+				// 		type: "POST",
+				// 		url: "/origami/" + sale_id + "/member_discount",
+				// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+		        //       success:function(result){           
+		        //           }
+		        //         });
+				// }
+		    //end member discount
+		    if(bank_integration == '1'){
+		    	$("#reference_no").val("");
+			    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+			}else{
+				$.ajax({type: "POST",
+		          url: "<%= origami_payment_jcb_path %>",
+		          data: "amount="+ amount + "&sale_id="+ sale_id,
+		          success:function(result){
+		            if(result){
+		              swal({
+		                title: "Information!",
+		                text: "Payment Successfully",
+		                html: true,
+		            closeOnConfirm: false,
+		            closeOnCancel: false,
+		            allowOutsideClick: false
+		              }, function () {
+		                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+		              });
+		            }
+		          }
+		        });
+			}
 		}else{
-			$.ajax({type: "POST",
-	          url: "<%= origami_payment_jcb_path %>",
-	          data: "amount="+ amount + "&sale_id="+ sale_id,
-	          success:function(result){
-	            if(result){
-	              swal({
-	                title: "Information!",
-	                text: "Payment Successfully",
-	                html: true,
-	            closeOnConfirm: false,
-	            closeOnCancel: false,
-	            allowOutsideClick: false
-	              }, function () {
-	                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
-	              });
-	            }
-	          }
-	        });
+		  if (amount>0) {
+	        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+	      }else{
+	        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+	      }
 		}
 	}else{
-	  if (amount>0) {
-        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
-      }else{
-        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
-      }
+		$("#reference_no_Err").html("can't be blank");
 	}
 })
 </script>
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index f5c8f06b..2e663b7a 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -52,7 +52,8 @@
       <div class="row">
        <div class="form-group col-lg-12 col-md-12 col-sm-12">
         <label>Reference Number</label>
-        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+        <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+        <br><span id="reference_no_Err" style="color:red;"></span>
       </div>
       <hr>
     </div>
@@ -192,53 +193,60 @@
 });
   $('#master_pay').on('click',function(){
     var amount = $('#amount').text();
+    var reference_no = $('#reference_no').val();
     var sale_id = "<%= @sale_id %>";
     var receipt_no = "<%= @receipt_no %>";
     var bank_integration = "<%= @bank_integration %>";
-    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-      $(this).off("click");
-      //start member discount 5% by pay card  
-        // var sub_total = $('#sub-total').text();
-        // var member_id = $('#membership_id').text();
-        // var member_discount = $('#member_discount').text();
-        // if (member_id && member_discount) {
-        //   $.ajax({
-        //     type: "POST",
-        //     url: "/origami/" + sale_id + "/member_discount",
-        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-        //           // success:function(result){           
-        //           // }
-        //         });
-        // }
-      //end member discount
-      if(bank_integration == '1'){
-        pay_withBank("SALE", "master", amount, sale_id, receipt_no);
-      }else{
-        $.ajax({type: "POST",
-          url: "<%= origami_payment_master_path %>",
-          data: "amount="+ amount + "&sale_id="+ sale_id,
-          success:function(result){
-            if(result){
-              swal({
-                title: "Information!",
-                text: "Payment Successfully",
-                html: true,
-            closeOnConfirm: false,
-            closeOnCancel: false,
-            allowOutsideClick: false
-              }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
-              });
+    $("#reference_no_Err").html("");
+    if(reference_no.length > 0){
+      if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+        $(this).off("click");
+        //start member discount 5% by pay card  
+          // var sub_total = $('#sub-total').text();
+          // var member_id = $('#membership_id').text();
+          // var member_discount = $('#member_discount').text();
+          // if (member_id && member_discount) {
+          //   $.ajax({
+          //     type: "POST",
+          //     url: "/origami/" + sale_id + "/member_discount",
+          //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+          //           // success:function(result){           
+          //           // }
+          //         });
+          // }
+        //end member discount
+        if(bank_integration == '1'){
+          $("#reference_no").val("");
+          pay_withBank("SALE", "master", amount, sale_id, receipt_no);
+        }else{
+          $.ajax({type: "POST",
+            url: "<%= origami_payment_master_path %>",
+            data: "amount="+ amount + "&sale_id="+ sale_id,
+            success:function(result){
+              if(result){
+                swal({
+                  title: "Information!",
+                  text: "Payment Successfully",
+                  html: true,
+              closeOnConfirm: false,
+              closeOnCancel: false,
+              allowOutsideClick: false
+                }, function () {
+                  window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+                });
+              }
             }
-          }
-        });
+          });
+        }
+      }else{
+        if (amount>0) {
+          swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+        }else{
+          swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+        }
       }
     }else{
-      if (amount>0) {
-        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
-      }else{
-        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
-      }
+      $("#reference_no_Err").html("can't be blank");
     }
   })
 </script>
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index f40ce252..f95b3773 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -52,7 +52,8 @@
 						<div class="row">
 							<div class="form-group col-lg-12 col-md-12 col-sm-12">
 								<label>Reference Number</label>
-								<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+								<input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+								<br><span id="reference_no_Err" style="color:red;"></span>	
 							</div>
 							<hr>
 						</div>
@@ -196,56 +197,62 @@
 	
 	$('#mpu_pay').on('click',function(){
 		var amount = $('#amount').text();
+		var reference_no = $('#reference_no').val();
 		var sale_id = "<%= @sale_id %>";
 		var receipt_no = "<%= @receipt_no %>";
 		var bank_integration = "<%= @bank_integration %>";
 		var cashier_type = "<%= @cashier_type %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-			$(this).off("click");
-		//start member discount 5% by pay card	
-			// var sub_total = $('#sub-total').text();
-			// var member_id = $('#membership_id').text();
-			// var member_discount = $('#member_discount').text();
-			// if (member_id && member_discount) {
-			// 	$.ajax({
-			// 		type: "POST",
-			// 		url: "/origami/" + sale_id + "/member_discount",
-			// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-		    //              success:function(result){           
-		    //              }
-		    //          });
-			// }
-	    //end member discount
-	    	if(bank_integration == '1'){
-	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
-	      	}else{
-	      		$.ajax({type: "POST",
-		          url: "<%= origami_payment_mpu_path %>",
-		          data: "amount="+ amount + "&sale_id="+ sale_id,
-		          success:function(result){
-		            if(result){
-		              swal({
-		                title: "Information!",
-		                text: "Payment Successfully",
-		                html: true,
-		            closeOnConfirm: false,
-		            closeOnCancel: false,
-		            allowOutsideClick: false
-		              }, function () {
-		                window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment";
-		              });
-		            }
-		          }
-		        });
-	      	}
-
-	     }else{
-	     	if (amount>0) {
-		        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+		$("#reference_no_Err").html("");
+		if(reference_no.length > 0){
+			if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+				$(this).off("click");
+			//start member discount 5% by pay card	
+				// var sub_total = $('#sub-total').text();
+				// var member_id = $('#membership_id').text();
+				// var member_discount = $('#member_discount').text();
+				// if (member_id && member_discount) {
+				// 	$.ajax({
+				// 		type: "POST",
+				// 		url: "/origami/" + sale_id + "/member_discount",
+				// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+			    //              success:function(result){           
+			    //              }
+			    //          });
+				// }
+		    //end member discount
+		    	if(bank_integration == '1'){
+		    		$("#reference_no").val("");
+		      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+		      	}else{
+		      		$.ajax({type: "POST",
+			          url: "<%= origami_payment_mpu_path %>",
+			          data: "amount="+ amount + "&sale_id="+ sale_id,
+			          success:function(result){
+			            if(result){
+			              swal({
+			                title: "Information!",
+			                text: "Payment Successfully",
+			                html: true,
+			            closeOnConfirm: false,
+			            closeOnCancel: false,
+			            allowOutsideClick: false
+			              }, function () {
+			                window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment";
+			              });
+			            }
+			          }
+			        });
+		      	}
 		    }else{
-		        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+		     	if (amount>0) {
+			        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+			    }else{
+			        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+			    }
 		    }
-	     }
-	 })
+		}else{
+		 	$("#reference_no_Err").html("can't be blank");
+		}
+	})
 </script>
 
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 5dee20f1..8658f23c 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -52,7 +52,8 @@
       <div class="row">
        <div class="form-group col-lg-12 col-md-12 col-sm-12">
         <label>Reference Number</label>
-        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+        <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+        <br><span id="reference_no_Err" style="color:red;"></span>
       </div>
       <hr>
     </div>
@@ -196,54 +197,61 @@
 });
   $('#unionpay_pay').on('click',function(){
     var amount = $('#amount').text();
+    var reference_no = $('#reference_no').val();
     var sale_id = "<%= @sale_id %>";
     var receipt_no = "<%= @receipt_no %>";
-    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-      $(this).off("click");
-      //start member discount 5% by pay card  
-        // var sub_total = $('#sub-total').text();
-        // var member_id = $('#membership_id').text();
-        // var member_discount = $('#member_discount').text();
-        // if (member_id && member_discount) {
-        //   $.ajax({
-        //     type: "POST",
-        //     url: "/origami/" + sale_id + "/member_discount",
-        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-        //            success:function(result){           
-        //            }
-        //         });
-        // }
-      //end member discount
-      var bank_integration = "<%= @bank_integration %>";
-      if(bank_integration == '1'){
-        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
-      }
-      else{
-        $.ajax({type: "POST",
-          url: "<%= origami_payment_unionpay_path %>",
-          data: "amount="+ amount + "&sale_id="+ sale_id,
-          success:function(result){
-            if(result){
-              swal({
-                title: "Information!",
-                text: "Payment Successfully",
-                html: true,
-                closeOnConfirm: false,
-                closeOnCancel: false,
-                allowOutsideClick: false
-              }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
-              });
+    $("#reference_no_Err").html("");
+    if(reference_no.length > 0){
+      if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+        $(this).off("click");
+        //start member discount 5% by pay card  
+          // var sub_total = $('#sub-total').text();
+          // var member_id = $('#membership_id').text();
+          // var member_discount = $('#member_discount').text();
+          // if (member_id && member_discount) {
+          //   $.ajax({
+          //     type: "POST",
+          //     url: "/origami/" + sale_id + "/member_discount",
+          //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+          //            success:function(result){           
+          //            }
+          //         });
+          // }
+        //end member discount
+        var bank_integration = "<%= @bank_integration %>";
+        if(bank_integration == '1'){
+          $("#reference_no").val("");
+          pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
+        }
+        else{
+          $.ajax({type: "POST",
+            url: "<%= origami_payment_unionpay_path %>",
+            data: "amount="+ amount + "&sale_id="+ sale_id,
+            success:function(result){
+              if(result){
+                swal({
+                  title: "Information!",
+                  text: "Payment Successfully",
+                  html: true,
+                  closeOnConfirm: false,
+                  closeOnCancel: false,
+                  allowOutsideClick: false
+                }, function () {
+                  window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+                });
+              }
             }
-          }
-         });
+           });
+        }
+      }else{
+        if (amount>0) {
+          swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+        }else{
+          swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+        }
       }
     }else{
-      if (amount>0) {
-        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
-      }else{
-        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
-      }
+      $("#reference_no_Err").html("can't be blank");
     }
   })
 </script>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 2970ba44..60f62caa 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -52,7 +52,8 @@
       <div class="row">
        <div class="form-group col-lg-12 col-md-12 col-sm-12">
         <label>Reference Number</label>
-        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+        <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+        <br><span id="reference_no_Err" style="color:red;"></span>  
       </div>
       <hr>
     </div>
@@ -195,56 +196,63 @@
 });
   $('#visa_pay').on('click',function(){
     var amount = $('#amount').text();
+    var reference_no = $('#reference_no').val();
     var sale_id = "<%= @sale_id %>";
     var receipt_no = "<%= @receipt_no %>";
     console.log(amount);
     console.log($("#validamount").attr("value"));
-    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-      $(this).off("click");
-      //start member discount 5% by pay card  
-        // var sub_total = $('#sub-total').text();
-        // var member_id = $('#membership_id').text();
-        // var member_discount = $('#member_discount').text();
-        // if (member_id && member_discount) {
-        //   $.ajax({
-        //     type: "POST",
-        //     url: "/origami/" + sale_id + "/member_discount",
-        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-        //            success:function(result){           
-        //            }
-        //         });
-        // }
-      //end member discount
-      var bank_integration = "<%= @bank_integration %>";
-      if(bank_integration == '1'){
-        pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
-      }
-      else{
-        $.ajax({type: "POST",
-          url: "<%= origami_payment_visa_path %>",
-          data: "amount="+ amount + "&sale_id="+ sale_id,
-          success:function(result){
-            if(result){
-              swal({
-                title: "Information!",
-                text: "Payment Successfully",
-                html: true,
-            closeOnConfirm: false,
-            closeOnCancel: false,
-            allowOutsideClick: false
-              }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
-              });
+    $("#reference_no_Err").html("");
+    if(reference_no.length > 0){    
+      if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+        $(this).off("click");
+        //start member discount 5% by pay card  
+          // var sub_total = $('#sub-total').text();
+          // var member_id = $('#membership_id').text();
+          // var member_discount = $('#member_discount').text();
+          // if (member_id && member_discount) {
+          //   $.ajax({
+          //     type: "POST",
+          //     url: "/origami/" + sale_id + "/member_discount",
+          //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+          //            success:function(result){           
+          //            }
+          //         });
+          // }
+        //end member discount
+        var bank_integration = "<%= @bank_integration %>";
+        if(bank_integration == '1'){
+          $("#reference_no").val("");
+          pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
+        }
+        else{
+          $.ajax({type: "POST",
+            url: "<%= origami_payment_visa_path %>",
+            data: "amount="+ amount + "&sale_id="+ sale_id,
+            success:function(result){
+              if(result){
+                swal({
+                  title: "Information!",
+                  text: "Payment Successfully",
+                  html: true,
+              closeOnConfirm: false,
+              closeOnCancel: false,
+              allowOutsideClick: false
+                }, function () {
+                  window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+                });
+              }
             }
-          }
-         });
+           });
+        }
+      }else{
+        if (amount>0) {
+          swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+        }else{
+          swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+        }
       }
     }else{
-      if (amount>0) {
-        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
-      }else{
-        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
-      }
+      $("#reference_no_Err").html("can't be blank");
     }
   })
 </script>

From fb35d83bbefd488642d63ed22e52349fc311c3ac Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 22 Feb 2018 17:21:07 +0630
Subject: [PATCH 296/651] change text 'Total Sale => Sale Revenue', 'Grand
 Total => Total Sale', 'Total Card => Other Payment' for dashboard 'Sale' box

---
 app/views/origami/dashboard/index.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 8f432e1e..cd9bd050 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -98,7 +98,7 @@
                 <td align="right"><%= @summ_sale.total_receipt %></td>
               </tr>
               <tr>
-                <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
+                <td><%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : </td>
                 <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
               </tr>
               <tr>
@@ -110,7 +110,7 @@
                 <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
               </tr>
               <tr>
-                <td><%= t("views.right_panel.detail.grand_total") %> : </td>
+                <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
                 <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
               </tr>
             </table>
@@ -135,7 +135,7 @@
               <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
               <% if !total_card.nil? %>
               <tr>
-                <td><%= t("views.right_panel.detail.card_sale") %> : </td>
+                <td><%= t("views.right_panel.detail.other_payment") %> : </td>
                 <td align="right">
                   <%= total_card["card"].to_f %>
                 </td>

From 5dac52160538564728fb207ab54560b8aedb410e Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 22 Feb 2018 18:26:46 +0630
Subject: [PATCH 297/651] Correct Redeem in close_cashier_pdf.rb

---
 app/pdf/close_cashier_pdf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 7bee4ed3..412cb9a4 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -213,7 +213,7 @@ class CloseCashierPdf < Prawn::Document
 
               y_position = cursor
               bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-               text "Reedem Payment :", :size => self.item_font_size, :align => :right
+               text "Redeem Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
                text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right

From c7b77aebfad0159c7afd69dd69ec8d1f111e2bbe Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 22 Feb 2018 18:48:59 +0630
Subject: [PATCH 298/651] update taday list and addorder

---
 app/assets/javascripts/OQS.js                 |  10 +-
 .../origami/sale_edit_controller.rb           |  30 +++--
 app/models/menu_item.rb                       | 124 ++++++++++++++++++
 app/models/order_queue_station.rb             |   8 +-
 app/models/printer/order_queue_printer.rb     |   6 +-
 app/models/sale.rb                            |   7 +-
 app/pdf/order_summary_pdf.rb                  |   2 +-
 app/views/oqs/home/index.html.erb             |   7 +-
 app/views/origami/addorders/detail.html.erb   |  27 ++--
 9 files changed, 191 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 35e08b4f..f334b31c 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -77,11 +77,17 @@ $(document).on('turbolinks:load', function() {
 						});
 					}
 	            }
-	            	
+
+	            	if (data[field]["table_type"]=null) {
+	            		table_type = data[field]["table_type"] +'-'+data[field]["zone"]
+	            	}else{
+	            		table_type = "No Table"
+	            		
+	            	}
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
 	                         +'<div class="row">'
-	                          +'<span class="col-md-4 order-zone-type font-13">'+data[field]["table_type"]+'-'+ data[field]["zone"] +'</span>'
+	                          +'<span class="col-md-4 order-zone-type font-13">'+table_type +'</span>'
 	                           +'<span class="order-zone hidden font-14">'+ data[field]["zone"] +'</span>'
 	                          +'<span class="col-md-8"><small class="float-right font-13">'+data[field]["order_id"]+'</small></span>'
 	                         +'</div>'
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 4c8bfd87..9c9d98d6 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -33,17 +33,17 @@ class Origami::SaleEditController < BaseOrigamiController
     saleObj = Sale.find(saleitemObj.sale_id)
 
     
-    order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
-    order = Order.find(order_id)
-    puts saleitemObj.to_json
-    order.order_items.each do |o|
-      if saleitemObj.product_code == o.item_code
-        o.qty = saleitemObj.qty * -1
-        o.price = saleitemObj.price * -1
-        o.save
+    booking = Booking.find_by_sale_id(saleitemObj.sale_id)
+    booking.booking_orders.each do |bo|
+      order = Order.find(bo.order_id)
+      order.order_items.each do |o|
+        if saleitemObj.product_code == o.item_code
+          o.qty = saleitemObj.qty * -1
+          o.price = saleitemObj.price * -1
+          o.save
+        end
       end
     end
-
     action_by = current_user.id
     remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
     sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" )
@@ -123,6 +123,18 @@ class Origami::SaleEditController < BaseOrigamiController
 
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
+
+    order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
+    order = Order.find(order_id)
+
+    order.order_items.each do |o|
+      if saleitemObj.product_code == o.item_code
+        o.qty = update_qty
+        o.price = update_price
+        o.save
+      end
+    end
+
     saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount)
 
     ProductCommission.edit_product_commission(saleitemObj)
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 67a3c823..818e5c1e 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -79,6 +79,130 @@ class MenuItem < ApplicationRecord
 
   end
 
+  def self.get_items(menu)
+    item = Array.new
+    if menu.menu_items
+      menu.menu_items do |item|
+        if item.is_available
+           # Format for attributes json
+          attr_format = []
+          # Format for attributes json 
+          if item.item_attributes.count > 0   
+            item.item_attributes.each do|attr_id|      
+              menu_attr = MenuItemAttribute.find(attr_id)
+              if attr_format.count == 0
+                attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] })
+                next
+              end
+
+              attr_format.each do |af|
+                if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]}
+                  if menu_attr.attribute_type == af[:type]
+                    af[:values].push(menu_attr.name)
+                  end
+                else 
+                  new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] }
+                  attr_format.push(new_attr) 
+                  break      
+                end          
+              end
+            end
+          end
+
+          # Format for option json
+          opt_format = []
+          # Format for attributes json 
+          if item.item_options.count > 0   
+            item.item_options.each do|opt|      
+              menu_opt = MenuItemOption.find(opt)
+              if opt_format.count == 0
+                opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
+                next
+              end
+
+              opt_format.each do |of|
+                if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
+                  if menu_opt.option_type == of[:type]
+                    of[:values].push(menu_opt.name)
+                  end
+                else 
+                  new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
+                  opt_format.push(new_opt) 
+                  break
+                end
+              end         
+            end
+          end
+
+          #Menu Item Information
+          menu_items.id           item.id
+          menu_items.code    item.item_code
+          menu_items.name         item.name
+          menu_items.alt_name     item.alt_name
+          menu_items.image        item.image_path.url
+          menu_items.description  item.description
+          menu_items.information  item.information
+          menu_items.type         item.type
+          menu_items.account_id   item.account_id
+          menu_items.min_qty      item.min_qty
+          menu_items.is_available item.is_available
+          menu_items.is_sub_item  item.is_sub_item
+          menu_items.unit         item.unit
+
+          # Item Sets of Menu Item 
+          item_sets = Array.new()
+          item.item_sets do |its|
+            sets.id                 its.id
+            sets.name               its.name
+            sets.alt_name           its.alt_name
+            sets.min_selectable_qty its.min_selectable_qty
+            sets.max_selectable_qty its.max_selectable_qty
+            instances = Array.new()
+            its.menu_item_instances do |i|
+              instan.id  i.id
+              instances.push(instan)
+            end
+            item_sets.push(sets)
+          end 
+
+          menu_items.attributes attr_format
+          menu_items.options opt_format
+         
+            instances = Array new()
+            item.menu_item_instances do |is|
+              if is.is_available
+                 # Convert id to name for attributes
+                instance_attr = []
+
+                is.item_attributes.each do |ia|
+                  # mItemAttr = MenuItemAttribute.find(is)
+                  # instance_attr.push(ia)
+                  mItemAttr = MenuItemAttribute.find(ia).name
+                  instance_attr.push(mItemAttr)
+                end
+              
+                instance.id is.id
+                instance.code is.item_instance_code
+                instance.name is.item_instance_name
+                instance.price is.price
+                instance.is_available is.is_available
+                instance.is_default is.is_default
+                instance.is_on_promotion is.is_on_promotion
+                instance.promotion_price is.promotion_price
+                instance.values instance_attr
+                # json.item_sets is.item_sets
+              end
+              instances.push(instance)
+            end
+        end
+        item.push(menu_items)
+      end
+      return item
+    end
+  end
+  
+
+
   # private
 
   # def generate_menu_item_code
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 5e9a2b56..af544ce5 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -46,10 +46,10 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                  # if (order_item.price != 0)
+                   if (order_item.qty > 0)
                     AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
                     oqs_order_items.push(order_item)
-                  # end
+                   end
                 # end                                           
               end
             end
@@ -81,10 +81,10 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                  # if (order_item.price != 0)
+                  if (order_item.qty > 0)
                     AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
                     oqs_order_items.push(order_item)
-                  # end
+                  end
                 # end                                           
               end
             end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 4d6371d7..4a8b1653 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -242,7 +242,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id
                 left join menu_items as item ON item.item_code = order_items.item_code")
-        .where("order_items.order_items_id = '#{ id }' and order_items.qty > 0")
+        .where("order_items.order_items_id = '#{ id }'")
         .group("order_items.item_code")
     elsif type == "order_summary"                                
       OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
@@ -252,7 +252,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id
                 left join menu_items as item ON item.item_code = order_items.item_code")
-        .where("orders.order_id = '#{ id }'  and order_items.qty > 0")
+        .where("orders.order_id = '#{ id }'")
         .group("order_items.order_items_id")
     else 
       # order summary for booking
@@ -263,7 +263,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id
                 left join menu_items as item ON item.item_code = order_items.item_code")
-        .where("b.booking_id = '#{ id }' and order_items.qty > 0")                      
+        .where("b.booking_id = '#{ id }'")                      
     end
 
   end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f381ba39..cf45f3a6 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -92,7 +92,12 @@ class Sale < ApplicationRecord
           self.cashier_id   = open_cashier[0].id
           self.cashier_name = open_cashier[0].name
           shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
-          self.shift_sale_id = shift_id.id
+          if shift_id
+            self.shift_sale_id = shift_id.id
+          else
+            self.shift_sale_id = current_shift.id
+          end
+          
         else
           self.cashier_id   = current_shift.employee_id
           self.cashier_name = Employee.find(current_shift.employee_id).name
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index d33ecec8..6c8dacac 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -36,7 +36,7 @@ class OrderSummaryPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    if order[0].dining.present?
+    if order[0].dining.to_i > 0
       text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 1f25e275..2912d38d 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -72,7 +72,12 @@
             <div class="card queue_station" data-order-no="<%= qid.order_id %>">
               <div class="card-block">
                 <div class="row">
-                  <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
+                <%if qid.type.present?%>
+                 <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
+                <%else%>
+                 <span class="col-md-4 order-zone-type font-13"></span>
+                <%end%>
+                 
                   <span class="order-zone hidden font-13"><%= qid.zone %></span>
                   <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
                 </div> 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 94902672..de9e5750 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -46,7 +46,7 @@
                 <!--if type quick_service or cashier for table -->
                   <% if type %>
                     <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
                           <p class="hidden menu-id"><%= menu.id  %></p> 
                           <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
                              <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
@@ -58,7 +58,7 @@
                   <% else %>
                     <% if @table.get_current_checkout_booking.nil? %>
                       <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
                           <p class="hidden menu-id"><%= menu.id  %></p> 
                           <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
                              <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
@@ -67,7 +67,7 @@
                         </li>
                       <% end%>
                     <% else %>
-                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
                            <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
@@ -82,8 +82,8 @@
             <%end %>
         </ul>
     </div>
-    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
-      <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 10px;">
+    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
+      <div class="card-columns custom-card-columns menu_items_list" style="column-gap: ;">
          <!-- append data -->
          <% @menu.each do |menu| %>
               <% if !menu.valid_time.nil? %>
@@ -132,15 +132,19 @@
            <!--  <i class="material-icons">reply</i> -->
              Back
           </button>
+          <% if current_user.role != "waiter"%>
            <button type="button" class="btn btn-lg btn-primary waves-effect col-md-7" id='pending_order'>Pending Order
           </button>
+          <%end%>
         <%elsif !modify_order && type%>
             <button type="button" class="btn btn-lg btn-default waves-effect col-md-2" id='back' style="    padding: .5rem 0.15rem !important;">
              <!--  <i class="material-icons">reply</i> -->
                Back
             </button>
-             <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
-            </button>
+            <% if current_user.role != "waiter"%>
+                <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
+                </button>
+            <%end%>
             <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
             <input type="hidden" name="table_id" value="" id="table_id">
 
@@ -218,8 +222,9 @@
                     <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
               <%elsif !modify_order && type%>
                   <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
-                  
-                    <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+                    <% if current_user.role != "waiter"%>
+                       <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+                    <%end%>
                     <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%else%>
                <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
@@ -467,6 +472,10 @@
     </div>
     <% end %>
 <script>
+    jQuery(function(){
+        id = "<%=@menu[0].id%>";
+       jQuery('.first_'+id).click();
+    });
     $(document).ready(function () {
     $(".tables").on('click', function () {
         $('.tables').css('background-color','');

From 7cbb67fd3093b0a6b6f0e295f5637a2d60676658 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Feb 2018 18:51:57 +0630
Subject: [PATCH 299/651] add link for oqs in origami

---
 app/assets/javascripts/OQS.js                 |  2 +-
 app/controllers/home_controller.rb            |  7 +-
 app/controllers/oqs/edit_controller.rb        |  6 ++
 .../origami/dashboard_controller.rb           |  1 +
 app/controllers/origami/home_controller.rb    |  5 ++
 .../origami/split_bill_controller.rb          |  1 +
 .../origami/table_invoices_controller.rb      |  2 +
 app/models/ability.rb                         |  3 +
 app/pdf/receipt_bill_a5_pdf.rb                |  6 +-
 app/pdf/receipt_bill_pdf.rb                   |  6 +-
 app/views/layouts/_header.html.erb            |  4 +-
 app/views/oqs/edit/index.html.erb             | 34 ++++++++-
 app/views/origami/dashboard/index.html.erb    | 52 +------------
 app/views/origami/home/show.html.erb          | 63 ++++++++++++----
 app/views/origami/payments/show.html.erb      | 30 +++++---
 app/views/origami/rooms/show.html.erb         |  7 +-
 app/views/origami/sale_edit/edit.html.erb     | 46 ++++++++++--
 app/views/origami/split_bill/index.html.erb   | 15 +++-
 .../origami/table_invoices/show.html.erb      | 74 +++++++++++++++----
 config/routes.rb                              |  2 +-
 20 files changed, 257 insertions(+), 109 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 35e08b4f..47c16ad1 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -185,7 +185,7 @@ $(document).on('turbolinks:load', function() {
 	$(document).on('click', '.order-item-edit', function(event){ 
 		var _self = $(this);	// To know in ajax return
 	    var assigned_item_id=$(this).attr('id').substr(5);
-	    window.location.href = '/oqs/'+ assigned_item_id  + "/edit"
+	    window.location.href = '/oqs/'+ assigned_item_id  + "/edit/oqs";
 	});
 
   	// complete for queue item
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 1c006be1..97c413c0 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -46,9 +46,12 @@ class HomeController < ApplicationController
       elsif @employee.role == "manager"
         session[:session_token] = @employee.token_session
         redirect_to dashboard_path
-      elsif @employee.role == "supervisor" || @employee.role == "waiter"
+      elsif @employee.role == "supervisor"
         session[:session_token] = @employee.token_session
         redirect_to origami_root_path
+      elsif @employee.role == "waiter"
+        session[:session_token] = @employee.token_session
+        redirect_to origami_dashboard_path
       elsif @employee.role == "account"
         session[:session_token] = @employee.token_session
         redirect_to reports_dailysale_index_path
@@ -160,7 +163,7 @@ class HomeController < ApplicationController
     elsif employee.role == "manager"
       redirect_to dashboard_path
     elsif employee.role == "waiter"
-      redirect_to oqs_root_path
+      redirect_to origami_dashboard_path
     elsif employee.role == "crm"
       redirect_to crm_root_path
     elsif @employee.role == "supervisor"
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index f8bef2de..52ebdd2c 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -1,6 +1,12 @@
 class Oqs::EditController < BaseOqsController
   def index
   	assigned_item_id = params[:id]
+    @link_type = params[:type]
+    @dining_type = nil
+    if params[:type] != 'oqs'
+      dining = DiningFacility.find_by_id(params[:type])
+      @dining_type = dining.type
+    end
     assigned_item = AssignedOrderItem.find(assigned_item_id)
     @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'");    
   end
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index e47a8e48..a3d08132 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -55,6 +55,7 @@ class Origami::DashboardController < BaseOrigamiController
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
+    @current_user = current_user
   end
 
   helper_method :shop_detail
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 3a7501e6..eedbfdfc 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -62,6 +62,7 @@ class Origami::HomeController < BaseOrigamiController
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
+          @assigned_order_items = Array.new
           if booking.booking_orders.empty?
             @booking = booking
           else
@@ -84,6 +85,10 @@ class Origami::HomeController < BaseOrigamiController
                     item.set_menu_items = arr_instance_item_sets
                   end
                   @order_items.push(item)
+                  assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+                  if !assigned_order_items.nil?
+                    @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+                  end
                 end
                 accounts = @customer.tax_profiles
                 puts accounts.to_json
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 987f68e7..59dd3a71 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -8,6 +8,7 @@ class Origami::SplitBillController < BaseOrigamiController
 		@orders = Array.new
 		@order_items = Array.new
 		@sale_data = Array.new
+		@current_user = current_user
 
 		table_bookings = Booking.where("dining_facility_id = #{dining_id} and sale_id IS NOT NULL")
 		if !table_bookings.nil?
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index f2dd132a..09535f4a 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -65,6 +65,8 @@ class Origami::TableInvoicesController < BaseOrigamiController
     if !lookup_spit_bill[0].nil?
       @split_bill = lookup_spit_bill[0][1]
     end
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
   end
 
   #Shop Name in Navbor
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 7afb6bc4..33372ac9 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -191,6 +191,9 @@ class Ability
      elsif user.role == "waiter"
         can :index, :home
         can :show, :home  
+        #ability for split_bill
+        can :index, :split_bill
+        can :create, :split_bill
     end
   end
 end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index c4666963..b3302485 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -487,17 +487,17 @@ class ReceiptBillA5Pdf < Prawn::Document
         move_down 5
         y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width+50) do
-            text "Individual amount for #{sale_data.equal_persons} persons", :size => self.item_font_size+1,:align => :left
+            text "Split Bill for #{sale_data.equal_persons} persons", :size => self.item_font_size+1,:align => :left
         end
 
         bounding_box([0,y_position], :width =>self.label_width) do
             move_down 15
-            text "Total Amount", :size => self.item_font_size,:align => :left
+            text "Amount Due (per person)", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
             move_down 15
-            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)} per person", :size => self.item_font_size,:align => :right
+            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         end
     end
 
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index aef26a9d..0ae57fea 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -488,17 +488,17 @@ class ReceiptBillPdf < Prawn::Document
         move_down 5
         y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width+50) do
-            text "Individual amount for #{sale_data.equal_persons} persons", :size => self.item_font_size+1,:align => :left
+            text "Split Bill for #{sale_data.equal_persons} persons", :size => self.item_font_size+1,:align => :left
         end
 
         bounding_box([0,y_position], :width =>self.label_width) do
             move_down 15
-            text "Total Amount", :size => self.item_font_size,:align => :left
+            text "Amount Due (per person)", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
             move_down 15
-            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)} per person", :size => self.item_font_size,:align => :right
+            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         end
     end
 
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ec0a3c68..45cedcc3 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,11 +14,11 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
-            <%if current_login_employee.role !="waiter" %>
+            <%if current_login_employee.role !="cashier" && current_login_employee.role !="waiter" %>
                 <a href="javascript:void(0);" class="bars"></a>
                 <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
             <% else %>
-                <a class="navbar-brand m-0" href="<%=dashboard_path%>">
+                <a class="navbar-brand m-0" href="<%= origami_dashboard_path%>">
             <%end%>
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 24599bd1..775b214d 100755
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -118,13 +118,45 @@ $(document).ready(function(){
       data: params,
       success: function(result){
         // alert("Updated!");
-        window.location.href = '/oqs';
+        <% if !@link_type.nil? %>
+          <% if @link_type == 'oqs' %>
+            window.location.href = '/oqs';
+          <% else %>
+            <% if !@dining_type.nil? %>
+              <% if @dining_type == 'Table' %>
+                window.location.href = '/origami/table/'+<%=@link_type%>;
+              <% else %>
+                window.location.href = '/origami/room/'+<%=@link_type%>;
+              <% end %>
+             <% else %>
+              window.location.href = '/origami/table/'+<%=@link_type%>;
+             <% end %>
+          <% end %>
+        <% else %>
+          window.location.href = '/oqs';
+        <% end %>
       }
     });
   });
 
    $('#back').on('click', function () {
+      <% if !@link_type.nil? %>
+        <% if @link_type == 'oqs' %>
+          window.location.href = '/oqs';
+        <% else %>
+         <% if !@dining_type.nil? %>
+          <% if @dining_type == 'Table' %>
+            window.location.href = '/origami/table/'+<%=@link_type%>;
+          <% else %>
+            window.location.href = '/origami/room/'+<%=@link_type%>;
+          <% end %>
+         <% else %>
+          window.location.href = '/origami/table/'+<%=@link_type%>;
+         <% end %>
+        <% end %>
+      <% else %>
         window.location.href = '/oqs';
+      <% end %>
     })
 
    // number key pad
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 8f432e1e..08f34f5e 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -14,55 +14,8 @@
       delimiter = ""
     end
     %> 
-    <!-- Widgets -->
-    <div class="row clearfix">
-      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-        <div class="info-box bg-cyan hover-expand-effect">
-          <div class="icon">
-            <i class="material-icons">help</i>
-          </div>
-          <div class="content">
-            <div class="text"><%= t :sale_count %></div>
-            <div class="number count-to" data-from="0" data-to="<%= @total_count%>" data-speed="1000" data-fresh-interval="20"></div>
-          </div>
-        </div>
-      </div>
-      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-        <div class="info-box bg-pink hover-expand-effect">
-          <div class="icon">
-            <i class="material-icons">attach_money</i>
-          </div>
-          <div class="content">
-            <div class="text"><%= t :total_sale %></div>
-            <div class="number count-to" data-from="0" data-to="<%= @total_sale%>" data-speed="15" data-fresh-interval="20"></div>
-          </div>
-        </div>
-      </div>
 
-      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-        <div class="info-box bg-light-green hover-expand-effect">
-          <div class="icon">
-            <i class="material-icons">person_add</i>
-          </div>
-          <div class="content">
-            <div class="text"><%= t :total_credit %></div>
-            <div class="number count-to" data-from="0" data-to="<%= @total_credit%>" data-speed="1000" data-fresh-interval="20"></div>
-          </div>
-        </div>
-      </div>
-      <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-        <div class="info-box bg-orange hover-expand-effect">
-          <div class="icon">
-            <i class="material-icons">credit_card</i>
-          </div>
-          <div class="content">
-            <div class="text"><%= t :total_card %></div>
-            <div class="number count-to" data-from="0" data-to="<%= @total_card%>" data-speed="1000" data-fresh-interval="20"></div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- #END# Widgets -->
+    <% if !@current_user.nil? && (@current_user.role == 'cashier' || @current_user.role == 'waiter' ) %>
     <!-- Widgets -->
     <div class="row clearfix">
       <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 qs_view">
@@ -83,6 +36,8 @@
       </div>
     </div>
     <!-- #END# Widgets -->
+    <% end %>
+    <% if !@current_user.nil? && @current_user.role == 'cashier' %>
     <!-- CPU Usage -->
     <div class="row clearfix">
 
@@ -230,6 +185,7 @@
           </div>
         </div>
       </div>
+      <% end %>
     </div>
 
 <script>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8f17c2c4..557b523f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -288,19 +288,39 @@
                                   sub_total = sub_total + (order_item.price * order_item.qty)
 
                                   # unless order_item.price == 0 %>
-                                  <tr>
-                                    <td><%= count %></td>
-                                    <td class='item-name'>
-                                      <%= order_item.item_name %>
-                                      <% if !order_item.set_menu_items.nil?  
-                                        order_item.set_menu_items.each do |item_instance| %> 
-                                        <br><span class="font-13"><%= item_instance %></span> 
-                                      <% end 
-                                      end %>
-                                    </td>
-                                    <td class='item-attr'><%= order_item.qty %></td>
-                                    <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                                  </tr>
+                                  <% if !@assigned_order_items.nil? %>
+                                    <% @assigned_order_items.each do |assigned_order_item| %>
+                                      <% if assigned_order_item.include? (order_item.order_items_id) %>
+                                        <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
+                                          <td><%= count %></td>
+                                          <td class='item-name'>
+                                            <%= order_item.item_name %>
+                                            <% if !order_item.set_menu_items.nil?  
+                                              order_item.set_menu_items.each do |item_instance| %> 
+                                              <br><span class="font-13"><%= item_instance %></span> 
+                                            <% end 
+                                            end %>
+                                          </td>
+                                          <td class='item-attr'><%= order_item.qty %></td>
+                                          <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                                        </tr>
+                                      <% end %>
+                                    <% end %>
+                                  <% else %>
+                                    <tr>
+                                      <td><%= count %></td>
+                                      <td class='item-name'>
+                                        <%= order_item.item_name %>
+                                        <% if !order_item.set_menu_items.nil?  
+                                          order_item.set_menu_items.each do |item_instance| %> 
+                                          <br><span class="font-13"><%= item_instance %></span> 
+                                        <% end 
+                                        end %>
+                                      </td>
+                                      <td class='item-attr'><%= order_item.qty %></td>
+                                      <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                                    </tr>
+                                  <% end %>
                               <%
 
                                 # end
@@ -427,7 +447,6 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
-          <% if current_login_employee.role != "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
@@ -447,18 +466,23 @@
                   <!-- <button type="button" class="btn btn-block bg-blue waves-effect" disabled> Void</button> -->
               <% end %>
               <% if @status_sale == 'sale' %>
+                <% if current_login_employee.role != "waiter" %>
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
+                <% end %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
+                <% if current_login_employee.role != "waiter" %>
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true"> Void</button>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
+                <% end %>
                   <% if !@split_bill.nil? %>
                     <% if @split_bill == '1' %>
                       <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
                     <% end %>
                   <% end %>
+                <% if current_login_employee.role != "waiter" %>
                    <!-- first bill not used in cloud -->
                   <% if ENV["SERVER_MODE"] == "cloud" %>
                     <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
@@ -471,6 +495,7 @@
                   <% end %> 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
               <% end %>
+            <% end %>
               <!-- Cashier Buttons -->
 
               <!-- <button type="button" id="re-print" class="btn btn-block bg-blue waves-effect" >Re.Print</button> -->
@@ -508,7 +533,6 @@
                     </div>
                 </div>
             </div>
-          <% end %>
         </div>
     </div>
 </div>
@@ -897,4 +921,13 @@
         }
       });
     });
+
+    /*edit order in oqs*/
+    $('.edit_order').on('click',function(){
+      var assigned_order_item_id = $(this).attr('data-id');
+      var dining_id = "<%= @dining.id %>";
+      if((assigned_order_item_id!=undefined) && (assigned_order_item_id!='')){
+        window.location.href = '/oqs/'+ assigned_order_item_id  + "/edit/"+dining_id;
+      }
+    });
 </script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index fa4167b2..2a78ee91 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -125,7 +125,13 @@
             <% if !@individual_total[0].nil? %>
               <tr>
                   <td class="charges-name">
-                    <strong>Individual amount for <%= @individual_total[0]['total_customer'] %> persons</strong>
+                    <strong>Split Bill for <%= @individual_total[0]['total_customer'] %> persons</strong>
+                  </td>
+                  <td></td>
+              </tr>
+              <tr>
+                  <td class="charges-name">
+                    <strong>Amount Due (per person)</strong>
                   </td>
                   <td class="item-attr"><strong><span><%= number_with_precision(@individual_total[0]['per_person_amount'], precision: precision.to_i )%></span></strong></td>
               </tr>
@@ -445,7 +451,7 @@ console.log("fffffffffffff")
         swal ( "Oops" ,  "Please select an table!" ,  "warning" );
       }
     }else{
-      swal("Opps","You are not authorized for Discount","warning")
+      swal("Oops","You are not authorized for Discount","warning")
     }
     return false;
   });
@@ -461,7 +467,7 @@ console.log("fffffffffffff")
       }
       
     }else{
-      swal("Opps","You are not authorized for void","warning")
+      swal("Oops","You are not authorized for void","warning")
     }
   });
 
@@ -548,23 +554,23 @@ console.log("fffffffffffff")
     $('#pay').click(function() {
       sub_total = $('#sub-total').text();
       if (payment_type == 'MPU' && $('.mpu').text() == 0 && sub_total != 0.0) {
-          swal("Opps","Please Pay with MPU Payment","warning");
+          swal("Oops","Please Pay with MPU Payment","warning");
       }else if(payment_type == "Redeem" && $('#ppamount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with Redeem Payment","warning");
+          swal("Oops","Please Pay with Redeem Payment","warning");
       }else if(payment_type == "VISA" && $('#visacount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with Visa Payment","warning");
+          swal("Oops","Please Pay with Visa Payment","warning");
         
       }else if(payment_type == "JCB" && $('#jcbcount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with jcb Payment","warning");
+          swal("Oops","Please Pay with jcb Payment","warning");
       }
       else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with Master Payment","warning");
+          swal("Oops","Please Pay with Master Payment","warning");
       }
       else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with UNIONPAY Payment","warning");
+          swal("Oops","Please Pay with UNIONPAY Payment","warning");
       }
       else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with Credit Payment","warning");
+          swal("Oops","Please Pay with Credit Payment","warning");
       }else{
 
         $( "#loading_wrapper").show();
@@ -664,7 +670,7 @@ console.log("fffffffffffff")
             })
          });
       }else{
-        swal("Opps","You are not authorized for void","warning")
+        swal("Oops","You are not authorized for void","warning")
       }
       
     });
@@ -722,7 +728,7 @@ console.log("fffffffffffff")
           }
         });
         }else{
-          swal("Opps","You are not authorized for foc","warning")
+          swal("Oops","You are not authorized for foc","warning")
         }
       });
 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4434d45d..1235f522 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -420,6 +420,7 @@
     <% if @status_sale == 'sale' %>
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
+        <% if current_login_employee.role != "waiter" %>
         <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
         <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
         <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
@@ -427,11 +428,13 @@
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
+        <% end %>
         <% if !@split_bill.nil? %>
           <% if @split_bill == '1' %>
             <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
           <% end %>
         <% end %>
+        <% if current_login_employee.role != "waiter" %>
          <!-- first bill not used in cloud -->
          <% if ENV["SERVER_MODE"] == "cloud" %>
          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
@@ -443,8 +446,10 @@
          <%end%>
          <%end%>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
+        <% end %>
        <!--  <button type="button" id="void" class="btn bg-blue btn-block" > Void </button> -->
      <% end %>
+        <% if current_login_employee.role != "waiter" %>
             <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
            <span class="hidden" id="member_discount"><%= @membership.discount%></span>
            <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
@@ -475,7 +480,7 @@
                 </div>
             </div>
      <!-- Cashier Buttons -->
-
+     <% end %>
    <!-- <button type="button" id="re-print" class="btn bg-blue btn-block" >Re.Print</button> -->
    <% end %>
  </div>
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 3f65a8ad..b971ddbd 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
   <!-- Column Two -->
-  <div class="col-lg-10 col-md-10 col-sm-10">
+  <div class="col-lg-11 col-md-11 col-sm-11">
     <div class="card">
       <div class="card-header">
         <div><strong id="order-title">INVOICE DETAILS </strong></div>
@@ -63,7 +63,8 @@
                             <span id="<%= sale_item.id %>_qtyErr" style="color:red;"></span>
                           </td>
                           <td class="p-1" width="10%">
-                            <input id="<%= sale_item.id %>_price" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
+                            <input id="<%= sale_item.id %>_price" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control" onkeypress="return isNumberKey(event);"/>
+                            <span id="<%= sale_item.id %>_priceErr" style="color:red;"></span>
                           </td>
                           <!-- <td class='' width="17%">
                         <input id="<%= sale_item.id %>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control"/>
@@ -168,8 +169,40 @@ var cashier_type = "<%= @cashier_type %>";
             var qty          = $('#' + sale_item_id + "_qty").val();
             var price        = $('#' + sale_item_id + "_price").val();
             console.log(qty + "|" + price);
-            if(qty > 0){
+            var qty_status = true;
+            var price_status = true;
+            if((qty > 0) && (price > 0)){
+              qty_status = true;
+              price_status = true;
               $('#' + sale_item_id + "_qtyErr").html("");
+              $('#' + sale_item_id + "_priceErr").html("");
+            }else if((qty > 0) && (price <= 0 || price == '')){
+              price_status = false;
+              $('#' + sale_item_id + "_qtyErr").html("");
+              if(price == ''){
+                $('#' + sale_item_id + "_priceErr").html("can't be blank");
+              }else{
+                $('#' + sale_item_id + "_price").val("");
+                $('#' + sale_item_id + "_priceErr").html("Price must be greater than 0");
+              }
+            }else if((qty <= 0 || qty == '') && (price > 0)){
+              qty_status = false;
+              if(qty == ''){
+                $('#' + sale_item_id + "_qtyErr").html("can't be blank");
+              }else{
+                $('#' + sale_item_id + "_qty").val("");
+                $('#' + sale_item_id + "_qtyErr").html("Quantity must be greater than 0");
+              }
+              
+              $('#' + sale_item_id + "_priceErr").html("");
+            }else{
+              qty_status = false;
+              price_status = false;
+              $('#' + sale_item_id + "_qtyErr").html("can't be blank");
+              $('#' + sale_item_id + "_priceErr").html("can't be blank");
+            }
+            
+            if(qty_status && price_status){
               var ajax_url      = "/origami/item_edit";
               $.ajax({
                   type: "POST",
@@ -184,10 +217,7 @@ var cashier_type = "<%= @cashier_type %>";
                       });
                   }
               });
-            }else{
-              $('#' + sale_item_id + "_qtyErr").html("can't be blank");
             }
-            
         });
 
         $('.void').on('click', function () {
@@ -334,4 +364,8 @@ var cashier_type = "<%= @cashier_type %>";
         $("#"+sale_item_id+"_qty").val('1');
       }
   }
+
+  function checkPrice(obj_value,sale_item_id) {
+      
+  }
 </script>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 5750bc2f..c00234e4 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -65,6 +65,8 @@
 			 																	<td style="width:60%; text-align:left">
 			 																		<span id="item-order-id" class="hidden"><%=odr_item['order_id'] %></span>
 			 																		<span id="item-account-type" class="hidden"><%=odr_item['account_id'] %></span>
+			 																		<span id="item-code" class="hidden"><%=odr_item['item_code'] %></span>
+			 																		<span id="item-instance-code" class="hidden"><%=odr_item['item_instance_code'] %></span>
 			 																		<span id="item-name-price">
 			 																			<%=odr_item['item_name'] %>
 			 																			<% if !odr_item['set_menu_items'].nil?  
@@ -132,6 +134,8 @@
 	 																	<td style="width:60%; text-align:left">
 	 																		<span id="item-order-id" class="hidden"><%=order_item[order.order_id.to_s]['order_id'] %></span>
 	 																		<span id="item-account-type" class="hidden"><%=order_item[order.order_id.to_s]['account_id'] %></span>
+	 																		<span id="item-code" class="hidden"><%=order_item[order.order_id.to_s]['item_code'] %></span>
+	 																		<span id="item-instance-code" class="hidden"><%=order_item[order.order_id.to_s]['item-instance-code'] %></span>
 	 																		<span id="item-name-price">
 	 																			<%=order_item[order.order_id.to_s]['item_name'] %>
 	 																			<% if !order_item[order.order_id.to_s]['set_menu_items'].nil?  
@@ -194,7 +198,9 @@
  									<th>#</th>
  									<th>Receipt No.</th>
  									<th>Total</th>
+ 									<% if !@current_user.nil? && @current_user.role == 'cashier' %>
  									<th>Action</th>
+ 									<% end %>
  								</thead>
  								<tbody>
  									<% @sale_data.each_with_index do |sale_data, sale_index| %>
@@ -207,9 +213,12 @@
 	 										<td><input type="radio" name="rdn_receipt" id="rdn_receipt" value="<%= sale_data.sale_id %>" <%= checked %>></td>
 	 										<td><span id="receipt_no"><%= sale_data.receipt_no %></span></td>
 	 										<td><span id="grand_total"><%= sale_data.grand_total %></span></td>
+
+ 											<% if !@current_user.nil? && @current_user.role == 'cashier' %>
 	 										<td>
 	 											<button type="button" class="btn btn-block waves-effect btn-primary btn_pay" id=<%= sale_data.sale_id %> >Pay</button>
 	 										</td>
+	 										<% end %>
 	 									</tr>
 	 									<% end %>
  									<% end %>
@@ -228,7 +237,9 @@
  			<!-- Action Panel -->
  			<div>
  				<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
- 				<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
+ 				<% if !@current_user.nil? && @current_user.role == 'cashier' %>
+ 					<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
+ 				<% end %>
  				<% if !@orders.empty? %>
 	 				<button id="order_split" class="btn btn-block waves-effect bg-blue">By Order</button>
 	 				<button id="order_item_split" class="btn btn-block waves-effect bg-blue">By Order Item</button>
@@ -689,6 +700,8 @@ function get_selected_order_items(){
 		var order_item = {};
 		order_item.id = $(this).attr('id').substr(0,16);
 		order_item.order_id = $(this).find('#item-order-id').text().trim();
+		order_item.item_code = $(this).find('#item-code').text().trim();
+		order_item.item_instance_code = $(this).find('#item-instance-code').text().trim();
 		order_item.name = $(this).find('#item-name-price').text().split('@')[0];
 		order_item.account_id = $(this).find('#item-account-type').text();
 		order_item.qty = $(this).find('#item-qty').text();
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 831dab61..3336ffe2 100755
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -1,11 +1,26 @@
 <div class="container-fluid">
 <div class="row">
+<% if !@print_settings.nil? %>
+  <% if @print_settings.precision.to_i > 0
+      precision = @print_settings.precision
+    else
+      precision = 0
+    end
+    #check delimiter
+    if @print_settings.delimiter
+      delimiter = ","
+    else
+      delimiter = ""
+    end
+  %>
+<% end %>
+
  <div class="col-lg-4 col-md-6 col-sm-6">
        <!-- <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> -->
          <% @sale_array.each do |sale| %>
-         <div class="card tables" data-id="<%= sale.id %>">
+         <div class="card tables receipt_block" data-id="<%= sale.id %>">
            <% if sale.id == @sale.id %>
-             <div class="card-block" style="background-color:#6080f0;">
+             <div class="card-block selected-item">
                 <%= sale.receipt_no %>
              </div>
            <% else %>
@@ -15,7 +30,7 @@
            <% end %>
          </div>
          <% end %>
-</div>
+  </div>
 
   <div class="col-lg-7 col-md-5 col-sm-5">
      <div class="card"  >
@@ -74,7 +89,7 @@
                  <td><%= count %></td>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
-                 <td class='item-attr'><%= sale_item.price %></td>
+                 <td class='item-attr'><%= number_with_precision(sale_item.price, precision: precision.to_i ) %></td>
                </tr>
                <%
                      # end
@@ -93,7 +108,7 @@
                  <td><%= count %></td>
                  <td class='item-name'><%= order_item.item_name %></td>
                  <td class='item-attr'><%= order_item.qty %></td>
-                 <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                 <td class='item-attr'><%= number_with_precision(order_item.qty*order_item.price, precision: precision.to_i ) %></td>
                </tr>
                <%
                      end
@@ -109,7 +124,7 @@
            <table class="table" id="order-charges-table" border="0">
              <tr>
                <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+               <td class="item-attr"><strong id="order-sub-total"><span id="sub_total"><%= number_with_precision(sub_total, precision: precision.to_i ) %></span></strong></td>
              </tr>
              <tr>
                <%if @sale.discount_type == 'member_discount'%>
@@ -117,19 +132,19 @@
                <%else%>
                 <td class="charges-name"><strong>Discount:</strong></td>
                <%end%>
-               <td class="item-attr"><strong id="order-discount">(<%= @sale.total_discount rescue 0%>)</strong></td>
+               <td class="item-attr"><strong id="order-discount">(<%= number_with_precision(@sale.total_discount, precision: precision.to_i ) rescue 0%>)</strong></td>
              </tr>
              <tr>
                <td class="charges-name"><strong>Tax:</strong></td>
-               <td class="item-attr"><strong id="order-Tax"><%= @sale.total_tax rescue 0%></strong></td>
+               <td class="item-attr"><strong id="order-Tax"><%= number_with_precision(@sale.total_tax, precision: precision.to_i ) rescue 0%></strong></td>
              </tr>
               <tr>
                <td class="charges-name"><strong>Rounding Adj:</strong></td>
-               <td class="item-attr"><strong id="order-round-adj"><%= @sale.rounding_adjustment rescue 0%></strong></td>
+               <td class="item-attr"><strong id="order-round-adj"><%= number_with_precision(@sale.rounding_adjustment, precision: precision.to_i ) rescue 0%></strong></td>
              </tr>
              <tr>
                <td class="charges-name"><strong>Grand Total:</strong></td>
-               <td class="item-attr"><strong id="order-grand-total"><%= @sale.grand_total rescue 0%></strong></td>
+               <td class="item-attr"><strong id="order-grand-total"><span id="grand_total"><%= number_with_precision(@sale.grand_total, precision: precision.to_i ) rescue 0%></span></strong></td>
              </tr>
               <tr class="rebate_amount"></tr>
            </table>
@@ -142,7 +157,8 @@
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
-   <button type="button" id="void" class="btn bg-danger btn-block" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true" > Void </button>
+   <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
+   <button type="button" id="void" class="btn bg-danger btn-block" active="<%= can? :overall_void, :void %>" > Void </button>
  </div>
 </div>
 </div>
@@ -200,13 +216,45 @@ $('#void').on('click',function () {
               type: 'POST',
               url: ajax_url,
               success: function () {
-                  window.location.href = '/origami/';
+                  window.location.href = '/origami';
               }
           });
         }
       }); 
     }else{
-      swal("Opps","You are not authorized for void","warning")
+      swal("Opps","You are not authorized for void","warning");
     }
 });
+
+$('#foc').click(function() {
+  var cash = $('#grand_total').text();
+  var sub_total = $('#sub_total').text();
+  var sale_id = '';
+  if($('.receipt_block > div').hasClass('selected-item')){
+    sale_id = $('.receipt_block > div.selected-item').parent().attr('data-id');
+  }
+  var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total };
+  // console.log(sale_id);
+  if(sale_id != ''){
+    if ($(this).attr('active')=== "true") {  
+        $.ajax({
+          type: "POST",
+          url: "<%= origami_payment_foc_path %>",
+          data: params,
+          success:function(result){    
+            if (cash >= 0) {
+              swal({
+               title: "Information!",
+               text: 'Thank You !',
+              }, function () {
+                window.location.href = '/origami';
+              });
+            }
+          }
+        });
+    }else{
+      swal("Oops","You are not authorized for foc","warning")
+    }
+  }
+});
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index dae341c0..b7f88301 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -271,7 +271,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'update_delivery', to: "home#update_delivery_status"
 
     # qty update
-    get "/:id/edit", to: "edit#index"
+    get "/:id/edit/:type", to: "edit#index"
     post "/:id", to: "edit#update"
 
     # Pass assigned_order_item_id

From 06abf1c744710d0fb48f6890890050a12351b5be Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Feb 2018 19:18:24 +0630
Subject: [PATCH 300/651] check oqs edit in origami

---
 app/assets/javascripts/OQS.js          | 19 ++++++++++++++++---
 app/controllers/oqs/home_controller.rb |  8 +++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 77ea81b5..7967f8a1 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -151,9 +151,22 @@ $(document).on('turbolinks:load', function() {
 	    	url: '/oqs/' + orderNo,
 	    	data: { 'status' : order_status },
 	    	success: function(res){
-	    		for (i = 0; i < res.length; i++) {	    			
-	    			var data = JSON.stringify(res[i]);	
+	    		// console.log(res);
+	    		for (i = 0; i < res["items"].length; i++) {	    			
+	    			var data = JSON.stringify(res["items"][i]);	
         			var parse_data = JSON.parse(data); 
+        			var assigned_order_items = {}; 
+        			var assigned_order_item_id = '';
+        			if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){
+        				assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"]));
+        				$.each(assigned_order_items,function(key,value){
+        					if(value[parse_data.order_items_id] != undefined){
+        						assigned_order_item_id = value[parse_data.order_items_id];
+        					}
+        				});
+        			}
+        			// console.log(assigned_order_item_id);
+        			
         			var set_menu_items = parse_data.set_menu_items;
         			var set_instance_items = "";
         			if(set_menu_items!=null){
@@ -165,7 +178,7 @@ $(document).on('turbolinks:load', function() {
         			}
 
         			if (oqs_id > 0){
-        				var order_item_row = "<tr id='edit_"+assigned_item_id+"' class='order-item-edit'>" +
+        				var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
 							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
               						 	 "</tr>";
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 371425ca..ad430e49 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -60,6 +60,7 @@ class Oqs::HomeController < BaseOqsController
   # Get Order items
   def get_order_items
     items = []
+    assigned_items = []
     order_no = params[:order_no]
     status = params[:status]
     # dining = DiningFacility.find_by_name(table_name);
@@ -90,6 +91,11 @@ class Oqs::HomeController < BaseOqsController
 
     if !items.empty?
       items.each do |item|
+        assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+        if !assigned_order_items.nil?
+          assigned_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+        end
+
         if !item.set_menu_items.nil?
           instance_item_sets = JSON.parse(item.set_menu_items)
           arr_instance_item_sets = Array.new
@@ -101,7 +107,7 @@ class Oqs::HomeController < BaseOqsController
         end
       end
     end
-    render :json => items.to_json
+    render :json => {'items' => items, 'assigned_order_items' => assigned_items }
   end
 
   def get_items_by_oqs

From ed1289798634cedfbd7084bb0a2fd15bece56a3a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 10:15:55 +0630
Subject: [PATCH 301/651] oqs js

---
 app/assets/javascripts/OQS.js | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 7967f8a1..9001bae3 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -78,12 +78,15 @@ $(document).on('turbolinks:load', function() {
 					}
 	            }
 
-	            	if (data[field]["table_type"]=null) {
-	            		table_type = data[field]["table_type"] +'-'+data[field]["zone"]
-	            	}else{
-	            		table_type = "No Table"
-	            		
-	            	}
+	            var table_type = '';
+
+            	if (data[field]["table_type"]=null) {
+            		table_type = data[field]["table_type"] +'-'+data[field]["zone"]
+            	}else{
+            		table_type = "No Table"
+            		
+            	}
+
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
 	                         +'<div class="row">'
@@ -155,7 +158,7 @@ $(document).on('turbolinks:load', function() {
 	    		for (i = 0; i < res["items"].length; i++) {	    			
 	    			var data = JSON.stringify(res["items"][i]);	
         			var parse_data = JSON.parse(data); 
-        			var assigned_order_items = {}; 
+        			var assigned_order_items = []; 
         			var assigned_order_item_id = '';
         			if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){
         				assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"]));
@@ -178,10 +181,18 @@ $(document).on('turbolinks:load', function() {
         			}
 
         			if (oqs_id > 0){
-        				var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" +
-							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
-							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
-              						 	 "</tr>";
+        				if(assigned_order_item_id != ''){
+        					var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" +
+									                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
+									                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
+		              						 	 "</tr>";
+					 	}else{
+					 		var order_item_row = "<tr>" +
+									                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
+									                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
+												"</tr>";
+					 	}
+        				
 				 	}else{
 				 		var order_item_row = "<tr>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +

From a1906ed5552f70639e8c9c19615132725d525ce7 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 10:42:12 +0630
Subject: [PATCH 302/651] check table type in oqs

---
 app/assets/javascripts/OQS.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 9001bae3..ec3db11f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -79,8 +79,7 @@ $(document).on('turbolinks:load', function() {
 	            }
 
 	            var table_type = '';
-
-            	if (data[field]["table_type"]=null) {
+            	if (data[field]["table_type"]!=null) {
             		table_type = data[field]["table_type"] +'-'+data[field]["zone"]
             	}else{
             		table_type = "No Table"

From ce217e1e0babef0be71a5478d9297f1cfcfc4e0e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 10:53:12 +0630
Subject: [PATCH 303/651] check waiter role

---
 app/views/layouts/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 45cedcc3..5f1fe42d 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,7 +14,7 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
-            <%if current_login_employee.role !="cashier" && current_login_employee.role !="waiter" %>
+            <%if current_login_employee.role !="waiter" %>
                 <a href="javascript:void(0);" class="bars"></a>
                 <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
             <% else %>

From 3ae604b4ce220fff76c44d8a8c3ce7881abb3674 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 10:57:50 +0630
Subject: [PATCH 304/651] check user role

---
 app/views/origami/dashboard/index.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 08f34f5e..98e253cc 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -15,7 +15,6 @@
     end
     %> 
 
-    <% if !@current_user.nil? && (@current_user.role == 'cashier' || @current_user.role == 'waiter' ) %>
     <!-- Widgets -->
     <div class="row clearfix">
       <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 qs_view">
@@ -36,8 +35,7 @@
       </div>
     </div>
     <!-- #END# Widgets -->
-    <% end %>
-    <% if !@current_user.nil? && @current_user.role == 'cashier' %>
+    <% if !@current_user.nil? && @current_user.role != 'waiter' %>
     <!-- CPU Usage -->
     <div class="row clearfix">
 

From 31c70480755fe8fb63fa3a4edbb95e3ade15fff3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Feb 2018 11:12:58 +0630
Subject: [PATCH 305/651] update oqs js

---
 app/models/menu_item.rb                     | 125 --------------------
 app/views/origami/addorders/detail.html.erb |   3 +-
 2 files changed, 2 insertions(+), 126 deletions(-)

diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 818e5c1e..836e0caf 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -78,131 +78,6 @@ class MenuItem < ApplicationRecord
     end
 
   end
-
-  def self.get_items(menu)
-    item = Array.new
-    if menu.menu_items
-      menu.menu_items do |item|
-        if item.is_available
-           # Format for attributes json
-          attr_format = []
-          # Format for attributes json 
-          if item.item_attributes.count > 0   
-            item.item_attributes.each do|attr_id|      
-              menu_attr = MenuItemAttribute.find(attr_id)
-              if attr_format.count == 0
-                attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] })
-                next
-              end
-
-              attr_format.each do |af|
-                if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]}
-                  if menu_attr.attribute_type == af[:type]
-                    af[:values].push(menu_attr.name)
-                  end
-                else 
-                  new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] }
-                  attr_format.push(new_attr) 
-                  break      
-                end          
-              end
-            end
-          end
-
-          # Format for option json
-          opt_format = []
-          # Format for attributes json 
-          if item.item_options.count > 0   
-            item.item_options.each do|opt|      
-              menu_opt = MenuItemOption.find(opt)
-              if opt_format.count == 0
-                opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
-                next
-              end
-
-              opt_format.each do |of|
-                if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
-                  if menu_opt.option_type == of[:type]
-                    of[:values].push(menu_opt.name)
-                  end
-                else 
-                  new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
-                  opt_format.push(new_opt) 
-                  break
-                end
-              end         
-            end
-          end
-
-          #Menu Item Information
-          menu_items.id           item.id
-          menu_items.code    item.item_code
-          menu_items.name         item.name
-          menu_items.alt_name     item.alt_name
-          menu_items.image        item.image_path.url
-          menu_items.description  item.description
-          menu_items.information  item.information
-          menu_items.type         item.type
-          menu_items.account_id   item.account_id
-          menu_items.min_qty      item.min_qty
-          menu_items.is_available item.is_available
-          menu_items.is_sub_item  item.is_sub_item
-          menu_items.unit         item.unit
-
-          # Item Sets of Menu Item 
-          item_sets = Array.new()
-          item.item_sets do |its|
-            sets.id                 its.id
-            sets.name               its.name
-            sets.alt_name           its.alt_name
-            sets.min_selectable_qty its.min_selectable_qty
-            sets.max_selectable_qty its.max_selectable_qty
-            instances = Array.new()
-            its.menu_item_instances do |i|
-              instan.id  i.id
-              instances.push(instan)
-            end
-            item_sets.push(sets)
-          end 
-
-          menu_items.attributes attr_format
-          menu_items.options opt_format
-         
-            instances = Array new()
-            item.menu_item_instances do |is|
-              if is.is_available
-                 # Convert id to name for attributes
-                instance_attr = []
-
-                is.item_attributes.each do |ia|
-                  # mItemAttr = MenuItemAttribute.find(is)
-                  # instance_attr.push(ia)
-                  mItemAttr = MenuItemAttribute.find(ia).name
-                  instance_attr.push(mItemAttr)
-                end
-              
-                instance.id is.id
-                instance.code is.item_instance_code
-                instance.name is.item_instance_name
-                instance.price is.price
-                instance.is_available is.is_available
-                instance.is_default is.is_default
-                instance.is_on_promotion is.is_on_promotion
-                instance.promotion_price is.promotion_price
-                instance.values instance_attr
-                # json.item_sets is.item_sets
-              end
-              instances.push(instance)
-            end
-        end
-        item.push(menu_items)
-      end
-      return item
-    end
-  end
-  
-
-
   # private
 
   # def generate_menu_item_code
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index de9e5750..58011788 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -85,6 +85,7 @@
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
       <div class="card-columns custom-card-columns menu_items_list" style="column-gap: ;">
          <!-- append data -->
+         <div id="custom-slimscroll">
          <% @menu.each do |menu| %>
               <% if !menu.valid_time.nil? %>
                 <% if menu.menu_category_id.nil? %>
@@ -122,7 +123,7 @@
                 <% end%>
               <% end %>
             <%end %>
-      </div>
+      </div> </div>
     </div>
 
     <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">

From 23548dffa63441d3dac638b311b93ea14b221654 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 11:34:53 +0630
Subject: [PATCH 306/651] check report error precision

---
 README.md                                     | 25 ++++++++++
 .../reports/saleitem_controller.rb            |  2 +
 .../reports/stock_check_controller.rb         |  2 +-
 app/views/reports/dailysale/index.html.erb    | 48 +++++++++----------
 app/views/reports/saleitem/index.html.erb     | 32 ++++++++-----
 app/views/reports/shiftsale/index.html.erb    | 20 ++++----
 app/views/reports/stock_check/index.html.erb  | 16 ++++++-
 7 files changed, 95 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 97f43595..8ec595bb 100755
--- a/README.md
+++ b/README.md
@@ -108,6 +108,31 @@ sudo cat /etc/sudoers
 ### cope and parse
 %superuser ALL=(ALL) NOPASSWD: ALL
 
+<---- Extra Fields Script ----->
+DROP TABLE IF EXISTS `display_images`;
+CREATE TABLE `display_images` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `shop_id` int(11) DEFAULT NULL,
+  `image` blob,
+  `created_by` varchar(255) DEFAULT NULL,
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE customers
+ADD COLUMN image_path VARCHAR(255);
+
+ALTER TABLE employees
+ADD COLUMN image_path VARCHAR(255);
+
+ALTER TABLE commissioners
+ADD COLUMN image_path VARCHAR(255);
+
+ALTER TABLE sales
+ADD COLUMN equal_persons INT(11) after rebate_status;
+<---- Extra Fields Script ----->
+
 * ToDo list
 
 1. Migration
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index a9d23797..4e337e30 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -34,6 +34,8 @@ class Reports::SaleitemController < BaseReportController
     @from       = from
     @to         = to
 
+    puts "foc_data"
+    puts @foc_data
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
 
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index a9188f5d..10eab5a3 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -17,7 +17,7 @@ class Reports::StockCheckController < BaseReportController
     @from       = from_date
     @to         = to_date
     # get printer info
-  @print_settings = PrintSetting.get_precision_delimiter()
+    @print_settings = PrintSetting.get_precision_delimiter()
     respond_to do |format|
       format.html
       format.xls
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 76438060..6dd1ebac 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -91,37 +91,37 @@
 								<tr>
 									<td style='text-align:right;'><%= count %></td>
 									<td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
-									<td style='color:red;text-align:right;'><%= number_with_precision(sale[:void_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:mpu_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:master_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:visa_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:jcb_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:paypar_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision, delimiter: delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:credit_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:foc_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>    
+									<td style='color:red;text-align:right;'><%= number_with_precision(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>    
 									<td style='text-align:right;'>(<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision,delimiter:delimiter) rescue '-'%></td>   
-									<td style='text-align:right;'><%= number_with_precision(sale[:rounding_adj].to_f, precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total], precision:precision,delimiter:delimiter) rescue '-'%></td>	   	
+									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_precision(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>	   	
 								</tr>
 								<% count = count + 1 %>
 								<% end %>
 
 								<tr style="font-weight:600;">
 									<td colspan="3" style='text-align:center;'>Total</td>	
-									<td style='text-align:right;'><%= number_with_precision(mpu ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(master, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(mpu ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(visa, precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(jcb, precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(paypar, precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(cash, precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(credit, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(foc, precision:precision,delimiter:delimiter) rescue '-'%></td>    
-									<td style='text-align:right;'>(<%= number_with_precision(discount, precision:precision,delimiter:delimiter) rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_precision(total, precision:precision,delimiter:delimiter) rescue '-'%></td>    
-									<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision,delimiter:delimiter) rescue '-'%></td>   	
-									<td style='text-align:right;'><%= number_with_precision(grand_total, precision:precision,delimiter:delimiter) rescue '-'%></td>   
+									<td style='text-align:right;'>(<%= number_with_precision(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   	
+									<td style='text-align:right;'><%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   
 								</tr>
 
 								<% total_tax = 0 %>
@@ -130,7 +130,7 @@
 								<% total_tax += tax.tax_amount.to_f %>
 								<tr style="font-weight:600;">
 									<td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(tax.tax_amount, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>
 								</tr>
 
@@ -138,7 +138,7 @@
 								<% net = total - total_tax %>
 								<tr style="font-weight:600;">
 									<td colspan="12" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-									<td style='text-align:right;'><%= number_with_precision(net, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>	
 								</tr>
 								<% end %>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 387a97a5..3c03dec2 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -101,7 +101,7 @@
 										<td>
 											<% @totalByAccount.each do |account, total| %>
 											<% if sale.account_id == account %>
-											<b><%= number_with_precision(total, precision:precision,delimiter:delimiter) %></b>
+											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
 											<% grand_total += total %>	  
 											<% end %>
 											<% end %>
@@ -120,8 +120,8 @@
 									<td><%= sale.item_code rescue '-' %></td>
 									<td><%= sale.product_name rescue '-' %></td>
 									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= number_with_precision(sale.unit_price ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_with_precision(sale.grand_total ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
 
@@ -140,7 +140,7 @@
 											<td><b>Total <%= sale.account_name %> Qty </b> </td>
 											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision,delimiter:delimiter)%> </span></td>
+											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
 										</tr>
 										<% sub_total = 0.0%>
 										<% sub_qty = 0 %>
@@ -168,8 +168,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(other.unit_price ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(other.grand_total ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 									
@@ -179,7 +179,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 							<!-- End Other Charges -->
@@ -188,29 +188,35 @@
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision,delimiter:delimiter)%></span></td> 
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
 							</tr>
 							<% end %>
 
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= number_with_precision(total_item_foc ,  precision:precision,delimiter:delimiter) %></span></td>
+								<td><span><%= number_with_precision(total_item_foc ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(total_item_dis ,  precision:precision,delimiter:delimiter) %></span></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(total_item_dis ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td><span><%= number_with_precision(@foc_data ,  precision:precision,delimiter:delimiter) %></span></td>
+								<td>
+									<span><%= number_with_precision(@foc_data,  precision:precision.to_i, delimiter:delimiter) %></span>
+								</td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(@discount_data ,  precision:precision,delimiter:delimiter) %></span></td>
+								<td style="border-bottom:2px solid grey;">
+									<span>
+										<%= number_with_precision(@discount_data ,  precision: precision.to_i,delimiter: delimiter) %>
+									</span>
+								</td>
 							</tr>	
 							
 								<% @sale_taxes.each do |tax| %>
@@ -226,7 +232,7 @@
 								<td colspan="5">&nbsp;</td>
 								<td style="border-top:2px solid grey;">Net Amount</td>
 								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision,delimiter:delimiter)%></td> 
+								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td> 
 							</tr>
 							<!-- <tr>
 								<td colspan="5">&nbsp;</td>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 9553e733..f3f418eb 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -98,16 +98,16 @@
 							<%= result[:shift_closed_at].strftime("%e %b %I:%M%p") rescue '-'  %>
 						</td>
 						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-						<td><%= number_with_precision(result[:cash_sales].to_f,  precision:precision,delimiter:delimiter) %></td>
-						<td><%= number_with_precision(result[:credit_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+						<td><%= number_with_precision(result[:cash_sales].to_f,  precision:precision.to_i,delimiter:delimiter) %></td>
+						<td><%= number_with_precision(result[:credit_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
 						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
 						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
-						<td><%= number_with_precision(result[:other_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>	  		  
+						<td><%= number_with_precision(result[:other_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>	  		  
 						<td>
-						 	<%= number_with_precision(result[:foc_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%>
+						 	<%= number_with_precision(result[:foc_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%>
 						</td>	  		  
-						<td><%= number_with_precision(result[:grand_total].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>	
+						<td><%= number_with_precision(result[:grand_total].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>	
 
 						<!--  <td><%= sprintf "%.2f",result[:rounding_adj].to_f.to_d  rescue '-'%></td>	 -->
 						<% grand_total = result[:grand_total].to_f %>	  
@@ -126,15 +126,15 @@
 					<tr style="border-top: 3px solid grey;">
 						<td colspan="3"></td>
 						<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
-						<td><b><%= number_with_precision(cash,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
-						<td><b><%= number_with_precision(credit,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(cash,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(credit,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
-						<td><b><%= number_with_precision(card,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
-						<td><b><%= number_with_precision(foc,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(card,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(foc,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
-						<td><b><%= number_with_precision(g_total,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>	 			
+						<td><b><%= number_with_precision(g_total,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>	 			
 					</tr>
 				</tbody>
 			</table>
diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb
index 1305abe5..e470a294 100755
--- a/app/views/reports/stock_check/index.html.erb
+++ b/app/views/reports/stock_check/index.html.erb
@@ -28,6 +28,18 @@
       <div class="margin-top-20">
         <div class="card">
           <div class="table-responsive">
+            <% if @print_settings.precision.to_i > 0
+              precision = @print_settings.precision
+            else
+              precision = 0
+            end
+            #check delimiter
+            if @print_settings.delimiter
+              delimiter = ","
+              else
+              delimiter = ""
+              end
+             %> 
             <table class="table table-striped">
               <thead>
                 <tr>
@@ -63,7 +75,7 @@
                     <% end %>
                   </td>
                   <td><%= result.stock_count rescue '-' %></td>
-                  <td><%= result.stock_balance rescue '-' %></td>
+                  <td><%= number_with_precision(result.stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
                   <td><%= result.different rescue '-' %></td>
                   <td><%= result.remark rescue '-' %></td>
                   <td><%= result.created_at.strftime('%e %b %Y %I:%M %p') rescue '-' %></td>
@@ -76,7 +88,7 @@
                 <tr style="border-top: 3px solid grey;">
                   <td colspan="3"></td>
                   <td><b><%= total_stock_count rescue '-' %></b></td>
-                  <td><b><%= total_stock_balance rescue '-' %></b></td>
+                  <td><b><%= number_with_precision(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
                   <td><b><%= total_different rescue '-' %></b></td>
                   <td colspan="2"></td>
                 </tr>

From 7c171057d1fc0e05d9062b1aa32ebbab01acfad6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 14:03:25 +0630
Subject: [PATCH 307/651] product sale

---
 .../javascripts/reports/product_sale.coffee   |   3 +
 .../stylesheets/reports/product_sale.scss     |   3 +
 .../reports/product_sale_controller.rb        |  80 +++++
 .../reports/saleitem_controller.rb            |   4 +-
 app/helpers/reports/product_sale_helper.rb    |   2 +
 app/models/sale.rb                            |  47 ++-
 app/views/layouts/_left_sidebar.html.erb      |   3 +
 .../_shift_sale_report_filter.html.erb        | 120 +++++++
 app/views/reports/product_sale/index.html.erb | 292 ++++++++++++++++++
 app/views/reports/product_sale/index.xls.erb  | 175 +++++++++++
 config/routes.rb                              |   1 +
 .../reports/product_sale_controller_spec.rb   |   5 +
 .../reports/product_sale_helper_spec.rb       |  15 +
 13 files changed, 746 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/javascripts/reports/product_sale.coffee
 create mode 100644 app/assets/stylesheets/reports/product_sale.scss
 create mode 100644 app/controllers/reports/product_sale_controller.rb
 create mode 100644 app/helpers/reports/product_sale_helper.rb
 create mode 100755 app/views/reports/product_sale/_shift_sale_report_filter.html.erb
 create mode 100644 app/views/reports/product_sale/index.html.erb
 create mode 100755 app/views/reports/product_sale/index.xls.erb
 create mode 100644 spec/controllers/reports/product_sale_controller_spec.rb
 create mode 100644 spec/helpers/reports/product_sale_helper_spec.rb

diff --git a/app/assets/javascripts/reports/product_sale.coffee b/app/assets/javascripts/reports/product_sale.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/reports/product_sale.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/reports/product_sale.scss b/app/assets/stylesheets/reports/product_sale.scss
new file mode 100644
index 00000000..cb0b9a13
--- /dev/null
+++ b/app/assets/stylesheets/reports/product_sale.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the reports/ProductSale controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/reports/product_sale_controller.rb b/app/controllers/reports/product_sale_controller.rb
new file mode 100644
index 00000000..0061818a
--- /dev/null
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -0,0 +1,80 @@
+class Reports::ProductSaleController < BaseReportController
+	authorize_resource :class => false
+
+	def index
+	    from, to  = get_date_range_from_params
+	    shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
+	    shift = ''
+	    if params[:shift_name].to_i != 0
+	      shift_sale = ShiftSale.find(params[:shift_name])
+	      if to.blank?        
+	        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
+	      else
+
+	        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
+	      end
+	    end
+	    @sale_data, @grand_total = Sale.get_by_items(shift_sale_range,shift, from, to)
+
+	    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
+
+	    @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
+
+
+	    @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1}
+
+	    @menu_cate_count = Hash.new {|hash, key| hash[key] = 0}
+	    @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1}
+
+
+	    @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+	    @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+
+	    @from       = from
+	    @to         = to
+
+	    # get printer info
+	    @print_settings = PrintSetting.get_precision_delimiter()
+
+	    if shift.present?
+	      shift.each do |sh|
+	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
+	        @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
+	        @shift_data = sh
+	      end
+	    end
+
+		respond_to do |format|
+			format.html
+			format.xls
+		end
+  	end
+
+  # def show
+  #   from, to, report_type  = get_date_range_from_params
+
+  #     @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
+  #     date_arr = Array.new
+  #     @sale_data.each do |sale|
+  #       local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
+  #       local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
+  #       opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
+  #       closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
+  #       shift_id = sale.id.nil? ? '-' : sale.id
+  #       str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
+  #       date_arr.push(str)
+  #     end
+
+  #     @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+  #     @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+
+  #     out = {:status => 'ok', :message => date_arr}
+      
+  #     respond_to do |format|
+  #       format.json { render json: out }
+  #     end
+  # end
+
+end
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 4e337e30..06124265 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -33,9 +33,7 @@ class Reports::SaleitemController < BaseReportController
 
     @from       = from
     @to         = to
-
-    puts "foc_data"
-    puts @foc_data
+    
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
 
diff --git a/app/helpers/reports/product_sale_helper.rb b/app/helpers/reports/product_sale_helper.rb
new file mode 100644
index 00000000..103bd624
--- /dev/null
+++ b/app/helpers/reports/product_sale_helper.rb
@@ -0,0 +1,2 @@
+module Reports::ProductSaleHelper
+end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 2265a135..cd896f5f 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -785,7 +785,6 @@ end
 
 def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   # date_type_selection = get_sql_function_for_report_type(report_type)
-
   query = self.get_item_query()
 
   discount_query = 0
@@ -861,6 +860,52 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   return query,other_charges, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
 end
 
+#product sale report query
+def self.get_product_item_query()
+  query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
+                     "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
+                     "i.remark as status_type,"+
+                     " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     " menu_category_name,mc.id as menu_category_id ")
+
+  query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
+                     " JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id" + 
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                     # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
+  query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
+  # query = query.where("i.item_instance_code IS NOT NULL")
+  query = query.group("acc.title,mi.account_id,mi.menu_category_id,mi.name,mii.price")
+               .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, mii.price asc")
+end
+
+def self.get_by_items(shift_sale_range, shift, from, to)
+  query = self.get_product_item_query()
+  
+  puts "query"
+  total_grand_total = 0
+
+  # if shift.present?
+  #     query          = query.where("sales.shift_sale_id IN (?)",shift.to_a)
+      
+  #     # total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+
+  #     ### => get all sales range in shift_sales
+  # elsif shift_sale_range.present?
+  #     query          = query.where("sales.shift_sale_id IN (?)",shift_sale_range.to_a)
+
+  #     # total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+
+  # else
+  #     query          = query.where("sales.receipt_date between ? and ?",from,to)
+  #     # total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+  # end
+
+  return query, total_grand_total
+end
+#product sale report query
+
 def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type)
     ## => left join -> show all sales although no orders
     if payment_type.blank?
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 9bffd4d7..de42e719 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -122,6 +122,9 @@
 					<li>
 						<a href="<%= reports_saleitem_index_path %>">Sale Items</a>
 					</li>
+					<li>
+						<a href="<%= reports_product_sale_index_path %>">Product Sale</a>
+					</li>
 					<li>
 						<a href="<%= reports_receipt_no_index_path %>">Receipt</a>
 					</li>
diff --git a/app/views/reports/product_sale/_shift_sale_report_filter.html.erb b/app/views/reports/product_sale/_shift_sale_report_filter.html.erb
new file mode 100755
index 00000000..88f26c1f
--- /dev/null
+++ b/app/views/reports/product_sale/_shift_sale_report_filter.html.erb
@@ -0,0 +1,120 @@
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+	<div class="row">
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
+			<select name="period" id="sel_period" class="form-control">
+				<option value=""><%= t("views.right_panel.detail.select_period") %></option>
+				<option value="0">Today</option>
+				<option value="1">Yesterday</option>
+				<option value="2">This week</option>
+				<option value="3">Last week</option>
+				<option value="4">Last 7 days</option>
+				<option value="5">This month</option>
+				<option value="6">Last month</option>
+				<option value="7">Last 30 days</option>
+				<option value="8">This year</option>
+				<option value="9">Last year</option>
+			</select>
+		</div>
+		<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->		
+		<div class="col-lg-3 col-md-3 col-sm-3">					
+			<!-- <label class="">Select Shift Period</label> -->
+			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
+		</div>
+		<div class="col-lg-3 col-md-3 col-sm-3">
+			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">All Shift</label>
+			<select class="form-control select" name="shift_name" id="shift_name" >
+			</select>
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+			<br>
+			<input type="submit" value="Generate Report" class='btn btn-primary'>
+		</div>							
+	</div>													
+	<% end %>
+
+	<% end %>	
+</div>	
+
+<script type="text/javascript">
+	$(function(){
+		$('#custom_excel').hide();
+
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
+		// window.location = url;
+	});
+
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
+
+	<% if params[:shift_name].to_i > 0%>
+	shift_id = '<%= params[:shift_name] %>'
+	local_date = '<%= @shift_from %> - <%= @shift_to %> '
+	var shift = $('#shift_name');
+	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+	shift.append(str);
+	<% end %>
+
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+
+
+	<% if params[:period_type] == 1 || params[:period_type] == "1" %>
+	$("#rd_period_type_1").attr("checked","checked");
+	<% else %>
+	$("#rd_period_type_0").attr("checked","checked");
+	<% end %>
+	$(".btn-group button").removeClass("active");
+	<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+	$("#btn_report_type_<%= report_type %>").addClass("active");
+
+	$('#item').change(function(){
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+
+		if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();		
+			if(payment_type){
+				$('#payment_type').show();
+			}
+		}
+		else{
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}
+		}
+	});
+</script>
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
new file mode 100644
index 00000000..12e1dfe1
--- /dev/null
+++ b/app/views/reports/product_sale/index.html.erb
@@ -0,0 +1,292 @@
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_product_sale_index_path} %>
+
+		<hr />
+
+		<div class="text-right">
+			<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
+		</div>	  			
+
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="table-responsive">				
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+							<tr>
+								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							</tr>
+							<% if @shift_from %>
+							<tr>
+								<% if @shift_data.employee %>		
+								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+								<% end %>			
+								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							</tr>
+							<% end %>
+							<tr>
+								<th>&nbsp;</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
+								<th><%= t("views.right_panel.detail.code") %></th>
+								<th><%= t("views.right_panel.detail.product") %></th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<th><%= t("views.right_panel.detail.revenue") %></th>
+							</tr>	
+						</thead>
+						<tbody>
+							<% if @print_settings.precision.to_i > 0
+								precision = @print_settings.precision
+							else
+								precision = 0
+							end
+							#check delimiter
+							if @print_settings.delimiter
+								delimiter = ","
+						    else
+								delimiter = ""
+						    end
+							 %>	
+							<% unless @sale_data.blank? %>
+							<% acc_arr = Array.new %>
+							<% cate_arr = Array.new %>	 
+
+							<% sub_qty = 0 %>
+							<% sub_total = 0 %>
+							<% other_sub_total = 0 %>
+							<% count = 0 %>
+							<% total_price = 0 %>
+							<% cate_count = 0 %>
+							<% acc_count = 0 %>
+							<% grand_total = 0 %>
+							<% total_qty = 0 %>
+							<% total_amount = 0 %>
+							<% discount = 0 %>
+							<% total_item_foc = 0 %>
+							<% total_item_dis = 0.0 %>
+							<% total_tax = 0 %>
+
+							<% @sale_data.each do |sale| %>
+							<!-- all total qty sum -->
+								<% if sale.status_type != "Discount" && sale.status_type != "foc"
+									total_qty += sale.total_item
+								end %>
+								<% if sale.status_type == "foc" && sale.price > 0
+									total_qty += sale.total_item
+								end %>
+							<!-- end all total qty -->
+								<% if sale.status_type == "foc" && sale.grand_total < 0
+									total_item_foc += sale.grand_total*(-1)
+								end %>	 
+
+								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
+									total_item_dis += sale.grand_total*(-1)
+								end %>
+
+								<% if !acc_arr.include?(sale.account_id) %>
+									<tr>
+										<td><b><%= sale.account_name %></b></td>
+										<td colspan="4">&nbsp;</td>
+										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
+										<td>
+											<% @totalByAccount.each do |account, total| %>
+											<% if sale.account_id == account %>
+											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
+											<% grand_total += total %>	  
+											<% end %>
+											<% end %>
+										</td>
+									</tr>
+								   <% acc_arr.push(sale.account_id) %>
+								<% end %>
+								<tr>
+									<td>&nbsp;</td>
+									<% if !cate_arr.include?(sale.menu_category_id) %>	
+									<td><%= sale.menu_category_name %></td>
+									<% cate_arr.push(sale.menu_category_id) %>
+									<% else %>
+									<td>&nbsp;</td>
+									<% end %>
+									<td><%= sale.item_code rescue '-' %></td>
+									<td><%= sale.product_name rescue '-' %></td>
+									<td><%= sale.total_item rescue '-' %></td>
+									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								</tr>
+								<!-- sub total -->
+
+							<% @menu_cate_count.each do |key,value| %>
+								<% if sale.account_id == key %>
+								    <% count = count + 1 %>	
+								    <% sub_total += sale.grand_total %>
+								    <% #sub_qty += sale.total_item %>
+								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
+										sub_qty += sale.total_item
+									end %>
+
+									<% if count == value %>	
+										<tr>
+											<td colspan="3">&nbsp;</td>
+											<td><b>Total <%= sale.account_name %> Qty </b> </td>
+											<td><b><%= sub_qty %></b></td>
+											<td><%= t("views.right_panel.detail.sub_total") %></td>
+											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
+										</tr>
+										<% sub_total = 0.0%>
+										<% sub_qty = 0 %>
+										<% count = 0%>
+									<% end %>
+							    <% end %>
+							<% end %>
+							<!-- end sub total -->
+						<% end %>
+							<!-- End Other Charges -->
+							<tr style="border-top:2px solid grey;">
+								<td colspan="3">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
+								<td><span><%= total_qty%></span></td>
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
+							</tr>
+							<% end %>
+
+							
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td style="border-top:2px solid grey;">Net Amount</td>
+								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td> 
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+
+
+		var check_arr = [];
+
+		var search = '<%= params[:period_type] %>';
+
+		if(search){
+
+			if(parseInt(search) == 0){
+				search_by_period();	
+			}
+			else{
+				search_by_date();				
+			}
+		}else{
+			search_by_period();		
+		}	
+
+		$('#sel_period').change(function(){
+			search_by_period();
+		});
+
+		function search_by_period(){
+			var period = $('#sel_period').val();
+			var period_type = 0;
+			var from = "";
+			var to = "";
+
+			show_shift_name(period,period_type,from,to,'shift_item');	
+		}   
+
+		// OK button is clicked
+		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
+			search_by_date();
+		});
+		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
+			search_by_date();
+		});     
+
+		function search_by_date(){
+			from = $("#from").val();
+	  		to   = $("#to").val();
+			var period = 0;
+			var period_type = 1;	   
+
+			if(to != '' && from != ''){
+				shift_name = from + ',' + to;
+
+				check_arr.push(to);
+
+				console.log(check_arr.length)
+				if(check_arr.length == 1){
+					show_shift_name(period,period_type,from,to,'shift_item');		   			   	
+				}
+				if(check_arr.length == 3){
+					check_arr = [];
+				}
+			}
+
+		}
+
+		function show_shift_name(period,period_type,from,to,shift_item){
+			var shift = $('#shift_name');
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
+			shift.empty();
+			var selected = '';
+			var str = '';
+			var param_shift = '<%= params[:shift_name]%>';
+			
+			url = '<%= reports_get_shift_by_date_path %>';
+			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
+				console.log(data)
+
+				str = '<option value="0">--- All Shift ---</option>';
+				$(data.message).each(function(index){	
+
+					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
+					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
+					var shift_id = data.message[index].shift_id ;
+
+					if(param_shift != ''){
+						if(shift_id == param_shift){
+							selected = 'selected = "selected"';
+						}
+						else{
+							selected = '';				   
+						}			   	
+					}
+					else{
+						selected = '';		   
+					}			   
+
+
+					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
+
+			   // console.log(sh_date)
+			}) 
+				shift.append(str);
+			});
+		}
+
+	});
+</script>
\ No newline at end of file
diff --git a/app/views/reports/product_sale/index.xls.erb b/app/views/reports/product_sale/index.xls.erb
new file mode 100755
index 00000000..f97edbb8
--- /dev/null
+++ b/app/views/reports/product_sale/index.xls.erb
@@ -0,0 +1,175 @@
+<div class="row">
+	<div class="col-md-12">
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="table-responsive">				
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+							<tr>
+								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							</tr>
+							<% if @shift_from %>
+							<tr>
+								<% if @shift_data.employee %>		
+								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+								<% end %>			
+								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							</tr>
+							<% end %>
+							<tr>
+								<th>&nbsp;</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
+								<th><%= t("views.right_panel.detail.code") %></th>
+								<th><%= t("views.right_panel.detail.product") %></th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<th><%= t("views.right_panel.detail.revenue") %></th>
+							</tr>	
+						</thead>
+						<tbody>
+							<% unless @sale_data.blank? %>
+							<% acc_arr = Array.new %>
+							<% cate_arr = Array.new %>	 
+
+							<% sub_total = 0 %>
+							<% other_sub_total = 0 %>
+							<% count = 0 %>
+							<% total_price = 0 %>
+							<% cate_count = 0 %>
+							<% acc_count = 0 %>
+							<% grand_total = 0 %>
+							<% total_qty = 0 %>
+							<% total_amount = 0 %>
+							<% discount = 0 %>
+							<% total_item_foc = 0 %>
+							<% total_item_dis = 0 %>
+
+							<% @sale_data.each do |sale| %>
+
+								<% if sale.total_item > 0
+									total_qty += sale.total_item
+								end %>
+
+								<% if !acc_arr.include?(sale.account_id) %>
+									<tr>
+										<td><b><%= sale.account_name %></b></td>
+										<td colspan="4">&nbsp;</td>
+										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
+										<td>
+											<% @totalByAccount.each do |account, total| %>
+											<% if sale.account_id == account %>
+											<b><%= total %></b>
+											<% grand_total += total %>	  
+											<% end %>
+											<% end %>
+										</td>
+									</tr>
+								   <% acc_arr.push(sale.account_id) %>
+								<% end %>
+								<tr>
+									<td>&nbsp;</td>
+									<% if !cate_arr.include?(sale.menu_category_id) %>	
+									<td><%= sale.menu_category_name %></td>
+									<% cate_arr.push(sale.menu_category_id) %>
+									<% else %>
+									<td>&nbsp;</td>
+									<% end %>
+									<td><%= sale.item_code rescue '-' %></td>
+									<td><%= sale.product_name rescue '-' %></td>
+									<td><%= sale.total_item rescue '-' %></td>
+									<td><%= sale.unit_price rescue '-' %></td>
+									<td><%= sale.grand_total rescue '-' %></td>
+								</tr>
+								<!-- sub total -->
+								<% @menu_cate_count.each do |key,value| %>
+								<% if sale.menu_category_id == key %>
+
+								    <% count = count + 1 %>	
+								    <% sub_total += sale.grand_total %>
+									<% if count == value %>	
+										<tr>
+											<td colspan="5">&nbsp;</td>
+											<td><%= t("views.right_panel.detail.sub_total") %></td>
+											<td ><span class="underline"><%= sub_total %></span></td>
+										</tr>
+										<% if sale.status_type === "foc"
+											total_item_foc += sale.grand_total 
+										end %>	 
+
+										<% if sale.status_type === "Discount"
+											total_item_dis += sale.grand_total 
+										end %>
+										<% sub_total = 0.0%>
+										<% count = 0%>
+									<% end %>
+							      <% end %>
+							    <% end %>
+							<!-- end sub total -->
+							<% end %>
+							<!--Other Charges -->
+							<tr>
+								<td><b>Other Charges</b></td>
+								<td colspan="4">&nbsp;</td>
+								<td></td>
+							</tr>
+							<% @other_charges.each do |other| %>
+								<% if other.total_item > 0
+									total_qty += other.total_item
+								end %>
+								<% grand_total +=other.grand_total%>
+								<tr>
+								<td>&nbsp;</td>
+									<td>Other Charges</td>
+									<td><%= other.item_code rescue '-' %></td>
+									<td><%= other.product_name rescue '-' %></td>
+									<td><%= other.total_item rescue '-' %></td>
+									<td><%= other.unit_price rescue '-' %></td>
+									<td><%= other.grand_total rescue '-' %></td>
+								</tr>
+								<!-- sub total -->
+								
+								    <% other_sub_total += other.grand_total %>
+							    <!-- end sub total -->								
+							<% end %>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.sub_total") %></td>
+								<td ><span class="underline"><%= other_sub_total %></span></td>
+							</tr>
+							<!-- End Other Charges -->
+							<tr style="border-top:2px solid grey;">
+								<td colspan="3">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
+								<td><span><%= total_qty%></span></td>
+								<td><%= t("views.right_panel.detail.net_amount") %></td>
+								<td><span><%= grand_total%></span></td> 
+							</tr>
+							<% end %>
+
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td><span><%= total_item_foc %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td><span><%= total_item_dis %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.foc_sales") %></td>
+								<td><span><%= @foc_data %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td><span><%= @discount_data %></span></td>
+							</tr>		
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 7d21aeb5..a189da13 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -373,6 +373,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :commission, :only => [:index, :show]
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
+    resources :product_sale, :only => [:index, :show]
 
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
   end
diff --git a/spec/controllers/reports/product_sale_controller_spec.rb b/spec/controllers/reports/product_sale_controller_spec.rb
new file mode 100644
index 00000000..1f87b3bc
--- /dev/null
+++ b/spec/controllers/reports/product_sale_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Reports::ProductSaleController, type: :controller do
+
+end
diff --git a/spec/helpers/reports/product_sale_helper_spec.rb b/spec/helpers/reports/product_sale_helper_spec.rb
new file mode 100644
index 00000000..17d29e63
--- /dev/null
+++ b/spec/helpers/reports/product_sale_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Reports::ProductSaleHelper. For example:
+#
+# describe Reports::ProductSaleHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Reports::ProductSaleHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 3f9d491cc4536baef964784131a3f27d54d0a17d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 14:06:35 +0630
Subject: [PATCH 308/651] check role for = split

---
 app/views/origami/split_bill/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index c00234e4..12148e28 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -237,7 +237,7 @@
  			<!-- Action Panel -->
  			<div>
  				<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
- 				<% if !@current_user.nil? && @current_user.role == 'cashier' %>
+ 				<% if !@current_user.nil? && @current_user.role != 'waiter' %>
  					<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
  				<% end %>
  				<% if !@orders.empty? %>

From 25a212bb702c199b9dcb4bf6061df0d3852b74c6 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 23 Feb 2018 14:45:53 +0630
Subject: [PATCH 309/651] update base controllers

---
 app/controllers/base_crm_controller.rb           | 1 +
 app/controllers/base_inventory_controller.rb     | 1 +
 app/controllers/base_oqs_controller.rb           | 1 +
 app/controllers/base_origami_controller.rb       | 1 +
 app/controllers/base_report_controller.rb        | 1 +
 app/controllers/base_waiter_controller.rb        | 1 +
 app/controllers/concerns/license_verification.rb | 3 ++-
 app/controllers/concerns/login_verification.rb   | 3 ++-
 app/controllers/home_controller.rb               | 5 +++--
 app/controllers/print_settings_controller.rb     | 1 +
 10 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index 5c412fcf..970ffe17 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -1,4 +1,5 @@
 class BaseCrmController < ApplicationController
+  include LoginVerification
 	layout "CRM"
 
   #before_action :check_installation
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index f44747d3..1d99c766 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -1,4 +1,5 @@
 class BaseInventoryController < ApplicationController
+  include LoginVerification
 	layout "inventory"
 
   #before_action :check_installation
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index f1f2831a..b50684de 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -1,4 +1,5 @@
 class BaseOqsController < ApplicationController
+  include LoginVerification
   layout "OQS"
 
   #before_action :check_installation
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 58d9b801..8a79c009 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,4 +1,5 @@
 class BaseOrigamiController < ApplicationController
+  include LoginVerification
   layout "origami"
 
   # before_action :checkin_process
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index f7551f22..a9fe207b 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -1,4 +1,5 @@
 class BaseReportController < ApplicationController
+	include LoginVerification
 	layout "application" 
 
 	#before_action :check_installation
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index 248e32a6..ca793e17 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,4 +1,5 @@
 class BaseWaiterController < ApplicationController  
+  include LoginVerification
   layout "waiter"
 
   #before_action :check_installation
diff --git a/app/controllers/concerns/license_verification.rb b/app/controllers/concerns/license_verification.rb
index bfa40f03..b838a48f 100644
--- a/app/controllers/concerns/license_verification.rb
+++ b/app/controllers/concerns/license_verification.rb
@@ -13,7 +13,7 @@ module LicenseVerification
       if (!@license.nil?)
         # logger.info "Location - " + @license.name        
         ActiveRecord::Base.establish_connection(website_connection(@license))    
-        authenticate_session_token    
+        # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
       else
         # reconnect_default_db
@@ -40,6 +40,7 @@ module LicenseVerification
       @user = Employee.authenticate_by_token(token)
       if !@user      
         flash[:notice] = 'Invalid Access!'
+        redirect_to root_path
       end
     end
   end
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index 7ddf3cec..bb98cf2e 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -2,7 +2,7 @@ module LoginVerification
   extend ActiveSupport::Concern
 
   included do
-    before_action :authenticate
+    before_action :authenticate_session_token
     helper_method :current_company,:current_login_employee
   end
 
@@ -25,6 +25,7 @@ module LoginVerification
         #Maybe log - login?
       else 
         flash[:notice] = 'Invalid Access!'
+        # return false
       end
     end
   end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index ea411fa0..5c0d4117 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,11 +1,12 @@
 class HomeController < ApplicationController  
+  include LoginVerification
   # layout "application", except: [:index, :show]
   # skip_before_action only: [:index, :show, :create, :update, :destroy]  
 
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")
     @employees = Employee.all.order("name asc")
-     @login_form = LoginForm.new()
+    @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end
 
@@ -56,7 +57,7 @@ class HomeController < ApplicationController
          render :index
       end
     else
-      redirect_to origami_root_path, :notice => "Username and Password doesn't match!"
+      redirect_to root_path, :notice => "Username and Password doesn't match!"
     end
 
   end
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index a72319b3..329b0fa2 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -1,4 +1,5 @@
 class PrintSettingsController < ApplicationController
+  include LoginVerification
   load_and_authorize_resource except: [:create]
   before_action :set_print_setting, only: [:show, :edit, :update, :destroy]
 

From 77a66d726bc48a7c5d8be7c12728c1d0a9a5621e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Feb 2018 14:53:08 +0630
Subject: [PATCH 310/651] update foc and void overall add remark

---
 .../origami/payments_controller.rb            |   5 +-
 app/controllers/origami/void_controller.rb    |   6 +-
 app/models/sale_audit.rb                      |  12 +-
 app/models/sale_payment.rb                    |   6 +-
 app/views/origami/home/show.html.erb          |  30 +++-
 app/views/origami/payments/show.html.erb      | 156 +++++++++++++-----
 6 files changed, 162 insertions(+), 53 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 199325e9..317743dd 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -87,7 +87,7 @@ class Origami::PaymentsController < BaseOrigamiController
       #end rounding adjustment
 
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash, "cash")
+      sale_payment.process_payment(saleObj, @usercurrent_user.name, cash, "cash")
 
       render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil
@@ -300,6 +300,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cash          = params[:cash]
     sale_id       = params[:sale_id]
     sub_total       = params[:sub_total]
+    remark       = params[:remark]
     member_info   = nil
     rebate_amount = nil
     current_balance = nil
@@ -313,7 +314,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
       
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash, "foc")
+      sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
 
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index aa36067b..578054ee 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -3,7 +3,7 @@ class Origami::VoidController < BaseOrigamiController
   def overall_void
 
     sale_id = params[:sale_id]
-
+    remark  = params[:remark]
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
       if sale.discount_type == "member_discount"
@@ -64,8 +64,8 @@ class Origami::VoidController < BaseOrigamiController
       end
 
       # FOr Sale Audit 
-      action_by = current_user.id
-      remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
+      action_by = current_user.name
+      # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
       sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" )
 
       # For Print 
diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb
index 55541851..633db6fe 100755
--- a/app/models/sale_audit.rb
+++ b/app/models/sale_audit.rb
@@ -24,9 +24,9 @@ class SaleAudit < ApplicationRecord
     sale_audit.sale_id     = sale_id
     sale_audit.action      = "SALECOMPLETE"
     sale_audit.action_at   = DateTime.now.utc
-    sale_audit.action_by   = action_by
+    sale_audit.action_by   = Sale.find(sale_id).cashier_id
     sale_audit.remark      = remark
-    sale_audit.approved_by = Time.now
+    sale_audit.approved_by = action_by
     sale_audit.save!
   end
 
@@ -72,9 +72,9 @@ class SaleAudit < ApplicationRecord
     sale_audit.sale_id = sale_id
     sale_audit.action = "SALEPAYMENT"
     sale_audit.action_at = DateTime.now.utc
-    sale_audit.action_by = action_by
+    sale_audit.action_by = Sale.find(sale_id).cashier_id
     sale_audit.remark = remark
-    sale_audit.approved_by = Time.now
+    sale_audit.approved_by = action_by
     sale_audit.save!
   end
 
@@ -83,9 +83,9 @@ class SaleAudit < ApplicationRecord
     sale_audit.sale_id = sale_id
     sale_audit.action = "PAYMAL"
     sale_audit.action_at = DateTime.now.utc
-    sale_audit.action_by = action_by
+    sale_audit.action_by = Sale.find(sale_id).cashier_id
     sale_audit.remark = remark
-    sale_audit.approved_by = Time.now
+    sale_audit.approved_by = action_by
     sale_audit.save!
   end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 661eb57b..5b0da284 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -8,7 +8,7 @@ class SalePayment < ApplicationRecord
 
   attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
 
-  def process_payment(invoice, action_by, cash_amount, payment_method)
+  def process_payment(invoice, action_by, cash_amount, payment_method,remark=nil)
     self.sale = invoice
     self.received_amount = cash_amount
     amount_due = invoice.grand_total
@@ -53,7 +53,7 @@ class SalePayment < ApplicationRecord
       end
 
       #record an payment in sale-audit
-      remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{cash_amount} | Payment Status ->#{payment_status}"
+      # remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{cash_amount} | Payment Status ->#{payment_status}"
       sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by)
 
       # update complete order items in oqs
@@ -67,7 +67,7 @@ class SalePayment < ApplicationRecord
       return true, self.save
     else
       #record an payment in sale-audit
-      remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]"
+      # remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]"
       sale_audit = SaleAudit.record_payment(invoice.id, remark,action_by)
 
       return false, "No outstanding Amount"
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6e1f7128..d5f63d3c 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -428,7 +428,8 @@
               <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
-                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true"> Void</button>
+                  <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
+                  
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
 
@@ -488,6 +489,30 @@
         </div>
     </div>
 </div>
+
+<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="voidModalLabel">Please Enter Reason for Void</h4>
+      </div>
+      <div class="modal-body">
+         <input type="textarea" name="remark" class="form-control col-md-12 remark" id="remark">
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-red waves-effect " id="void" active="true">VOID</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>
 <script>
     $(document).ready(function () {
       /* start check first bill or not*/
@@ -814,9 +839,12 @@
           if (isConfirm) {
             var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
             var ajax_url = "/origami/sale/" + sale_id + '/void';
+            var remark  = $("#remark").val();
+
             $.ajax({
                 type: 'POST',
                 url: ajax_url,
+                data: "remark="+ remark + "&sale_id=" + sale_id,
                 success: function () {
                     window.location.href = '/origami/';
                 }
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1dbe960f..c6f8f941 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -289,19 +289,64 @@
    </div>
  </div>
 </div>
-<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
-  <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
-    <i class="material-icons">reply</i>
-     Back
-  </button>
-  <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
-  <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
-  <!-- Waiter Buttons -->
+  <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
+    <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
+      <i class="material-icons">reply</i>
+       Back
+    </button>
+    <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
+    <button type="button" class="btn bg-red btn-block" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
+    <!-- Waiter Buttons -->
+  </div>
+  <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
+  </div>
 </div>
-<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
+<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="voidModalLabel">Please Enter Reason for Void</h4>
+      </div>
+      <div class="modal-body">
+         <input type="textarea" name="remark" class="form-control col-md-12 remark" id="remark">
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-red waves-effect " id="void" active="true">VOID</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
 </div>
-</div>
-
+<div class="modal fade" id="focModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="focModalLabel">Please Enter Reason for FOC</h4>
+      </div>
+      <div class="modal-body">
+         <input type="textarea" name="remark" class="form-control col-md-12 remark" id="foc_remark">
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-red waves-effect " id="foc" active="true">FOC</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>       
 <script>
   $(document).ready(function(){
     /* start check first bill or not*/
@@ -513,26 +558,51 @@
         }
     });
 
-    $('#void').on('click',function () {
-      if ($(this).attr('active') === "true") { 
+    // $('#void').on('click',function () {
+    //   if ($(this).attr('active') === "true") { 
+    //         var sale_id = $('#sale_id').text();
+    //         var remark  = $("#remark").val();
+    //         var ajax_url = "/origami/sale/" + sale_id + '/void';
+    //         $.ajax({
+    //           type: 'POST',
+    //           url: ajax_url,
+    //           data: "remark="+ remark + "&sale_id=" + sale_id,
+    //           success: function () {
+    //              window.location.href = '/origami/';
+    //           }
+    //         })
+    //   }else{
+    //     swal("Opps","You are not authorized for void","warning")
+    //   }
+    // });
+    $('#void').on('click', function () {
+      if ($(this).attr('active')=== "true") {
         swal({
-           title: "Information!",
-           text: 'Are you sure want to Void !',
-          }, function () {
+            title: "Alert",
+            text: "Are you sure want to Void?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, void it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
             var sale_id = $('#sale_id').text();
+            var remark  = $("#remark").val();
             var ajax_url = "/origami/sale/" + sale_id + '/void';
             $.ajax({
               type: 'POST',
               url: ajax_url,
+              data: "remark="+ remark + "&sale_id=" + sale_id,
               success: function () {
-                window.location.href = '/origami/';
+                 window.location.href = '/origami/';
               }
             })
-         });
+          }
+        }); 
       }else{
         swal("Opps","You are not authorized for void","warning")
       }
-      
     });
   });
 
@@ -554,31 +624,41 @@
   $('#foc').click(function() {
     //$( "#loading_wrapper" ).show();
         //  payment
+        var remark  = $("#foc_remark").val();
         var cash = $('#grand_total').text();
         var sub_total = $('#sub-total').text();
         var sale_id = $('#sale_id').text();
-        var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total };
+        var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark };
 
         if ($(this).attr('active')=== "true") {  
-        $.ajax({
-          type: "POST",
-          url: "<%= origami_payment_foc_path %>",
-          data: params,
-          success:function(result){          
-
-            //$( "#loading_wrapper" ).hide();
-            
-            if (cash >= 0) {
-              swal({
-               title: "Information!",
-               text: 'Thank You !',
-             }, function () {
-              window.location.href = '/origami';
-            });
-            }
-            
+          swal({
+            title: "Alert",
+            text: "Are you sure want to FOC This Receipt?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, FOC it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+              $.ajax({
+                type: "POST",
+                url: "<%= origami_payment_foc_path %>",
+                data: params,
+                success:function(result){          
+                  if (cash >= 0) {
+                    swal({
+                       title: "Information!",
+                       text: 'Thank You !',
+                       }, function () {
+                        window.location.href = '/origami';
+                      });
+                  }
+                }
+              });
           }
-        });
+        }); 
+        
         }else{
           swal("Opps","You are not authorized for foc","warning")
         }

From 970a9bb430968f9bf0e343e950a9281deb90359a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 15:26:24 +0630
Subject: [PATCH 311/651] sale

---
 app/models/sale.rb | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index cd896f5f..54806964 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -861,27 +861,24 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
 end
 
 #product sale report query
-def self.get_product_item_query()
-  query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
-                     "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
-                     "i.remark as status_type,"+
-                     " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+def self.get_menu_item_query()
+  query = MenuItem.select("acc.id as account_id, acc.title as account_name, 
+                      i.item_instance_code as item_code, " +
+                     "i.qty as qty," +
+                     "i.product_name as product_name, 
+                     mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
-  query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
-                     " JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
-                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
-                     " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id" + 
-                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
-                     # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
-  query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
-  # query = query.where("i.item_instance_code IS NOT NULL")
+  query = query.joins(" LEFT JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
+                     " LEFT JOIN menu_items mi ON mi.id = mii.menu_item_id" + 
+                     " LEFT JOIN menu_categories mc ON mc.id = mi.menu_category_id" +
+                     " LEFT JOIN accounts acc ON acc.id = mi.account_id")
   query = query.group("acc.title,mi.account_id,mi.menu_category_id,mi.name,mii.price")
                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, mii.price asc")
 end
 
 def self.get_by_items(shift_sale_range, shift, from, to)
-  query = self.get_product_item_query()
+  query = self.get_menu_item_query()
   
   puts "query"
   total_grand_total = 0

From 2dda29c5ccdfb32c43bf79300daf5b7e8d4bbf63 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 15:29:22 +0630
Subject: [PATCH 312/651] add shop detail info in inventory

---
 app/controllers/inventory/inventory_controller.rb           | 6 ++++++
 .../inventory/inventory_definitions_controller.rb           | 6 ++++++
 app/controllers/inventory/stock_check_items_controller.rb   | 6 ++++++
 app/controllers/inventory/stock_checks_controller.rb        | 6 ++++++
 app/controllers/inventory/stock_journals_controller.rb      | 6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 1a311552..d512a2dc 100755
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -3,4 +3,10 @@ class Inventory::InventoryController < BaseInventoryController
    def index
      @products = InventoryDefinition.all.active.order('created_at desc') 
    end
+
+   	#Shop Name in Navbor
+	helper_method :shop_detail
+	def shop_detail
+		@shop = Shop.first
+	end
 end
diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index 33b7dd75..accb90b4 100755
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -61,6 +61,12 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_inventory_definition
diff --git a/app/controllers/inventory/stock_check_items_controller.rb b/app/controllers/inventory/stock_check_items_controller.rb
index 18980f29..7a37f789 100755
--- a/app/controllers/inventory/stock_check_items_controller.rb
+++ b/app/controllers/inventory/stock_check_items_controller.rb
@@ -61,6 +61,12 @@ class Inventory::StockCheckItemsController < BaseInventoryController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_stock_check_item
diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index 52d183de..8e938a3a 100755
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -38,6 +38,12 @@ class Inventory::StockChecksController < BaseInventoryController
     printer.print_stock_check_result(print_settings, stockcheck, stockcheck_items, checker.name, shop_details)
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
   # before_action :set_stock_check, only: [:show, :edit, :update, :destroy]
 
   # GET /stock_checks
diff --git a/app/controllers/inventory/stock_journals_controller.rb b/app/controllers/inventory/stock_journals_controller.rb
index a40fa8ab..11db2efd 100755
--- a/app/controllers/inventory/stock_journals_controller.rb
+++ b/app/controllers/inventory/stock_journals_controller.rb
@@ -61,6 +61,12 @@ class StockJournalsController < ApplicationController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_stock_journal

From 3bb6649d392d8dd561b5125a125afef53e05ac6c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 15:45:59 +0630
Subject: [PATCH 313/651] add edit for rooms and check inventory link

---
 app/controllers/origami/rooms_controller.rb |   5 +
 app/views/origami/home/show.html.erb        |  47 ++++++---
 app/views/origami/rooms/show.html.erb       | 102 ++++++++++++++------
 3 files changed, 113 insertions(+), 41 deletions(-)

diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 03e864fa..ac2092b6 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -58,6 +58,7 @@ class Origami::RoomsController < BaseOrigamiController
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new
+           @assigned_order_items = Array.new
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
               @customer = order.customer
@@ -78,6 +79,10 @@ class Origami::RoomsController < BaseOrigamiController
                     item.set_menu_items = arr_instance_item_sets
                   end
                   @order_items.push(item)
+                  assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+                  if !assigned_order_items.nil?
+                    @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+                  end
                 end
               end
            end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6e70730a..26e65d90 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -387,20 +387,39 @@
                           @order_items.each do |order_item|
                             count += 1
                         %>
-
-                            <tr>
-                              <td><%= count %>
-                              <td class='item-name'>
-                                <%= order_item.item_name %>
-                                <% if !order_item.set_menu_items.nil?  
-                                  order_item.set_menu_items.each do |item_instance| %> 
-                                  <br><span class="font-13"><%= item_instance %></span> 
-                                <% end 
-                                end %>
-                              </td>
-                              <td class='item-attr'><%= order_item.qty %></td>
-                              <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                            </tr>
+                          <% if !@assigned_order_items.nil? %>
+                            <% @assigned_order_items.each do |assigned_order_item| %>
+                              <% if assigned_order_item.include? (order_item.order_items_id) %>
+                                <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
+                                  <td><%= count %>
+                                  <td class='item-name'>
+                                    <%= order_item.item_name %>
+                                    <% if !order_item.set_menu_items.nil?  
+                                      order_item.set_menu_items.each do |item_instance| %> 
+                                      <br><span class="font-13"><%= item_instance %></span> 
+                                    <% end 
+                                    end %>
+                                  </td>
+                                  <td class='item-attr'><%= order_item.qty %></td>
+                                  <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                                </tr>
+                                <% end %>
+                              <% end %>
+                            <% else %>
+                              <tr>
+                                <td><%= count %>
+                                <td class='item-name'>
+                                  <%= order_item.item_name %>
+                                  <% if !order_item.set_menu_items.nil?  
+                                    order_item.set_menu_items.each do |item_instance| %> 
+                                    <br><span class="font-13"><%= item_instance %></span> 
+                                  <% end 
+                                  end %>
+                                </td>
+                                <td class='item-attr'><%= order_item.qty %></td>
+                                <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                              </tr>
+                          <% end %>
 
                         <%
                           end
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1235f522..70c0e723 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -277,19 +277,39 @@
                       sub_total = sub_total + (order_item.price * order_item.qty)
 
                   # unless order_item.price == 0 %>
-                 <tr>
-                   <td><%= count %></td>
-                   <td class='item-name'>
-                    <%= order_item.item_name %>
-                    <% if !order_item.set_menu_items.nil?  
-                      order_item.set_menu_items.each do |item_instance| %> 
-                      <br><span class="font-13"><%= item_instance %></span> 
-                    <% end 
-                    end %>
-                    </td>
-                   <td class='item-attr'><%= order_item.qty %></td>
-                   <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                 </tr>
+                    <% if !@assigned_order_items.nil? %>
+                      <% @assigned_order_items.each do |assigned_order_item| %>
+                        <% if assigned_order_item.include? (order_item.order_items_id) %>
+                         <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
+                           <td><%= count %></td>
+                           <td class='item-name'>
+                            <%= order_item.item_name %>
+                            <% if !order_item.set_menu_items.nil?  
+                              order_item.set_menu_items.each do |item_instance| %> 
+                              <br><span class="font-13"><%= item_instance %></span> 
+                            <% end 
+                            end %>
+                            </td>
+                           <td class='item-attr'><%= order_item.qty %></td>
+                           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                         </tr>
+                        <% end %>
+                      <% end %>
+                    <% else %>
+                        <tr>
+                           <td><%= count %></td>
+                           <td class='item-name'>
+                            <%= order_item.item_name %>
+                            <% if !order_item.set_menu_items.nil?  
+                              order_item.set_menu_items.each do |item_instance| %> 
+                              <br><span class="font-13"><%= item_instance %></span> 
+                            <% end 
+                            end %>
+                            </td>
+                           <td class='item-attr'><%= order_item.qty %></td>
+                           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                         </tr>
+                    <% end %>
                  <%
 
                        # end
@@ -345,20 +365,39 @@
                   @order_items.each do |order_item |
                     count += 1
                   %>
-
-                  <tr>
-                    <td><%= count %>
-                    <td class='item-name'>
-                      <%= order_item.item_name %>
-                      <% if !order_item.set_menu_items.nil?  
-                        order_item.set_menu_items.each do |item_instance| %> 
-                        <br><span class="font-13"><%= item_instance %></span> 
-                      <% end 
-                      end %>
-                    </td>
-                    <td class='item-attr'><%= order_item.qty %></td>
-                    <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                  </tr>
+                   <% if !@assigned_order_items.nil? %>
+                      <% @assigned_order_items.each do |assigned_order_item| %>
+                        <% if assigned_order_item.include? (order_item.order_items_id) %>
+                        <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
+                          <td><%= count %>
+                          <td class='item-name'>
+                            <%= order_item.item_name %>
+                            <% if !order_item.set_menu_items.nil?  
+                              order_item.set_menu_items.each do |item_instance| %> 
+                              <br><span class="font-13"><%= item_instance %></span> 
+                            <% end 
+                            end %>
+                          </td>
+                          <td class='item-attr'><%= order_item.qty %></td>
+                          <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                        </tr>
+                      <% end %>
+                    <% end %>
+                  <% else %>
+                    <tr>
+                      <td><%= count %>
+                      <td class='item-name'>
+                        <%= order_item.item_name %>
+                        <% if !order_item.set_menu_items.nil?  
+                          order_item.set_menu_items.each do |item_instance| %> 
+                          <br><span class="font-13"><%= item_instance %></span> 
+                        <% end 
+                        end %>
+                      </td>
+                      <td class='item-attr'><%= order_item.qty %></td>
+                      <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                    </tr>
+                  <% end %>
 
                   <%
                    end
@@ -906,4 +945,13 @@ $('#add_invoice').on('click',function(){
         }
       });
     });
+
+    /*edit order in oqs*/
+    $('.edit_order').on('click',function(){
+      var assigned_order_item_id = $(this).attr('data-id');
+      var dining_id = "<%= @room.id %>";
+      if((assigned_order_item_id!=undefined) && (assigned_order_item_id!='')){
+        window.location.href = '/oqs/'+ assigned_order_item_id  + "/edit/"+dining_id;
+      }
+    });
 </script>

From a6abfb2f499cdf7ceb8681470450befff40d2926 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 23 Feb 2018 15:49:29 +0630
Subject: [PATCH 314/651] update token mismatch

---
 app/controllers/base_crm_controller.rb        |  1 -
 app/controllers/base_inventory_controller.rb  |  1 -
 app/controllers/base_oqs_controller.rb        |  1 -
 app/controllers/base_origami_controller.rb    |  1 -
 app/controllers/base_report_controller.rb     |  1 -
 app/controllers/base_waiter_controller.rb     |  1 -
 .../concerns/license_verification.rb          |  8 +++--
 .../concerns/login_verification.rb            | 32 +++++++++----------
 app/controllers/home_controller.rb            |  1 -
 app/controllers/print_settings_controller.rb  |  1 -
 10 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index 970ffe17..5c412fcf 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -1,5 +1,4 @@
 class BaseCrmController < ApplicationController
-  include LoginVerification
 	layout "CRM"
 
   #before_action :check_installation
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index 1d99c766..f44747d3 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -1,5 +1,4 @@
 class BaseInventoryController < ApplicationController
-  include LoginVerification
 	layout "inventory"
 
   #before_action :check_installation
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index b50684de..f1f2831a 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -1,5 +1,4 @@
 class BaseOqsController < ApplicationController
-  include LoginVerification
   layout "OQS"
 
   #before_action :check_installation
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 8a79c009..58d9b801 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,5 +1,4 @@
 class BaseOrigamiController < ApplicationController
-  include LoginVerification
   layout "origami"
 
   # before_action :checkin_process
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index a9fe207b..f7551f22 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -1,5 +1,4 @@
 class BaseReportController < ApplicationController
-	include LoginVerification
 	layout "application" 
 
 	#before_action :check_installation
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index ca793e17..248e32a6 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,5 +1,4 @@
 class BaseWaiterController < ApplicationController  
-  include LoginVerification
   layout "waiter"
 
   #before_action :check_installation
diff --git a/app/controllers/concerns/license_verification.rb b/app/controllers/concerns/license_verification.rb
index b838a48f..94e9ad91 100644
--- a/app/controllers/concerns/license_verification.rb
+++ b/app/controllers/concerns/license_verification.rb
@@ -29,6 +29,7 @@ module LicenseVerification
       #   redirect_to activate_path
       # end      
     end
+    authenticate_session_token
   end
 
   def authenticate_session_token
@@ -38,9 +39,12 @@ module LicenseVerification
       #Rails.logger.debug "token - " + token.to_s
 
       @user = Employee.authenticate_by_token(token)
-      if !@user      
+      if @user
+        return true
+        #Maybe log - login?
+      else 
         flash[:notice] = 'Invalid Access!'
-        redirect_to root_path
+        # return false
       end
     end
   end
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index bb98cf2e..aa9d8319 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -6,6 +6,21 @@ module LoginVerification
     helper_method :current_company,:current_login_employee
   end
 
+  #this is base api base controller to need to inherit.
+  #all token authentication must be done here
+  #response format must be set to JSON
+  def current_company
+    begin
+     return Company.first
+    rescue
+      return nil
+    end
+
+  end
+
+  def current_login_employee
+    @employee = Employee.find_by_token_session(session[:session_token])
+  end
 
   protected
   # Authenticate the user with token based authentication
@@ -34,23 +49,6 @@ module LoginVerification
     redirect_to root_path
   end
 
-
-  #this is base api base controller to need to inherit.
-  #all token authentication must be done here
-  #response format must be set to JSON
-  def current_company
-    begin
-     return Company.first
-    rescue
-      return nil
-    end
-
-  end
-
-  def current_login_employee
-    @employee = Employee.find_by_token_session(session[:session_token])
-  end
-
   private
   def check_license
     License.check_license_file 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 5c0d4117..e1b51e86 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,5 +1,4 @@
 class HomeController < ApplicationController  
-  include LoginVerification
   # layout "application", except: [:index, :show]
   # skip_before_action only: [:index, :show, :create, :update, :destroy]  
 
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index 329b0fa2..a72319b3 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -1,5 +1,4 @@
 class PrintSettingsController < ApplicationController
-  include LoginVerification
   load_and_authorize_resource except: [:create]
   before_action :set_print_setting, only: [:show, :edit, :update, :destroy]
 

From 36511c258f23ad55270b9b905c147c55f557a1f9 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Fri, 23 Feb 2018 17:07:25 +0630
Subject: [PATCH 315/651] Add Key Pad in login_dashboard.html.erb

---
 app/views/layouts/login_dashboard.html.erb | 70 +++++++++++++++++++++-
 app/views/origami/dashboard/index.html.erb |  4 ++
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index e238953f..24b0f2e5 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -65,8 +65,46 @@
 		        </p> 
 	    	</div>
 	    </div>
-	    <div class="row bg-white">            
-            <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
+	    <div class="row bg-white">   
+            <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
+                <div class="row justify-content-center form-group">                    
+                    <input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
+                </div>               
+
+                <br>
+                <div class="card padding-10">
+                <div class="card-content">
+                  <div class='col-md-12'>
+                    <div class='row bottom'>
+                      <div class="pin_pad " data-value="1">1</div>
+                      <div class="pin_pad left" data-value="2">2</div>
+                      <div class="pin_pad left" data-value="3">3</div>
+                    </div>
+                    <div class='row bottom'>
+                      <div class="pin_pad" data-value="4">4</div>
+                      <div class="pin_pad left" data-value="5">5</div>
+                      <div class="pin_pad left" data-value="6">6</div>
+                    </div>
+                    <div class='row bottom'>
+                      <div class="pin_pad" data-value="7">7</div>
+                      <div class="pin_pad left" data-value="8">8</div>
+                      <div class="pin_pad left" data-value="9">9</div>
+                    </div>
+                    <div class='row bottom'>
+                      <!--  <div class="pin_pad bg-grey" data-value="CLR">CLR</div>
+                       <div class="pin_pad left" data-value="0">0</div>
+                       <div class="pin_pad left bg-indigo" data-value="ENT">ENT</div> -->
+                       <div class="pin_pad bg-blue-grey" data-value="BAC">BACK</div>
+                       <div class="pin_pad left" data-value="0">0</div>
+                       <div class="pin_pad bg-grey left" data-value="CLR">CLR</div>                    
+                    </div>                      
+                  </div>
+                 </div>   
+                 </div>              
+
+                
+            </div>         
+            <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
                 <div class="row justify-content-center form-group">                    
                 	<input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
                 </div>                
@@ -177,7 +215,9 @@
 </body>
 </html>
 
-<script>   
+<script>  
+
+
     $(document).ready(function () {
          // for Notificaiotn message
          var placementFrom  = $("#noti").attr('data-placement-from');
@@ -197,6 +237,30 @@
             $(item).submit();
         });
 
+        $("#emp_id").focus();
+        $(".pin_pad").click(function (event) {
+            event.preventDefault();                
+            var value = $(this).data("value");
+
+            if (value == "CLR") {
+                $("#emp_id").val("");
+            } else if (value == "BAC") {
+                window.location.href = "/"
+            } else {
+                var old_value = $("#emp_id").val();
+                $("#emp_id").val(old_value + value);
+            }
+            if((old_value + value).length == 3){
+                if($.isNumeric(old_value + value)){
+                    if((old_value + value).length === 3){
+                        window.location.href = '/auth/'+(old_value + value);
+                    }else{
+                        alert("Please Enter Numeric Number");
+                    }
+                }
+            }
+        });
+
         $('#emp_id').keyup(function(e) {
             e.preventDefault();
             var txtVal = this.value; 
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index cd9bd050..8f58ceb0 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -113,6 +113,10 @@
                 <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
                 <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
               </tr>
+              <tr>
+                <td><%= t("views.right_panel.detail.total") %> <%= t :redeem %> : </td>
+                <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
+              </tr>
             </table>
             <table class="table">
               <% if !(@total_payment_methods.nil?) %>

From f4f591553276678bbd2caa931f642fe314342865 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 26 Feb 2018 09:19:14 +0630
Subject: [PATCH 316/651] update waiter view add order

---
 app/assets/javascripts/addorder.js            |  84 +++++----
 .../origami/addorders_controller.rb           |  13 +-
 .../origami/payments_controller.rb            |   2 +-
 .../origami/pending_order_controller.rb       |  39 +++-
 .../origami/quick_service_controller.rb       |  33 ++--
 .../origami/request_bills_controller.rb       |   3 +
 app/models/sale.rb                            |   9 +-
 app/views/origami/addorders/detail.html.erb   |  17 +-
 app/views/origami/home/show.html.erb          |   2 +-
 app/views/origami/payments/show.html.erb      |  30 +--
 .../origami/pending_order/index.html.erb      |   9 +-
 app/views/origami/pending_order/show.html.erb | 178 ++++++++++++------
 12 files changed, 259 insertions(+), 160 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 25b9aa9b..c55525bc 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -1,5 +1,5 @@
 $(function() { 
-
+  var role = $('#role').val();
   type = $('#type').val();
   modify_order = $('#modify_order').val();
   //click menu sidebar menu category
@@ -758,7 +758,11 @@ $(function() {
     
     type = $('#type').val();
     if (type == 'true') {
-      type = 'cashier'
+      // if (role == 'waiter') {
+        type = 'quick_service'
+      // }else{
+      //   type = 'cashier'
+      // }
 
       var table_type = $('#table_type').text();
       var table_id    = $('#table_id').val();
@@ -773,42 +777,45 @@ $(function() {
       var booking_id  = $('#booking_id').text();
       var ajax_url = '../addorders/create';
     }
-    if (!booking_id.length > 0) {
+    var order_items = JSON.stringify(get_order_item_rows());
+    if (booking_id.length > 0) {
       
       var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
                   'table_id': table_id, 
                   'order_items': order_items };
-    }
-   
-    var order_items = JSON.stringify(get_order_item_rows());
-    
-    var params = {'order_source': type, 'order_type': "dine_in",
+    }else{
+      var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
                   'order_items': order_items };
-    if (table_id.length>0) {
-      $.ajax({
-        type: "POST",
-        url: ajax_url,
-        data: params,
-        dataType: "json",
-         success:function(result){         
-            
-              if(table_type == "Table"){
-                window.location.href = "/origami/table/" + table_id
-              }
-              else {
-                window.location.href = "/origami/room/" + table_id
-              }                
-         }
-      });
-    }else{
-      $(this).removeAttr('disabled', '');
-      $("#oqs_loading_wrapper").hide();
-
-      swal("Opps","Please Select Table or Room","warning");
     }
+    
+      if (table_id.length>0 || role == 'waiter') {
+        $.ajax({
+          type: "POST",
+          url: ajax_url,
+          data: params,
+          dataType: "json",
+           success:function(result){         
+              if (type == "quick_service") {
+                  window.location.href = "/origami/quick_service"
+              }else{
+                if(table_type == "Table"){
+                  window.location.href = "/origami/table/" + table_id
+                }
+                else {
+                  window.location.href = "/origami/room/" + table_id
+                } 
+              }
+           }
+        });
+      }else{
+        $(this).removeAttr('disabled', '');
+        $("#oqs_loading_wrapper").hide();
+
+        swal("Opps","Please Select Table or Room","warning");
+      }
   });
 
 
@@ -835,21 +842,20 @@ $(function() {
         var booking_id  = $('#booking_id').text();
         var sale_id     = ""
       }
-    
-    if (!booking_id.length > 0) {
+    var order_items = JSON.stringify(get_order_item_rows());
+    if (booking_id.length > 0) {
       
       var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
                   'table_id': table_id, 
-                  'order_items': order_items };
-    }
-    var order_items = JSON.stringify(get_order_item_rows());
-    
-    var params = {'order_source': type, 'order_type': "dine_in",
+                  'order_items': order_items,'sale_id': sale_id  };
+    }else{
+      var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
                   'order_items': order_items,'sale_id': sale_id };
-                  console.log(params)
+    }
+    
     $.ajax({
       type: "POST",
       url: ajax_url,
@@ -858,7 +864,11 @@ $(function() {
        success:function(result){
         console.log(result)
           if (result.status) {
+            if (result.data == null){
+               window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+            }else{
             window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
+            }
           }
           } 
     });
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index add3065b..42412c51 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -153,13 +153,18 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       end
 
       @status, @booking = @order.generate
-
-      if @status && @booking && @order.source == 'quick_service'
+      if current_user.role != "waiter"
+        if @status && @booking && @order.source == 'quick_service'
         
-        @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
-        result = {:status=> @status, :data => @sale }
+          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+          result = {:status=> @status, :data => @sale }
+          render :json => result.to_json
+        end
+      else
+        result = {:status=> @status, :data => 0 }
         render :json => result.to_json
       end
+      
   end
 
   # render json for http status code
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index e79e92f6..404f8c6b 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -93,7 +93,7 @@ class Origami::PaymentsController < BaseOrigamiController
       #end rounding adjustment
 
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @usercurrent_user.name, cash, "cash")
+      sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
       render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index a1942a27..4ed81121 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -2,21 +2,46 @@ class Origami::PendingOrderController < BaseOrigamiController
   def index
     # @dining= DiningFacility.where("status = 'occupied'")
     # @order = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status = 'billed' and source = 'quick_service'",DateTime.now.strftime('%Y-%m-%d'))
-    @sale = Sale.pending_order
+    @sale = Sale.pending_sale
+    @order = Sale.pending_order
+
   end
   def show
-    @sales = Sale.pending_order
-    @sale = Sale.find(params[:sale_id])
-    @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
-    @booking = BookingOrder.find_by_order_id(@order).booking_id
-    if Booking.find(@booking).dining_facility_id.to_i > 0
-      @table_id = Booking.find(@booking).dining_facility_id
+    @sales  = Sale.pending_sale
+    @orders = Sale.pending_order
+    @id     = params[:sale_id]
+    if(@id[0,3] == "SAL")     
+      @sale = Sale.find(@id)
+      @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
+      @booking = BookingOrder.find_by_order_id(@order).booking_id
+      @bookings = Booking.find(@booking)
+      @status = "sale"
+    else
+      # @booking = BookingOrder.find_by_order_id(@order).booking_id
+      @bookings = Booking.find(@id)
+      @status = "order"
+
+      @order_items = Array.new
+      @bookings.booking_orders.each do |booking_order|
+        order = Order.find(booking_order.order_id)
+        if (order.status == "new")
+          order.order_items.each do |item|
+            @order_items.push(item)
+          end
+        end
+      end
+    end
+    
+    if @bookings.dining_facility_id.to_i > 0
+      @table_id = Booking.find(@bookings.booking_id).dining_facility_id
       @dining  = DiningFacility.find(@table_id)
     else
       @table_id = nil
       @dining  = nil
     end
+
   end
+   
    helper_method :shop_detail
   def shop_detail
     @shop = Shop.first
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index ef170480..2b943e7e 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -134,21 +134,26 @@ class Origami::QuickServiceController < ApplicationController
       end
 
       @status, @booking = @order.generate
-
-      if @status && @booking && @order.source == 'quick_service'
-        if params[:sale_id]
-          @sale = Sale.find(params[:sale_id])
-          if @order.table_id.to_i > 0
-            @table_id = @order.table_id
-          else
-            @table_id = nil
+      if(params[:sale_id][0,3] == "SAL") 
+        if @status && @booking && @order.source == 'quick_service'
+          if params[:sale_id]
+            @sale = Sale.find(params[:sale_id])
+            if @order.table_id.to_i > 0
+              @table_id = @order.table_id
+            else
+              @table_id = nil
+            end
+            update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
           end
-          update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
-        end
-        
-        result = {:status=> true, :data => @sale }
-        render :json => result.to_json
-      end
+          
+          result = {:status=> true, :data => @sale }
+          render :json => result.to_json
+        end   
+      else
+        result = {:status=> true, :data => nil }
+          render :json => result.to_json
+      end 
+
   end
 
   def get_menu_category ()
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index ad46ede6..409177fe 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -8,6 +8,9 @@ class Origami::RequestBillsController < ApplicationController
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
+      puts params[:id]
+      puts bk_order
+      puts bk_order.booking_id
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
       
       if check_booking.sale_id.nil?
diff --git a/app/models/sale.rb b/app/models/sale.rb
index cf45f3a6..8ae6656d 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1315,12 +1315,19 @@ end
       end
   end
 
-  def self.pending_order
+  def self.pending_sale
     query = Sale.all
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
     query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
   end
+  def self.pending_order
+    query = Booking.all
+    query = query.joins("join booking_orders as booking_orders on booking_orders.booking_id = bookings.booking_id")
+                 .joins("join orders as orders on orders.order_id = booking_orders.order_id")
+    query = query.where("bookings.booking_status = 'assign' AND orders.status = 'new' AND orders.source =? ","quick_service")
+                  .group("bookings.booking_id")
+  end
 
   private
 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 58011788..c2bd6deb 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -9,6 +9,8 @@
 <% modify_order = request.path_info.include?('modify_order')%>
 <input type="hidden" name="type" id="type" value="<%=type%>">
 <input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
+<input type="hidden" name="type" id="role" value="<%= current_user.role%>">
+
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <!-- <a href="javascript:void(0);" class="dropdown-toggle waves-block p-t-15 p-l-15 p-b-15" data-toggle="dropdown" aria-haspopup="" aria-expanded="true" style="background-color: #eeeeee;border-bottom: .214rem solid #fff;border-left: 1px solid #54A5AF;
@@ -133,19 +135,19 @@
            <!--  <i class="material-icons">reply</i> -->
              Back
           </button>
-          <% if current_user.role != "waiter"%>
+          
            <button type="button" class="btn btn-lg btn-primary waves-effect col-md-7" id='pending_order'>Pending Order
           </button>
-          <%end%>
+         
         <%elsif !modify_order && type%>
             <button type="button" class="btn btn-lg btn-default waves-effect col-md-2" id='back' style="    padding: .5rem 0.15rem !important;">
              <!--  <i class="material-icons">reply</i> -->
                Back
             </button>
-            <% if current_user.role != "waiter"%>
+            
                 <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
                 </button>
-            <%end%>
+           
             <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
             <input type="hidden" name="table_id" value="" id="table_id">
 
@@ -225,10 +227,13 @@
                   <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
                     <% if current_user.role != "waiter"%>
                        <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+                    <%end%>
+                    <% if current_user.role == "waiter"%>
+                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
                     <%end%>
-                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
                <%else%>
-               <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Create Order</button>
+               <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
                <%end%>
 
                 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6e70730a..ceaca628 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -276,11 +276,11 @@
                               </tr>
 
                           <%
-                            # end
                             end
                             end
 
                             if @status_order == 'order' && @status_sale != 'sale'
+                              puts
                               unless @order_items.nil? || @order_items.empty?
                                 count = 0
                                 @order_items.each do |order_item|
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index ade7b51c..60ea300a 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -734,15 +734,11 @@ console.log("fffffffffffff")
               url: ajax_url,
               data: "remark="+ remark + "&sale_id=" + sale_id,
               success: function () {
-<<<<<<< HEAD
                if (cashier_type=="cashier") {
                  window.location.href = '/origami';
                }else{
                  window.location.href = '/origami/quick_service';
-               }  
-=======
-                 window.location.href = '/origami/';
->>>>>>> 77a66d726bc48a7c5d8be7c12728c1d0a9a5621e
+               } 
               }
             })
           }
@@ -782,29 +778,6 @@ console.log("fffffffffffff")
         var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark };
 
         if ($(this).attr('active')=== "true") {  
-<<<<<<< HEAD
-        $.ajax({
-          type: "POST",
-          url: "<%= origami_payment_foc_path %>",
-          data: params,
-          success:function(result){          
-
-            //$( "#loading_wrapper" ).hide();
-            
-            if (cash >= 0) {
-              swal({
-               title: "Information!",
-               text: 'Thank You !',
-             }, function () {
-              if (cashier_type=="cashier") {
-                window.location.href = '/origami';
-              }else{
-                window.location.href = '/origami/quick_service';
-              }  
-            });
-            }
-            
-=======
           swal({
             title: "Alert",
             text: "Are you sure want to FOC This Receipt?",
@@ -830,7 +803,6 @@ console.log("fffffffffffff")
                   }
                 }
               });
->>>>>>> 77a66d726bc48a7c5d8be7c12728c1d0a9a5621e
           }
         }); 
         
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index a3df293c..8fa9a7af 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -12,10 +12,17 @@
 		                  <% @sale.each do |sale| %>
 		                      <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
 						           <div class="card-block">
-						              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
+						              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span>
 						           </div>
 						      </div>
 		                  <% end %>
+                          <% @order.each do |order| %>
+                              <div class="card sales blue text-white" data-id = "<%= order.booking_id %>">
+                                   <div class="card-block">
+                                      <%= order.booking_id %><span style="font-size:12px;float:right;line-height:inherit;">new</span>
+                                   </div>
+                              </div>
+                          <% end %>
 		                </div>
 		          </div>
 	            </div>
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index c7233400..c400071e 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -10,12 +10,19 @@
         <div id="custom-slimscroll">
           <div class="card-columns">
             <% @sales.each do |sale| %>
-            <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
-             <div class="card-block">
-              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
-            </div>
-          </div>
-          <% end %>
+              <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
+                 <div class="card-block">
+                  <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span>
+                </div>
+              </div>
+            <% end %>
+            <% @orders.each do |order| %>
+              <div class="card sales blue text-white" data-id = "<%= order.booking_id %>">
+                 <div class="card-block">
+                  <%= order.booking_id %><span style="font-size:12px;float:right;line-height:inherit;">new</span>
+                </div>
+              </div>
+            <% end %>
         </div>
       </div>
     </div>
@@ -31,19 +38,38 @@
        </div>
        <div class="card-block">
          <div class="card-title row p-l-5 p-r-5">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-              &nbsp; Receipt No: <span id="receipt_no">
-                 <%= @sale.receipt_no rescue '' %>
-             </span>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             Date:  <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%> &nbsp; </span>
-           </div>
+           
+             <% if @status == 'sale' %>
+                <div class="col-lg-6 col-md-6 col-sm-6">
+                  &nbsp; Receipt No: <span id="receipt_no">
+                  <%= @sale.receipt_no rescue '' %></span>
+                  </div>
+             <% else%>
+             <input type="hidden" id="save_order_id" value="<%=@bookings.booking_orders[0].order_id%>">
+             <div class="col-lg-8 col-md-8 col-sm-8">
+                &nbsp; Order No: <span id="receipt_no">
+                  <%= @bookings.booking_orders[0].order_id rescue '' %></span>
+                  </div>
+             <% end%>
+           
+           
+            <% if @status == 'sale' %>
+              <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+               Date:  <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%> &nbsp; </span>
+              </div>
+            <% else%>
+            <div class="col-lg-4 col-md-4 col-sm-4 text-right">
+                 Date:  <span id="receipt_date"><%= @order.created_at.strftime("%I:%M %p") rescue '-'%> &nbsp; </span>
+                 </div>
+            <% end%>
          </div>
          <div class="card-title row customer_detail p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-            &nbsp; Customer : <%= @sale.customer.name rescue "-" %>
-
+            <% if @status == 'sale' %>
+              &nbsp; Customer : <%= @sale.customer.name rescue "-" %>
+            <% else%>
+            &nbsp; Customer : <%= @order.customer.name rescue "-" %>
+            <% end%>
            </div>
 
          </div>
@@ -58,55 +84,64 @@
                </tr>
              </thead>
              <tbody>
-               <%
-                 sub_total = 0
+                <% if @status == 'sale' %>
+                  <% sub_total = 0
                   @sale.sale_items.each do |sale_item|
-                  sub_total = sub_total + sale_item.price
-               %>
-               <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
-               <% #unless sale_item.price <= 0 %>
-               <tr>
-                 <td class='item-name'><%= sale_item.product_name %></td>
-                 <td class='item-attr'><%= sale_item.qty %></td>
-                 <td class='item-attr'><%= sale_item.price %></td>
-               </tr>
-               <%
-
-                   #end
-                 end
-
-                %>
+                  sub_total = sub_total + sale_item.price %>
+                   <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
+                   <tr>
+                     <td class='item-name'><%= sale_item.product_name %></td>
+                     <td class='item-attr'><%= sale_item.qty %></td>
+                     <td class='item-attr'><%= sale_item.price %></td>
+                   </tr>
+                   <% end%>
+                <% else%>
+                   <% sub_total = 0
+                      @order_items.each do |order_item|
+                      sub_total = sub_total + order_item.price %>
+                   <input type="hidden" id="sale_id" value="<%= @bookings.booking_id %>">
+                   <tr>
+                     <td class='item-name'><%= order_item.item_name %></td>
+                     <td class='item-attr'><%= order_item.qty %></td>
+                     <td class='item-attr'><%= order_item.price %></td>
+                   </tr>
+                   <% end%>
+                <% end%>
+               
              </tbody>
            </table>
          </div>
          </div>
          <div class="card-footer">
            <table class="table" id="order-charges-table" border="0">
-             <tr>
-               <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
-             </tr>
-             <tr>
+              <% if @status == 'sale' %>
+                <tr>
                 <%if @sale.discount_type == 'member_discount'%>
-                <td class="charges-name"><strong>Member Discount:</strong></td>
-               <%else%>
-                <td class="charges-name"><strong>Discount:</strong></td>
-               <%end%>
-               <td class="item-attr"><strong id="order-discount">(<%= @sale.total_discount rescue 0%>)</strong></td>
-             </tr>
-             <tr>
-               <td class="charges-name"><strong>Tax:</strong></td>
-               <td class="item-attr"><strong id="order-Tax"><%= @sale.total_tax rescue 0%></strong></td>
-             </tr>
-             <tr>
-               <td class="charges-name"><strong>Rounding Adj:</strong></td>
-               <td class="item-attr"><strong id="order-round-adj"><%= @sale.rounding_adjustment rescue 0%></strong></td>
-             </tr>
-             <tr>
-               <td class="charges-name"><strong>Grand Total:</strong></td>
-               <td class="item-attr"><strong id="order-grand-total"><%= @sale.grand_total rescue 0%></strong></td>
-             </tr>
-              <tr class="rebate_amount"></tr>
+                  <td class="charges-name"><strong>Member Discount:</strong></td>
+                <%else%>
+                  <td class="charges-name"><strong>Discount:</strong></td>
+                <%end%>
+                  <td class="item-attr"><strong id="order-discount">(<%= @sale.total_discount rescue 0%>)</strong></td>
+               </tr>
+               <tr>
+                 <td class="charges-name"><strong>Tax:</strong></td>
+                 <td class="item-attr"><strong id="order-Tax"><%= @sale.total_tax rescue 0%></strong></td>
+               </tr>
+               <tr>
+                 <td class="charges-name"><strong>Rounding Adj:</strong></td>
+                 <td class="item-attr"><strong id="order-round-adj"><%= @sale.rounding_adjustment rescue 0%></strong></td>
+               </tr>
+               <tr>
+                 <td class="charges-name"><strong>Grand Total:</strong></td>
+                 <td class="item-attr"><strong id="order-grand-total"><%= @sale.grand_total rescue 0%></strong></td>
+               </tr>
+                <tr class="rebate_amount"></tr>
+              <% else%>
+                <tr>
+                   <td class="charges-name"><strong>Sub Total:</strong></td>
+                   <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+                </tr>
+              <% end%>
            </table>
          </div>
        </div>
@@ -115,8 +150,15 @@
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
+   <% if current_user.role != "waiter" || @status != "sale"%>
    <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
-   <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
+   <%end%>
+   <% if current_user.role != "waiter"%>
+      <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
+   <%end%>
+   <% if @status != "sale"%>
+      <button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
+   <%end%>
  </div>
 </div>
 </div>
@@ -135,7 +177,7 @@ $(document).ready(function(){
   });
   $('#addorder').on('click', function () {
     var table_id = "<%=@table_id%>";
-    var booking_id = "<%=@booking%>";
+    var booking_id = "<%=@bookings.booking_id%>";
     if (table_id) {
       window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val();
     }else{
@@ -143,5 +185,23 @@ $(document).ready(function(){
     }
     
   });
+  // Bill Request
+    $('#request_bills').click(function () {
+      var order_id = $('#save_order_id').val();
+      var ajax_url = "/origami/" + order_id + "/request_bills";
+      $.ajax({
+          type: "GET",
+          url: ajax_url,
+          // data: 'order_id='+ order_id,
+          success: function (result) {
+              if (!result.status) {
+                swal("Information!", result.error_message);
+              }
+              else {              
+                location.reload();
+              }
+          }
+      });   
+    });
 });
 </script>

From f559aa0f14bc0d7dca6bc2a76b7980248f701a09 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 26 Feb 2018 09:20:57 +0630
Subject: [PATCH 317/651] product sale query

---
 .../reports/product_sale_controller.rb        |  70 +----
 app/models/sale.rb                            |  54 +---
 .../_shift_sale_report_filter.html.erb        | 120 -------
 app/views/reports/product_sale/index.html.erb | 294 ++++--------------
 app/views/reports/product_sale/index.xls.erb  | 177 ++---------
 5 files changed, 119 insertions(+), 596 deletions(-)
 delete mode 100755 app/views/reports/product_sale/_shift_sale_report_filter.html.erb

diff --git a/app/controllers/reports/product_sale_controller.rb b/app/controllers/reports/product_sale_controller.rb
index 0061818a..afb4b537 100644
--- a/app/controllers/reports/product_sale_controller.rb
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -2,79 +2,19 @@ class Reports::ProductSaleController < BaseReportController
 	authorize_resource :class => false
 
 	def index
-	    from, to  = get_date_range_from_params
-	    shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+		order_by = 'desc'
+		if !params[:order_by].nil?
+			order_by = params[:order_by]
+		end
 
-	    shift = ''
-	    if params[:shift_name].to_i != 0
-	      shift_sale = ShiftSale.find(params[:shift_name])
-	      if to.blank?        
-	        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
-	      else
-
-	        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
-	      end
-	    end
-	    @sale_data, @grand_total = Sale.get_by_items(shift_sale_range,shift, from, to)
-
-	    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
-
-	    @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
-
-
-	    @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1}
-
-	    @menu_cate_count = Hash.new {|hash, key| hash[key] = 0}
-	    @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1}
-
-
-	    @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
-	    @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
-
-	    @from       = from
-	    @to         = to
+	    @sale_data = Sale.get_menu_item_query(order_by)
 
 	    # get printer info
 	    @print_settings = PrintSetting.get_precision_delimiter()
 
-	    if shift.present?
-	      shift.each do |sh|
-	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
-	        @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
-	        @shift_data = sh
-	      end
-	    end
-
 		respond_to do |format|
 			format.html
 			format.xls
 		end
   	end
-
-  # def show
-  #   from, to, report_type  = get_date_range_from_params
-
-  #     @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
-
-  #     date_arr = Array.new
-  #     @sale_data.each do |sale|
-  #       local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
-  #       local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
-  #       opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
-  #       closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
-  #       shift_id = sale.id.nil? ? '-' : sale.id
-  #       str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
-  #       date_arr.push(str)
-  #     end
-
-  #     @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
-  #     @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
-
-  #     out = {:status => 'ok', :message => date_arr}
-      
-  #     respond_to do |format|
-  #       format.json { render json: out }
-  #     end
-  # end
-
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 54806964..4167d549 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -861,45 +861,23 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
 end
 
 #product sale report query
-def self.get_menu_item_query()
-  query = MenuItem.select("acc.id as account_id, acc.title as account_name, 
-                      i.item_instance_code as item_code, " +
-                     "i.qty as qty," +
-                     "i.product_name as product_name, 
+def self.get_menu_item_query(order_by)
+  query = MenuItem.unscoped.select("acc.id as account_id, 
+                      acc.title as account_name, 
+                      mii.item_instance_code as item_code, " +
+                     "(CASE WHEN si.qty > 0 THEN SUM(si.qty) ELSE 0 END) as total_item," +
+                     "(CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END) as unit_price," +
+                     "(CASE WHEN (si.qty * si.unit_price) > 0 THEN (si.qty * si.unit_price) ELSE 0 END) as grand_total," +
+                     "mii.price as unit_price, menu_items.name as product_name, 
                      mc.name as" +
-                     " menu_category_name,mc.id as menu_category_id ")
-
-  query = query.joins(" LEFT JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
-                     " LEFT JOIN menu_items mi ON mi.id = mii.menu_item_id" + 
-                     " LEFT JOIN menu_categories mc ON mc.id = mi.menu_category_id" +
-                     " LEFT JOIN accounts acc ON acc.id = mi.account_id")
-  query = query.group("acc.title,mi.account_id,mi.menu_category_id,mi.name,mii.price")
-               .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, mii.price asc")
-end
-
-def self.get_by_items(shift_sale_range, shift, from, to)
-  query = self.get_menu_item_query()
-  
-  puts "query"
-  total_grand_total = 0
-
-  # if shift.present?
-  #     query          = query.where("sales.shift_sale_id IN (?)",shift.to_a)
-      
-  #     # total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-
-  #     ### => get all sales range in shift_sales
-  # elsif shift_sale_range.present?
-  #     query          = query.where("sales.shift_sale_id IN (?)",shift_sale_range.to_a)
-
-  #     # total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-
-  # else
-  #     query          = query.where("sales.receipt_date between ? and ?",from,to)
-  #     # total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-  # end
-
-  return query, total_grand_total
+                     " menu_category_name,mc.id as menu_category_id, si.remark as status_type, si.price as price ")
+          .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + 
+               " LEFT JOIN menu_categories mc ON mc.id = menu_items.menu_category_id" +
+               " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
+               " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
+               " LEFT JOIN sales s ON s.sale_id = si.sale_id")
+          .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
+          .order("si.qty #{order_by}, menu_items.menu_category_id desc")
 end
 #product sale report query
 
diff --git a/app/views/reports/product_sale/_shift_sale_report_filter.html.erb b/app/views/reports/product_sale/_shift_sale_report_filter.html.erb
deleted file mode 100755
index 88f26c1f..00000000
--- a/app/views/reports/product_sale/_shift_sale_report_filter.html.erb
+++ /dev/null
@@ -1,120 +0,0 @@
-<div class="p-l-15">
-	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-	<% if period_type != false %>
-	<div class="row">
-		<div class="col-lg-2 col-md-2 col-sm-2">
-			<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
-			<select name="period" id="sel_period" class="form-control">
-				<option value=""><%= t("views.right_panel.detail.select_period") %></option>
-				<option value="0">Today</option>
-				<option value="1">Yesterday</option>
-				<option value="2">This week</option>
-				<option value="3">Last week</option>
-				<option value="4">Last 7 days</option>
-				<option value="5">This month</option>
-				<option value="6">Last month</option>
-				<option value="7">Last 30 days</option>
-				<option value="8">This year</option>
-				<option value="9">Last year</option>
-			</select>
-		</div>
-		<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->		
-		<div class="col-lg-3 col-md-3 col-sm-3">					
-			<!-- <label class="">Select Shift Period</label> -->
-			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
-		</div>
-		<div class="col-lg-3 col-md-3 col-sm-3">
-			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
-		</div>
-		<div class="col-lg-2 col-md-2 col-sm-2">
-			<label class="font-14">All Shift</label>
-			<select class="form-control select" name="shift_name" id="shift_name" >
-			</select>
-		</div>
-		<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-			<br>
-			<input type="submit" value="Generate Report" class='btn btn-primary'>
-		</div>							
-	</div>													
-	<% end %>
-
-	<% end %>	
-</div>	
-
-<script type="text/javascript">
-	$(function(){
-		$('#custom_excel').hide();
-
-		$('#custom_excel').click(function(){
-			var url = $('#custom_excel').attr('data-url');
-			$('#frm_report').attr('action',url)
-			$('#frm_report').submit();
-		// window.location = url;
-	});
-
-		var item = $('#item').val();
-		var payment_type = $('#payment_type');
-
-		if(item == 'order'){
-			$('#cashier').hide();
-			$('#waiter').show();
-			if(payment_type){
-				$('#payment_type').hide();
-			}		
-		}
-		else if(item == 'sale'){
-			$('#waiter').hide();
-			$('#cashier').show();
-		}
-		else{
-			$('#waiter').hide();
-			$('#cashier').show();		
-			$("#item").val('sale');
-		}
-	});
-
-	<% if params[:shift_name].to_i > 0%>
-	shift_id = '<%= params[:shift_name] %>'
-	local_date = '<%= @shift_from %> - <%= @shift_to %> '
-	var shift = $('#shift_name');
-	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
-	shift.append(str);
-	<% end %>
-
-	$("#from").val("<%=params[:from] rescue '-'%>");
-	$("#to").val("<%=params[:to] rescue '-'%>");
-	$("#sel_period").val(<%=params[:period] rescue '-'%>);
-	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
-
-
-	<% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
-	<% else %>
-	$("#rd_period_type_0").attr("checked","checked");
-	<% end %>
-	$(".btn-group button").removeClass("active");
-	<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-	$("#btn_report_type_<%= report_type %>").addClass("active");
-
-	$('#item').change(function(){
-		var item = $('#item').val();
-		var payment_type = $('#payment_type');
-
-		if(item == 'sale'){
-			$('#waiter').hide();
-			$('#cashier').show();		
-			if(payment_type){
-				$('#payment_type').show();
-			}
-		}
-		else{
-			$('#cashier').hide();
-			$('#waiter').show();
-			if(payment_type){
-				$('#payment_type').hide();
-			}
-		}
-	});
-</script>
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
index 12e1dfe1..ab3136a3 100644
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -9,31 +9,25 @@
 </div>
 <div class="row">
 	<div class="col-md-12">
-		<%= render :partial=>'shift_sale_report_filter',
-		:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_product_sale_index_path} %>
-
-		<hr />
-
 		<div class="text-right">
 			<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
 		</div>	  			
 
 		<div class="margin-top-20">
 			<div class="card">
+				<div class="p-l-20 p-t-20 p-b-20">
+					<div class="col-md-6">
+						<label class="font-16" for="order_by">Order by Qty</label>
+						<select name="order_by" id="order_by" class="form-control" style="width:10%">
+							<option value="asc">ASC</option>
+							<option value="desc">DESC</option>
+						</select>
+					</div>
+				</div>
+
 				<div class="table-responsive">				
 					<table class="table table-striped" id="items_table" border="0">
 						<thead>
-							<tr>
-								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-							</tr>
-							<% if @shift_from %>
-							<tr>
-								<% if @shift_data.employee %>		
-								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-								<% end %>			
-								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
-							</tr>
-							<% end %>
 							<tr>
 								<th>&nbsp;</th>
 								<th><%= t("views.right_panel.header.menu_category") %></th>
@@ -41,7 +35,7 @@
 								<th><%= t("views.right_panel.detail.product") %></th>
 								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
 								<th><%= t("views.right_panel.detail.unit_price") %></th>
-								<th><%= t("views.right_panel.detail.revenue") %></th>
+								<th><%= t("views.right_panel.detail.total") %></th>
 							</tr>	
 						</thead>
 						<tbody>
@@ -58,114 +52,48 @@
 						    end
 							 %>	
 							<% unless @sale_data.blank? %>
-							<% acc_arr = Array.new %>
-							<% cate_arr = Array.new %>	 
+								<% acc_arr = Array.new %>
+								<% cate_arr = Array.new %>	
 
-							<% sub_qty = 0 %>
-							<% sub_total = 0 %>
-							<% other_sub_total = 0 %>
-							<% count = 0 %>
-							<% total_price = 0 %>
-							<% cate_count = 0 %>
-							<% acc_count = 0 %>
-							<% grand_total = 0 %>
-							<% total_qty = 0 %>
-							<% total_amount = 0 %>
-							<% discount = 0 %>
-							<% total_item_foc = 0 %>
-							<% total_item_dis = 0.0 %>
-							<% total_tax = 0 %>
+								<% grand_total = 0 %>
+								<% total_qty = 0 %>
 
-							<% @sale_data.each do |sale| %>
-							<!-- all total qty sum -->
-								<% if sale.status_type != "Discount" && sale.status_type != "foc"
-									total_qty += sale.total_item
-								end %>
-								<% if sale.status_type == "foc" && sale.price > 0
-									total_qty += sale.total_item
-								end %>
-							<!-- end all total qty -->
-								<% if sale.status_type == "foc" && sale.grand_total < 0
-									total_item_foc += sale.grand_total*(-1)
-								end %>	 
-
-								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
-									total_item_dis += sale.grand_total*(-1)
-								end %>
-
-								<% if !acc_arr.include?(sale.account_id) %>
-									<tr>
-										<td><b><%= sale.account_name %></b></td>
-										<td colspan="4">&nbsp;</td>
-										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
-										<td>
-											<% @totalByAccount.each do |account, total| %>
-											<% if sale.account_id == account %>
-											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
-											<% grand_total += total %>	  
-											<% end %>
-											<% end %>
-										</td>
-									</tr>
-								   <% acc_arr.push(sale.account_id) %>
-								<% end %>
-								<tr>
-									<td>&nbsp;</td>
-									<% if !cate_arr.include?(sale.menu_category_id) %>	
-									<td><%= sale.menu_category_name %></td>
-									<% cate_arr.push(sale.menu_category_id) %>
-									<% else %>
-									<td>&nbsp;</td>
-									<% end %>
-									<td><%= sale.item_code rescue '-' %></td>
-									<td><%= sale.product_name rescue '-' %></td>
-									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-								</tr>
-								<!-- sub total -->
-
-							<% @menu_cate_count.each do |key,value| %>
-								<% if sale.account_id == key %>
-								    <% count = count + 1 %>	
-								    <% sub_total += sale.grand_total %>
-								    <% #sub_qty += sale.total_item %>
-								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
-										sub_qty += sale.total_item
+								<% @sale_data.each do |sale| %>
+									<% if sale.status_type != "Discount" && sale.status_type != "foc"
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
+									<% if sale.status_type == "foc" && sale.price > 0
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
 									end %>
 
-									<% if count == value %>	
-										<tr>
-											<td colspan="3">&nbsp;</td>
-											<td><b>Total <%= sale.account_name %> Qty </b> </td>
-											<td><b><%= sub_qty %></b></td>
-											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
-										</tr>
-										<% sub_total = 0.0%>
-										<% sub_qty = 0 %>
-										<% count = 0%>
-									<% end %>
-							    <% end %>
-							<% end %>
-							<!-- end sub total -->
-						<% end %>
-							<!-- End Other Charges -->
-							<tr style="border-top:2px solid grey;">
-								<td colspan="3">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
-								<td><span><%= total_qty%></span></td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
-							</tr>
-							<% end %>
-
-							
+									<tr>
+										<td>&nbsp;</td>
+										<% if !cate_arr.include?(sale.menu_category_id) %>	
+										<td><%= sale.menu_category_name %></td>
+										<% cate_arr.push(sale.menu_category_id) %>
+										<% else %>
+										<td>&nbsp;</td>
+										<% end %>
+										<td><%= sale.item_code rescue '-' %></td>
+										<td><%= sale.product_name rescue '-' %></td>
+										<td><%= sale.total_item rescue '-' %></td>
+										<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
+									</tr>
+									<!-- sub total -->
+								<!-- end sub total -->
+								<% end %>
 							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-top:2px solid grey;">Net Amount</td>
-								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td> 
+								<td colspan="3"></td>
+								<td><strong>Total</strong></td>
+								<td><strong><%= total_qty %></strong></td>
+								<td></td>
+								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
 							</tr>
+							
+						<% end %>
 						</tbody>
 					</table>
 				</div>
@@ -175,118 +103,26 @@
 </div>
 
 <script>
+	var order_status = '';
 	$(function(){
-
-
-		var check_arr = [];
-
-		var search = '<%= params[:period_type] %>';
-
-		if(search){
-
-			if(parseInt(search) == 0){
-				search_by_period();	
-			}
-			else{
-				search_by_date();				
-			}
+		if(order_status == ''){
+			$('#order_by').val('desc');
 		}else{
-			search_by_period();		
-		}	
-
-		$('#sel_period').change(function(){
-			search_by_period();
-		});
-
-		function search_by_period(){
-			var period = $('#sel_period').val();
-			var period_type = 0;
-			var from = "";
-			var to = "";
-
-			show_shift_name(period,period_type,from,to,'shift_item');	
-		}   
-
-		// OK button is clicked
-		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			new_date = new Date(date) ;
-			month    = parseInt(new_date.getMonth()+1)
-			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
-			$('#from').val(from)
-			search_by_date();
-		});
-		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			new_date = new Date(date) ;
-			month    = parseInt(new_date.getMonth()+1)
-			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
-			$('#to').val(to)
-			search_by_date();
-		});     
-
-		function search_by_date(){
-			from = $("#from").val();
-	  		to   = $("#to").val();
-			var period = 0;
-			var period_type = 1;	   
-
-			if(to != '' && from != ''){
-				shift_name = from + ',' + to;
-
-				check_arr.push(to);
-
-				console.log(check_arr.length)
-				if(check_arr.length == 1){
-					show_shift_name(period,period_type,from,to,'shift_item');		   			   	
-				}
-				if(check_arr.length == 3){
-					check_arr = [];
-				}
-			}
-
+			$('#order_by').val(''+order_status+'');
 		}
-
-		function show_shift_name(period,period_type,from,to,shift_item){
-			var shift = $('#shift_name');
-			if (from == '' && to == '') {
-				from = $("#from").val();
-	  		    to   = $("#to").val();
-			}
-			shift.empty();
-			var selected = '';
-			var str = '';
-			var param_shift = '<%= params[:shift_name]%>';
-			
-			url = '<%= reports_get_shift_by_date_path %>';
-			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
-				console.log(data)
-
-				str = '<option value="0">--- All Shift ---</option>';
-				$(data.message).each(function(index){	
-
-					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
-					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
-					var shift_id = data.message[index].shift_id ;
-
-					if(param_shift != ''){
-						if(shift_id == param_shift){
-							selected = 'selected = "selected"';
-						}
-						else{
-							selected = '';				   
-						}			   	
-					}
-					else{
-						selected = '';		   
-					}			   
-
-
-					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
-
-			   // console.log(sh_date)
-			}) 
-				shift.append(str);
-			});
-		}
-
+	});
+	
+	$('#order_by').on('change', function(){
+		var order_by = $("#order_by").val();
+		order_status = order_by;
+		$.ajax({
+	        type: 'GET',
+	        data: {'order_by' : order_by},
+	        datatype: 'JSON',
+	        url: '?',
+	        success: function(data) {
+	        	// window.location.reload();
+	        }
+	    });
 	});
 </script>
\ No newline at end of file
diff --git a/app/views/reports/product_sale/index.xls.erb b/app/views/reports/product_sale/index.xls.erb
index f97edbb8..7123588c 100755
--- a/app/views/reports/product_sale/index.xls.erb
+++ b/app/views/reports/product_sale/index.xls.erb
@@ -5,17 +5,6 @@
 				<div class="table-responsive">				
 					<table class="table table-striped" id="items_table" border="0">
 						<thead>
-							<tr>
-								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-							</tr>
-							<% if @shift_from %>
-							<tr>
-								<% if @shift_data.employee %>		
-								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-								<% end %>			
-								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
-							</tr>
-							<% end %>
 							<tr>
 								<th>&nbsp;</th>
 								<th><%= t("views.right_panel.header.menu_category") %></th>
@@ -23,149 +12,49 @@
 								<th><%= t("views.right_panel.detail.product") %></th>
 								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
 								<th><%= t("views.right_panel.detail.unit_price") %></th>
-								<th><%= t("views.right_panel.detail.revenue") %></th>
+								<th><%= t("views.right_panel.detail.total") %></th>
 							</tr>	
 						</thead>
 						<tbody>
 							<% unless @sale_data.blank? %>
-							<% acc_arr = Array.new %>
-							<% cate_arr = Array.new %>	 
+								<% acc_arr = Array.new %>
+								<% cate_arr = Array.new %>	
+								<% grand_total = 0 %>
+								<% total_qty = 0 %>
 
-							<% sub_total = 0 %>
-							<% other_sub_total = 0 %>
-							<% count = 0 %>
-							<% total_price = 0 %>
-							<% cate_count = 0 %>
-							<% acc_count = 0 %>
-							<% grand_total = 0 %>
-							<% total_qty = 0 %>
-							<% total_amount = 0 %>
-							<% discount = 0 %>
-							<% total_item_foc = 0 %>
-							<% total_item_dis = 0 %>
+								<% @sale_data.each do |sale| %>
+									<% if sale.status_type != "Discount" && sale.status_type != "foc"
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
+									<% if sale.status_type == "foc" && sale.price > 0
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
 
-							<% @sale_data.each do |sale| %>
-
-								<% if sale.total_item > 0
-									total_qty += sale.total_item
-								end %>
-
-								<% if !acc_arr.include?(sale.account_id) %>
 									<tr>
-										<td><b><%= sale.account_name %></b></td>
-										<td colspan="4">&nbsp;</td>
-										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
-										<td>
-											<% @totalByAccount.each do |account, total| %>
-											<% if sale.account_id == account %>
-											<b><%= total %></b>
-											<% grand_total += total %>	  
-											<% end %>
-											<% end %>
-										</td>
+										<td>&nbsp;</td>
+										<% if !cate_arr.include?(sale.menu_category_id) %>	
+										<td><%= sale.menu_category_name %></td>
+										<% cate_arr.push(sale.menu_category_id) %>
+										<% else %>
+										<td>&nbsp;</td>
+										<% end %>
+										<td><%= sale.item_code rescue '-' %></td>
+										<td><%= sale.product_name rescue '-' %></td>
+										<td><%= sale.total_item rescue '-' %></td>
+										<td><%= sale.unit_price rescue '-' %></td>
+										<td><%= sale.grand_total rescue '-' %></td>
 									</tr>
-								   <% acc_arr.push(sale.account_id) %>
 								<% end %>
 								<tr>
-									<td>&nbsp;</td>
-									<% if !cate_arr.include?(sale.menu_category_id) %>	
-									<td><%= sale.menu_category_name %></td>
-									<% cate_arr.push(sale.menu_category_id) %>
-									<% else %>
-									<td>&nbsp;</td>
-									<% end %>
-									<td><%= sale.item_code rescue '-' %></td>
-									<td><%= sale.product_name rescue '-' %></td>
-									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= sale.unit_price rescue '-' %></td>
-									<td><%= sale.grand_total rescue '-' %></td>
-								</tr>
-								<!-- sub total -->
-								<% @menu_cate_count.each do |key,value| %>
-								<% if sale.menu_category_id == key %>
-
-								    <% count = count + 1 %>	
-								    <% sub_total += sale.grand_total %>
-									<% if count == value %>	
-										<tr>
-											<td colspan="5">&nbsp;</td>
-											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%= sub_total %></span></td>
-										</tr>
-										<% if sale.status_type === "foc"
-											total_item_foc += sale.grand_total 
-										end %>	 
-
-										<% if sale.status_type === "Discount"
-											total_item_dis += sale.grand_total 
-										end %>
-										<% sub_total = 0.0%>
-										<% count = 0%>
-									<% end %>
-							      <% end %>
-							    <% end %>
-							<!-- end sub total -->
-							<% end %>
-							<!--Other Charges -->
-							<tr>
-								<td><b>Other Charges</b></td>
-								<td colspan="4">&nbsp;</td>
-								<td></td>
-							</tr>
-							<% @other_charges.each do |other| %>
-								<% if other.total_item > 0
-									total_qty += other.total_item
-								end %>
-								<% grand_total +=other.grand_total%>
-								<tr>
-								<td>&nbsp;</td>
-									<td>Other Charges</td>
-									<td><%= other.item_code rescue '-' %></td>
-									<td><%= other.product_name rescue '-' %></td>
-									<td><%= other.total_item rescue '-' %></td>
-									<td><%= other.unit_price rescue '-' %></td>
-									<td><%= other.grand_total rescue '-' %></td>
-								</tr>
-								<!-- sub total -->
-								
-								    <% other_sub_total += other.grand_total %>
-							    <!-- end sub total -->								
-							<% end %>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.sub_total") %></td>
-								<td ><span class="underline"><%= other_sub_total %></span></td>
-							</tr>
-							<!-- End Other Charges -->
-							<tr style="border-top:2px solid grey;">
-								<td colspan="3">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
-								<td><span><%= total_qty%></span></td>
-								<td><%= t("views.right_panel.detail.net_amount") %></td>
-								<td><span><%= grand_total%></span></td> 
-							</tr>
-							<% end %>
-
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_foc %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_dis %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td><span><%= @foc_data %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= @discount_data %></span></td>
-							</tr>		
+									<td colspan="3"></td>
+									<td><strong>Total</strong></td>
+									<td><strong><%= total_qty %></strong></td>
+									<td></td>
+									<td><strong><%= grand_total rescue '-' %></strong></td>
+								</tr>								
+							<% end %>		
 						</tbody>
 					</table>
 				</div>

From a0b34e80844bafbc6b48ea6af932d410526dde2f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 26 Feb 2018 09:33:38 +0630
Subject: [PATCH 318/651] update scroll for order

---
 app/views/origami/addorders/detail.html.erb | 88 +++++++++++----------
 1 file changed, 48 insertions(+), 40 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index c2bd6deb..0c3e7bb5 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -84,48 +84,56 @@
             <%end %>
         </ul>
     </div>
+
+
+
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
-      <div class="card-columns custom-card-columns menu_items_list" style="column-gap: ;">
-         <!-- append data -->
-         <div id="custom-slimscroll">
-         <% @menu.each do |menu| %>
-              <% if !menu.valid_time.nil? %>
-                <% if menu.menu_category_id.nil? %>
-                <!--if type quick_service or cashier for table -->
-                  <% if type %>
-                    <% if !menu.code.include? "SPL" %>
-                      <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                        <div class='card-block custom-card-block'>
-                          <p><%=menu.name%> <p>
-                          <p><%=menu.code%> <p>
-                        </div>
-                      </div>
-                    <% end%>
-                  <!-- else quick_service or cashier for table -->
-                  <% else %>
-                    <% if @table.get_current_checkout_booking.nil? %>
-                      <% if !menu.code.include? "SPL" %>
-                        <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                          <div class='card-block custom-card-block'>
-                            <p><%=menu.name%> <p>
-                            <p><%=menu.code%> <p>
-                          </div>
-                       </div>
+      <div class="card">
+        <div class="card-block">
+          <div id="custom-slimscroll">
+             <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
+               <!-- append data -->
+               <% @menu.each do |menu| %>
+                    <% if !menu.valid_time.nil? %>
+                      <% if menu.menu_category_id.nil? %>
+                      <!--if type quick_service or cashier for table -->
+                        <% if type %>
+                          <% if !menu.code.include? "SPL" %>
+                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                              <div class='card-block custom-card-block'>
+                                <p><%=menu.name%> <p>
+                                <p><%=menu.code%> <p>
+                              </div>
+                            </div>
+                          <% end%>
+                        <!-- else quick_service or cashier for table -->
+                        <% else %>
+                          <% if @table.get_current_checkout_booking.nil? %>
+                            <% if !menu.code.include? "SPL" %>
+                              <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                                <div class='card-block custom-card-block'>
+                                  <p><%=menu.name%> <p>
+                                  <p><%=menu.code%> <p>
+                                </div>
+                             </div>
+                            <% end%>
+                          <% else %>
+                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                              <div class='card-block custom-card-block'>
+                                <p><%=menu.name%> <p>
+                                <p><%=menu.code%> <p>
+                              </div>
+                            </div>
+                          <% end%>
+                          <!-- end quick_service or cashier for table -->
+                        <% end %>
                       <% end%>
-                    <% else %>
-                      <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                        <div class='card-block custom-card-block'>
-                          <p><%=menu.name%> <p>
-                          <p><%=menu.code%> <p>
-                        </div>
-                      </div>
-                    <% end%>
-                    <!-- end quick_service or cashier for table -->
-                  <% end %>
-                <% end%>
-              <% end %>
-            <%end %>
-      </div> </div>
+                    <% end %>
+                  <%end %>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
 
     <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">

From 8b064a442855cdf401c35c58d6606e657e83fcc8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 26 Feb 2018 10:01:35 +0630
Subject: [PATCH 319/651] change assigned item id to order item id

---
 app/controllers/oqs/edit_controller.rb     |  9 ++-
 app/controllers/origami/home_controller.rb | 10 ++--
 app/views/origami/home/show.html.erb       | 69 +++++-----------------
 3 files changed, 25 insertions(+), 63 deletions(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 52ebdd2c..ea2e6662 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -3,12 +3,15 @@ class Oqs::EditController < BaseOqsController
   	assigned_item_id = params[:id]
     @link_type = params[:type]
     @dining_type = nil
-    if params[:type] != 'oqs'
+    if params[:type] == 'oqs'
+      assigned_item = AssignedOrderItem.find(assigned_item_id)
+      @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'")
+    else
+      assigned_item = OrderItem.find(assigned_item_id)
       dining = DiningFacility.find_by_id(params[:type])
       @dining_type = dining.type
+      @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.item_instance_code }'")
     end
-    assigned_item = AssignedOrderItem.find(assigned_item_id)
-    @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'");    
   end
 
   def update
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index eedbfdfc..c33a02fa 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -62,7 +62,7 @@ class Origami::HomeController < BaseOrigamiController
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
-          @assigned_order_items = Array.new
+          # @assigned_order_items = Array.new
           if booking.booking_orders.empty?
             @booking = booking
           else
@@ -85,10 +85,10 @@ class Origami::HomeController < BaseOrigamiController
                     item.set_menu_items = arr_instance_item_sets
                   end
                   @order_items.push(item)
-                  assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
-                  if !assigned_order_items.nil?
-                    @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
-                  end
+                  # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+                  # if !assigned_order_items.nil?
+                  #   @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+                  # end
                 end
                 accounts = @customer.tax_profiles
                 puts accounts.to_json
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index d50d5182..19223467 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -288,26 +288,7 @@
                                   sub_total = sub_total + (order_item.price * order_item.qty)
 
                                   # unless order_item.price == 0 %>
-                                  <% if !@assigned_order_items.nil? %>
-                                    <% @assigned_order_items.each do |assigned_order_item| %>
-                                      <% if assigned_order_item.include? (order_item.order_items_id) %>
-                                        <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
-                                          <td><%= count %></td>
-                                          <td class='item-name'>
-                                            <%= order_item.item_name %>
-                                            <% if !order_item.set_menu_items.nil?  
-                                              order_item.set_menu_items.each do |item_instance| %> 
-                                              <br><span class="font-13"><%= item_instance %></span> 
-                                            <% end 
-                                            end %>
-                                          </td>
-                                          <td class='item-attr'><%= order_item.qty %></td>
-                                          <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                                        </tr>
-                                      <% end %>
-                                    <% end %>
-                                  <% else %>
-                                    <tr>
+                                    <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
                                       <td><%= count %></td>
                                       <td class='item-name'>
                                         <%= order_item.item_name %>
@@ -320,7 +301,6 @@
                                       <td class='item-attr'><%= order_item.qty %></td>
                                       <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                                     </tr>
-                                  <% end %>
                               <%
 
                                 # end
@@ -387,40 +367,19 @@
                           @order_items.each do |order_item|
                             count += 1
                         %>
-                          <% if !@assigned_order_items.nil? %>
-                            <% @assigned_order_items.each do |assigned_order_item| %>
-                              <% if assigned_order_item.include? (order_item.order_items_id) %>
-                                <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
-                                  <td><%= count %>
-                                  <td class='item-name'>
-                                    <%= order_item.item_name %>
-                                    <% if !order_item.set_menu_items.nil?  
-                                      order_item.set_menu_items.each do |item_instance| %> 
-                                      <br><span class="font-13"><%= item_instance %></span> 
-                                    <% end 
-                                    end %>
-                                  </td>
-                                  <td class='item-attr'><%= order_item.qty %></td>
-                                  <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                                </tr>
-                                <% end %>
-                              <% end %>
-                            <% else %>
-                              <tr>
-                                <td><%= count %>
-                                <td class='item-name'>
-                                  <%= order_item.item_name %>
-                                  <% if !order_item.set_menu_items.nil?  
-                                    order_item.set_menu_items.each do |item_instance| %> 
-                                    <br><span class="font-13"><%= item_instance %></span> 
-                                  <% end 
-                                  end %>
-                                </td>
-                                <td class='item-attr'><%= order_item.qty %></td>
-                                <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                              </tr>
-                          <% end %>
-
+                          <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
+                            <td><%= count %>
+                            <td class='item-name'>
+                              <%= order_item.item_name %>
+                              <% if !order_item.set_menu_items.nil?  
+                                order_item.set_menu_items.each do |item_instance| %> 
+                                <br><span class="font-13"><%= item_instance %></span> 
+                              <% end 
+                              end %>
+                            </td>
+                            <td class='item-attr'><%= order_item.qty %></td>
+                            <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                          </tr>
                         <%
                           end
                         %>

From a76d0ddbcd721767e557130d8598778cfa5afbd6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 26 Feb 2018 10:09:33 +0630
Subject: [PATCH 320/651] change assigned order item id to order item id in
 Origami/Room

---
 app/controllers/origami/rooms_controller.rb | 10 +--
 app/views/origami/rooms/show.html.erb       | 68 +++++----------------
 2 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index ac2092b6..e49c82e7 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -58,7 +58,7 @@ class Origami::RoomsController < BaseOrigamiController
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new
-           @assigned_order_items = Array.new
+           # @assigned_order_items = Array.new
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
               @customer = order.customer
@@ -79,10 +79,10 @@ class Origami::RoomsController < BaseOrigamiController
                     item.set_menu_items = arr_instance_item_sets
                   end
                   @order_items.push(item)
-                  assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
-                  if !assigned_order_items.nil?
-                    @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
-                  end
+                  # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+                  # if !assigned_order_items.nil?
+                  #   @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+                  # end
                 end
               end
            end
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 70c0e723..efec7698 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -277,39 +277,19 @@
                       sub_total = sub_total + (order_item.price * order_item.qty)
 
                   # unless order_item.price == 0 %>
-                    <% if !@assigned_order_items.nil? %>
-                      <% @assigned_order_items.each do |assigned_order_item| %>
-                        <% if assigned_order_item.include? (order_item.order_items_id) %>
-                         <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
-                           <td><%= count %></td>
-                           <td class='item-name'>
-                            <%= order_item.item_name %>
-                            <% if !order_item.set_menu_items.nil?  
-                              order_item.set_menu_items.each do |item_instance| %> 
-                              <br><span class="font-13"><%= item_instance %></span> 
-                            <% end 
-                            end %>
-                            </td>
-                           <td class='item-attr'><%= order_item.qty %></td>
-                           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                         </tr>
-                        <% end %>
-                      <% end %>
-                    <% else %>
-                        <tr>
-                           <td><%= count %></td>
-                           <td class='item-name'>
-                            <%= order_item.item_name %>
-                            <% if !order_item.set_menu_items.nil?  
-                              order_item.set_menu_items.each do |item_instance| %> 
-                              <br><span class="font-13"><%= item_instance %></span> 
-                            <% end 
-                            end %>
-                            </td>
-                           <td class='item-attr'><%= order_item.qty %></td>
-                           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                         </tr>
-                    <% end %>
+                     <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
+                       <td><%= count %></td>
+                       <td class='item-name'>
+                        <%= order_item.item_name %>
+                        <% if !order_item.set_menu_items.nil?  
+                          order_item.set_menu_items.each do |item_instance| %> 
+                          <br><span class="font-13"><%= item_instance %></span> 
+                        <% end 
+                        end %>
+                        </td>
+                       <td class='item-attr'><%= order_item.qty %></td>
+                       <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                     </tr>
                  <%
 
                        # end
@@ -365,26 +345,7 @@
                   @order_items.each do |order_item |
                     count += 1
                   %>
-                   <% if !@assigned_order_items.nil? %>
-                      <% @assigned_order_items.each do |assigned_order_item| %>
-                        <% if assigned_order_item.include? (order_item.order_items_id) %>
-                        <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
-                          <td><%= count %>
-                          <td class='item-name'>
-                            <%= order_item.item_name %>
-                            <% if !order_item.set_menu_items.nil?  
-                              order_item.set_menu_items.each do |item_instance| %> 
-                              <br><span class="font-13"><%= item_instance %></span> 
-                            <% end 
-                            end %>
-                          </td>
-                          <td class='item-attr'><%= order_item.qty %></td>
-                          <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                        </tr>
-                      <% end %>
-                    <% end %>
-                  <% else %>
-                    <tr>
+                    <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
                       <td><%= count %>
                       <td class='item-name'>
                         <%= order_item.item_name %>
@@ -397,7 +358,6 @@
                       <td class='item-attr'><%= order_item.qty %></td>
                       <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                     </tr>
-                  <% end %>
 
                   <%
                    end

From 5523ff6fc17be50b8e57831cf70e49ddaab9873f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 26 Feb 2018 11:24:47 +0630
Subject: [PATCH 321/651] check product sale report

---
 app/controllers/oqs/home_controller.rb        |  26 +--
 .../origami/payments_controller.rb            |   2 +-
 .../reports/product_sale_controller.rb        |   9 +-
 app/models/sale.rb                            |   2 +-
 app/views/oqs/home/index.html.erb             |  12 +-
 app/views/origami/payments/show.html.erb      |   2 +-
 app/views/reports/product_sale/index.html.erb | 202 +++++++++---------
 7 files changed, 125 insertions(+), 130 deletions(-)

diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index d8642df4..78c2434b 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -14,19 +14,19 @@ class Oqs::HomeController < BaseOqsController
     @queue_stations = OrderQueueStation.all
    
     @queue_completed_item = completed_order(@filter)
-    # if !@queue_completed_item.empty?
-    #   @queue_completed_item.each do |queue_item|
-    #     if !queue_item.set_menu_items.nil?
-    #       instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
-    #       arr_instance_item_sets = Array.new
-    #       instance_item_sets.each do |instance_item|
-    #         item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-    #         arr_instance_item_sets.push(item_instance_name)
-    #       end
-    #       queue_item.set_menu_items = arr_instance_item_sets
-    #     end
-    #   end
-    # end
+    if !@queue_completed_item.empty?
+      @queue_completed_item.each do |queue_item|
+        if !queue_item.set_menu_items.nil?
+          instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+          end
+          queue_item.set_menu_items = arr_instance_item_sets
+        end
+      end
+    end
 
     if !@filter.nil?
       @count = queue_items_count_query(false,@filter)
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 317743dd..80f429a3 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -87,7 +87,7 @@ class Origami::PaymentsController < BaseOrigamiController
       #end rounding adjustment
 
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @usercurrent_user.name, cash, "cash")
+      sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
       render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil
diff --git a/app/controllers/reports/product_sale_controller.rb b/app/controllers/reports/product_sale_controller.rb
index afb4b537..a2ba1c7f 100644
--- a/app/controllers/reports/product_sale_controller.rb
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -2,18 +2,19 @@ class Reports::ProductSaleController < BaseReportController
 	authorize_resource :class => false
 
 	def index
-		order_by = 'desc'
+		@order_by = 'desc'
 		if !params[:order_by].nil?
-			order_by = params[:order_by]
+			@order_by = params[:order_by]
 		end
-
-	    @sale_data = Sale.get_menu_item_query(order_by)
+		
+	    @sale_data = Sale.get_menu_item_query(@order_by)
 
 	    # get printer info
 	    @print_settings = PrintSetting.get_precision_delimiter()
 
 		respond_to do |format|
 			format.html
+			format.json 
 			format.xls
 		end
   	end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 4167d549..ee24ed15 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -877,7 +877,7 @@ def self.get_menu_item_query(order_by)
                " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
                " LEFT JOIN sales s ON s.sale_id = si.sale_id")
           .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
-          .order("si.qty #{order_by}, menu_items.menu_category_id desc")
+          .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
 end
 #product sale report query
 
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 1f25e275..2bb5a94e 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -83,13 +83,13 @@
                   <span class="order-qty">
                     <%= qid.qty %>
                   </span> ]  
-                  <% if !qid.set_menu_items.nil? 
-                      qid.set_menu_items.each do |item_instance|%>
-                    <br><span class="font-12">
+                  <% if !qid.set_menu_items.nil? %>
+                    <% qid.set_menu_items.each do |item_instance|%>
+                      <br><span class="font-12">
                       <%= item_instance %>
-                    </span>
-                  <% end 
-                  end %> 
+                      </span>
+                    <% end %>
+                  <% end %> 
                 </p>                  
                 
                 <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c6f8f941..64ca49bd 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -441,7 +441,7 @@
           var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
           var total = $('#amount_due').text();
           var amt = parseFloat(total) - parseFloat(othertotal);
-          $('#cash').text(parseFloat(amt).toFixed(1));
+          $('#cash').text(parseFloat(amt).toFixed(2));
           update_balance();
         break;
       }
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
index ab3136a3..7c0f3108 100644
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -1,127 +1,121 @@
-<div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
-    <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
-    </span>
-  </ol>
-</div>
-<div class="row">
-	<div class="col-md-12">
-		<div class="text-right">
-			<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
-		</div>	  			
+<div class="div_product_sale">
+	<div class="page-header">
+	  <ol class="breadcrumb">
+	    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+	    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
+	    <span class="float-right">
+	      <%= link_to 'Back', dashboard_path %>
+	    </span>
+	  </ol>
+	</div>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="text-right">
+				<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
+			</div>	  			
 
-		<div class="margin-top-20">
-			<div class="card">
-				<div class="p-l-20 p-t-20 p-b-20">
-					<div class="col-md-6">
-						<label class="font-16" for="order_by">Order by Qty</label>
-						<select name="order_by" id="order_by" class="form-control" style="width:10%">
-							<option value="asc">ASC</option>
-							<option value="desc">DESC</option>
-						</select>
+			<div class="margin-top-20">
+				<div class="card">
+					<div class="p-l-20 p-t-20 p-b-20">
+						<div class="col-md-6">
+							<label class="font-16" for="order_by">Order by Qty</label>
+							<select name="order_by" id="order_by" class="form-control" style="width:10%">
+								<option value="asc">ASC</option>
+								<option value="desc">DESC</option>
+							</select>
+						</div>
 					</div>
-				</div>
 
-				<div class="table-responsive">				
-					<table class="table table-striped" id="items_table" border="0">
-						<thead>
-							<tr>
-								<th>&nbsp;</th>
-								<th><%= t("views.right_panel.header.menu_category") %></th>
-								<th><%= t("views.right_panel.detail.code") %></th>
-								<th><%= t("views.right_panel.detail.product") %></th>
-								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
-								<th><%= t("views.right_panel.detail.unit_price") %></th>
-								<th><%= t("views.right_panel.detail.total") %></th>
-							</tr>	
-						</thead>
-						<tbody>
-							<% if @print_settings.precision.to_i > 0
-								precision = @print_settings.precision
-							else
-								precision = 0
-							end
-							#check delimiter
-							if @print_settings.delimiter
-								delimiter = ","
-						    else
-								delimiter = ""
-						    end
-							 %>	
-							<% unless @sale_data.blank? %>
-								<% acc_arr = Array.new %>
-								<% cate_arr = Array.new %>	
+					<div class="table-responsive">	
+						<% if @print_settings.precision.to_i > 0
+							precision = @print_settings.precision
+						else
+							precision = 0
+						end
+						#check delimiter
+						if @print_settings.delimiter
+							delimiter = ","
+					    else
+							delimiter = ""
+					    end %>				
+						<table class="table table-striped" id="items_table" border="0">
+							<thead>
+								<tr>
+									<th>&nbsp;</th>
+									<th><%= t("views.right_panel.header.menu_category") %></th>
+									<th><%= t("views.right_panel.detail.code") %></th>
+									<th><%= t("views.right_panel.detail.product") %></th>
+									<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+									<th><%= t("views.right_panel.detail.unit_price") %></th>
+									<th><%= t("views.right_panel.detail.total") %></th>
+								</tr>	
+							</thead>
+							<tbody id="tbd_data">
+								<% unless @sale_data.blank? %>
+									<% acc_arr = Array.new %>
+									<% cate_arr = Array.new %>	
 
-								<% grand_total = 0 %>
-								<% total_qty = 0 %>
+									<% grand_total = 0 %>
+									<% total_qty = 0 %>
 
-								<% @sale_data.each do |sale| %>
-									<% if sale.status_type != "Discount" && sale.status_type != "foc"
-										total_qty += sale.total_item
-										grand_total += sale.grand_total
-									end %>
-									<% if sale.status_type == "foc" && sale.price > 0
-										total_qty += sale.total_item
-										grand_total += sale.grand_total
-									end %>
+									<% @sale_data.each do |sale| %>
+										<% if sale.status_type != "Discount" && sale.status_type != "foc"
+											total_qty += sale.total_item
+											grand_total += sale.grand_total
+										end %>
+										<% if sale.status_type == "foc" && sale.price > 0
+											total_qty += sale.total_item
+											grand_total += sale.grand_total
+										end %>
 
-									<tr>
-										<td>&nbsp;</td>
-										<% if !cate_arr.include?(sale.menu_category_id) %>	
-										<td><%= sale.menu_category_name %></td>
-										<% cate_arr.push(sale.menu_category_id) %>
-										<% else %>
-										<td>&nbsp;</td>
-										<% end %>
-										<td><%= sale.item_code rescue '-' %></td>
-										<td><%= sale.product_name rescue '-' %></td>
-										<td><%= sale.total_item rescue '-' %></td>
-										<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
-									</tr>
-									<!-- sub total -->
-								<!-- end sub total -->
-								<% end %>
-							<tr>
-								<td colspan="3"></td>
-								<td><strong>Total</strong></td>
-								<td><strong><%= total_qty %></strong></td>
-								<td></td>
-								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
-							</tr>
-							
-						<% end %>
-						</tbody>
-					</table>
+										<tr>
+											<td>&nbsp;</td>
+											<% if !cate_arr.include?(sale.menu_category_id) %>	
+											<td><%= sale.menu_category_name %></td>
+											<% cate_arr.push(sale.menu_category_id) %>
+											<% else %>
+											<td>&nbsp;</td>
+											<% end %>
+											<td><%= sale.item_code rescue '-' %></td>
+											<td><%= sale.product_name rescue '-' %></td>
+											<td><%= sale.total_item rescue '-' %></td>
+											<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+											<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
+										</tr>
+										<!-- sub total -->
+									<!-- end sub total -->
+									<% end %>
+								<tr>
+									<td colspan="3"></td>
+									<td><strong>Total</strong></td>
+									<td><strong><%= total_qty %></strong></td>
+									<td></td>
+									<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
+								</tr>
+								
+							<% end %>
+							</tbody>
+						</table>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
 </div>
 
-<script>
-	var order_status = '';
+<script type="text/javascript">
 	$(function(){
-		if(order_status == ''){
-			$('#order_by').val('desc');
-		}else{
-			$('#order_by').val(''+order_status+'');
-		}
+		$('#order_by').val('<%= @order_by %>');
 	});
 	
 	$('#order_by').on('change', function(){
 		var order_by = $("#order_by").val();
-		order_status = order_by;
+		$('.div_product_sale').html("");
 		$.ajax({
 	        type: 'GET',
-	        data: {'order_by' : order_by},
-	        datatype: 'JSON',
-	        url: '?',
+	        url: '?order_by='+order_by,
 	        success: function(data) {
-	        	// window.location.reload();
+	        	$('.div_product_sale').html(data);
 	        }
 	    });
 	});

From 0f36e44d1c2806a7a50d65d903355c5c519ba58a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 26 Feb 2018 11:33:51 +0630
Subject: [PATCH 322/651] check route in product sale

---
 .../reports/product_sale_controller.rb        |   7 +-
 app/views/reports/product_sale/index.html.erb | 193 +++++++++---------
 2 files changed, 94 insertions(+), 106 deletions(-)

diff --git a/app/controllers/reports/product_sale_controller.rb b/app/controllers/reports/product_sale_controller.rb
index a2ba1c7f..748c8716 100644
--- a/app/controllers/reports/product_sale_controller.rb
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -2,11 +2,8 @@ class Reports::ProductSaleController < BaseReportController
 	authorize_resource :class => false
 
 	def index
-		@order_by = 'desc'
-		if !params[:order_by].nil?
-			@order_by = params[:order_by]
-		end
-		
+		@order_by = params[:order_by]
+
 	    @sale_data = Sale.get_menu_item_query(@order_by)
 
 	    # get printer info
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
index 7c0f3108..eb797122 100644
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -1,102 +1,100 @@
-<div class="div_product_sale">
-	<div class="page-header">
-	  <ol class="breadcrumb">
-	    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-	    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
-	    <span class="float-right">
-	      <%= link_to 'Back', dashboard_path %>
-	    </span>
-	  </ol>
-	</div>
-	<div class="row">
-		<div class="col-md-12">
-			<div class="text-right">
-				<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
-			</div>	  			
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<div class="text-right">
+			<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
+		</div>	  			
 
-			<div class="margin-top-20">
-				<div class="card">
-					<div class="p-l-20 p-t-20 p-b-20">
-						<div class="col-md-6">
-							<label class="font-16" for="order_by">Order by Qty</label>
-							<select name="order_by" id="order_by" class="form-control" style="width:10%">
-								<option value="asc">ASC</option>
-								<option value="desc">DESC</option>
-							</select>
-						</div>
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="p-l-20 p-t-20 p-b-20">
+					<div class="col-md-6">
+						<label class="font-16" for="order_by">Order by Qty</label>
+						<select name="order_by" id="order_by" class="form-control" style="width:10%">
+							<option value="asc">ASC</option>
+							<option value="desc">DESC</option>
+						</select>
 					</div>
+				</div>
 
-					<div class="table-responsive">	
-						<% if @print_settings.precision.to_i > 0
-							precision = @print_settings.precision
-						else
-							precision = 0
-						end
-						#check delimiter
-						if @print_settings.delimiter
-							delimiter = ","
-					    else
-							delimiter = ""
-					    end %>				
-						<table class="table table-striped" id="items_table" border="0">
-							<thead>
-								<tr>
-									<th>&nbsp;</th>
-									<th><%= t("views.right_panel.header.menu_category") %></th>
-									<th><%= t("views.right_panel.detail.code") %></th>
-									<th><%= t("views.right_panel.detail.product") %></th>
-									<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
-									<th><%= t("views.right_panel.detail.unit_price") %></th>
-									<th><%= t("views.right_panel.detail.total") %></th>
-								</tr>	
-							</thead>
-							<tbody id="tbd_data">
-								<% unless @sale_data.blank? %>
-									<% acc_arr = Array.new %>
-									<% cate_arr = Array.new %>	
+				<div class="table-responsive">	
+					<% if @print_settings.precision.to_i > 0
+						precision = @print_settings.precision
+					else
+						precision = 0
+					end
+					#check delimiter
+					if @print_settings.delimiter
+						delimiter = ","
+				    else
+						delimiter = ""
+				    end %>				
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+							<tr>
+								<th>&nbsp;</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
+								<th><%= t("views.right_panel.detail.code") %></th>
+								<th><%= t("views.right_panel.detail.product") %></th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<th><%= t("views.right_panel.detail.total") %></th>
+							</tr>	
+						</thead>
+						<tbody id="tbd_data">
+							<% unless @sale_data.blank? %>
+								<% acc_arr = Array.new %>
+								<% cate_arr = Array.new %>	
 
-									<% grand_total = 0 %>
-									<% total_qty = 0 %>
+								<% grand_total = 0 %>
+								<% total_qty = 0 %>
 
-									<% @sale_data.each do |sale| %>
-										<% if sale.status_type != "Discount" && sale.status_type != "foc"
-											total_qty += sale.total_item
-											grand_total += sale.grand_total
-										end %>
-										<% if sale.status_type == "foc" && sale.price > 0
-											total_qty += sale.total_item
-											grand_total += sale.grand_total
-										end %>
+								<% @sale_data.each do |sale| %>
+									<% if sale.status_type != "Discount" && sale.status_type != "foc"
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
+									<% if sale.status_type == "foc" && sale.price > 0
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
 
-										<tr>
-											<td>&nbsp;</td>
-											<% if !cate_arr.include?(sale.menu_category_id) %>	
-											<td><%= sale.menu_category_name %></td>
-											<% cate_arr.push(sale.menu_category_id) %>
-											<% else %>
-											<td>&nbsp;</td>
-											<% end %>
-											<td><%= sale.item_code rescue '-' %></td>
-											<td><%= sale.product_name rescue '-' %></td>
-											<td><%= sale.total_item rescue '-' %></td>
-											<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-											<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
-										</tr>
-										<!-- sub total -->
-									<!-- end sub total -->
-									<% end %>
-								<tr>
-									<td colspan="3"></td>
-									<td><strong>Total</strong></td>
-									<td><strong><%= total_qty %></strong></td>
-									<td></td>
-									<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
-								</tr>
-								
-							<% end %>
-							</tbody>
-						</table>
-					</div>
+									<tr>
+										<td>&nbsp;</td>
+										<% if !cate_arr.include?(sale.menu_category_id) %>	
+										<td><%= sale.menu_category_name %></td>
+										<% cate_arr.push(sale.menu_category_id) %>
+										<% else %>
+										<td>&nbsp;</td>
+										<% end %>
+										<td><%= sale.item_code rescue '-' %></td>
+										<td><%= sale.product_name rescue '-' %></td>
+										<td><%= sale.total_item rescue '-' %></td>
+										<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
+									</tr>
+									<!-- sub total -->
+								<!-- end sub total -->
+								<% end %>
+							<tr>
+								<td colspan="3"></td>
+								<td><strong>Total</strong></td>
+								<td><strong><%= total_qty %></strong></td>
+								<td></td>
+								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
+							</tr>
+							
+						<% end %>
+						</tbody>
+					</table>
 				</div>
 			</div>
 		</div>
@@ -110,13 +108,6 @@
 	
 	$('#order_by').on('change', function(){
 		var order_by = $("#order_by").val();
-		$('.div_product_sale').html("");
-		$.ajax({
-	        type: 'GET',
-	        url: '?order_by='+order_by,
-	        success: function(data) {
-	        	$('.div_product_sale').html(data);
-	        }
-	    });
+		window.location.href = "?order_by=" + order_by;
 	});
 </script>
\ No newline at end of file

From b38e98a22a739a4dc2fc2eacc5e51c40ea649daa Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 26 Feb 2018 16:56:57 +0630
Subject: [PATCH 323/651] update edit with remark

---
 .../origami/discounts_controller.rb           |  6 +-
 .../origami/other_charges_controller.rb       |  2 +-
 .../origami/payments_controller.rb            |  4 +-
 .../origami/sale_edit_controller.rb           | 16 ++--
 app/models/sale.rb                            | 63 +++++++--------
 app/models/sale_item.rb                       |  6 +-
 app/models/sale_payment.rb                    |  2 +-
 app/views/origami/discounts/index.html.erb    |  2 +-
 app/views/origami/sale_edit/edit.html.erb     | 79 ++++++++++++++++---
 config/secrets.yml                            |  4 +-
 10 files changed, 123 insertions(+), 61 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 1166a705..56389302 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -41,7 +41,7 @@ class Origami::DiscountsController < BaseOrigamiController
           sale_item.product_name = di["name"]
           sale_item.item_instance_code = origin_sale_item.item_instance_code
           sale_item.product_alt_name = ""
-          sale_item.remark = "Discount"
+          sale_item.status = "Discount"
 
           sale_item.qty = -1
           sale_item.unit_price = di["price"].to_f * (-1)
@@ -123,7 +123,7 @@ class Origami::DiscountsController < BaseOrigamiController
       discount_items = []                
       #destroy all discount sale item
       sale.sale_items.each do |si|          
-        if si.remark == "Discount" && si.price < 0                                 
+        if si.status == "Discount" && si.price < 0                                 
           sale.total_amount = (sale.total_amount + si.price.abs) 
           discount_items.push(si)         
         end
@@ -277,7 +277,7 @@ class Origami::DiscountsController < BaseOrigamiController
   #   sale_item.sale_id = sale_id
   #   sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
   #   sale_item.product_name = product_name
-  #   sale_item.remark = remark
+  #   sale_item.status = remark
 
   #   sale_item.qty = 1
   #   sale_item.unit_price = (0-discount_amount.to_f)
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index 51a1f7db..07cd177e 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -32,7 +32,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 	          sale_item.product_code = "Other Charges"
 	          sale_item.product_name = "*" + di["name"]
 	          sale_item.product_alt_name = ""
-	          sale_item.remark = "Other Charges"
+	          sale_item.status = "Other Charges"
 
 	          sale_item.qty = 1
 	          sale_item.unit_price = di["price"]
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 317743dd..c5418d10 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -307,12 +307,14 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
-         
+       
       if saleObj.discount_type == "member_discount"
         saleObj.update_attributes(rounding_adjustment: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       
+      saleObj.update_attributes(rounding_adjustment: 0)
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
 
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index c00c35f0..e87deb35 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -10,8 +10,10 @@ class Origami::SaleEditController < BaseOrigamiController
   # create item void. make duplicate old record and update qty and price
   def item_void
     saleitemId = params[:sale_item_id]
+    remark     = params[:remark]
     saleitemObj = SaleItem.find(saleitemId)
-    saleitemObj.remark = 'void'
+    saleitemObj.status = 'void'
+    saleitemObj.remark = remark
     saleitemObj.save
     @newsaleitem = SaleItem.new
     @newsaleitem = saleitemObj.dup
@@ -21,6 +23,7 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem.is_taxable = 1
     @newsaleitem.taxable_price = saleitemObj.taxable_price * -1
     @newsaleitem.product_name = saleitemObj.product_name + ' (VOID)'
+    @newsaleitem.remark = remark
     @newsaleitem.save
 
     # re-calc tax
@@ -36,8 +39,10 @@ class Origami::SaleEditController < BaseOrigamiController
 
   def item_foc
     saleitemId = params[:sale_item_id]
+    remark     = params[:remark]
     saleitemObj = SaleItem.find(saleitemId)
-    saleitemObj.remark = 'foc'
+    saleitemObj.status = 'foc'
+    saleitemObj.remark = remark
     saleitemObj.save
     @newsaleitem = SaleItem.new
     @newsaleitem = saleitemObj.dup
@@ -47,6 +52,7 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem.taxable_price = saleitemObj.taxable_price * -1
     @newsaleitem.price = saleitemObj.price * -1
     @newsaleitem.product_name = saleitemObj.product_name + ' (FOC)'
+    @newsaleitem.remark = remark
     @newsaleitem.save
 
     # re-calc tax
@@ -65,7 +71,7 @@ class Origami::SaleEditController < BaseOrigamiController
   #   update_qty = params[:update_qty]
   #   update_price = params[:update_price]
   #   saleitemObj = SaleItem.find(saleitemId)
-  #   saleitemObj.remark = 'void'
+  #   saleitemObj.status = 'void'
   #   saleitemObj.save
   #   @newsaleitem = SaleItem.new
   #   @newsaleitem = saleitemObj.dup
@@ -117,7 +123,7 @@ class Origami::SaleEditController < BaseOrigamiController
     both = SaleItem.where('product_code=?', saleitemObj.product_code)
     both.each do |item|
       if item.qty.to_i > 0
-        item.remark = nil
+        item.status = nil
         item.save
       end
     end
@@ -142,7 +148,7 @@ class Origami::SaleEditController < BaseOrigamiController
       if item.qty.to_i < 0
         item.destroy
       else
-        item.remark = nil
+        item.status = nil
       end
       item.save
       ProductCommission.remove_product_commission(item)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f0166491..47733557 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -92,7 +92,7 @@ class Sale < ApplicationRecord
           self.cashier_id   = open_cashier[0].id
           self.cashier_name = open_cashier[0].name
           shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
-          self.shift_sale_id = shift_id.id
+          self.shift_sale_id = current_shift.id
         else
           self.cashier_id   = current_shift.employee_id
           self.cashier_name = Employee.find(current_shift.employee_id).name
@@ -227,7 +227,7 @@ class Sale < ApplicationRecord
     sale_item.product_name = item.item_name
     sale_item.product_alt_name = item.alt_name
     sale_item.account_id = item.account_id
-    sale_item.remark = item.remark
+    sale_item.status = item.remark
 
     sale_item.qty = item.qty
     sale_item.unit_price = item.price
@@ -255,7 +255,7 @@ class Sale < ApplicationRecord
       sale_item.product_name       = instance.item_instance_name
       sale_item.product_alt_name   = menu_item.alt_name
       sale_item.account_id         = menu_item.account_id
-      sale_item.remark             = nil
+      sale_item.status             = nil
 
       sale_item.qty                = item["quantity"]
       sale_item.unit_price         = item["price"]
@@ -381,7 +381,7 @@ class Sale < ApplicationRecord
     rounding_adjustment = 0
 
     sales_items.each do |item|
-      if item.remark != 'void' && item.remark != 'foc'
+      if item.status != 'void' && item.status != 'foc'
         #compute each item and added to total
         subtotal_price = subtotal_price + item.price
 
@@ -417,35 +417,36 @@ class Sale < ApplicationRecord
     tax_profiles = TaxProfile.all.order("order_by asc")
     customer = Customer.find(sale.customer_id)
     # #Creat new tax records
-    tax_profiles.each do |tax|
-      customer.tax_profiles.each do |cus_tax|
-        if cus_tax.to_i == tax.id
-          sale_tax = SaleTax.new(:sale => sale)
-          sale_tax.tax_name = tax.name
-          sale_tax.tax_rate = tax.rate
+    if sale.payment_status != 'foc'
+      tax_profiles.each do |tax|
+        customer.tax_profiles.each do |cus_tax|
+          if cus_tax.to_i == tax.id
+            sale_tax = SaleTax.new(:sale => sale)
+            sale_tax.tax_name = tax.name
+            sale_tax.tax_rate = tax.rate
 
-          # substract , to give after discount
-          total_tax = total_taxable - total_discount
-          #include or execulive
-          if tax.inclusive
-            rate = tax.rate
-            divided_value = (100 + rate)/rate
-            sale_tax.tax_payable_amount = total_tax / divided_value
-          else
-            sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
-            total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
-          end
-          #new taxable amount is standard rule for step by step
-          if shop.calc_tax_order
-            total_taxable = total_taxable + sale_tax.tax_payable_amount
-          end
+            # substract , to give after discount
+            total_tax = total_taxable - total_discount
+            #include or execulive
+            if tax.inclusive
+              rate = tax.rate
+              divided_value = (100 + rate)/rate
+              sale_tax.tax_payable_amount = total_tax / divided_value
+            else
+              sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+              total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
+            end
+            #new taxable amount is standard rule for step by step
+            if shop.calc_tax_order
+              total_taxable = total_taxable + sale_tax.tax_payable_amount
+            end
 
-          sale_tax.inclusive = tax.inclusive
-          sale_tax.save
+            sale_tax.inclusive = tax.inclusive
+            sale_tax.save
+          end
         end
       end
     end
-
     sale.total_tax = total_tax_amount
   end
 
@@ -757,7 +758,7 @@ end
 def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
-                     "i.remark as status_type,"+
+                     "i.status as status_type,"+
                      " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
@@ -776,7 +777,7 @@ end
 def self.get_other_charges()
   query = Sale.select("i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +
-                     "i.remark as status_type,"+
+                     "i.status as status_type,"+
                      " i.unit_price as unit_price,i.product_name as product_name")
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id")
   query = query.where("i.item_instance_code IS NULL AND i.product_code = 'Other Charges'")
@@ -1227,7 +1228,7 @@ end
 
   def self.total_foc_items(today)
     query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          .where("sales.sale_status = 'completed' and a.status='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           .sum("a.qty")
   end
 
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index 465af104..64e0ec73 100755
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -28,7 +28,7 @@ class SaleItem < ApplicationRecord
 
   def self.update_existing_item(qty, item, sale_id, type, item_price, price)
       # Original Item to add remark
-      item.remark = type
+      item.status = type
       item.save
 
       sale_item = SaleItem.new
@@ -37,7 +37,7 @@ class SaleItem < ApplicationRecord
       sale_item.product_name = item.product_name + " (#{type.upcase})"
       sale_item.product_alt_name = item.product_alt_name
       sale_item.account_id = item.account_id
-      sale_item.remark = type
+      sale_item.status = type
       if type == "foc" || type == "promotion" || type == "void"
         sale_item.qty = qty * (-1)
       else
@@ -99,7 +99,7 @@ class SaleItem < ApplicationRecord
       discount_account = {:name => a.title, :price => 0}
 
       # Check for actual sale items
-      sale_items.where("remark = 'Discount'").find_each do |si|
+      sale_items.where("status = 'Discount'").find_each do |si|
         if si.account_id == a.id
           discount_account[:price] = (discount_account[:price].abs + si.price.abs) * (1)
         end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 5b0da284..aff43626 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -194,7 +194,7 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     # add to sale item with foc
-    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and remark is null")
+    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and status is null")
     
     sale_items.each do|item|
       SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 72f4fd3c..51b1e717 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -38,7 +38,7 @@
       						<% @sale_data.sale_items.each do |sale_item| %>
       						<% 
       						sub_total += sale_item.qty*sale_item.unit_price 
-      						if sale_item.price != 0 && sale_item.remark != "void" && sale_item.remark != "foc"
+      						if sale_item.price != 0 && sale_item.status != "void" && sale_item.status != "foc"
       							%>
       							<tr class="item-row" id=<%= sale_item.sale_item_id %> >
       								<td style="width:60%; text-align:left">
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 940b497a..6e79f9cb 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -57,7 +57,7 @@
                       <td class="p-2" width="20%">
                         <%= sale_item.product_name %>
                       </td>
-                      <% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %>
+                      <% if sale_item.status != 'void' && sale_item.status != 'edit' && sale_item.status != 'foc' %>
                           <td class="p-1" width="5%">
                             <input id="<%= sale_item.id %>_qty" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
                           </td>
@@ -69,11 +69,12 @@
                     </td> -->
                           <td class="p-1" width="25%">
                             <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-blue waves-effect update'>Update</button>
-                            <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-danger waves-effect void'>Void</button>
-                            <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-red waves-effect foc'>FOC</button>
+                            <button data-id="<%= sale_item.id %>" data-type="void" class='editModal btn btn-lg bg-danger waves-effect' data-toggle="modal" data-target="#editModal">Void</button>
+
+                            <button data-id="<%= sale_item.id %>" data-type="foc" class='editModal btn btn-lg bg-danger waves-effect' data-toggle="modal" data-target="#editModal">FOC</button>
                           </td>
 
-                      <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
+                      <% elsif sale_item.qty.to_i < 0 || sale_item.status == 'edit' %>
                           <td class="p-1" width="5%">
                             <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
                           </td>
@@ -148,18 +149,48 @@
      </div>   
    </div>  
  </div> -->
-  <!-- Column Three -->
-  <div class="col-lg-1 col-md-1 col-sm-1">
-    <!-- Waiter Buttons -->
-    <button type="button" class="btn btn-block btn-lg bg-default waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
-    <button type="button" class="btn btn-danger btn- action-btn" id='cancel_all_void'>Cancel All Void</button>
-    <button type="button" class="btn btn-block btn-lg bg-blue waves-effect" id='apply'>Apply</button>
+    <!-- Column Three -->
+    <div class="col-lg-1 col-md-1 col-sm-1">
+      <!-- Waiter Buttons -->
+      <button type="button" class="btn btn-block btn-lg bg-default waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
+      <button type="button" class="btn btn-danger btn- action-btn" id='cancel_all_void'>Cancel All Void</button>
+      <button type="button" class="btn btn-block btn-lg bg-blue waves-effect" id='apply'>Apply</button>
+    </div>
   </div>
 </div>
+
+
+<div class="modal fade" id="editModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="editModalLabel">Please Enter Remark</h4>
+      </div>
+      <div class="modal-body">
+         <input type="textarea" name="remark" class="form-control col-md-12 remark" id="remark">
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-red waves-effect" id="action">VOID</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
 </div>
 <script>
     // Bill Request
     $(document).ready(function () {
+        $('.editModal').on('click', function () {
+        $("#action").attr('data-type', $(this).attr('data-type'));
+        $("#action").attr('data-id', $(this).attr('data-id'));
+        $("#action").text($(this).attr('data-type'))
+    })
 
         $(".update").on('click', function () {
             var sale_item_id = $(this).attr('data-id');
@@ -182,13 +213,14 @@
             });
         });
 
-        $('.void').on('click', function () {
+        /*$('.void').on('click', function () {
             var sale_item_id = $(this).attr('data-id');
+            var remark = $("#remark").val();
             var ajax_url = "/origami/item_void";
             $.ajax({
                 type: "POST",
                 url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id,
+                data: 'sale_item_id=' + sale_item_id + "&remark=" + remark,
                 success: function (result) {
                     location.reload();
                 }
@@ -201,7 +233,27 @@
             $.ajax({
                 type: "POST",
                 url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id,
+                data: 'sale_item_id=' + sale_item_id + "&remark=" + remark,
+                success: function (result) {
+                    location.reload();
+                }
+            });
+        })*/
+
+        $('#action').on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var type       = $(this).attr('data-type');
+            var remark       = $("#remark").val();
+            if (type=='foc') {
+              var ajax_url = "/origami/item_foc";
+            }else{
+              var ajax_url = "/origami/item_void";
+            }
+            
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id + "&remark=" + remark,
                 success: function (result) {
                     location.reload();
                 }
@@ -224,6 +276,7 @@
 
     })
 
+    
     $('#back').on('click', function () {
         var table_id = '<%= @table_id %>'
         window.location.href = '/origami/table/' + table_id;
diff --git a/config/secrets.yml b/config/secrets.yml
index 286c1ade..b74dcdbc 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: 192.168.1.125:3002/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 
@@ -25,7 +25,7 @@ test:
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: application
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From 13b7b1f800652101261686bab556e55ed88ebb6b Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 26 Feb 2018 17:42:54 +0630
Subject: [PATCH 324/651] add action base and update base ctrls

---
 app/controllers/application_controller.rb     | 14 +---
 app/controllers/base_crm_controller.rb        |  3 +-
 app/controllers/base_inventory_controller.rb  |  3 +-
 app/controllers/base_oqs_controller.rb        |  3 +-
 app/controllers/base_origami_controller.rb    |  3 +-
 app/controllers/base_report_controller.rb     | 11 +--
 app/controllers/base_waiter_controller.rb     |  3 +-
 .../concerns/login_verification.rb            |  2 +-
 config/initializers/action_controller.rb      | 81 +++++++++++++++++++
 9 files changed, 100 insertions(+), 23 deletions(-)
 create mode 100644 config/initializers/action_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3c061feb..833b49d6 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,11 +1,11 @@
 class ApplicationController < ActionController::Base
-  include LicenseVerification
+  include LoginVerification
   
   #before_action :check_installation
   protect_from_forgery with: :exception
 
   # lookup domain for db from  provision
-  before_action :set_locale
+  # before_action :set_locale
 
   helper_method :current_company,:current_login_employee,:current_user
    # alias_method :current_user, :current_login_employee,:current_user
@@ -13,16 +13,6 @@ class ApplicationController < ActionController::Base
   #all token authentication must be done here
   #response format must be set to JSON
 
-  #change locallization
-  def set_locale
-    I18n.locale = params[:locale] || I18n.default_locale
-  end
-
-  # RESTful url for localize
-  def default_url_options
-    { locale: I18n.locale }
-  end
-
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     redirect_to root_path
diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index 5c412fcf..91da2a72 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -1,4 +1,5 @@
-class BaseCrmController < ApplicationController
+class BaseCrmController < ActionController::Base
+  include LoginVerification
 	layout "CRM"
 
   #before_action :check_installation
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index f44747d3..2fe167c0 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -1,4 +1,5 @@
-class BaseInventoryController < ApplicationController
+class BaseInventoryController < ActionController::Base
+  include LoginVerification
 	layout "inventory"
 
   #before_action :check_installation
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index f1f2831a..db9f8231 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -1,4 +1,5 @@
-class BaseOqsController < ApplicationController
+class BaseOqsController < ActionController::Base
+  include LoginVerification
   layout "OQS"
 
   #before_action :check_installation
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 58d9b801..ec415bad 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,4 +1,5 @@
-class BaseOrigamiController < ApplicationController
+class BaseOrigamiController < ActionController::Base
+  include LoginVerification
   layout "origami"
 
   # before_action :checkin_process
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index f7551f22..733e48f9 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -1,10 +1,11 @@
-class BaseReportController < ApplicationController
-	layout "application" 
+class BaseReportController < ActionController::Base
+  include LoginVerification
+  layout "application" 
 
-	#before_action :check_installation
-	protect_from_forgery with: :exception
+  #before_action :check_installation
+  protect_from_forgery with: :exception
 
-	rescue_from CanCan::AccessDenied do |exception|
+  rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     redirect_to root_path
   end
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index 248e32a6..ca4622db 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,4 +1,5 @@
-class BaseWaiterController < ApplicationController  
+class BaseWaiterController < ActionController::Base
+  include LoginVerification  
   layout "waiter"
 
   #before_action :check_installation
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index aa9d8319..fa588574 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -2,7 +2,7 @@ module LoginVerification
   extend ActiveSupport::Concern
 
   included do
-    before_action :authenticate_session_token
+    before_action :authenticate
     helper_method :current_company,:current_login_employee
   end
 
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
new file mode 100644
index 00000000..f33ebfed
--- /dev/null
+++ b/config/initializers/action_controller.rb
@@ -0,0 +1,81 @@
+# ActionController::Base are used by both Peatio controllers and
+# Doorkeeper controllers.
+class ActionController::Base
+
+  before_action :lookup_domain, :set_language
+
+  private
+
+  def lookup_domain 
+    if request.subdomain.present? && request.subdomain != "www" 
+      from = request.subdomain.downcase  + "." + request.domain.downcase    
+      @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
+      if (!@license.nil?)
+        # logger.info "Location - " + @license.name        
+        ActiveRecord::Base.establish_connection(website_connection(@license))    
+        # authenticate_session_token    
+        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
+      else
+        # reconnect_default_db
+        logger.info 'License is nil'
+        # redirect_to root_url(:host => request.domain) + "store_error"
+         render :json => [{ status: false, message: 'Invalid Access!'}]
+      end      
+    else         
+      # check for license file
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
+    end    
+  end
+
+  def current_license(url)  
+    @license = License.new(url)
+    flag = @license.detail_with_local_file()
+    if (flag == 0)
+      flash[:notice] = 'Expired or No License!'      
+    elsif (flag == 2)
+      flash[:notice] = 'Expiring! Please, License extend...'      
+    else
+      puts "RUN SAY BYAR"
+    end
+  end
+
+  def cache_license(url, lookup)    
+    @license = License.new(url, lookup)        
+
+    if (@license.detail_with_local_cache(lookup) == true)
+      return @license
+    else
+      return nil
+    end
+  end
+
+  def website_connection(license)
+    default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
+    :username => license.dbusername, :password => license.dbpassword)
+
+  end
+
+  def reconnect_default_db
+    ActiveRecord::Base.establish_connection(Rails.env)
+  end
+
+  # Regular database.yml configuration hash
+  def default_connection
+    @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
+  end
+
+  #change locallization
+  def set_locale
+    I18n.locale = params[:locale] || I18n.default_locale
+  end
+
+  # RESTful url for localize
+  def default_url_options
+    { locale: I18n.locale }
+  end  
+
+end

From 7d8442fd098d8d1d2a90ccad58815c2cb3dd9d5c Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 26 Feb 2018 17:49:19 +0630
Subject: [PATCH 325/651] To add the condition for CloseCashierCustmisePdf

---
 app/controllers/origami/shifts_controller.rb  | 16 +++++++++-
 app/models/printer/cashier_station_printer.rb | 31 +++++++++++++++++--
 app/pdf/close_cashier_customise_pdf.rb        |  2 +-
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index e05922fd..1647ba37 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -61,7 +61,21 @@ class Origami::ShiftsController < BaseOrigamiController
       end
 
       if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+
+        close_cashier_pdf = Lookup.collection_of("print_settings")
         unique_code = "CloseCashierPdf"
+
+        if !close_cashier_pdf.empty?
+        close_cashier_pdf.each do |close_cashier|
+            if close_cashier[0] == 'CloseCashierCustomisePdf' 
+              if close_cashier[1] == '1'
+                unique_code="CloseCashierCustomisePdf"
+              else
+                unique_code="CloseCashierPdf"
+              end
+            end
+          end
+        end
         shop_details = Shop.find(1)
         #get tax
         shift_obj      = ShiftSale.where('id =?',@shift.id)
@@ -79,7 +93,7 @@ class Origami::ShiftsController < BaseOrigamiController
 
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)
-
+        #byebug
         printer = Printer::CashierStationPrinter.new(print_settings)
 
         printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges)
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index b1cab253..ba3483ca 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -22,16 +22,43 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   # end
 
   #Bill Receipt Print
+  # def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+  #   #Use CUPS service
+  #   #Generate PDF
+  #   #Print
+  #   cashier = shift_sale.employee.name
+  #   shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
+
+  #   pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+  #   filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
+  #   pdf.render_file filename
+  #   self.print(filename, cashier_terminal.printer_name)
+  # end
+
   def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+
     #Use CUPS service
     #Generate PDF
     #Print
     cashier = shift_sale.employee.name
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
-
+    filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf"
     pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
-    filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
+    close_cashier_pdf = Lookup.collection_of("print_settings") #print_settings with name:CloseCashierPdf
+    
+    if !close_cashier_pdf.empty?
+      close_cashier_pdf.each do |close_cashier|
+        if close_cashier[0] == 'CloseCashierCustomisePdf'
+          if close_cashier[1] == '1'
+            pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+          else
+            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+          end
+        end
+      end
+    end
     pdf.render_file filename
+
     self.print(filename, cashier_terminal.printer_name)
   end
 
diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index cd9d7b3b..65089a74 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -416,7 +416,7 @@ class CloseCashierCustomisePdf < Prawn::Document
         #end total amount by Account 
 
         #start total other charges amount
-        if total_other_charges > 0
+        if total_other_charges.present?
           y_position = cursor
           bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
            text "Total Other Charges :", :size => self.item_font_size, :align => :right

From 72b5701ec9d30705fbec045d13d30d21dfe3e03d Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 26 Feb 2018 18:29:58 +0630
Subject: [PATCH 326/651] To add the condition for CloseCashierCustmisePdf

---
 app/controllers/origami/shifts_controller.rb  |  4 ++--
 app/models/printer/cashier_station_printer.rb |  4 ++--
 app/pdf/close_cashier_customise_pdf.rb        |  7 ++++---
 app/pdf/close_cashier_pdf.rb                  | 11 ++++-------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 1647ba37..19def9b6 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -66,7 +66,7 @@ class Origami::ShiftsController < BaseOrigamiController
         unique_code = "CloseCashierPdf"
 
         if !close_cashier_pdf.empty?
-        close_cashier_pdf.each do |close_cashier|
+          close_cashier_pdf.each do |close_cashier|
             if close_cashier[0] == 'CloseCashierCustomisePdf' 
               if close_cashier[1] == '1'
                 unique_code="CloseCashierCustomisePdf"
@@ -90,7 +90,7 @@ class Origami::ShiftsController < BaseOrigamiController
         @total_dinein               = ShiftSale.get_total_dinein(@shift).total_dinein_amount
         @total_takeway              = ShiftSale.get_total_takeway(@shift).total_takeway_amount
         @total_other_charges        = ShiftSale.get_total_other_charges(@shift).total_other_charges_amount
-
+        
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)
         #byebug
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index ba3483ca..c9404b3d 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -43,7 +43,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     cashier = shift_sale.employee.name
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf"
-    pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
     close_cashier_pdf = Lookup.collection_of("print_settings") #print_settings with name:CloseCashierPdf
     
     if !close_cashier_pdf.empty?
@@ -52,7 +52,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
           if close_cashier[1] == '1'
             pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
           else
-            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
           end
         end
       end
diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index 65089a74..bcc27724 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -455,12 +455,13 @@ class CloseCashierCustomisePdf < Prawn::Document
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
            text "-#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end 
+          move_down -5
+          stroke_horizontal_rule
+          move_down 7
         end 
         #end total over all discount
 
-        move_down -5
-        stroke_horizontal_rule
-        move_down 7
+       
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 412cb9a4..7ac7a130 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -234,14 +234,12 @@ class CloseCashierPdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-        # text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-        text "#{ number_with_precision(shift_sale.total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-       
+         text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Gross Sale :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
@@ -394,7 +392,6 @@ class CloseCashierPdf < Prawn::Document
         move_down 5
         stroke_horizontal_rule
         move_down 5
-		move_down 5
+    move_down 5
   end
-end
-
+end
\ No newline at end of file

From 1b1206d7354050b7328a0076e4ff96a7fedb8c78 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 10:02:14 +0630
Subject: [PATCH 327/651] add Old Town req:

---
 app/controllers/home_controller.rb            |  64 +-
 .../reports/product_sale_controller.rb        |  18 +
 app/models/sale.rb                            | 982 +++++++++++++++---
 app/views/home/dashboard.html.erb             |  98 +-
 app/views/reports/product_sale/index.html.erb | 113 ++
 app/views/reports/product_sale/index.xls.erb  |  64 ++
 config/routes.rb                              |   1 +
 7 files changed, 1163 insertions(+), 177 deletions(-)
 create mode 100755 app/controllers/reports/product_sale_controller.rb
 create mode 100755 app/views/reports/product_sale/index.html.erb
 create mode 100755 app/views/reports/product_sale/index.xls.erb

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 25fb0d70..97ac4051 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -62,57 +62,59 @@ class HomeController < ApplicationController
   end
 
   def dashboard
+    @from, @to = get_date_range_from_params
+
     @shop = Shop.first
 
     today = DateTime.now.strftime('%Y-%m-%d')
     @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
     @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
 
-    @top_products = Sale.top_products(today).sum('i.qty')
-    @bottom_products = Sale.bottom_products(today).sum('i.qty')
-    @hourly_sales = Sale.hourly_sales(today).sum(:grand_total)
+    @top_products = Sale.top_products(today,@from,@to).sum('i.qty')
+    @bottom_products = Sale.bottom_products(today,@from,@to).sum('i.qty')
+    @hourly_sales = Sale.hourly_sales(today,@from,@to).sum(:grand_total)
     # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
     # .sum(:grand_total)
-    @employee_sales = Sale.employee_sales(today)
+    @employee_sales = Sale.employee_sales(today,@from,@to)
                     .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
-    @inventories    = StockJournal.inventory_balances(today).sum(:balance)
+    @inventories    = StockJournal.inventory_balances(today,@from,@to).sum(:balance)
 
-    @total_sale     = Sale.total_sale(today)
-    @total_count    = Sale.total_count(today)
-    @total_card     = Sale.total_card_sale(today)
-    @total_credit   = Sale.credit_payment(today)
+    @total_sale     = Sale.total_sale(today,current_user,@from,@to)
+    @total_count    = Sale.total_count(today,current_user,@from,@to)
+    @total_card     = Sale.total_card_sale(today,current_user,@from,@to)
+    @total_credit   = Sale.credit_payment(today,current_user,@from,@to)
 
     @sale_data = Array.new
-    @total_payment_methods = Sale.total_payment_methods(today)
+    @total_payment_methods = Sale.total_payment_methods(today,current_user,@from,@to)
 
     @total_payment_methods.each do |payment|
       if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
-        pay = Sale.payment_sale('card', today)
+        pay = Sale.payment_sale('card', today, current_user,@from,@to)
         @sale_data.push({'card' => pay.payment_amount})
       else 
-        pay = Sale.payment_sale(payment.payment_method, today)
+        pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to)
         @sale_data.push({payment.payment_method => pay.payment_amount})
       end
     end
-    @summ_sale              = Sale.summary_sale_receipt(today)
-    @total_customer         = Sale.total_customer(today)
-    @total_dinein           = Sale.total_dinein(today)
-    @total_takeaway         = Sale.total_takeaway(today)
-    @total_other_customer   = Sale.total_other_customer(today)
-    @total_membership       = Sale.total_membership(today)
+    @summ_sale              = Sale.summary_sale_receipt(today,current_user,@from,@to)
+    @total_customer         = Sale.total_customer(today,current_user,@from,@to)
+    @total_dinein           = Sale.total_dinein(today,current_user,@from,@to)
+    @total_takeaway         = Sale.total_takeaway(today,current_user,@from,@to)
+    @total_other_customer   = Sale.total_other_customer(today,current_user,@from,@to)
+    @total_membership       = Sale.total_membership(today,current_user,@from,@to)
 
-    @total_order            = Sale.total_order(today)
-    @total_accounts         = Sale.total_account(today)
+    @total_order            = Sale.total_order(today,current_user,@from,@to)
+    @total_accounts         = Sale.total_account(today,current_user,@from,@to)
     @account_data = Array.new
     @total_accounts.each do |account|
-      acc = Sale.account_data(account.account_id, today)
+      acc = Sale.account_data(account.account_id, today,current_user,@from,@to)
       if !acc.nil?
         @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
       end
     end
 
-    @top_items         = Sale.top_items(today)
-    @total_foc_items   = Sale.total_foc_items(today) 
+    @top_items         = Sale.top_items(today,current_user,@from,@to)
+    @total_foc_items   = Sale.total_foc_items(today,current_user,@from,@to) 
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
@@ -162,4 +164,20 @@ class HomeController < ApplicationController
         redirect_to reports_dailysale_index_path
     end
   end
+
+  def get_date_range_from_params
+      from = params[:from]
+      to = params[:to]   
+
+      if from.present? && to.present?
+        f_date = DateTime.parse(from)
+        t_date = DateTime.parse(to)
+        f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
+        t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
+        from   = f_time.beginning_of_day.utc.getlocal
+        to     = t_time.end_of_day.utc.getlocal  
+      end
+
+    return from, to 
+  end
 end
diff --git a/app/controllers/reports/product_sale_controller.rb b/app/controllers/reports/product_sale_controller.rb
new file mode 100755
index 00000000..748c8716
--- /dev/null
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -0,0 +1,18 @@
+class Reports::ProductSaleController < BaseReportController
+	authorize_resource :class => false
+
+	def index
+		@order_by = params[:order_by]
+
+	    @sale_data = Sale.get_menu_item_query(@order_by)
+
+	    # get printer info
+	    @print_settings = PrintSetting.get_precision_delimiter()
+
+		respond_to do |format|
+			format.html
+			format.json 
+			format.xls
+		end
+  	end
+end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f42b62a0..5196672c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -78,14 +78,29 @@ class Sale < ApplicationRecord
       self.tax_type = "exclusive"
 
       # set cashier
-      if cashier != nil
+      open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+      current_shift = ShiftSale.current_shift
+      shift = ShiftSale.current_open_shift(cashier.id)
+
+       # set cashier
+      if shift != nil
         self.cashier_id = cashier.id
         self.cashier_name = cashier.name
+        self.shift_sale_id = shift.id
       else
-        self.cashier_id = requested_by.id
-        self.cashier_name = requested_by.name
+        if open_cashier.count>0
+          self.cashier_id   = open_cashier[0].id
+          self.cashier_name = open_cashier[0].name
+          shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
+          self.shift_sale_id = current_shift.id
+        else
+          self.cashier_id   = current_shift.employee_id
+          self.cashier_name = Employee.find(current_shift.employee_id).name
+          self.shift_sale_id = current_shift.id
+        end
       end
 
+
       # set waiter
       self.requested_by = requested_by.name
 
@@ -212,7 +227,7 @@ class Sale < ApplicationRecord
     sale_item.product_name = item.item_name
     sale_item.product_alt_name = item.alt_name
     sale_item.account_id = item.account_id
-    sale_item.remark = item.remark
+    sale_item.status = item.remark
 
     sale_item.qty = item.qty
     sale_item.unit_price = item.price
@@ -240,7 +255,7 @@ class Sale < ApplicationRecord
       sale_item.product_name       = instance.item_instance_name
       sale_item.product_alt_name   = menu_item.alt_name
       sale_item.account_id         = menu_item.account_id
-      sale_item.remark             = nil
+      sale_item.status             = nil
 
       sale_item.qty                = item["quantity"]
       sale_item.unit_price         = item["price"]
@@ -366,7 +381,7 @@ class Sale < ApplicationRecord
     rounding_adjustment = 0
 
     sales_items.each do |item|
-      if item.remark != 'void' && item.remark != 'foc'
+      if item.status != 'void' && item.status != 'foc'
         #compute each item and added to total
         subtotal_price = subtotal_price + item.price
 
@@ -402,35 +417,36 @@ class Sale < ApplicationRecord
     tax_profiles = TaxProfile.all.order("order_by asc")
     customer = Customer.find(sale.customer_id)
     # #Creat new tax records
-    tax_profiles.each do |tax|
-      customer.tax_profiles.each do |cus_tax|
-        if cus_tax.to_i == tax.id
-          sale_tax = SaleTax.new(:sale => sale)
-          sale_tax.tax_name = tax.name
-          sale_tax.tax_rate = tax.rate
+    if sale.payment_status != 'foc'
+      tax_profiles.each do |tax|
+        customer.tax_profiles.each do |cus_tax|
+          if cus_tax.to_i == tax.id
+            sale_tax = SaleTax.new(:sale => sale)
+            sale_tax.tax_name = tax.name
+            sale_tax.tax_rate = tax.rate
 
-          # substract , to give after discount
-          total_tax = total_taxable - total_discount
-          #include or execulive
-          if tax.inclusive
-            rate = tax.rate
-            divided_value = (100 + rate)/rate
-            sale_tax.tax_payable_amount = total_tax / divided_value
-          else
-            sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
-            total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
-          end
-          #new taxable amount is standard rule for step by step
-          if shop.calc_tax_order
-            total_taxable = total_taxable + sale_tax.tax_payable_amount
-          end
+            # substract , to give after discount
+            total_tax = total_taxable - total_discount
+            #include or execulive
+            if tax.inclusive
+              rate = tax.rate
+              divided_value = (100 + rate)/rate
+              sale_tax.tax_payable_amount = total_tax / divided_value
+            else
+              sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+              total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
+            end
+            #new taxable amount is standard rule for step by step
+            if shop.calc_tax_order
+              total_taxable = total_taxable + sale_tax.tax_payable_amount
+            end
 
-          sale_tax.inclusive = tax.inclusive
-          sale_tax.save
+            sale_tax.inclusive = tax.inclusive
+            sale_tax.save
+          end
         end
       end
     end
-
     sale.total_tax = total_tax_amount
   end
 
@@ -742,8 +758,8 @@ end
 def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
-                     "i.remark as status_type,"+
-                     " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     "i.status as status_type,"+
+                     " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
@@ -754,14 +770,14 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name")
+  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name,i.unit_price")
                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
 end
 
 def self.get_other_charges()
   query = Sale.select("i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +
-                     "i.remark as status_type,"+
+                     "i.status as status_type,"+
                      " i.unit_price as unit_price,i.product_name as product_name")
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id")
   query = query.where("i.item_instance_code IS NULL AND i.product_code = 'Other Charges'")
@@ -770,7 +786,6 @@ end
 
 def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   # date_type_selection = get_sql_function_for_report_type(report_type)
-
   query = self.get_item_query()
 
   discount_query = 0
@@ -846,6 +861,27 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   return query,other_charges, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
 end
 
+#product sale report query
+def self.get_menu_item_query(order_by)
+  query = MenuItem.unscoped.select("acc.id as account_id, 
+                      acc.title as account_name, 
+                      mii.item_instance_code as item_code, " +
+                     "(CASE WHEN si.qty > 0 THEN SUM(si.qty) ELSE 0 END) as total_item," +
+                     "(CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END) as unit_price," +
+                     "(CASE WHEN (si.qty * si.unit_price) > 0 THEN (si.qty * si.unit_price) ELSE 0 END) as grand_total," +
+                     "mii.price as unit_price, menu_items.name as product_name, 
+                     mc.name as" +
+                     " menu_category_name,mc.id as menu_category_id, si.remark as status_type, si.price as price ")
+          .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + 
+               " LEFT JOIN menu_categories mc ON mc.id = menu_items.menu_category_id" +
+               " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
+               " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
+               " LEFT JOIN sales s ON s.sale_id = si.sale_id")
+          .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
+          .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
+end
+#product sale report query
+
 def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type)
     ## => left join -> show all sales although no orders
     if payment_type.blank?
@@ -1053,95 +1089,376 @@ end
      return tax
   end
 
-  def self.top_products(today)
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.top_products(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
+                      "and payment_status='paid' and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) DESC").limit(20)
+    else
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(10)
+                .order("SUM(i.qty) DESC").limit(20)
+    end
   end
 
-  def self.bottom_products(today)
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.bottom_products(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
+                      "and payment_status='paid' and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) ASC").limit(20)
+    else
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) ASC").limit(10)
+                .order("SUM(i.qty) ASC").limit(20)
+    end
   end
 
-  def self.hourly_sales(today)
-    query= Sale.select("grand_total")
+  def self.hourly_sales(today,from,to)
+    if !from.nil? && !to.nil?
+      query= Sale.select("grand_total")
+            .where('payment_status="paid" and sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+            .order('receipt_date')
+    else
+      query= Sale.select("grand_total")
             .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
             .order('receipt_date')
+    end
   end
 
-  def self.employee_sales(today)
-    query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+  def self.employee_sales(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between '#{from}' and '#{to}'")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .order("e.name")
+    else
+      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
                 .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
+    end
   end
 
-  def self.total_sale(today)
-  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
-
-  end
-
-  def self.total_count(today)
-  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
-  end
-
-  def self.total_card_sale(today)
-    payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' or payment_method = 'unionpay' "
-    # query        = Sale.select("SUM(tax_payable_amount) AS st_amount,tax_name")
-    #                 .where('sale_status = "completed" #{payment_type} and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-    #                 .joins("join sale_payments on sale_id = sales.sale_id")
-    #                 .group("sales.sale_id")
-
-    query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-            .sum("sp.payment_amount")
-
-  end
-
-  def self.credit_payment(today)
-    query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
-            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-            .sum("payment_amount")
-  end
-
-  def self.summary_sale_receipt(today)
-    query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-          .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
-  end
-
-  def self.total_payment_methods(today)
-    query = Sale.select("distinct sp.payment_method")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-  end
-
-  def self.payment_sale(payment_method, today)
-    query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-          if payment_method == 'card'
-            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-          else
-            query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+  def self.total_sale(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and sales.receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
+                  .sum("grand_total")
           end
-          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        end
+      end
+    else
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+                  .sum("grand_total")
+          end
+        end
+      end
+    end
   end
 
-  def self.total_customer(today)
-    dinein_cnt = self.total_dinein(today)
-    takeaway_cnt = self.total_takeaway(today)
-    membership_cnt = self.total_membership(today)
+  def self.total_count(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id = ?',from,to,shift.id).count
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id = ?',today,shift.id).count
+          end
+        end
+      end
+    end
+  end
+
+  def self.total_card_sale(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+          end
+        end
+      end
+    end
+  end
+
+  def self.credit_payment(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ? and s.shift_sale_id=?',from,to,shift.id)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ? and s.shift_sale_id=?',today,shift.id)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+          end
+        end
+      end
+    end
+  end
+
+  def self.summary_sale_receipt(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
+  end
+
+  def self.total_payment_methods(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          end
+        end
+      end
+    end
+  end
+
+  def self.payment_sale(payment_method, today, current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+              if payment_method == 'card'
+                query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
+              else
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              end
+              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+              if payment_method == 'card'
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
+              else
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              end
+              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          end
+        end
+      end
+    end
+  end
+
+  def self.total_customer(today,current_user=nil,from,to)
+    dinein_cnt = self.total_dinein(today,current_user,from,to)
+    takeaway_cnt = self.total_takeaway(today,current_user,from,to)
+    membership_cnt = self.total_membership(today,current_user,from,to)
 
     total_cus = 0
     if !dinein_cnt.nil? || !takeaway_cnt.nil? || !membership_cnt.nil?
@@ -1151,69 +1468,448 @@ end
     return total_cus
   end
 
-  def self.total_dinein(today)
-    query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
-          .first()
+  def self.total_dinein(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+                .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+                .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_takeaway(today)
-    query = Sale.select("count(sales.customer_id) as total_take_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
-          .first()
+  def self.total_takeaway(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_membership(today)
-    query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
-          .first()
+  def self.total_membership(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_other_customer(today)
-    query = Sale.select("count(sales.customer_id) as total_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
-          .first()
+  def self.total_other_customer(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_order(today)
-    query = Sale.select("count(distinct a.order_id) as total_order")
-          .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-          .joins("JOIN orders as b ON b.order_id = a.order_id")
-          .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
+  def self.total_order(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct a.order_id) as total_order")
+              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN orders as b ON b.order_id = a.order_id")
+              .where('b.status = "billed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct a.order_id) as total_order")
+              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN orders as b ON b.order_id = a.order_id")
+              .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_account(today)
-    query = Sale.select("distinct b.id as account_id, b.title as title")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .joins("JOIN accounts as b ON b.id = a.account_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+  def self.total_account(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("distinct b.id as account_id, b.title as title")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN accounts as b ON b.id = a.account_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("distinct b.id as account_id, b.title as title")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN accounts as b ON b.id = a.account_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+          end
+        end
+      end
+    end
   end
 
-  def self.account_data(account_id, today)
-    query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .first()
+  def self.account_data(account_id, today, current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.top_items(today)
-    query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .group("a.product_code")
-          .order("SUM(a.qty) DESC")
-          .first()
+  def self.top_items(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
+            .group("a.product_code")
+            .order("SUM(a.qty) DESC")
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .group("a.product_code")
+            .order("SUM(a.qty) DESC")
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_foc_items(today)
-    query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .sum("a.qty")
+  def self.total_foc_items(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
+            .sum("a.qty")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
+              .sum("a.qty")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+                .sum("a.qty")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .sum("a.qty")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .sum("a.qty")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+                .sum("a.qty")
+          end
+        end
+      end
+    end
   end
 
   #card sale trans data
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 104c4c67..91cce7e3 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -1,6 +1,7 @@
 <div class="container-fluid">
   <div class="block-header">
-    <h2><%= t :dashboard %></h2>
+    <!-- <h2><%= t :dashboard %></h2> -->
+    <h2><%= t :date_time %> : <%= Time.zone.now.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %></h2>
   </div>
   <% if @print_settings.precision.to_i > 0
       precision = @print_settings.precision
@@ -65,8 +66,28 @@
   <!-- #END# Widgets -->
   <!-- CPU Usage -->
 
-  <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+  <!-- Date range for dashboard -->
+  <div class="row clearfix">
+    <div class="col-lg-4 col-md-4 col-sm-4">
+      <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" value="<%= Time.now.utc.strftime('%d-%m-%Y') %>" placeholder="From date" style="height: 35px;">
+      <span id="fromErr" style="color:red;"></span>
+    </div>
+    <div class="col-lg-4 col-md-4 col-sm-4">
+      <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" value="<%= Time.now.utc.strftime('%d-%m-%Y') %>" placeholder="To date" style="height: 35px;">
+      <span id="toErr" style="color:red;"></span>
+    </div>
+    <div class="col-lg-2 col-md-2 col-sm-2">
+      <label></label><br>
+      <input type="button" value="Generate" class='btn btn-primary btn_generate'>
+    </div>
+  </div>
+  <br>
+  <!-- Date range for dashboard -->
+
   <div class="row">
+    <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
     <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -122,10 +143,18 @@
         </div>
       </div>
     </div>
-    <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+    <% end %>
+    <% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'cashier' %>
     <% if !@summ_sale.nil? %>
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+      <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+      <% else %>
+      <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+        <div class="row">
+          <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+      <% end %>
           <div class="card">
             <div class="body">
               <h6><%= t :sale %></h6>
@@ -136,19 +165,19 @@
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.grand_total") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
+                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
               </table>
               <table class="table">
@@ -161,7 +190,7 @@
                           <td align="right">
                             <% @sale_data.each do |data| %>
                               <% pay_mth = payment.payment_method %>
-                              <%= data[""+pay_mth+""] %>
+                              <%= number_with_precision(data[""+pay_mth+""], precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
                             <% end %>
                           </td>
                         </tr>
@@ -174,7 +203,7 @@
                       <tr>
                         <td><%= t("views.right_panel.detail.card_sale") %> : </td>
                         <td align="right">
-                            <%= total_card["card"].to_f %>
+                            <%= number_with_precision(total_card["card"], precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
                         </td>
                       </tr>
                   <% end %>
@@ -184,11 +213,17 @@
             </div>
           </div>
         </div>
+        <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       </div>
       <% end %>
+      <% end %>
 
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+      <% else %>
+        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+      <% end %>
           <div class="card">
             <div class="body">
               <h6><%= t :customer %></h6>
@@ -227,10 +262,16 @@
             </div>
           </div>
         </div>
+        <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       </div>
+      <% end %>
 
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+      <% else %>
+        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+      <% end %>
           <div class="card">
             <div class="body">
               <h6><%= t("views.right_panel.detail.order") %></h6>
@@ -274,6 +315,41 @@
         </div>
       </div>    
     </div>
+    <% end %>
   </div>
-  <% end %>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+  $(document).ready(function(){
+    var from = '<%= @from.strftime('%d-%m-%Y') rescue '' %>';
+    var to = '<%= @to.strftime('%d-%m-%Y') rescue '' %>';
+    
+    if((from!=undefined) && (from != null) && (from != '')){
+      $('#from').val(from);
+    }
+    if((to!=undefined) && (to != null) && (to != '')){
+      $('#to').val(to);
+    }
+  });
+
+  $('.btn_generate').on('click',function(){
+    var from = $("#from").val();
+    var to = $("#to").val();
+    if((from=='') && (to=='')){
+      $('#fromErr').html("can't be blank");
+      $('#toErr').html("can't be blank");
+    }else if((from!='') && (to=='')){
+      $('#fromErr').html("");
+      $('#toErr').html("can't be blank");
+    }else if((from=='') && (to!='')){
+      $('#fromErr').html("can't be blank");
+      $('#toErr').html("");
+    }else{
+      $('#fromErr').html("");
+      $('#toErr').html("");
+    }
+    if((from!='') && (to!='')){
+      window.location.href = '/dashboard?from='+from+'&to='+to;
+    }
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
new file mode 100755
index 00000000..eb797122
--- /dev/null
+++ b/app/views/reports/product_sale/index.html.erb
@@ -0,0 +1,113 @@
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<div class="text-right">
+			<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
+		</div>	  			
+
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="p-l-20 p-t-20 p-b-20">
+					<div class="col-md-6">
+						<label class="font-16" for="order_by">Order by Qty</label>
+						<select name="order_by" id="order_by" class="form-control" style="width:10%">
+							<option value="asc">ASC</option>
+							<option value="desc">DESC</option>
+						</select>
+					</div>
+				</div>
+
+				<div class="table-responsive">	
+					<% if @print_settings.precision.to_i > 0
+						precision = @print_settings.precision
+					else
+						precision = 0
+					end
+					#check delimiter
+					if @print_settings.delimiter
+						delimiter = ","
+				    else
+						delimiter = ""
+				    end %>				
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+							<tr>
+								<th>&nbsp;</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
+								<th><%= t("views.right_panel.detail.code") %></th>
+								<th><%= t("views.right_panel.detail.product") %></th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<th><%= t("views.right_panel.detail.total") %></th>
+							</tr>	
+						</thead>
+						<tbody id="tbd_data">
+							<% unless @sale_data.blank? %>
+								<% acc_arr = Array.new %>
+								<% cate_arr = Array.new %>	
+
+								<% grand_total = 0 %>
+								<% total_qty = 0 %>
+
+								<% @sale_data.each do |sale| %>
+									<% if sale.status_type != "Discount" && sale.status_type != "foc"
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
+									<% if sale.status_type == "foc" && sale.price > 0
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
+
+									<tr>
+										<td>&nbsp;</td>
+										<% if !cate_arr.include?(sale.menu_category_id) %>	
+										<td><%= sale.menu_category_name %></td>
+										<% cate_arr.push(sale.menu_category_id) %>
+										<% else %>
+										<td>&nbsp;</td>
+										<% end %>
+										<td><%= sale.item_code rescue '-' %></td>
+										<td><%= sale.product_name rescue '-' %></td>
+										<td><%= sale.total_item rescue '-' %></td>
+										<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
+									</tr>
+									<!-- sub total -->
+								<!-- end sub total -->
+								<% end %>
+							<tr>
+								<td colspan="3"></td>
+								<td><strong>Total</strong></td>
+								<td><strong><%= total_qty %></strong></td>
+								<td></td>
+								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
+							</tr>
+							
+						<% end %>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+	$(function(){
+		$('#order_by').val('<%= @order_by %>');
+	});
+	
+	$('#order_by').on('change', function(){
+		var order_by = $("#order_by").val();
+		window.location.href = "?order_by=" + order_by;
+	});
+</script>
\ No newline at end of file
diff --git a/app/views/reports/product_sale/index.xls.erb b/app/views/reports/product_sale/index.xls.erb
new file mode 100755
index 00000000..7123588c
--- /dev/null
+++ b/app/views/reports/product_sale/index.xls.erb
@@ -0,0 +1,64 @@
+<div class="row">
+	<div class="col-md-12">
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="table-responsive">				
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+							<tr>
+								<th>&nbsp;</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
+								<th><%= t("views.right_panel.detail.code") %></th>
+								<th><%= t("views.right_panel.detail.product") %></th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<th><%= t("views.right_panel.detail.total") %></th>
+							</tr>	
+						</thead>
+						<tbody>
+							<% unless @sale_data.blank? %>
+								<% acc_arr = Array.new %>
+								<% cate_arr = Array.new %>	
+								<% grand_total = 0 %>
+								<% total_qty = 0 %>
+
+								<% @sale_data.each do |sale| %>
+									<% if sale.status_type != "Discount" && sale.status_type != "foc"
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
+									<% if sale.status_type == "foc" && sale.price > 0
+										total_qty += sale.total_item
+										grand_total += sale.grand_total
+									end %>
+
+									<tr>
+										<td>&nbsp;</td>
+										<% if !cate_arr.include?(sale.menu_category_id) %>	
+										<td><%= sale.menu_category_name %></td>
+										<% cate_arr.push(sale.menu_category_id) %>
+										<% else %>
+										<td>&nbsp;</td>
+										<% end %>
+										<td><%= sale.item_code rescue '-' %></td>
+										<td><%= sale.product_name rescue '-' %></td>
+										<td><%= sale.total_item rescue '-' %></td>
+										<td><%= sale.unit_price rescue '-' %></td>
+										<td><%= sale.grand_total rescue '-' %></td>
+									</tr>
+								<% end %>
+								<tr>
+									<td colspan="3"></td>
+									<td><strong>Total</strong></td>
+									<td><strong><%= total_qty %></strong></td>
+									<td></td>
+									<td><strong><%= grand_total rescue '-' %></strong></td>
+								</tr>								
+							<% end %>		
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 7d21aeb5..a189da13 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -373,6 +373,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :commission, :only => [:index, :show]
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
+    resources :product_sale, :only => [:index, :show]
 
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
   end

From 90b7a7f201475396f88e4799cf6b24028f124069 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 10:04:48 +0630
Subject: [PATCH 328/651] change stock check for dashboard query

---
 app/models/stock_journal.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb
index 35bebca2..c2a12f4a 100755
--- a/app/models/stock_journal.rb
+++ b/app/models/stock_journal.rb
@@ -36,12 +36,20 @@ class StockJournal < ApplicationRecord
     journal.save
   end
 
-  def self.inventory_balances(today)
-    query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
+  def self.inventory_balances(today,from,to)
+    if !from.nil? && !to.nil?
+      query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
+            .joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
+            .where("stock_journals.created_at between '#{from}' and '#{to}'")
+            .group("mii.item_instance_name")
+            .order("mii.item_instance_name ASC")
+    else
+      query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
             .joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
             .where("DATE_FORMAT(stock_journals.created_at,'%Y-%m-%d') = '#{today}'")
             .group("mii.item_instance_name")
             .order("mii.item_instance_name ASC")
+    end
   end
 
 end

From 700ff91127f12940764141717a6fa5705836c89d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 10:27:52 +0630
Subject: [PATCH 329/651] product sale

---
 app/controllers/reports/product_sale_controller.rb | 5 ++++-
 app/views/layouts/_left_sidebar.html.erb           | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/reports/product_sale_controller.rb b/app/controllers/reports/product_sale_controller.rb
index 748c8716..38a77115 100755
--- a/app/controllers/reports/product_sale_controller.rb
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -2,7 +2,10 @@ class Reports::ProductSaleController < BaseReportController
 	authorize_resource :class => false
 
 	def index
-		@order_by = params[:order_by]
+		@order_by = 'desc'
+		if !params[:order_by].nil?
+			@order_by = params[:order_by]
+		end
 
 	    @sale_data = Sale.get_menu_item_query(@order_by)
 
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 9bffd4d7..de42e719 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -122,6 +122,9 @@
 					<li>
 						<a href="<%= reports_saleitem_index_path %>">Sale Items</a>
 					</li>
+					<li>
+						<a href="<%= reports_product_sale_index_path %>">Product Sale</a>
+					</li>
 					<li>
 						<a href="<%= reports_receipt_no_index_path %>">Receipt</a>
 					</li>

From d8243afaab0a06c85f6206eacd53f20ea2d92927 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 11:09:28 +0630
Subject: [PATCH 330/651] check = split btn

---
 app/views/origami/split_bill/index.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 12148e28..fdd07dd8 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -198,7 +198,7 @@
  									<th>#</th>
  									<th>Receipt No.</th>
  									<th>Total</th>
- 									<% if !@current_user.nil? && @current_user.role == 'cashier' %>
+ 									<% if !@current_user.nil? && @current_user.role != 'waiter' %>
  									<th>Action</th>
  									<% end %>
  								</thead>
@@ -238,7 +238,9 @@
  			<div>
  				<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
  				<% if !@current_user.nil? && @current_user.role != 'waiter' %>
- 					<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
+ 					<% if !@sale_data.empty? %>
+ 						<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
+ 					<% end %>
  				<% end %>
  				<% if !@orders.empty? %>
 	 				<button id="order_split" class="btn btn-block waves-effect bg-blue">By Order</button>

From fc3cd1e72d3c17533181a3aacfdf1207b13b4fc5 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 11:33:51 +0630
Subject: [PATCH 331/651] check order item

---
 .../origami/split_bill_controller.rb          | 26 ++++++++++---------
 app/views/origami/split_bill/index.html.erb   |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 59dd3a71..9f8afd0d 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -147,15 +147,15 @@ class Origami::SplitBillController < BaseOrigamiController
 						end
 					end
 
-					# puts order_id
-					# puts order_ids.count
-					# puts order_id_count
-					# puts order_items.count
-					# puts order_item_count
+					puts order_id
+					puts order_ids.count
+					puts order_id_count
+					puts order_items.count
+					puts order_item_count
 
 					if !order_id.nil?
 						if order_id_count > 1
-							# puts "order_id_count > 1"
+							puts "order_id_count > 1"
 
 							updated_order_id = Array.new
 							order_ids.each do |odr_id|
@@ -165,8 +165,8 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 							end
 
-							# puts "updated_order_id"
-							# puts updated_order_id
+							puts "updated_order_id"
+							puts updated_order_id
 
 							if !updated_order_id.empty?
 								order_ids.each do |odr_id|
@@ -195,7 +195,7 @@ class Origami::SplitBillController < BaseOrigamiController
 										end
 								    end
 
-								    # puts new_order_status
+								    puts new_order_status
 
 									if new_order_status
 								    	BookingOrder.find_by_order_id(odr_id).delete
@@ -223,7 +223,7 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 							end
 						else
-							# puts "order_id_count < 1"
+							puts "order_id_count < 1"
 							new_order_status = true
 							order_items.each do |order_item|
 								orderItem = OrderItem.find_by_order_id(order_id)
@@ -236,7 +236,7 @@ class Origami::SplitBillController < BaseOrigamiController
 								end
 						    end
 
-						    # puts new_order_status
+						    puts new_order_status
 
 						    if new_order_status
 						    	BookingOrder.find_by_order_id(order_id).delete
@@ -266,7 +266,9 @@ class Origami::SplitBillController < BaseOrigamiController
 						    end
 						end
 					else
-						if order_ids.count == 1 && order_id_count > 0 && order_item_count == 1
+						# puts order_ids
+						if order_ids.count == 1 && order_id_count == 0 && order_item_count == 1
+							BookingOrder.find_by_order_id(order_ids[0]).delete
 							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
 							order_items.each do |order_item|
 								update_order_item(order_ids[0], order_item)
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index fdd07dd8..1db44d41 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -214,7 +214,7 @@
 	 										<td><span id="receipt_no"><%= sale_data.receipt_no %></span></td>
 	 										<td><span id="grand_total"><%= sale_data.grand_total %></span></td>
 
- 											<% if !@current_user.nil? && @current_user.role == 'cashier' %>
+ 											<% if !@current_user.nil? && @current_user.role != 'waiter' %>
 	 										<td>
 	 											<button type="button" class="btn btn-block waves-effect btn-primary btn_pay" id=<%= sale_data.sale_id %> >Pay</button>
 	 										</td>

From 3e0943275fd3d82c5917816d2a6be82586e3e51a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 11:35:26 +0630
Subject: [PATCH 332/651] check bacck btn

---
 app/views/origami/payments/show.html.erb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 60ea300a..355e9f37 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -320,10 +320,6 @@
  </div>
 </div>
 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
-  <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
-    <i class="material-icons">reply</i>
-     Back
-  </button>
     <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
       <i class="material-icons">reply</i>
        Back

From ac470c5747e86f0a778ad8b9e60839ac053616ee Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 27 Feb 2018 11:41:24 +0630
Subject: [PATCH 333/651] license and local move to base action and update
 other base

---
 app/controllers/application_controller.rb     |  6 ++--
 app/controllers/base_crm_controller.rb        | 15 --------
 app/controllers/base_inventory_controller.rb  |  5 ---
 app/controllers/base_oqs_controller.rb        | 15 --------
 app/controllers/base_origami_controller.rb    |  9 +----
 app/controllers/base_report_controller.rb     | 34 +++++++++++++++----
 app/controllers/base_waiter_controller.rb     | 27 +++++++++++++++
 .../concerns/login_verification.rb            | 22 ++++++++----
 config/initializers/action_controller.rb      |  8 ++---
 9 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 833b49d6..5f19ddaf 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,7 +7,8 @@ class ApplicationController < ActionController::Base
   # lookup domain for db from  provision
   # before_action :set_locale
 
-  helper_method :current_company,:current_login_employee,:current_user
+  # helper_method :current_company,:current_login_employee,:current_user
+  
    # alias_method :current_user, :current_login_employee,:current_user
   #this is base api base controller to need to inherit.
   #all token authentication must be done here
@@ -18,6 +19,7 @@ class ApplicationController < ActionController::Base
     redirect_to root_path
   end
 
+  private
   def current_user
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
@@ -36,7 +38,7 @@ class ApplicationController < ActionController::Base
 
   end
 
-  def current_login_employee
+  def current_login_employee    
     if (!session[:session_token].nil?)
       @employee = Employee.find_by_token_session(session[:session_token])
     end
diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index 91da2a72..d7c008f6 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -9,19 +9,4 @@ class BaseCrmController < ActionController::Base
   	flash[:warning] = exception.message
   	redirect_to root_path
   end
-
-  #change locallization
-  def set_locale
-    I18n.locale = params[:locale] || I18n.default_locale
-  end
-
-  # RESTful url for localize
-  def default_url_options
-    { locale: I18n.locale }
-  end
-
-  def current_user
-  	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
-  end
-  
 end
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index 2fe167c0..fc9c0c47 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -9,9 +9,4 @@ class BaseInventoryController < ActionController::Base
   	flash[:warning] = exception.message
   	redirect_to root_path
   end
-
-  def current_user
-  	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
-  end
-
 end
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index db9f8231..19b01ea3 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -9,19 +9,4 @@ class BaseOqsController < ActionController::Base
   	flash[:warning] = exception.message
   	redirect_to root_path
   end
-
-  #change locallization
-  def set_locale
-    I18n.locale = params[:locale] || I18n.default_locale
-  end
-
-  # RESTful url for localize
-  def default_url_options
-    { locale: I18n.locale }
-  end
-  
-  def current_user
-  	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
-  end
-
 end
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index ec415bad..a67aa58f 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -6,16 +6,9 @@ class BaseOrigamiController < ActionController::Base
 
   #before_action :check_installation
   protect_from_forgery with: :exception
+
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     redirect_to origami_root_path
   end
-
-  def current_user
-    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
-  end
-
-  # def checkin_process
-  #   CheckinJob.set(wait: 1.minute).perform_later()
-  # end
 end
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index 733e48f9..154a0bbb 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -5,15 +5,13 @@ class BaseReportController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
+  helper_method :current_company,:current_login_employee,:current_user
+
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     redirect_to root_path
   end
 
-  def current_user
-    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
-  end
-
 	PERIOD = {
 		"today" => 0,
 		"yesterday" => 1,
@@ -83,8 +81,30 @@ class BaseReportController < ActionController::Base
 		    end
 
 	    return from, to 
-
-
 	end
-  
+
+	private
+	  def current_user
+	    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+	  end
+
+	  #  Get current Cashier
+	  def get_cashier
+	    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+	  end
+
+	  def current_company
+	    begin
+	     return Company.first
+	    rescue
+	      return nil
+	    end
+
+	  end
+
+	  def current_login_employee    
+	    if (!session[:session_token].nil?)
+	      @employee = Employee.find_by_token_session(session[:session_token])
+	    end
+	  end
 end
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index ca4622db..32ae0853 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -4,4 +4,31 @@ class BaseWaiterController < ActionController::Base
 
   #before_action :check_installation
   protect_from_forgery with: :exception
+
+  helper_method :current_company,:current_login_employee,:current_user
+
+  private
+  def current_user
+    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+  end
+
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
+  def current_company
+    begin
+     return Company.first
+    rescue
+      return nil
+    end
+
+  end
+
+  def current_login_employee    
+    if (!session[:session_token].nil?)
+      @employee = Employee.find_by_token_session(session[:session_token])
+    end
+  end
 end
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index fa588574..a82a5c7f 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -2,8 +2,8 @@ module LoginVerification
   extend ActiveSupport::Concern
 
   included do
-    before_action :authenticate
-    helper_method :current_company,:current_login_employee
+    before_action :authenticate_session_token
+    helper_method :current_company, :current_login_employee, :current_user, :get_cashier
   end
 
   #this is base api base controller to need to inherit.
@@ -15,16 +15,24 @@ module LoginVerification
     rescue
       return nil
     end
-
   end
 
   def current_login_employee
     @employee = Employee.find_by_token_session(session[:session_token])
   end
 
+  def current_user
+    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+  end
+
+  #  Get current Cashiers
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   protected
   # Authenticate the user with token based authentication
-  def authenticate    
+  def authenticate   
     authenticate_session_token || render_unauthorized
   end
 
@@ -38,9 +46,9 @@ module LoginVerification
       if @user
         return true
         #Maybe log - login?
-      else 
-        flash[:notice] = 'Invalid Access!'
-        # return false
+      # else 
+      #   flash[:notice] = 'Invalid Access!'
+      #   # return false
       end
     end
   end
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index f33ebfed..7cabe7f7 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -1,17 +1,15 @@
-# ActionController::Base are used by both Peatio controllers and
-# Doorkeeper controllers.
 class ActionController::Base
 
-  before_action :lookup_domain, :set_language
+  before_action :lookup_domain, :set_locale
 
   private
 
-  def lookup_domain 
+  def lookup_domain     
     if request.subdomain.present? && request.subdomain != "www" 
       from = request.subdomain.downcase  + "." + request.domain.downcase    
       @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
       if (!@license.nil?)
-        # logger.info "Location - " + @license.name        
+        logger.info "Location - " + @license.dbhost        
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema

From 908b590ed146ee1a10d2bf43e12942d5319462e6 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 27 Feb 2018 15:34:58 +0630
Subject: [PATCH 334/651] nothing change

---
 app/controllers/concerns/login_verification.rb | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index 36bb2a6e..bb9df067 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -18,19 +18,11 @@ module LoginVerification
   end
 
   def current_login_employee
-    if (!session[:session_token].nil?)
-      @employee = Employee.find_by_token_session(session[:session_token])
-    else 
-      render_unauthorized
-    end
+    @employee = Employee.find_by_token_session(session[:session_token])
   end
 
   def current_user
-    if (!session[:session_token].nil?)
-      @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
-    else 
-      render_unauthorized
-    end
+    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
   #  Get current Cashiers
@@ -54,9 +46,6 @@ module LoginVerification
       if @user
         return true
         #Maybe log - login?
-      # else 
-      #   flash[:notice] = 'Invalid Access!'
-      #   # return false
       end
     end
   end

From 674632fc9fe7e1ba080ca8d67ea45a1f2030f66b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 17:24:56 +0630
Subject: [PATCH 335/651] check shop detail

---
 app/controllers/application_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index da17a7eb..330c5c1f 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
+  helper_method :shop_detail
   # lookup domain for db from  provision
   # before_action :set_locale
   # helper_method :current_company,:current_login_employee,:current_user

From c1865f5356050c7a6c8d9dd7f911bfa8d1adaec3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 17:40:48 +0630
Subject: [PATCH 336/651] change sale.rb file

---
 app/models/sale.rb | 958 +++++++--------------------------------------
 1 file changed, 131 insertions(+), 827 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 5196672c..f42b62a0 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -78,29 +78,14 @@ class Sale < ApplicationRecord
       self.tax_type = "exclusive"
 
       # set cashier
-      open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
-      current_shift = ShiftSale.current_shift
-      shift = ShiftSale.current_open_shift(cashier.id)
-
-       # set cashier
-      if shift != nil
+      if cashier != nil
         self.cashier_id = cashier.id
         self.cashier_name = cashier.name
-        self.shift_sale_id = shift.id
       else
-        if open_cashier.count>0
-          self.cashier_id   = open_cashier[0].id
-          self.cashier_name = open_cashier[0].name
-          shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
-          self.shift_sale_id = current_shift.id
-        else
-          self.cashier_id   = current_shift.employee_id
-          self.cashier_name = Employee.find(current_shift.employee_id).name
-          self.shift_sale_id = current_shift.id
-        end
+        self.cashier_id = requested_by.id
+        self.cashier_name = requested_by.name
       end
 
-
       # set waiter
       self.requested_by = requested_by.name
 
@@ -227,7 +212,7 @@ class Sale < ApplicationRecord
     sale_item.product_name = item.item_name
     sale_item.product_alt_name = item.alt_name
     sale_item.account_id = item.account_id
-    sale_item.status = item.remark
+    sale_item.remark = item.remark
 
     sale_item.qty = item.qty
     sale_item.unit_price = item.price
@@ -255,7 +240,7 @@ class Sale < ApplicationRecord
       sale_item.product_name       = instance.item_instance_name
       sale_item.product_alt_name   = menu_item.alt_name
       sale_item.account_id         = menu_item.account_id
-      sale_item.status             = nil
+      sale_item.remark             = nil
 
       sale_item.qty                = item["quantity"]
       sale_item.unit_price         = item["price"]
@@ -381,7 +366,7 @@ class Sale < ApplicationRecord
     rounding_adjustment = 0
 
     sales_items.each do |item|
-      if item.status != 'void' && item.status != 'foc'
+      if item.remark != 'void' && item.remark != 'foc'
         #compute each item and added to total
         subtotal_price = subtotal_price + item.price
 
@@ -417,36 +402,35 @@ class Sale < ApplicationRecord
     tax_profiles = TaxProfile.all.order("order_by asc")
     customer = Customer.find(sale.customer_id)
     # #Creat new tax records
-    if sale.payment_status != 'foc'
-      tax_profiles.each do |tax|
-        customer.tax_profiles.each do |cus_tax|
-          if cus_tax.to_i == tax.id
-            sale_tax = SaleTax.new(:sale => sale)
-            sale_tax.tax_name = tax.name
-            sale_tax.tax_rate = tax.rate
+    tax_profiles.each do |tax|
+      customer.tax_profiles.each do |cus_tax|
+        if cus_tax.to_i == tax.id
+          sale_tax = SaleTax.new(:sale => sale)
+          sale_tax.tax_name = tax.name
+          sale_tax.tax_rate = tax.rate
 
-            # substract , to give after discount
-            total_tax = total_taxable - total_discount
-            #include or execulive
-            if tax.inclusive
-              rate = tax.rate
-              divided_value = (100 + rate)/rate
-              sale_tax.tax_payable_amount = total_tax / divided_value
-            else
-              sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
-              total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
-            end
-            #new taxable amount is standard rule for step by step
-            if shop.calc_tax_order
-              total_taxable = total_taxable + sale_tax.tax_payable_amount
-            end
-
-            sale_tax.inclusive = tax.inclusive
-            sale_tax.save
+          # substract , to give after discount
+          total_tax = total_taxable - total_discount
+          #include or execulive
+          if tax.inclusive
+            rate = tax.rate
+            divided_value = (100 + rate)/rate
+            sale_tax.tax_payable_amount = total_tax / divided_value
+          else
+            sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+            total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
           end
+          #new taxable amount is standard rule for step by step
+          if shop.calc_tax_order
+            total_taxable = total_taxable + sale_tax.tax_payable_amount
+          end
+
+          sale_tax.inclusive = tax.inclusive
+          sale_tax.save
         end
       end
     end
+
     sale.total_tax = total_tax_amount
   end
 
@@ -758,8 +742,8 @@ end
 def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
-                     "i.status as status_type,"+
-                     " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     "i.remark as status_type,"+
+                     " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
@@ -770,14 +754,14 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name,i.unit_price")
+  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name")
                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
 end
 
 def self.get_other_charges()
   query = Sale.select("i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +
-                     "i.status as status_type,"+
+                     "i.remark as status_type,"+
                      " i.unit_price as unit_price,i.product_name as product_name")
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id")
   query = query.where("i.item_instance_code IS NULL AND i.product_code = 'Other Charges'")
@@ -786,6 +770,7 @@ end
 
 def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   # date_type_selection = get_sql_function_for_report_type(report_type)
+
   query = self.get_item_query()
 
   discount_query = 0
@@ -861,27 +846,6 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   return query,other_charges, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
 end
 
-#product sale report query
-def self.get_menu_item_query(order_by)
-  query = MenuItem.unscoped.select("acc.id as account_id, 
-                      acc.title as account_name, 
-                      mii.item_instance_code as item_code, " +
-                     "(CASE WHEN si.qty > 0 THEN SUM(si.qty) ELSE 0 END) as total_item," +
-                     "(CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END) as unit_price," +
-                     "(CASE WHEN (si.qty * si.unit_price) > 0 THEN (si.qty * si.unit_price) ELSE 0 END) as grand_total," +
-                     "mii.price as unit_price, menu_items.name as product_name, 
-                     mc.name as" +
-                     " menu_category_name,mc.id as menu_category_id, si.remark as status_type, si.price as price ")
-          .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + 
-               " LEFT JOIN menu_categories mc ON mc.id = menu_items.menu_category_id" +
-               " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
-               " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
-               " LEFT JOIN sales s ON s.sale_id = si.sale_id")
-          .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
-          .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
-end
-#product sale report query
-
 def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type)
     ## => left join -> show all sales although no orders
     if payment_type.blank?
@@ -1089,376 +1053,95 @@ end
      return tax
   end
 
-  def self.top_products(today,from,to)
-    if !from.nil? && !to.nil?
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
-                        " i.price as unit_price,mi.name as product_name")
-                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
-                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
-                .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(20)
-    else
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.top_products(today)
+    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(20)
-    end
+                .order("SUM(i.qty) DESC").limit(10)
   end
 
-  def self.bottom_products(today,from,to)
-    if !from.nil? && !to.nil?
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
-                        " i.price as unit_price,mi.name as product_name")
-                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
-                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
-                .group('mi.name')
-                .order("SUM(i.qty) ASC").limit(20)
-    else
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.bottom_products(today)
+    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) ASC").limit(20)
-    end
+                .order("SUM(i.qty) ASC").limit(10)
   end
 
-  def self.hourly_sales(today,from,to)
-    if !from.nil? && !to.nil?
-      query= Sale.select("grand_total")
-            .where('payment_status="paid" and sale_status = "completed" and receipt_date between ? and ?',from,to)
-            .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
-            .order('receipt_date')
-    else
-      query= Sale.select("grand_total")
+  def self.hourly_sales(today)
+    query= Sale.select("grand_total")
             .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
             .order('receipt_date')
-    end
   end
 
-  def self.employee_sales(today,from,to)
-    if !from.nil? && !to.nil?
-      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
-                .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
-                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between '#{from}' and '#{to}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
-                .order("e.name")
-    else
-      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+  def self.employee_sales(today)
+    query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
                 .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
-    end
   end
 
-  def self.total_sale(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
-      else
-        if current_user.role == 'administrator'
-          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            total = Sale.where('sale_status = "completed" and sales.receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
-                  .sum("grand_total")
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
-      else
-        if current_user.role == 'administrator'
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            total = Sale.where('sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
-                  .sum("grand_total")
-          end
-        end
-      end
-    end
+  def self.total_sale(today)
+  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+
   end
 
-  def self.total_count(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
-      else
-        if current_user.role == 'administrator'
-          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            total = Sale.where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id = ?',from,to,shift.id).count
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
-      else
-        if current_user.role == 'administrator'
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id = ?',today,shift.id).count
-          end
-        end
-      end
-    end
+  def self.total_count(today)
+  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
   end
 
-  def self.total_card_sale(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
-              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-              .sum("sp.payment_amount")
-      else
-        if current_user.role == 'administrator'
-          query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
-              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-              .sum("sp.payment_amount")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
-              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-              .sum("sp.payment_amount")
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-              .sum("sp.payment_amount")
-      else
-        if current_user.role == 'administrator'
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-              .sum("sp.payment_amount")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
-              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-              .sum("sp.payment_amount")
-          end
-        end
-      end
-    end
+  def self.total_card_sale(today)
+    payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' or payment_method = 'unionpay' "
+    # query        = Sale.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+    #                 .where('sale_status = "completed" #{payment_type} and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+    #                 .joins("join sale_payments on sale_id = sales.sale_id")
+    #                 .group("sales.sale_id")
+
+    query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+            .sum("sp.payment_amount")
+
   end
 
-  def self.credit_payment(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
-              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-              .sum("payment_amount")
-      else
-        if current_user.role == 'administrator'
-          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
-              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-              .sum("payment_amount")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ? and s.shift_sale_id=?',from,to,shift.id)
-              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-              .sum("payment_amount")
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
-              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-              .sum("payment_amount")
-      else
-        if current_user.role == 'administrator'
-          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
-              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-              .sum("payment_amount")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ? and s.shift_sale_id=?',today,shift.id)
-              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-              .sum("payment_amount")
-          end
-        end
-      end
-    end
+  def self.credit_payment(today)
+    query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+            .sum("payment_amount")
   end
 
-  def self.summary_sale_receipt(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-              .where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
-              .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-              .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
-              .first()
-          end
-        end
-      end
-    end
+  def self.summary_sale_receipt(today)
+    query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+          .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+          .first()
   end
 
-  def self.total_payment_methods(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("distinct sp.payment_method")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
-            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
-              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
-              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("distinct sp.payment_method")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
-              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-          end
-        end
-      end
-    end
+  def self.total_payment_methods(today)
+    query = Sale.select("distinct sp.payment_method")
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+          .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
   end
 
-  def self.payment_sale(payment_method, today, current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-            if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
-            else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
-            end
-            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-            if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
-            else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
-            end
-            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-              if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
-              else
-                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
-              end
-              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+  def self.payment_sale(payment_method, today)
+    query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          if payment_method == 'card'
+            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+          else
+            query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-            if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-            else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-            end
-            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-            if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-            else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-            end
-            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-              if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
-              else
-                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
-              end
-              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-          end
-        end
-      end
-    end
+          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
   end
 
-  def self.total_customer(today,current_user=nil,from,to)
-    dinein_cnt = self.total_dinein(today,current_user,from,to)
-    takeaway_cnt = self.total_takeaway(today,current_user,from,to)
-    membership_cnt = self.total_membership(today,current_user,from,to)
+  def self.total_customer(today)
+    dinein_cnt = self.total_dinein(today)
+    takeaway_cnt = self.total_takeaway(today)
+    membership_cnt = self.total_membership(today)
 
     total_cus = 0
     if !dinein_cnt.nil? || !takeaway_cnt.nil? || !membership_cnt.nil?
@@ -1468,448 +1151,69 @@ end
     return total_cus
   end
 
-  def self.total_dinein(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-                .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
-                .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-                .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
-                .first()
-          end
-        end
-      end
-    end
+  def self.total_dinein(today)
+    query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
+          .first()
   end
 
-  def self.total_takeaway(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
-              .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
-              .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
-              .first()
-          end
-        end
-      end
-    end
+  def self.total_takeaway(today)
+    query = Sale.select("count(sales.customer_id) as total_take_cus")
+          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+          .first()
   end
 
-  def self.total_membership(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',today,shift.id)
-              .first()
-          end
-        end
-      end
-    end
+  def self.total_membership(today)
+    query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+          .first()
   end
 
-  def self.total_other_customer(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
-              .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(sales.customer_id) as total_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
-              .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(sales.customer_id) as total_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
-              .first()
-          end
-        end
-      end
-    end
+  def self.total_other_customer(today)
+    query = Sale.select("count(sales.customer_id) as total_cus")
+          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
+          .first()
   end
 
-  def self.total_order(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("count(distinct a.order_id) as total_order")
-            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN orders as b ON b.order_id = a.order_id")
-            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(distinct a.order_id) as total_order")
-            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN orders as b ON b.order_id = a.order_id")
-            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(distinct a.order_id) as total_order")
-              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-              .joins("JOIN orders as b ON b.order_id = a.order_id")
-              .where('b.status = "billed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("count(distinct a.order_id) as total_order")
-            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN orders as b ON b.order_id = a.order_id")
-            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(distinct a.order_id) as total_order")
-            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN orders as b ON b.order_id = a.order_id")
-            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-            .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(distinct a.order_id) as total_order")
-              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-              .joins("JOIN orders as b ON b.order_id = a.order_id")
-              .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
-              .first()
-          end
-        end
-      end
-    end
+  def self.total_order(today)
+    query = Sale.select("count(distinct a.order_id) as total_order")
+          .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+          .joins("JOIN orders as b ON b.order_id = a.order_id")
+          .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+          .first()
   end
 
-  def self.total_account(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("distinct b.id as account_id, b.title as title")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN accounts as b ON b.id = a.account_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("distinct b.id as account_id, b.title as title")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .joins("JOIN accounts as b ON b.id = a.account_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("distinct b.id as account_id, b.title as title")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .joins("JOIN accounts as b ON b.id = a.account_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("distinct b.id as account_id, b.title as title")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN accounts as b ON b.id = a.account_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("distinct b.id as account_id, b.title as title")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .joins("JOIN accounts as b ON b.id = a.account_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("distinct b.id as account_id, b.title as title")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .joins("JOIN accounts as b ON b.id = a.account_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
-          end
-        end
-      end
-    end
+  def self.total_account(today)
+    query = Sale.select("distinct b.id as account_id, b.title as title")
+          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+          .joins("JOIN accounts as b ON b.id = a.account_id")
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
   end
 
-  def self.account_data(account_id, today, current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
-              .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
-              .first()
-          end
-        end
-      end
-    end
+  def self.account_data(account_id, today)
+    query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+          .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          .first()
   end
 
-  def self.top_items(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
-            .group("a.product_code")
-            .order("SUM(a.qty) DESC")
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
-              .group("a.product_code")
-              .order("SUM(a.qty) DESC")
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
-              .group("a.product_code")
-              .order("SUM(a.qty) DESC")
-              .first()
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-            .group("a.product_code")
-            .order("SUM(a.qty) DESC")
-            .first()
-      else
-        if current_user.role == 'administrator'
-          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-              .group("a.product_code")
-              .order("SUM(a.qty) DESC")
-              .first()
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
-              .group("a.product_code")
-              .order("SUM(a.qty) DESC")
-              .first()
-          end
-        end
-      end
-    end
+  def self.top_items(today)
+    query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+          .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          .group("a.product_code")
+          .order("SUM(a.qty) DESC")
+          .first()
   end
 
-  def self.total_foc_items(today,current_user=nil,from,to)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
-            .sum("a.qty")
-      else
-        if current_user.role == 'administrator'
-          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
-              .sum("a.qty")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
-                .sum("a.qty")
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-            .sum("a.qty")
-      else
-        if current_user.role == 'administrator'
-          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-              .sum("a.qty")
-        else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
-                .sum("a.qty")
-          end
-        end
-      end
-    end
+  def self.total_foc_items(today)
+    query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+          .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          .sum("a.qty")
   end
 
   #card sale trans data

From 98795478b15d889b37f6904f9a8c982f355f91d6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 17:46:02 +0630
Subject: [PATCH 337/651] add product sale data

---
 app/models/sale.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f42b62a0..d8a91daf 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -846,6 +846,27 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   return query,other_charges, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
 end
 
+#product sale report query
+def self.get_menu_item_query(order_by)
+  query = MenuItem.unscoped.select("acc.id as account_id, 
+                      acc.title as account_name, 
+                      mii.item_instance_code as item_code, " +
+                     "(CASE WHEN si.qty > 0 THEN SUM(si.qty) ELSE 0 END) as total_item," +
+                     "(CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END) as unit_price," +
+                     "(CASE WHEN (si.qty * si.unit_price) > 0 THEN (si.qty * si.unit_price) ELSE 0 END) as grand_total," +
+                     "mii.price as unit_price, menu_items.name as product_name, 
+                     mc.name as" +
+                     " menu_category_name,mc.id as menu_category_id, si.remark as status_type, si.price as price ")
+          .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + 
+               " LEFT JOIN menu_categories mc ON mc.id = menu_items.menu_category_id" +
+               " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
+               " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
+               " LEFT JOIN sales s ON s.sale_id = si.sale_id")
+          .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
+          .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
+end
+#product sale report query
+
 def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type)
     ## => left join -> show all sales although no orders
     if payment_type.blank?

From 9daf5c92ef7b0498dc4d2c9a9be7ce786e835b7d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 27 Feb 2018 18:07:15 +0630
Subject: [PATCH 338/651] check sale data

---
 app/models/sale.rb | 876 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 768 insertions(+), 108 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index d8a91daf..7aa18282 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1074,95 +1074,376 @@ end
      return tax
   end
 
-  def self.top_products(today)
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.top_products(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
+                      "and payment_status='paid' and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) DESC").limit(20)
+    else
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(10)
+                .order("SUM(i.qty) DESC").limit(20)
+    end
   end
 
-  def self.bottom_products(today)
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+  def self.bottom_products(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
+                      "and payment_status='paid' and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) ASC").limit(20)
+    else
+      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) ASC").limit(10)
+                .order("SUM(i.qty) ASC").limit(20)
+    end
   end
 
-  def self.hourly_sales(today)
-    query= Sale.select("grand_total")
+  def self.hourly_sales(today,from,to)
+    if !from.nil? && !to.nil?
+      query= Sale.select("grand_total")
+            .where('payment_status="paid" and sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+            .order('receipt_date')
+    else
+      query= Sale.select("grand_total")
             .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
             .order('receipt_date')
+    end
   end
 
-  def self.employee_sales(today)
-    query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+  def self.employee_sales(today,from,to)
+    if !from.nil? && !to.nil?
+      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between '#{from}' and '#{to}'")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .order("e.name")
+    else
+      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
                 .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
+    end
   end
 
-  def self.total_sale(today)
-  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
-
-  end
-
-  def self.total_count(today)
-  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
-  end
-
-  def self.total_card_sale(today)
-    payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' or payment_method = 'unionpay' "
-    # query        = Sale.select("SUM(tax_payable_amount) AS st_amount,tax_name")
-    #                 .where('sale_status = "completed" #{payment_type} and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-    #                 .joins("join sale_payments on sale_id = sales.sale_id")
-    #                 .group("sales.sale_id")
-
-    query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-            .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-            .sum("sp.payment_amount")
-
-  end
-
-  def self.credit_payment(today)
-    query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
-            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-            .sum("payment_amount")
-  end
-
-  def self.summary_sale_receipt(today)
-    query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-          .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
-  end
-
-  def self.total_payment_methods(today)
-    query = Sale.select("distinct sp.payment_method")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-  end
-
-  def self.payment_sale(payment_method, today)
-    query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-          if payment_method == 'card'
-            query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
-          else
-            query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+  def self.total_sale(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and sales.receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
+                  .sum("grand_total")
           end
-          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        end
+      end
+    else
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+                  .sum("grand_total")
+          end
+        end
+      end
+    end
   end
 
-  def self.total_customer(today)
-    dinein_cnt = self.total_dinein(today)
-    takeaway_cnt = self.total_takeaway(today)
-    membership_cnt = self.total_membership(today)
+  def self.total_count(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id = ?',from,to,shift.id).count
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+      else
+        if current_user.role == 'administrator'
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id = ?',today,shift.id).count
+          end
+        end
+      end
+    end
+  end
+
+  def self.total_card_sale(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
+              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+              .sum("sp.payment_amount")
+          end
+        end
+      end
+    end
+  end
+
+  def self.credit_payment(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ? and s.shift_sale_id=?',from,to,shift.id)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+      else
+        if current_user.role == 'administrator'
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ? and s.shift_sale_id=?',today,shift.id)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+          end
+        end
+      end
+    end
+  end
+
+  def self.summary_sale_receipt(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
+  end
+
+  def self.total_payment_methods(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          end
+        end
+      end
+    end
+  end
+
+  def self.payment_sale(payment_method, today, current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+              if payment_method == 'card'
+                query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
+              else
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              end
+              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+              if payment_method == 'card'
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
+              else
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              end
+              query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          end
+        end
+      end
+    end
+  end
+
+  def self.total_customer(today,current_user=nil,from,to)
+    dinein_cnt = self.total_dinein(today,current_user,from,to)
+    takeaway_cnt = self.total_takeaway(today,current_user,from,to)
+    membership_cnt = self.total_membership(today,current_user,from,to)
 
     total_cus = 0
     if !dinein_cnt.nil? || !takeaway_cnt.nil? || !membership_cnt.nil?
@@ -1172,69 +1453,448 @@ end
     return total_cus
   end
 
-  def self.total_dinein(today)
-    query = Sale.select("count(sales.customer_id) as total_dinein_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
-          .first()
+  def self.total_dinein(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+                .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+                .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_takeaway(today)
-    query = Sale.select("count(sales.customer_id) as total_take_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
-          .first()
+  def self.total_takeaway(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_membership(today)
-    query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
-          .first()
+  def self.total_membership(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_other_customer(today)
-    query = Sale.select("count(sales.customer_id) as total_cus")
-          .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
-          .first()
+  def self.total_other_customer(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
+              .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(sales.customer_id) as total_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(sales.customer_id) as total_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_order(today)
-    query = Sale.select("count(distinct a.order_id) as total_order")
-          .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
-          .joins("JOIN orders as b ON b.order_id = a.order_id")
-          .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
+  def self.total_order(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct a.order_id) as total_order")
+              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN orders as b ON b.order_id = a.order_id")
+              .where('b.status = "billed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(distinct a.order_id) as total_order")
+            .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN orders as b ON b.order_id = a.order_id")
+            .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+            .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(distinct a.order_id) as total_order")
+              .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN orders as b ON b.order_id = a.order_id")
+              .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_account(today)
-    query = Sale.select("distinct b.id as account_id, b.title as title")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .joins("JOIN accounts as b ON b.id = a.account_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+  def self.total_account(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("distinct b.id as account_id, b.title as title")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN accounts as b ON b.id = a.account_id")
+            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("distinct b.id as account_id, b.title as title")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .joins("JOIN accounts as b ON b.id = a.account_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("distinct b.id as account_id, b.title as title")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .joins("JOIN accounts as b ON b.id = a.account_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and sales.shift_sale_id=?',today,shift.id)
+          end
+        end
+      end
+    end
   end
 
-  def self.account_data(account_id, today)
-    query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .first()
+  def self.account_data(account_id, today, current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.top_items(today)
-    query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
-          .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .group("a.product_code")
-          .order("SUM(a.qty) DESC")
-          .first()
+  def self.top_items(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
+            .group("a.product_code")
+            .order("SUM(a.qty) DESC")
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .group("a.product_code")
+            .order("SUM(a.qty) DESC")
+            .first()
+      else
+        if current_user.role == 'administrator'
+          query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
+              .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+              .group("a.product_code")
+              .order("SUM(a.qty) DESC")
+              .first()
+          end
+        end
+      end
+    end
   end
 
-  def self.total_foc_items(today)
-    query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .sum("a.qty")
+  def self.total_foc_items(today,current_user=nil,from,to)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
+            .sum("a.qty")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
+              .sum("a.qty")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+                .sum("a.qty")
+          end
+        end
+      end
+    else
+      if current_user.nil?
+        query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+            .sum("a.qty")
+      else
+        if current_user.role == 'administrator'
+          query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+              .sum("a.qty")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
+                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
+                .sum("a.qty")
+          end
+        end
+      end
+    end
   end
 
   #card sale trans data

From 58863898272a8eb7ca86e66fa9973bcf2e850bb7 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 10:01:42 +0630
Subject: [PATCH 339/651] check discount

---
 app/views/origami/discounts/index.html.erb | 42 +++++++++++-----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 7d45fd7c..eab4d888 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -253,34 +253,32 @@ var cashier_type = "<%= @cashier_type %>";
 			if(event.handled !== true) {
 				var original_value=0;
 				original_value = $('#discount-amount').val();
-
 				var input_type = $(this).attr("data-type");
-
+				var grand_total = $('#order-grand-total').text();
+				console.log(grand_total);
 				switch (input_type) {
 					case 'num':
-					var input_value = $(this).attr("data-value");
-					if (original_value == "0.0"){
-						$('#discount-amount').val(input_value);						
-					}
-					else{
-						$('#discount-amount').val(original_value + '' + input_value);						
-					}
-					break;
-
+						var input_value = $(this).attr("data-value");
+						console.log(input_value);
+						if (original_value == "0.0"){
+							$('#discount-amount').val(input_value);						
+						}
+						else{
+							$('#discount-amount').val(original_value + '' + input_value);						
+						}
+						break;
 					case 'add':
-					var input_value = $(this).attr("data-value");
-					amount = parseInt(input_value);
-					$('#discount-amount').val(amount);										
-					break;
-
+						var input_value = $(this).attr("data-value");
+						amount = parseInt(input_value);
+						$('#discount-amount').val(amount);
+						break;
 					case 'del' :
-					var discount_text=$('#discount-amount').val();
-					$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));		
-					break;
-
+						var discount_text=$('#discount-amount').val();
+						$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));		
+						break;
 					case 'clr':
-					$('#discount-amount').val("0.0");	            
-					break;
+						$('#discount-amount').val("0.0");	            
+						break;
 				}
 				event.handled = true;
 			} else {

From 300c1ea4030eb840566aa49ac87d2bd0ba9ad45c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 10:05:40 +0630
Subject: [PATCH 340/651] cadd close cashier customise pdf in readme

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 97f43595..70b821d1 100755
--- a/README.md
+++ b/README.md
@@ -108,6 +108,11 @@ sudo cat /etc/sudoers
 ### cope and parse
 %superuser ALL=(ALL) NOPASSWD: ALL
 
+For CloseCashierCustomisePdf in lookups
+	*** change CloseCashierPdf to CloseCashierCustomisePdf
+	1) settings/print_settings
+  	2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 }
+
 * ToDo list
 
 1. Migration

From 0acd533bfe944a841bd441c655113bc10695fd5e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 28 Feb 2018 10:14:18 +0630
Subject: [PATCH 341/651] update add oredr

---
 app/assets/javascripts/addorder.js            |   9 +-
 .../origami/addorders_controller.rb           |   7 +-
 .../origami/quick_service_controller.rb       |   3 +-
 app/models/menu_category.rb                   |   2 +-
 .../origami/addorders/_add_order.html.erb     | 584 ++++++++++++++++++
 app/views/origami/addorders/detail.html.erb   | 584 +-----------------
 .../quick_service/_menu_item.json.jbuilder    | 119 ++++
 .../get_all_product.json.jbuilder             |   4 +
 .../quick_service/get_menu.json.jbuilder      |   1 +
 .../get_menu_category.json.jbuilder           |   8 +
 .../get_menu_sub_category.json.jbuilder       |   9 +
 .../origami/quick_service/index.html.erb      |   3 +
 12 files changed, 743 insertions(+), 590 deletions(-)
 create mode 100644 app/views/origami/addorders/_add_order.html.erb
 create mode 100755 app/views/origami/quick_service/_menu_item.json.jbuilder
 create mode 100755 app/views/origami/quick_service/get_all_product.json.jbuilder
 create mode 100644 app/views/origami/quick_service/get_menu.json.jbuilder
 create mode 100755 app/views/origami/quick_service/get_menu_category.json.jbuilder
 create mode 100644 app/views/origami/quick_service/get_menu_sub_category.json.jbuilder

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index c55525bc..475652af 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -76,8 +76,8 @@ $(function() {
   }
   //end show list function
   //click menu sidebar menu category
-  // $(".menu_category").on("click", function(){
   $(document).on('click', '.menu_category', function(event){
+    event.preventDefault();
     var menu_id = $(this).attr("data-id");
     var url = "get_menu_category/"+menu_id;
     show_menu_item_list(url); 
@@ -104,6 +104,8 @@ $(function() {
       data: {},
       dataType: "json",
       success: function(data) {
+        console.log(data);
+        console.log("ememem")
         var menu_items_list = $('.menu_items_list');
         menu_items_list.empty();
         menu_items = data.menu_items;
@@ -1099,7 +1101,8 @@ $(function() {
 
    //click menu sidebar menu category
 
-  $(".sub_click").on("click", function(){
+   $(document).on('click', '.sub_click', function(event){ 
+     event.preventDefault();
     var menu_id = $(this).attr("data-id");
     var url = "get_menu_sub_category/"+menu_id;
     sub_category = $(this).find('.sub_category_list');
@@ -1127,6 +1130,8 @@ $(function() {
       data: {},
       dataType: "json",
       success: function(data) {
+        console.log(data)
+        console.log("ffffffffff")
         var sub_category_list = $('.sub_category_list');
         sub_category_list.empty();
         data = data.sub_category;
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 42412c51..9c19bbf2 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -37,9 +37,10 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
   def get_menu_category ()
     if (params[:id])
-      puts params[:id]
+      
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])
+      
       # puts @menu.menu_items[1].item_attributes.to_json
       return @menu
     else
@@ -49,7 +50,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
   def get_menu()
     if (params[:id])
-      puts params[:id]
       #Pull this menu
       @menu = Menu.find_by_id(params[:id])
       @menu_category = MenuCategory.where("menu_id='#{@menu.id}'").order("order_by asc")
@@ -61,10 +61,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   end
 
   def get_menu_sub_category ()
+
     id = params[:id]
+
     if (id)
       #Pull this menu
       @sub_menu = MenuCategory.where("menu_category_id = #{id}").active
+
       # puts @menu.menu_items[1].item_attributes.to_json
       return @sub_menu
     end
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 2b943e7e..8516c493 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -14,7 +14,7 @@ class Origami::QuickServiceController < ApplicationController
       # @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')
-      render "origami/addorders/detail"
+      # render "origami/addorders/detail"
   end
 
   def modify_order
@@ -51,7 +51,6 @@ class Origami::QuickServiceController < ApplicationController
     else
       @booking = nil
     end
-     render "origami/addorders/detail"
   end
 
   def update_modify_order
diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 3c1a39ab..acb06c4f 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -52,7 +52,7 @@ class MenuCategory < ApplicationRecord
     if from > to
       h = to_t.hour
       if h < 12 # before noon
-        if h = 0
+        if h == 0
           to = 24
           to = to * 3600 + to_t.min* 60 + to_t.sec
         end
diff --git a/app/views/origami/addorders/_add_order.html.erb b/app/views/origami/addorders/_add_order.html.erb
new file mode 100644
index 00000000..efe21d2a
--- /dev/null
+++ b/app/views/origami/addorders/_add_order.html.erb
@@ -0,0 +1,584 @@
+
+
+<div id="oqs_loading_wrapper" style="display:none;">
+  <div id="oqs_loading"></div>
+</div>
+
+<% type = request.path_info.include?('quick_service')%>
+<% modify_order = request.path_info.include?('modify_order')%>
+<input type="hidden" name="type" id="type" value="<%=type%>">
+<input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
+<input type="hidden" name="type" id="role" value="<%= current_user.role%>">
+
+<div class="row m-t--20">
+    <div class="col-lg-2 col-md-2 col-sm-2">
+        <!-- <a href="javascript:void(0);" class="dropdown-toggle waves-block p-t-15 p-l-15 p-b-15" data-toggle="dropdown" aria-haspopup="" aria-expanded="true" style="background-color: #eeeeee;border-bottom: .214rem solid #fff;border-left: 1px solid #54A5AF;
+    border-right: 1px solid #54A5AF;"> 
+            <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
+        </a>
+        <ul class="dropdown-menu menu_list" style="width:90%">
+           <% @menus.each do |menu| %>
+              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>">
+                   <a class="nav-link" data-toggle="tab" href="" role="tab"><%=menu.name%></a>
+              </li>
+           <%end%>
+        </ul>  -->  
+        <li class="list-menu">
+        <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
+          
+          <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
+         <!--  <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
+        </a>
+        <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
+          <% @menus.each do |menu| %>
+              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
+                   <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
+              </li>
+           <%end%>
+        </ul>
+      </li> 
+        <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
+            <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
+              <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
+            </li>
+            <% @menu.each do |menu| %>
+              <% if !menu.valid_time.nil? %>
+                <% if menu.menu_category_id.nil? %>
+                <!--if type quick_service or cashier for table -->
+                  <% if type %>
+                    <% if !menu.code.include? "SPL" %>
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                          <p class="hidden menu-id"><%= menu.id  %></p> 
+                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                             <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                            </ul>
+                          </a>
+                        </li>
+                    <% end%>
+                  <!-- else quick_service or cashier for table -->
+                  <% else %>
+                    <% if @table.get_current_checkout_booking.nil? %>
+                      <% if !menu.code.include? "SPL" %>
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                          <p class="hidden menu-id"><%= menu.id  %></p> 
+                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                             <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                            </ul>
+                          </a>
+                        </li>
+                      <% end%>
+                    <% else %>
+                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                          </ul>
+                        </a>
+                      </li>
+                    <% end%>
+                    <!-- end quick_service or cashier for table -->
+                  <% end %>
+                <% end%>
+              <% end %>
+            <%end %>
+        </ul>
+    </div>
+
+
+
+    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
+      <div class="card">
+        <div class="card-block">
+          <div id="custom-slimscroll">
+             <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
+               <!-- append data -->
+               <% @menu.each do |menu| %>
+                    <% if !menu.valid_time.nil? %>
+                      <% if menu.menu_category_id.nil? %>
+                      <!--if type quick_service or cashier for table -->
+                        <% if type %>
+                          <% if !menu.code.include? "SPL" %>
+                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                              <div class='card-block custom-card-block'>
+                                <p><%=menu.name%> <p>
+                                <p><%=menu.code%> <p>
+                              </div>
+                            </div>
+                          <% end%>
+                        <!-- else quick_service or cashier for table -->
+                        <% else %>
+                          <% if @table.get_current_checkout_booking.nil? %>
+                            <% if !menu.code.include? "SPL" %>
+                              <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                                <div class='card-block custom-card-block'>
+                                  <p><%=menu.name%> <p>
+                                  <p><%=menu.code%> <p>
+                                </div>
+                             </div>
+                            <% end%>
+                          <% else %>
+                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                              <div class='card-block custom-card-block'>
+                                <p><%=menu.name%> <p>
+                                <p><%=menu.code%> <p>
+                              </div>
+                            </div>
+                          <% end%>
+                          <!-- end quick_service or cashier for table -->
+                        <% end %>
+                      <% end%>
+                    <% end %>
+                  <%end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
+        
+        <% if type && modify_order%>
+          <button type="button" class="btn btn-lg btn-default waves-effect col-md-4" id='back'>
+           <!--  <i class="material-icons">reply</i> -->
+             Back
+          </button>
+          
+           <button type="button" class="btn btn-lg btn-primary waves-effect col-md-7" id='pending_order'>Pending Order
+          </button>
+         
+        <%elsif !modify_order && type%>
+            <button type="button" class="btn btn-lg btn-default waves-effect col-md-2" id='back' style="    padding: .5rem 0.15rem !important;">
+             <!--  <i class="material-icons">reply</i> -->
+               Back
+            </button>
+            
+                <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
+                </button>
+           
+            <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
+            <input type="hidden" name="table_id" value="" id="table_id">
+
+         <%else%>
+            <button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
+                <i class="material-icons">reply</i>Back
+            </button>
+         <%end%>
+          <br>
+        <div class="card-header" style="padding: 0.5rem 0.25rem">
+          <% if type %>
+            <div class="row clearfix">
+               <div class="col-md-6 col-lg-6 col-sm-12">
+                 <strong id="order-title" class="font-13">ORDER DETAILS </strong>
+               </div>
+
+               <% if modify_order %>
+                    <% if @table.nil? %>
+                       <div class="col-md-6 col-lg-6 col-sm-6">Table : </div>
+                       <p class="hidden" id="table_id"><%=@table_id%></p>
+                       <p class="hidden" id="table_type"></p>
+                    <% else%>
+                      <div class="col-md-6 col-lg-6 col-sm-6">Table : <%=@table.name%></div>
+                      <p class="hidden" id="table_id"><%=@table_id%></p>
+                      <p class="hidden" id="table_type"><%=@table.type%></p>
+                    <% end%>
+                     
+                     <p class="hidden" id="booking_id"><%=@booking_id%></p>
+                     <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
+                     <p class="hidden" id="sale_id"><%=@sale_id%></p>
+              <% else%>
+                <p class="hidden" id="table_type"></p>
+              <% end%>
+            </div>
+          <% else %>
+            <div>
+             <strong id="order-title" class="font-14">ORDER DETAILS </strong>| <span class="font-14">Table-<%=@table.name%></span>
+             <p class="hidden" id="table_id"><%=@table_id%></p>
+             <p class="hidden" id="table_type"><%=@table.type%></p>
+             <p class="hidden" id="booking_id"><%=@booking_id%></p>
+             <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
+          </div>
+          <% end%>
+          
+        </div>
+        <div class="card-block">
+            <div class="card-text" id="order-detail-slimscroll" data-height="180">
+               <table class="table table-striped summary-items" id="order-items-table" >
+                 <thead>
+                   <tr>
+                     <th>#</th>
+                     <th class="item-name">Items</th>
+                     <th class="item-qty">QTY</th>
+                     <th class="item-attr">Price</th>
+                   </tr>
+                 </thead>
+                 <tbody class="font-13" >
+                 
+                 </tbody>
+               </table>
+            </div>
+            <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
+            
+               <table class="table" id="order-charges-table" border="0">
+                 <tr>
+                   <td style="padding:2px;" width="5%"></td>
+                   <td style="padding:2px;" width="15%"></td>
+                   <td style="padding:2px; text-align:" class="charges-name" width="25%"><strong>Total:</strong></td>
+                   <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total">0.00</strong></td>
+                 </tr>
+               </table>
+               <% if type && modify_order%>
+                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
+                  
+                    <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
+              <%elsif !modify_order && type%>
+                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
+                    <% if current_user.role != "waiter"%>
+                       <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+                    <%end%>
+                    <% if current_user.role == "waiter"%>
+                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+                    <%end%>
+               <%else%>
+               <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+               <%end%>
+
+                
+            </div>
+        </div>
+    </div>
+
+    <!-- Modal -->
+    <div class=" modal" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="sx_itemModalLabel" aria-hidden="true" style="">
+      <div class="modal-dialog custom-modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+          <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h4 class="modal-title"></h4>
+          </div>
+          <div class="modal-body">
+            <table width="100%" class="table table-striped">
+             <thead>
+               <tr>
+                 <th style="">Item Name</th>
+                 <th style="">Quantity</th>
+                 <th></th>
+               </tr>
+             </thead>
+             <tbody>
+               <tr>
+                 <td class="item_name" id="modal-item-name"></td>
+                 <td>
+                   <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
+                 </td>
+                 <td>
+                   <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
+                 </td>
+               </tr>
+             </tbody>
+             </table>
+         </div>
+          <div class="modal-footer">
+          <div class="row">
+            <div class="col-md-5">
+              <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
+            </div>
+            <div class="col-md-5">
+              <button type="button" class="btn btn-primary " data-dismiss="modal" id="save">Update</button>
+            </div>
+          </div>
+            
+            
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Menu Item modal -->
+
+    <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+      <div class="modal-dialog custom-modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
+            <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
+               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+                
+            </div>
+            <div class="modal-body">
+                <div class="row no-set-item">
+                  <div class="col-md-5">
+                      <p style="text-align: center;" id="modal_box_img"></p>
+                
+                      
+                        <!-- <label class="col-md-6" style="margin-top:5px">Quantity</label>
+                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="change_qty" value="" min="1" max="100"> -->
+                       
+                        <div class="input-group">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-danger btn-number"  value="-" id="minus">
+                               <i class="material-icons">remove</i>
+                                
+                              </button>
+                          </span>
+                          <input type="text" value="1" id="count" class="change_qty keypress_qty form-control col-md-12 ">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-success btn-number" value="+" id="plus">
+                                 <i class="material-icons">add</i>
+                              </button>
+                          </span>
+                      </div>
+                      
+                        <p class="hidden" id="unit_price"></p>
+                        <p class="hidden" id="instance_code"></p>
+                        <p class="hidden" id="instance_name"></p>
+                        <p class="hidden" id="promotion_price"></p>
+                        <p class="hidden" id="item_instances"></p>
+                        <p class="hidden" id="item_code"></p>
+                  </div>
+                  <div class="col-md-7 item-detail">      
+                      <h5>Attributes</h5>           
+                     <div class="attributes-list">
+                     </div>
+                     <hr>
+                     <h5>Options</h5>
+                     <div class="options-list">
+                     </div>
+                     <hr>
+                  </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <div class="mr-auto">
+                  <h4 class=" pull-left">Total : <span id="total_price"></span></h4>
+                </div>
+               <div class="row">
+                <div class="col-md-4">
+                  <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
+                </div>
+                <div class="col-md-6">
+                    <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order</button>
+                </div>
+              </div>
+            </div>
+        </div>
+      </div>
+    </div>
+
+
+     <!-- Large modal -->
+    <div class=" modal sx_item_set_detailModal" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
+      <div class="modal-dialog custom-modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
+            <h4 class="modal-title" style="color:#fff;" id="set_name"></h4>
+               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+                
+            </div>
+            <div class="modal-body">
+                <div class="row set-item">
+                  <div class="col-md-4">
+                  <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
+                      <!-- <div class="form-group">
+                        <label class="col-md-6" style="margin-top:5px">Quantity</label>
+                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">
+                      </div>  -->
+
+                      <div class="input-group">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-danger btn-number"  value="-" id="set_minus">
+                                <i class="material-icons">remove</i>
+                              </button>
+                          </span>
+                          <input type="text" value="1" id="set_count" class="set_change_qty keypress_qty form-control col-md-12 ">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
+                                  <i class="material-icons">add</i>
+                              </button>
+                          </span>
+                      </div>
+
+                        <p class="hidden" id="set_unit_price"></p>
+                        <p class="hidden" id="set_instance_code"></p>
+                        <p class="hidden" id="set_instance_name"></p>
+                        <p class="hidden" id="set_promotion_price"></p>
+                        <p class="hidden" id="set_item_instances"></p>
+                        <p class="hidden" id="set_item_code"></p>
+                        <p></p>
+
+                        <div class="options-list">
+                        </div>
+
+                  </div>
+                  <div class="col-md-8">       
+                     <div class="instance-list row"></div>
+                  </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <div class="mr-auto">
+                  <h4 class=" pull-left">Total : <span id="set_total_price"></span></h4>
+                </div>
+
+               <div class="row">
+
+                <div class="col-md-4">
+                  <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
+                </div>
+                <div class="col-md-6">
+                    <button type="button" class="btn btn-primary set_order" data-dismiss="modal" id="set_order">Add to Order</button>
+                </div>
+              </div>
+               
+            </div>
+        </div>
+      </div>
+    </div>
+    
+    <% if type && !modify_order%>
+    <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header" style="margin-top: -1rem;">
+            <!-- <h4 class="modal-title" id="TableModalLabel">Select Table</h4> -->
+             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
+          </div>
+          <div class="modal-body" style="margin-top: -0.75rem;padding-top:5px">
+          <%@zone.each do |zone| %>
+            <h5>Zone : <%=zone.name%></h5>
+            <div class="card-columns" style="column-count: 7;">
+              <%zone.tables.each do |table| %>
+                 <% if table.status == 'occupied' %>
+                          <% if table.get_booking.nil? %>
+                            <% if table.get_checkout_booking.nil? %>
+                              <%  color="red"%>
+                            <% else %>                            
+                              <%  color="orange"%>
+                            <% end %>                         
+                                
+                          <% else %>         
+                            <% if table.get_checkout_booking.nil? %>
+                              <%  color="blue"%>
+                            <% else %>                       
+                              <%  color="orange"%>
+                            <% end %>
+                          <% end %>
+                      <% else %>
+                         <%  color="green"%>
+                      <% end %>
+                <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
+                  <div class="card-block">
+                    <%= table.name %>
+                    
+                  </div>
+                </div>
+              <%end%>
+           </div>
+        <%end%>
+         <div class="modal-footer  p-r-30">
+              <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+              &nbsp;  &nbsp;
+              <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
+        </div>
+      </div>
+    </div>
+    </div>
+    </div>
+    <% end %>
+<script>
+    jQuery(function(){
+        id = "<%=@menu[0].id%>";
+       jQuery('.first_'+id).click();
+    });
+    $(document).ready(function () {
+    $(".tables").on('click', function () {
+        $('.tables').css('background-color','');
+        $('.tables').removeClass('purple')
+        var dining_id = $(this).attr("data-id");
+        var name = $(this).attr("data-name");
+        var type = $(this).attr("data-type");
+        $(this).css('background-color','purple');
+        $(this).addClass('purple')
+        $('.confirm_table').attr("data-id",dining_id)
+        $('.confirm_table').attr("data-name",name)
+        $('.confirm_table').attr("data-type",type)
+
+    });
+    $(".confirm_table").on('click', function () {
+        var dining_id = $(this).attr("data-id");
+        var name      = $(this).attr("data-name");
+        var type      = $(this).attr("data-type");
+        $('#table_id').val(dining_id)
+        $('#table_type').text(type)
+        $('.select_table').text(name)
+
+        console.log(type)
+
+    });
+
+    $('#pending_order').on('click', function () {
+      window.location.href = '/origami/quick_service/pending_order';
+    });
+
+    $(document).on('click', '.menu_click', function(event){
+      var menu_id = $(this).attr("data-id");
+      var name = $(this).attr("data-name");
+      var url = "get_menu/"+menu_id;
+      show_menu_cat_list(name, url); 
+    }); 
+  //End menu category Click
+
+    //show menu item list when click menu category
+    function show_menu_cat_list(name, url_item){ 
+      var menu_list = $('.menu_items_list');
+      menu_list.empty();
+
+      var menu_cat = $('.category_list');
+      menu_cat.empty();
+
+      $(".main_menu").text(name)
+      if (modify_order=="true" && type =="true") {
+         url_item = '../../../addorders/'+url_item;
+       }if(modify_order=="false" && type =="true"){
+         url_item = 'addorders/'+url_item
+       }else{
+         url_item = url_item;
+       }
+
+      //Start Ajax
+      $.ajax({      
+        type: "GET",         
+        url: url_item, 
+        data: {},
+        dataType: "json",
+        success: function(data) {
+
+          for(var i in data) {  
+            if (data[i].is_available == true) {
+              
+              row = '<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="'+ data[i].id +'">'
+                       +' <div class="card-block custom-card-block">'
+                         +'  <p>'+ data[i].name +'<p>'
+                         +'  <p>'+ data[i].code +' <p>'
+                       +'  </div>'
+                    +'   </div>';
+              $('.menu_items_list').append(row);
+
+              list = '<li class="nav-item menu_category sub_click" data-id="'+ data[i].id +'">'
+                        +'<p class="hidden menu-id">'+ data[i].id +'</p> '
+                          +'<a class="nav-link" data-toggle="tab" href="" role="tab"> '+ data[i].name +''
+                           +'<ul class=" sub_category_list hidden fadeInTop animated"' 
+                           +'id="sub_category_list">'
+                          +'</ul>'
+                        +'</a>'
+                      +'</li>';
+              $('.category_list').append(list);
+            }
+            
+          }
+        }
+      });
+      //end Ajax 
+    }
+    //end show list function
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 0c3e7bb5..1e96edc7 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -1,585 +1,3 @@
-
 <%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
-<div id="oqs_loading_wrapper" style="display:none;">
-  <div id="oqs_loading"></div>
-</div>
-
-<% type = request.path_info.include?('quick_service')%>
-<% modify_order = request.path_info.include?('modify_order')%>
-<input type="hidden" name="type" id="type" value="<%=type%>">
-<input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
-<input type="hidden" name="type" id="role" value="<%= current_user.role%>">
-
-<div class="row m-t--20">
-    <div class="col-lg-2 col-md-2 col-sm-2">
-        <!-- <a href="javascript:void(0);" class="dropdown-toggle waves-block p-t-15 p-l-15 p-b-15" data-toggle="dropdown" aria-haspopup="" aria-expanded="true" style="background-color: #eeeeee;border-bottom: .214rem solid #fff;border-left: 1px solid #54A5AF;
-    border-right: 1px solid #54A5AF;"> 
-            <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
-        </a>
-        <ul class="dropdown-menu menu_list" style="width:90%">
-           <% @menus.each do |menu| %>
-              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>">
-                   <a class="nav-link" data-toggle="tab" href="" role="tab"><%=menu.name%></a>
-              </li>
-           <%end%>
-        </ul>  -->  
-        <li class="list-menu">
-        <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
-          
-          <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
-         <!--  <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
-        </a>
-        <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
-          <% @menus.each do |menu| %>
-              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
-                   <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
-              </li>
-           <%end%>
-        </ul>
-      </li> 
-        <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
-            <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
-              <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
-            </li>
-            <% @menu.each do |menu| %>
-              <% if !menu.valid_time.nil? %>
-                <% if menu.menu_category_id.nil? %>
-                <!--if type quick_service or cashier for table -->
-                  <% if type %>
-                    <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
-                          <p class="hidden menu-id"><%= menu.id  %></p> 
-                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                             <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                            </ul>
-                          </a>
-                        </li>
-                    <% end%>
-                  <!-- else quick_service or cashier for table -->
-                  <% else %>
-                    <% if @table.get_current_checkout_booking.nil? %>
-                      <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
-                          <p class="hidden menu-id"><%= menu.id  %></p> 
-                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                             <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                            </ul>
-                          </a>
-                        </li>
-                      <% end%>
-                    <% else %>
-                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
-                        <p class="hidden menu-id"><%= menu.id  %></p> 
-                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                          </ul>
-                        </a>
-                      </li>
-                    <% end%>
-                    <!-- end quick_service or cashier for table -->
-                  <% end %>
-                <% end%>
-              <% end %>
-            <%end %>
-        </ul>
-    </div>
-
-
-
-    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
-      <div class="card">
-        <div class="card-block">
-          <div id="custom-slimscroll">
-             <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
-               <!-- append data -->
-               <% @menu.each do |menu| %>
-                    <% if !menu.valid_time.nil? %>
-                      <% if menu.menu_category_id.nil? %>
-                      <!--if type quick_service or cashier for table -->
-                        <% if type %>
-                          <% if !menu.code.include? "SPL" %>
-                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                              <div class='card-block custom-card-block'>
-                                <p><%=menu.name%> <p>
-                                <p><%=menu.code%> <p>
-                              </div>
-                            </div>
-                          <% end%>
-                        <!-- else quick_service or cashier for table -->
-                        <% else %>
-                          <% if @table.get_current_checkout_booking.nil? %>
-                            <% if !menu.code.include? "SPL" %>
-                              <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                                <div class='card-block custom-card-block'>
-                                  <p><%=menu.name%> <p>
-                                  <p><%=menu.code%> <p>
-                                </div>
-                             </div>
-                            <% end%>
-                          <% else %>
-                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                              <div class='card-block custom-card-block'>
-                                <p><%=menu.name%> <p>
-                                <p><%=menu.code%> <p>
-                              </div>
-                            </div>
-                          <% end%>
-                          <!-- end quick_service or cashier for table -->
-                        <% end %>
-                      <% end%>
-                    <% end %>
-                  <%end %>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
-        
-        <% if type && modify_order%>
-          <button type="button" class="btn btn-lg btn-default waves-effect col-md-4" id='back'>
-           <!--  <i class="material-icons">reply</i> -->
-             Back
-          </button>
-          
-           <button type="button" class="btn btn-lg btn-primary waves-effect col-md-7" id='pending_order'>Pending Order
-          </button>
-         
-        <%elsif !modify_order && type%>
-            <button type="button" class="btn btn-lg btn-default waves-effect col-md-2" id='back' style="    padding: .5rem 0.15rem !important;">
-             <!--  <i class="material-icons">reply</i> -->
-               Back
-            </button>
-            
-                <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
-                </button>
-           
-            <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
-            <input type="hidden" name="table_id" value="" id="table_id">
-
-         <%else%>
-            <button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
-                <i class="material-icons">reply</i>Back
-            </button>
-         <%end%>
-          <br>
-        <div class="card-header" style="padding: 0.5rem 0.25rem">
-          <% if type %>
-            <div class="row clearfix">
-               <div class="col-md-6 col-lg-6 col-sm-12">
-                 <strong id="order-title" class="font-13">ORDER DETAILS </strong>
-               </div>
-
-               <% if modify_order %>
-                    <% if @table.nil? %>
-                       <div class="col-md-6 col-lg-6 col-sm-6">Table : </div>
-                       <p class="hidden" id="table_id"><%=@table_id%></p>
-                       <p class="hidden" id="table_type"></p>
-                    <% else%>
-                      <div class="col-md-6 col-lg-6 col-sm-6">Table : <%=@table.name%></div>
-                      <p class="hidden" id="table_id"><%=@table_id%></p>
-                      <p class="hidden" id="table_type"><%=@table.type%></p>
-                    <% end%>
-                     
-                     <p class="hidden" id="booking_id"><%=@booking_id%></p>
-                     <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
-                     <p class="hidden" id="sale_id"><%=@sale_id%></p>
-              <% else%>
-                <p class="hidden" id="table_type"></p>
-              <% end%>
-            </div>
-          <% else %>
-            <div>
-             <strong id="order-title" class="font-14">ORDER DETAILS </strong>| <span class="font-14">Table-<%=@table.name%></span>
-             <p class="hidden" id="table_id"><%=@table_id%></p>
-             <p class="hidden" id="table_type"><%=@table.type%></p>
-             <p class="hidden" id="booking_id"><%=@booking_id%></p>
-             <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
-          </div>
-          <% end%>
-          
-        </div>
-        <div class="card-block">
-            <div class="card-text" id="order-detail-slimscroll" data-height="180">
-               <table class="table table-striped summary-items" id="order-items-table" >
-                 <thead>
-                   <tr>
-                     <th>#</th>
-                     <th class="item-name">Items</th>
-                     <th class="item-qty">QTY</th>
-                     <th class="item-attr">Price</th>
-                   </tr>
-                 </thead>
-                 <tbody class="font-13" >
-                 
-                 </tbody>
-               </table>
-            </div>
-            <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
-            
-               <table class="table" id="order-charges-table" border="0">
-                 <tr>
-                   <td style="padding:2px;" width="5%"></td>
-                   <td style="padding:2px;" width="15%"></td>
-                   <td style="padding:2px; text-align:" class="charges-name" width="25%"><strong>Total:</strong></td>
-                   <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total">0.00</strong></td>
-                 </tr>
-               </table>
-               <% if type && modify_order%>
-                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
-                  
-                    <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
-              <%elsif !modify_order && type%>
-                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
-                    <% if current_user.role != "waiter"%>
-                       <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
-                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
-                    <%end%>
-                    <% if current_user.role == "waiter"%>
-                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
-                    <%end%>
-               <%else%>
-               <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
-               <%end%>
-
-                
-            </div>
-        </div>
-    </div>
-
-    <!-- Modal -->
-    <div class=" modal" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="sx_itemModalLabel" aria-hidden="true" style="">
-      <div class="modal-dialog custom-modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-          <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title"></h4>
-          </div>
-          <div class="modal-body">
-            <table width="100%" class="table table-striped">
-             <thead>
-               <tr>
-                 <th style="">Item Name</th>
-                 <th style="">Quantity</th>
-                 <th></th>
-               </tr>
-             </thead>
-             <tbody>
-               <tr>
-                 <td class="item_name" id="modal-item-name"></td>
-                 <td>
-                   <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
-                 </td>
-                 <td>
-                   <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
-                 </td>
-               </tr>
-             </tbody>
-             </table>
-         </div>
-          <div class="modal-footer">
-          <div class="row">
-            <div class="col-md-5">
-              <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
-            </div>
-            <div class="col-md-5">
-              <button type="button" class="btn btn-primary " data-dismiss="modal" id="save">Update</button>
-            </div>
-          </div>
-            
-            
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- Menu Item modal -->
-
-    <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-      <div class="modal-dialog custom-modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
-            <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
-               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
-                
-            </div>
-            <div class="modal-body">
-                <div class="row no-set-item">
-                  <div class="col-md-5">
-                      <p style="text-align: center;" id="modal_box_img"></p>
-                
-                      
-                        <!-- <label class="col-md-6" style="margin-top:5px">Quantity</label>
-                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="change_qty" value="" min="1" max="100"> -->
-                       
-                        <div class="input-group">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-danger btn-number"  value="-" id="minus">
-                               <i class="material-icons">remove</i>
-                                
-                              </button>
-                          </span>
-                          <input type="text" value="1" id="count" class="change_qty keypress_qty form-control col-md-12 ">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-success btn-number" value="+" id="plus">
-                                 <i class="material-icons">add</i>
-                              </button>
-                          </span>
-                      </div>
-                      
-                        <p class="hidden" id="unit_price"></p>
-                        <p class="hidden" id="instance_code"></p>
-                        <p class="hidden" id="instance_name"></p>
-                        <p class="hidden" id="promotion_price"></p>
-                        <p class="hidden" id="item_instances"></p>
-                        <p class="hidden" id="item_code"></p>
-                  </div>
-                  <div class="col-md-7 item-detail">      
-                      <h5>Attributes</h5>           
-                     <div class="attributes-list">
-                     </div>
-                     <hr>
-                     <h5>Options</h5>
-                     <div class="options-list">
-                     </div>
-                     <hr>
-                  </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <div class="mr-auto">
-                  <h4 class=" pull-left">Total : <span id="total_price"></span></h4>
-                </div>
-               <div class="row">
-                <div class="col-md-4">
-                  <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
-                </div>
-                <div class="col-md-6">
-                    <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order</button>
-                </div>
-              </div>
-            </div>
-        </div>
-      </div>
-    </div>
-
-
-     <!-- Large modal -->
-    <div class=" modal sx_item_set_detailModal" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
-      <div class="modal-dialog custom-modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
-            <h4 class="modal-title" style="color:#fff;" id="set_name"></h4>
-               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
-                
-            </div>
-            <div class="modal-body">
-                <div class="row set-item">
-                  <div class="col-md-4">
-                  <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
-                      <!-- <div class="form-group">
-                        <label class="col-md-6" style="margin-top:5px">Quantity</label>
-                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">
-                      </div>  -->
-
-                      <div class="input-group">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-danger btn-number"  value="-" id="set_minus">
-                                <i class="material-icons">remove</i>
-                              </button>
-                          </span>
-                          <input type="text" value="1" id="set_count" class="set_change_qty keypress_qty form-control col-md-12 ">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
-                                  <i class="material-icons">add</i>
-                              </button>
-                          </span>
-                      </div>
-
-                        <p class="hidden" id="set_unit_price"></p>
-                        <p class="hidden" id="set_instance_code"></p>
-                        <p class="hidden" id="set_instance_name"></p>
-                        <p class="hidden" id="set_promotion_price"></p>
-                        <p class="hidden" id="set_item_instances"></p>
-                        <p class="hidden" id="set_item_code"></p>
-                        <p></p>
-
-                        <div class="options-list">
-                        </div>
-
-                  </div>
-                  <div class="col-md-8">       
-                     <div class="instance-list row"></div>
-                  </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <div class="mr-auto">
-                  <h4 class=" pull-left">Total : <span id="set_total_price"></span></h4>
-                </div>
-
-               <div class="row">
-
-                <div class="col-md-4">
-                  <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
-                </div>
-                <div class="col-md-6">
-                    <button type="button" class="btn btn-primary set_order" data-dismiss="modal" id="set_order">Add to Order</button>
-                </div>
-              </div>
-               
-            </div>
-        </div>
-      </div>
-    </div>
-    
-    <% if type && !modify_order%>
-    <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header" style="margin-top: -1rem;">
-            <!-- <h4 class="modal-title" id="TableModalLabel">Select Table</h4> -->
-             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
-          </div>
-          <div class="modal-body" style="margin-top: -0.75rem;padding-top:5px">
-          <%@zone.each do |zone| %>
-            <h5>Zone : <%=zone.name%></h5>
-            <div class="card-columns" style="column-count: 7;">
-              <%zone.tables.each do |table| %>
-                 <% if table.status == 'occupied' %>
-                          <% if table.get_booking.nil? %>
-                            <% if table.get_checkout_booking.nil? %>
-                              <%  color="red"%>
-                            <% else %>                            
-                              <%  color="orange"%>
-                            <% end %>                         
-                                
-                          <% else %>         
-                            <% if table.get_checkout_booking.nil? %>
-                              <%  color="blue"%>
-                            <% else %>                       
-                              <%  color="orange"%>
-                            <% end %>
-                          <% end %>
-                      <% else %>
-                         <%  color="green"%>
-                      <% end %>
-                <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
-                  <div class="card-block">
-                    <%= table.name %>
-                    
-                  </div>
-                </div>
-              <%end%>
-           </div>
-        <%end%>
-         <div class="modal-footer  p-r-30">
-              <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
-              &nbsp;  &nbsp;
-              <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
-        </div>
-      </div>
-    </div>
-    </div>
-    </div>
-    <% end %>
-<script>
-    jQuery(function(){
-        id = "<%=@menu[0].id%>";
-       jQuery('.first_'+id).click();
-    });
-    $(document).ready(function () {
-    $(".tables").on('click', function () {
-        $('.tables').css('background-color','');
-        $('.tables').removeClass('purple')
-        var dining_id = $(this).attr("data-id");
-        var name = $(this).attr("data-name");
-        var type = $(this).attr("data-type");
-        $(this).css('background-color','purple');
-        $(this).addClass('purple')
-        $('.confirm_table').attr("data-id",dining_id)
-        $('.confirm_table').attr("data-name",name)
-        $('.confirm_table').attr("data-type",type)
-
-    });
-    $(".confirm_table").on('click', function () {
-        var dining_id = $(this).attr("data-id");
-        var name      = $(this).attr("data-name");
-        var type      = $(this).attr("data-type");
-        $('#table_id').val(dining_id)
-        $('#table_type').text(type)
-        $('.select_table').text(name)
-
-        console.log(type)
-
-    });
-
-    $('#pending_order').on('click', function () {
-      window.location.href = '/origami/quick_service/pending_order';
-    });
-
-    $(document).on('click', '.menu_click', function(event){
-      var menu_id = $(this).attr("data-id");
-      var name = $(this).attr("data-name");
-      var url = "get_menu/"+menu_id;
-      show_menu_cat_list(name, url); 
-    }); 
-  //End menu category Click
-
-    //show menu item list when click menu category
-    function show_menu_cat_list(name, url_item){ 
-      var menu_list = $('.menu_items_list');
-      menu_list.empty();
-
-      var menu_cat = $('.category_list');
-      menu_cat.empty();
-
-      $(".main_menu").text(name)
-      if (modify_order=="true" && type =="true") {
-         url_item = '../../../addorders/'+url_item;
-       }if(modify_order=="false" && type =="true"){
-         url_item = 'addorders/'+url_item
-       }else{
-         url_item = url_item;
-       }
-
-      //Start Ajax
-      $.ajax({      
-        type: "GET",         
-        url: url_item, 
-        data: {},
-        dataType: "json",
-        success: function(data) {
-
-          for(var i in data) {  
-            if (data[i].is_available == true) {
-              
-              row = '<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="'+ data[i].id +'">'
-                       +' <div class="card-block custom-card-block">'
-                         +'  <p>'+ data[i].name +'<p>'
-                         +'  <p>'+ data[i].code +' <p>'
-                       +'  </div>'
-                    +'   </div>';
-              $('.menu_items_list').append(row);
-
-              list = '<li class="nav-item menu_category sub_click" data-id="'+ data[i].id +'">'
-                        +'<p class="hidden menu-id">'+ data[i].id +'</p> '
-                          +'<a class="nav-link" data-toggle="tab" href="" role="tab"> '+ data[i].name +''
-                           +'<ul class=" sub_category_list hidden fadeInTop animated"' 
-                           +'id="sub_category_list">'
-                          +'</ul>'
-                        +'</a>'
-                      +'</li>';
-              $('.category_list').append(list);
-            }
-            
-          }
-        }
-      });
-      //end Ajax 
-    }
-    //end show list function
-  });
-</script>
\ No newline at end of file
+<%= render 'add_order' %>
\ No newline at end of file
diff --git a/app/views/origami/quick_service/_menu_item.json.jbuilder b/app/views/origami/quick_service/_menu_item.json.jbuilder
new file mode 100755
index 00000000..a18645c8
--- /dev/null
+++ b/app/views/origami/quick_service/_menu_item.json.jbuilder
@@ -0,0 +1,119 @@
+# Format for attributes json
+attr_format = []
+# Format for attributes json 
+if item.item_attributes.count > 0   
+  item.item_attributes.each do|attr_id|      
+    menu_attr = MenuItemAttribute.find(attr_id)
+    if attr_format.count == 0
+      attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] })
+      next
+    end
+
+    attr_format.each do |af|
+      if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]}
+        if menu_attr.attribute_type == af[:type]
+          af[:values].push(menu_attr.name)
+        end
+      else 
+        new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] }
+        attr_format.push(new_attr) 
+        break      
+      end          
+    end
+  end
+end
+
+# Format for option json
+opt_format = []
+# Format for attributes json 
+if item.item_options.count > 0   
+  item.item_options.each do|opt|      
+    menu_opt = MenuItemOption.find(opt)
+    if opt_format.count == 0
+      opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
+      next
+    end
+
+    opt_format.each do |of|
+      if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
+        if menu_opt.option_type == of[:type]
+          of[:values].push(menu_opt.name)
+        end
+      else 
+        new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
+        opt_format.push(new_opt) 
+        break
+      end
+    end         
+  end
+end
+
+#Menu Item Information
+json.id           item.id
+json.code    item.item_code
+json.name         item.name
+json.alt_name     item.alt_name
+json.image        item.image_path.url
+json.description  item.description
+json.information  item.information
+json.type         item.type
+json.account_id   item.account_id
+json.min_qty      item.min_qty
+json.is_available item.is_available
+json.is_sub_item  item.is_sub_item
+json.unit         item.unit
+
+# Item Sets of Menu Item 
+json.item_sets item.item_sets do |its|
+  json.id                 its.id
+  json.name               its.name
+  json.alt_name           its.alt_name
+  json.min_selectable_qty its.min_selectable_qty
+  json.max_selectable_qty its.max_selectable_qty
+  json.instances its.menu_item_instances do |i|
+    json.id  i.id
+  end
+end 
+
+json.attributes attr_format
+json.options opt_format
+# json.min_selectable_item item.min_selectable_item
+# json.max_selectable_item item.max_selectable_item
+
+#Item instance
+# if item.menu_item_instances.count == 1 then
+#   item_instance = item.menu_item_instances[0]
+#   json.price = item_instance.price
+#   json.is_available = item_instance.is_available
+#   json.is_on_promotion = item_instance.is_on_promotion
+#   json.promotion_price = item_instance.promotion_price
+#   json.item_attributes = item_instance.item_attributes
+
+json.instances item.menu_item_instances do |is|
+  if is.is_available
+    # Convert id to name for attributes
+    instance_attr = []
+    is.item_attributes.each do |ia|
+       mItemAttr = MenuItemAttribute.find(ia).name
+      instance_attr.push(mItemAttr)
+    end
+    
+      json.id is.id
+      json.code is.item_instance_code
+      json.name is.item_instance_name
+      json.price is.price
+      json.is_available is.is_available
+      json.is_default is.is_default
+      json.is_on_promotion is.is_on_promotion
+      json.promotion_price is.promotion_price
+      json.values instance_attr
+      # json.item_sets is.item_sets
+  end
+end
+
+#Child Menu items
+# if (item.children) then
+#   json.set_items item.children.each do |item|
+#     json.partial! 'api/restaurant/menu/menu_item', item: item
+#   end
+# end
\ No newline at end of file
diff --git a/app/views/origami/quick_service/get_all_product.json.jbuilder b/app/views/origami/quick_service/get_all_product.json.jbuilder
new file mode 100755
index 00000000..01921c59
--- /dev/null
+++ b/app/views/origami/quick_service/get_all_product.json.jbuilder
@@ -0,0 +1,4 @@
+
+json.array! @product, :id, :item_code, :name, :alt_name,:image_path,
+						 :description,:information,:taxable,:unit_price, :created_at,
+						 :updated_at, :created_by
\ No newline at end of file
diff --git a/app/views/origami/quick_service/get_menu.json.jbuilder b/app/views/origami/quick_service/get_menu.json.jbuilder
new file mode 100644
index 00000000..bbe18fff
--- /dev/null
+++ b/app/views/origami/quick_service/get_menu.json.jbuilder
@@ -0,0 +1 @@
+json.array! @menu_category
\ No newline at end of file
diff --git a/app/views/origami/quick_service/get_menu_category.json.jbuilder b/app/views/origami/quick_service/get_menu_category.json.jbuilder
new file mode 100755
index 00000000..91f659e8
--- /dev/null
+++ b/app/views/origami/quick_service/get_menu_category.json.jbuilder
@@ -0,0 +1,8 @@
+if @menu.menu_items
+    json.menu_items @menu.menu_items do |item|
+    	if item.is_available
+    		json.partial! 'origami/addorders/menu_item', item: item
+    	end
+		
+    end
+end
diff --git a/app/views/origami/quick_service/get_menu_sub_category.json.jbuilder b/app/views/origami/quick_service/get_menu_sub_category.json.jbuilder
new file mode 100644
index 00000000..d391e4c5
--- /dev/null
+++ b/app/views/origami/quick_service/get_menu_sub_category.json.jbuilder
@@ -0,0 +1,9 @@
+if @sub_menu
+	json.sub_category @sub_menu.each do |sub_cat|
+		json.id                 sub_cat.id
+		json.code               sub_cat.code
+		json.name               sub_cat.name
+		json.menu_id            sub_cat.menu_id
+		json.menu_category_id   sub_cat.menu_category_id
+	end
+end
diff --git a/app/views/origami/quick_service/index.html.erb b/app/views/origami/quick_service/index.html.erb
index e69de29b..7108125b 100644
--- a/app/views/origami/quick_service/index.html.erb
+++ b/app/views/origami/quick_service/index.html.erb
@@ -0,0 +1,3 @@
+<%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
+<%= render 'origami/addorders/add_order' %>
\ No newline at end of file

From b073ebbeebcad845be1efcd7c4b59e1ba56976e2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 10:20:50 +0630
Subject: [PATCH 342/651] change ReceiptBillPdf

---
 app/models/print_setting.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb
index b4f17a62..d28b852b 100755
--- a/app/models/print_setting.rb
+++ b/app/models/print_setting.rb
@@ -3,6 +3,6 @@ class PrintSetting < ApplicationRecord
 	validates_presence_of :name, :unique_code, :printer_name, :page_width, :page_height, :print_copies
 
 	def self.get_precision_delimiter
-		PrintSetting.find_by_unique_code("CloseCashierPdf")
+		PrintSetting.find_by_unique_code("ReceiptBillPdf")
 	end
 end

From 32340c52e656e61566f93220e171d00ae65f26d9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 13:55:24 +0630
Subject: [PATCH 343/651] check discount calculation

---
 app/views/origami/discounts/index.html.erb | 266 ++++++++++++---------
 1 file changed, 158 insertions(+), 108 deletions(-)

diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index eab4d888..ccb2c0e8 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -31,6 +31,7 @@
       	</div>
       	<div id="order-detail-slimscroll" data-height="160">
       	<div class="card-text dining">
+      		<span id="discount_itemsErr" style="color:red;"></span>
       		<table class="table table-default" id="order-items-table">
       			<thead>
       				<tr>
@@ -117,6 +118,7 @@
 					<div class="col-md-12">	
 						<div class="form-group">											
 							<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
+							<span id="discount-amountErr" style="color:red;"></span>
 						</div>
 						<br>
 						<div class="form-group">			
@@ -254,12 +256,9 @@ var cashier_type = "<%= @cashier_type %>";
 				var original_value=0;
 				original_value = $('#discount-amount').val();
 				var input_type = $(this).attr("data-type");
-				var grand_total = $('#order-grand-total').text();
-				console.log(grand_total);
 				switch (input_type) {
 					case 'num':
 						var input_value = $(this).attr("data-value");
-						console.log(input_value);
 						if (original_value == "0.0"){
 							$('#discount-amount').val(input_value);						
 						}
@@ -332,24 +331,40 @@ var cashier_type = "<%= @cashier_type %>";
 	$("#net").on('click', function(e){
 		e.preventDefault();
 		var sale_id = $('#sale-id').text();
-		var discount_value = parseFloat($('#discount-amount').val());
+		var discount_value = $('#discount-amount').val();
+		var sub_total = parseFloat($('#order-sub-total').text());
 		var ajax_url = "/origami/" + sale_id + "/discount";
+		
+		if(discount_value!=""){
+			if(discount_value > 0){
+				if(parseFloat(discount_value) > sub_total){
+					$("#discount-amount").val("");
+					$("#discount-amountErr").html("Discount is greater than sub total!");
+				}else{
+					$("#discount-amountErr").html("");
+					// Selected Items
+					var sale_items = get_selected_sale_items();					
 
-		// Selected Items
-		var sale_items = get_selected_sale_items();					
+					// Selected Account
+					var account_types = get_selected_account_types();
 
-		// Selected Account
-		var account_types = get_selected_account_types();
+					if(sale_items.length == 0 && account_types.length == 0){
+						calculate_overall_discount(0, discount_value);
+					}
+					else {
+						calculate_item_discount(0, discount_value, sale_items, account_types);	
+					}	
 
-		if(sale_items.length == 0 && account_types.length == 0){
-			calculate_overall_discount(0, discount_value);
+					// Remove Selection
+					selection_remove();
+				}
+			}else{
+				$("#discount-amountErr").html("Discount must be greater than 0!");
+			}
+		}else{
+			$("#discount-amountErr").html("can't be  blank");
 		}
-		else {
-			calculate_item_discount(0, discount_value, sale_items, account_types);	
-		}	
-
-		// Remove Selection
-		selection_remove();						
+						
 	});
 
 	// Calculate Percentage Discount for Payment
@@ -360,8 +375,7 @@ var cashier_type = "<%= @cashier_type %>";
 		var ajax_url = "/origami/" + sale_id + "/discount";
 
 		// Selected Items
-		var sale_items = get_selected_sale_items();					
-
+		var sale_items = get_selected_sale_items();	
 		// Selected Account
 		var account_types = get_selected_account_types();
 		
@@ -435,7 +449,6 @@ var cashier_type = "<%= @cashier_type %>";
 
 		// Selected Items		
 		var sale_items = get_selected_sale_items();	
-		console.log(sale_items.length);
 		if(sale_items.length == 0){
 			//swal("Information!", "You have no selected item!");
 			swal ( "Oops" ,  "You have no selected item!" ,  "error" );		
@@ -669,113 +682,150 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 	var dis_amount = 0;
 	var sub_total = 0;
 	var total_discount = 0;
+	var arrItemName = "";
+	$("#discount_itemsErr").html("");
+	$("#discount-amountErr").html("");
 	// For Net Pay
-	if(type == 0){
-		dis_amount = (0 - amount);
-		if(sale_items.length > 0){
-			for(var i=0;i < sale_items.length;i++){
-				// if(account_types.length > 0){
-				// 	for(var j=0; j < account_types.length; j++){
-				// 		if(sale_items[i].account_id == account_types[j].id){						
-				// 			// Discount Items
-				// 	        var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount);
-				// 	        $("#order-items-table tbody").append(discount_item_row);
-				// 	        total_discount = total_discount + amount;
-				// 		}
-				// 	}
-				// }
-				// else {
-					var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-					$("#order-items-table tbody").append(discount_item_row);
-					total_discount = total_discount + amount;
-				// }
-			}
-		}
-
-		// No Needs For Auto Selected
-		// if(account_types.length > 0){			
-		// 	var item_rows=get_item_rows();
-		// 	if(item_rows.length > 0){
-		// 		for(var k=0; k < item_rows.length; k++){
-		// 			for(var j=0; j < account_types.length; j++){
-		// 				if(item_rows[k].account_id == account_types[j].id){
-		// 					// Discount Items
-		// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
-		// 			        $("#order-items-table tbody").append(discount_item_row);
-		// 			        total_discount = total_discount + amount;
-		// 				}
-		// 			}
-		// 		}
-		// 	}
-		// 	else {
-		// 		alert("No Items!");
-		// 	}						
-		// }
-
-		sub_total = origin_sub_total - total_discount;
-	}
-
-	// For Percentage Pay
-	if(type == 1){
-		if(amount > 100 ){
-			swal({
-			    title:"Oops!",
-			    text:'Percentage Value over 100!',
-			    type: "error",
-			    confirmButtonText: 'OK',
-			    confirmButtonColor:"red"
-			});				
-		}
-		else{
-			// Check sale items exists
+	if(origin_sub_total > 0){
+		if(type == 0){
+			dis_amount = (0 - amount);
 			if(sale_items.length > 0){
 				for(var i=0;i < sale_items.length;i++){
 					// if(account_types.length > 0){
 					// 	for(var j=0; j < account_types.length; j++){
 					// 		if(sale_items[i].account_id == account_types[j].id){						
 					// 			// Discount Items
-					// 			dis_amount = 0 - ((sale_items[i].price * amount)/100);
-					// 	        var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+					// 	        var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount);
 					// 	        $("#order-items-table tbody").append(discount_item_row);
-					// 	        total_discount = total_discount + dis_amount;
+					// 	        total_discount = total_discount + amount;
 					// 		}
 					// 	}
 					// }
 					// else {
-						dis_amount = 0 - ((sale_items[i].price * amount)/100);
-						var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-						$("#order-items-table tbody").append(discount_item_row);
-						total_discount = total_discount + dis_amount;
+						if(parseFloat(amount) > parseFloat(sale_items[i].price)){
+							arrItemName += ", " + sale_items[i].name;
+						}else{
+							var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+							total_discount = parseFloat(total_discount) + parseFloat(amount);
+
+							if(parseFloat(origin_sub_total) >= parseFloat(total_discount)){
+								$("#order-items-table tbody").append(discount_item_row);
+							}else{
+								total_discount = parseFloat(total_discount) - parseFloat(amount);
+								$("#discount-amountErr").html("Discount is greater than sub total!");
+							}
+						}
+						
 					// }
 				}
-				sub_total = origin_sub_total + total_discount;
 			}
+
+			if(arrItemName!=""){
+				arrItemName = arrItemName.substr(2);
+				if(arrItemName.match(/,/g || []) != null){
+					if(arrItemName.match(/,/g || []).length >= 1){
+						$("#discount_itemsErr").html("Discount is greater than "+arrItemName+" prices");
+					}
+				}else{
+					$("#discount_itemsErr").html("Discount is greater than "+arrItemName+" price");
+				}
+				
+			}
+			
+			// No Needs For Auto Selected
+			// if(account_types.length > 0){			
+			// 	var item_rows=get_item_rows();
+			// 	if(item_rows.length > 0){
+			// 		for(var k=0; k < item_rows.length; k++){
+			// 			for(var j=0; j < account_types.length; j++){
+			// 				if(item_rows[k].account_id == account_types[j].id){
+			// 					// Discount Items
+			// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
+			// 			        $("#order-items-table tbody").append(discount_item_row);
+			// 			        total_discount = total_discount + amount;
+			// 				}
+			// 			}
+			// 		}
+			// 	}
+			// 	else {
+			// 		alert("No Items!");
+			// 	}						
+			// }
+
+			sub_total = parseFloat(origin_sub_total) - parseFloat(total_discount);
 		}
-		// No Needs For Auto Selected
-		// Check account types exists
-		// if(account_types.length > 0){			
-		// 	var item_rows=get_item_rows();
-		// 	console.log(account_types);
-		// 	if(item_rows.length > 0){
-		// 		for(var k=0; k < item_rows.length; k++){
-		// 			for(var j=0; j < account_types.length; j++){
-		// 				if(item_rows[k].account_id == account_types[j].id){
-		// 					// Discount Items							
-		// 					dis_amount = 0 - ((item_rows[k].price * amount)/100);
-		// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
-		// 			        $("#order-items-table tbody").append(discount_item_row);
-		// 			        total_discount = total_discount + dis_amount;
-		// 				}
-		// 			}
-		// 		}
-		// 	}
-		// 	else {
-		// 		alert("No Items!");
-		// 	}						
-		// }		
+
+		// For Percentage Pay
+		if(type == 1){
+			if(amount > 100 ){
+				swal({
+				    title:"Oops!",
+				    text:'Percentage Value over 100!',
+				    type: "error",
+				    confirmButtonText: 'OK',
+				    confirmButtonColor:"red"
+				});				
+			}
+			else{
+				// Check sale items exists
+				if(sale_items.length > 0){
+					for(var i=0;i < sale_items.length;i++){
+						// if(account_types.length > 0){
+						// 	for(var j=0; j < account_types.length; j++){
+						// 		if(sale_items[i].account_id == account_types[j].id){						
+						// 			// Discount Items
+						// 			dis_amount = 0 - ((sale_items[i].price * amount)/100);
+						// 	        var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+						// 	        $("#order-items-table tbody").append(discount_item_row);
+						// 	        total_discount = total_discount + dis_amount;
+						// 		}
+						// 	}
+						// }
+						// else {
+							dis_amount = 0 - ((sale_items[i].price * amount)/100);
+							var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
+							
+							total_discount = total_discount + dis_amount;
+							if(parseFloat(origin_sub_total) >= parseFloat(total_discount)){
+								$("#order-items-table tbody").append(discount_item_row);
+							}else{
+								total_discount = total_discount - dis_amount;
+								$("#discount-amountErr").html("Discount is greater than sub total!");
+							}
+						// }
+					}
+					sub_total = parseFloat(origin_sub_total) + parseFloat(total_discount);
+				}
+			}
+			// No Needs For Auto Selected
+			// Check account types exists
+			// if(account_types.length > 0){			
+			// 	var item_rows=get_item_rows();
+			// 	console.log(account_types);
+			// 	if(item_rows.length > 0){
+			// 		for(var k=0; k < item_rows.length; k++){
+			// 			for(var j=0; j < account_types.length; j++){
+			// 				if(item_rows[k].account_id == account_types[j].id){
+			// 					// Discount Items							
+			// 					dis_amount = 0 - ((item_rows[k].price * amount)/100);
+			// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
+			// 			        $("#order-items-table tbody").append(discount_item_row);
+			// 			        total_discount = total_discount + dis_amount;
+			// 				}
+			// 			}
+			// 		}
+			// 	}
+			// 	else {
+			// 		alert("No Items!");
+			// 	}						
+			// }		
+		}
+		
+		$("#order-sub-total").text(parseFloat(sub_total).toFixed(2));
+	}else{
+		$("#discount-amountErr").html("Discount is greater than sub total!");
 	}
 	
-	$("#order-sub-total").text(sub_total);
 }
 
 function item_row_template(type, item, discount_amount, amount){

From 1d70a9f1781ec41d69110e58343a461c0677e65f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 28 Feb 2018 14:20:22 +0630
Subject: [PATCH 344/651] update fixed issues for quickservice from sqa

---
 app/assets/javascripts/addorder.js            |  69 +--
 app/assets/stylesheets/addorder.scss          |   2 +-
 .../origami/addorders_controller.rb           |   2 +-
 .../origami/payments_controller.rb            |  13 +
 .../origami/pending_order_controller.rb       |   8 +-
 .../origami/quick_service_controller.rb       |   3 +-
 .../origami/addorders/_add_order.html.erb     | 584 ------------------
 app/views/origami/addorders/detail.html.erb   | 581 ++++++++++++++++-
 app/views/origami/addorders/index.html.erb    | 111 ----
 app/views/origami/payments/show.html.erb      |  12 +-
 app/views/origami/pending_order/show.html.erb |   2 +-
 .../quick_service/_menu_item.json.jbuilder    | 119 ----
 .../get_all_product.json.jbuilder             |   4 -
 .../quick_service/get_menu.json.jbuilder      |   1 -
 .../get_menu_category.json.jbuilder           |   8 -
 .../get_menu_sub_category.json.jbuilder       |   9 -
 .../origami/quick_service/index.html.erb      |   3 -
 17 files changed, 641 insertions(+), 890 deletions(-)
 delete mode 100644 app/views/origami/addorders/_add_order.html.erb
 delete mode 100755 app/views/origami/addorders/index.html.erb
 delete mode 100755 app/views/origami/quick_service/_menu_item.json.jbuilder
 delete mode 100755 app/views/origami/quick_service/get_all_product.json.jbuilder
 delete mode 100644 app/views/origami/quick_service/get_menu.json.jbuilder
 delete mode 100755 app/views/origami/quick_service/get_menu_category.json.jbuilder
 delete mode 100644 app/views/origami/quick_service/get_menu_sub_category.json.jbuilder

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 475652af..de1024ea 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -1,7 +1,7 @@
 $(function() { 
   var role = $('#role').val();
-  type = $('#type').val();
-  modify_order = $('#modify_order').val();
+  type = window.location.href.indexOf("quick_service");
+  modify_order = window.location.href.indexOf("modify_order");
   //click menu sidebar menu category
   $(".product").on("click", function(){
     var url = $(this).attr('data-ref');
@@ -88,13 +88,16 @@ $(function() {
   function show_menu_item_list(url_item){ 
     var menu_list = $('.menu_items_list');
     menu_list.empty();
-  
-    if (modify_order=="true" && type =="true") {
-       url_item = '../../../addorders/'+url_item;
-    }if(modify_order=="false" && type =="true"){
-       url_item = 'addorders/'+url_item
-    }else{
-       url_item = url_item;
+
+   type = window.location.href.indexOf("quick_service");
+   modify_order = window.location.href.indexOf("modify_order");
+    if (type != -1 && modify_order != -1) {
+      url_item = '../../../addorders/'+url_item;
+    }if(modify_order == -1 && type != -1){
+      url_item = 'addorders/'+url_item;
+    }
+    if (type ==-1 && modify_order == -1){
+      url_item = url_item
     }
 
     //Start Ajax
@@ -104,8 +107,6 @@ $(function() {
       data: {},
       dataType: "json",
       success: function(data) {
-        console.log(data);
-        console.log("ememem")
         var menu_items_list = $('.menu_items_list');
         menu_items_list.empty();
         menu_items = data.menu_items;
@@ -758,14 +759,10 @@ $(function() {
     e.preventDefault();
     $("#oqs_loading_wrapper").show();
     
-    type = $('#type').val();
-    if (type == 'true') {
-      // if (role == 'waiter') {
-        type = 'quick_service'
-      // }else{
-      //   type = 'cashier'
-      // }
+    type = window.location.href.indexOf("quick_service");
 
+    if (type != 'true') {
+      type = 'quick_service'
       var table_type = $('#table_type').text();
       var table_id    = $('#table_id').val();
       var customer_id = $('#customer_id').val();
@@ -785,15 +782,15 @@ $(function() {
       var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
                   'table_id': table_id, 
-                  'order_items': order_items };
+                  'order_items': order_items,'create_type' : "create_only" };
     }else{
       var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
-                  'order_items': order_items };
+                  'order_items': order_items,'create_type' : "create_only" };
     }
-    
-      if (table_id.length>0 || role == 'waiter') {
+
+      // if (table_id.length>0 || role == 'waiter') {
         $.ajax({
           type: "POST",
           url: ajax_url,
@@ -812,12 +809,12 @@ $(function() {
               }
            }
         });
-      }else{
-        $(this).removeAttr('disabled', '');
-        $("#oqs_loading_wrapper").hide();
+      // }else{
+      //   $(this).removeAttr('disabled', '');
+      //   $("#oqs_loading_wrapper").hide();
 
-        swal("Opps","Please Select Table or Room","warning");
-      }
+      //   swal("Opps","Please Select Table or Room","warning");
+      // }
   });
 
 
@@ -826,9 +823,10 @@ $(function() {
     $(this).attr('disabled', 'disabled');
     e.preventDefault();
     type = "quick_service"
+    modify_order = window.location.href.indexOf("modify_order");
     $("#oqs_loading_wrapper").show();
     console.log(modify_order)
-      if (modify_order == "true") {
+      if (modify_order !=-1) {
         console.log($('#sale_id').text())
         var ajax_url   = '../../../quick_service/update_modify_order';
         var table_type = $('#table_type').text();
@@ -850,12 +848,12 @@ $(function() {
       var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
                   'table_id': table_id, 
-                  'order_items': order_items,'sale_id': sale_id  };
+                  'order_items': order_items,'sale_id': sale_id,'create_type': "create_pay"  };
     }else{
       var params = {'order_source': type, 'order_type': "dine_in",
                   'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
-                  'order_items': order_items,'sale_id': sale_id };
+                  'order_items': order_items,'sale_id': sale_id,'create_type': "create_pay" };
     }
     
     $.ajax({
@@ -987,7 +985,7 @@ $(function() {
   $("#back").on("click", function(){
     var table_id   = $('#table_id').text();
     var table_type = $('#table_type').text();
-    type = $('#type').val();
+    type = window.location.href.indexOf("quick_service");
     if (type == 'true') {
       var table_type = $('#table_id').find("option:selected").data('type');
       var table_id    = $('#table_id').val();
@@ -1113,11 +1111,12 @@ $(function() {
   //show menu item list when click menu category
   function show_sub_category_list(url,sub_category){ 
 
-    if (modify_order == "true" && type =="true") {
+    if (type != -1 && modify_order != -1) {
       var url = "../../../addorders/"+url;
-    }if(modify_order=="false" && type =="true"){
+    }if(modify_order== -1 && type != -1){
       var url = 'addorders/'+url;
-    }else{
+    }
+    if (type ==-1 && modify_order == -1){
       var url = url;
     }
 
@@ -1130,8 +1129,6 @@ $(function() {
       data: {},
       dataType: "json",
       success: function(data) {
-        console.log(data)
-        console.log("ffffffffff")
         var sub_category_list = $('.sub_category_list');
         sub_category_list.empty();
         data = data.sub_category;
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index faff5850..d8adba16 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -175,7 +175,7 @@ section.content{
   text-align: center;
 }
 
-.add_icon{
+.menu_item_box{
    cursor: pointer; 
 }
 
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 9c19bbf2..c9b1bc44 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -156,7 +156,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       end
 
       @status, @booking = @order.generate
-      if current_user.role != "waiter"
+      if current_user.role != "waiter" && params[:create_type] == "create_pay"
         if @status && @booking && @order.source == 'quick_service'
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fa7e5914..970095e9 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -403,6 +403,19 @@ class Origami::PaymentsController < BaseOrigamiController
 
         printer = Printer::ReceiptPrinter.new(print_settings)
         printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)   
+
+        if params[:type] == "quick_service"
+          booking = Booking.find_by_sale_id(sale_id)
+          if booking.dining_facility_id.to_i>0
+            table_id = booking.dining_facility_id
+          else
+            table_id = 0
+          end
+          
+          booking.booking_orders.each do |order|
+            Order.pay_process_order_queue(order.order_id,table_id)
+          end
+        end
       end
     end    
   end
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index 4ed81121..d738a0a5 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -23,15 +23,15 @@ class Origami::PendingOrderController < BaseOrigamiController
 
       @order_items = Array.new
       @bookings.booking_orders.each do |booking_order|
-        order = Order.find(booking_order.order_id)
-        if (order.status == "new")
-          order.order_items.each do |item|
+        @order = Order.find(booking_order.order_id)
+        if (@order.status == "new")
+          @order.order_items.each do |item|
             @order_items.push(item)
           end
         end
       end
     end
-    
+    puts @status
     if @bookings.dining_facility_id.to_i > 0
       @table_id = Booking.find(@bookings.booking_id).dining_facility_id
       @dining  = DiningFacility.find(@table_id)
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 8516c493..44dcfcb8 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -14,7 +14,7 @@ class Origami::QuickServiceController < ApplicationController
       # @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')
-      # render "origami/addorders/detail"
+       render "origami/addorders/detail"
   end
 
   def modify_order
@@ -51,6 +51,7 @@ class Origami::QuickServiceController < ApplicationController
     else
       @booking = nil
     end
+     render "origami/addorders/detail"
   end
 
   def update_modify_order
diff --git a/app/views/origami/addorders/_add_order.html.erb b/app/views/origami/addorders/_add_order.html.erb
deleted file mode 100644
index efe21d2a..00000000
--- a/app/views/origami/addorders/_add_order.html.erb
+++ /dev/null
@@ -1,584 +0,0 @@
-
-
-<div id="oqs_loading_wrapper" style="display:none;">
-  <div id="oqs_loading"></div>
-</div>
-
-<% type = request.path_info.include?('quick_service')%>
-<% modify_order = request.path_info.include?('modify_order')%>
-<input type="hidden" name="type" id="type" value="<%=type%>">
-<input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
-<input type="hidden" name="type" id="role" value="<%= current_user.role%>">
-
-<div class="row m-t--20">
-    <div class="col-lg-2 col-md-2 col-sm-2">
-        <!-- <a href="javascript:void(0);" class="dropdown-toggle waves-block p-t-15 p-l-15 p-b-15" data-toggle="dropdown" aria-haspopup="" aria-expanded="true" style="background-color: #eeeeee;border-bottom: .214rem solid #fff;border-left: 1px solid #54A5AF;
-    border-right: 1px solid #54A5AF;"> 
-            <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
-        </a>
-        <ul class="dropdown-menu menu_list" style="width:90%">
-           <% @menus.each do |menu| %>
-              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>">
-                   <a class="nav-link" data-toggle="tab" href="" role="tab"><%=menu.name%></a>
-              </li>
-           <%end%>
-        </ul>  -->  
-        <li class="list-menu">
-        <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
-          
-          <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
-         <!--  <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
-        </a>
-        <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
-          <% @menus.each do |menu| %>
-              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
-                   <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
-              </li>
-           <%end%>
-        </ul>
-      </li> 
-        <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
-            <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
-              <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
-            </li>
-            <% @menu.each do |menu| %>
-              <% if !menu.valid_time.nil? %>
-                <% if menu.menu_category_id.nil? %>
-                <!--if type quick_service or cashier for table -->
-                  <% if type %>
-                    <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
-                          <p class="hidden menu-id"><%= menu.id  %></p> 
-                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                             <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                            </ul>
-                          </a>
-                        </li>
-                    <% end%>
-                  <!-- else quick_service or cashier for table -->
-                  <% else %>
-                    <% if @table.get_current_checkout_booking.nil? %>
-                      <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
-                          <p class="hidden menu-id"><%= menu.id  %></p> 
-                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                             <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                            </ul>
-                          </a>
-                        </li>
-                      <% end%>
-                    <% else %>
-                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
-                        <p class="hidden menu-id"><%= menu.id  %></p> 
-                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                          </ul>
-                        </a>
-                      </li>
-                    <% end%>
-                    <!-- end quick_service or cashier for table -->
-                  <% end %>
-                <% end%>
-              <% end %>
-            <%end %>
-        </ul>
-    </div>
-
-
-
-    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
-      <div class="card">
-        <div class="card-block">
-          <div id="custom-slimscroll">
-             <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
-               <!-- append data -->
-               <% @menu.each do |menu| %>
-                    <% if !menu.valid_time.nil? %>
-                      <% if menu.menu_category_id.nil? %>
-                      <!--if type quick_service or cashier for table -->
-                        <% if type %>
-                          <% if !menu.code.include? "SPL" %>
-                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                              <div class='card-block custom-card-block'>
-                                <p><%=menu.name%> <p>
-                                <p><%=menu.code%> <p>
-                              </div>
-                            </div>
-                          <% end%>
-                        <!-- else quick_service or cashier for table -->
-                        <% else %>
-                          <% if @table.get_current_checkout_booking.nil? %>
-                            <% if !menu.code.include? "SPL" %>
-                              <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                                <div class='card-block custom-card-block'>
-                                  <p><%=menu.name%> <p>
-                                  <p><%=menu.code%> <p>
-                                </div>
-                             </div>
-                            <% end%>
-                          <% else %>
-                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
-                              <div class='card-block custom-card-block'>
-                                <p><%=menu.name%> <p>
-                                <p><%=menu.code%> <p>
-                              </div>
-                            </div>
-                          <% end%>
-                          <!-- end quick_service or cashier for table -->
-                        <% end %>
-                      <% end%>
-                    <% end %>
-                  <%end %>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
-        
-        <% if type && modify_order%>
-          <button type="button" class="btn btn-lg btn-default waves-effect col-md-4" id='back'>
-           <!--  <i class="material-icons">reply</i> -->
-             Back
-          </button>
-          
-           <button type="button" class="btn btn-lg btn-primary waves-effect col-md-7" id='pending_order'>Pending Order
-          </button>
-         
-        <%elsif !modify_order && type%>
-            <button type="button" class="btn btn-lg btn-default waves-effect col-md-2" id='back' style="    padding: .5rem 0.15rem !important;">
-             <!--  <i class="material-icons">reply</i> -->
-               Back
-            </button>
-            
-                <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
-                </button>
-           
-            <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
-            <input type="hidden" name="table_id" value="" id="table_id">
-
-         <%else%>
-            <button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
-                <i class="material-icons">reply</i>Back
-            </button>
-         <%end%>
-          <br>
-        <div class="card-header" style="padding: 0.5rem 0.25rem">
-          <% if type %>
-            <div class="row clearfix">
-               <div class="col-md-6 col-lg-6 col-sm-12">
-                 <strong id="order-title" class="font-13">ORDER DETAILS </strong>
-               </div>
-
-               <% if modify_order %>
-                    <% if @table.nil? %>
-                       <div class="col-md-6 col-lg-6 col-sm-6">Table : </div>
-                       <p class="hidden" id="table_id"><%=@table_id%></p>
-                       <p class="hidden" id="table_type"></p>
-                    <% else%>
-                      <div class="col-md-6 col-lg-6 col-sm-6">Table : <%=@table.name%></div>
-                      <p class="hidden" id="table_id"><%=@table_id%></p>
-                      <p class="hidden" id="table_type"><%=@table.type%></p>
-                    <% end%>
-                     
-                     <p class="hidden" id="booking_id"><%=@booking_id%></p>
-                     <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
-                     <p class="hidden" id="sale_id"><%=@sale_id%></p>
-              <% else%>
-                <p class="hidden" id="table_type"></p>
-              <% end%>
-            </div>
-          <% else %>
-            <div>
-             <strong id="order-title" class="font-14">ORDER DETAILS </strong>| <span class="font-14">Table-<%=@table.name%></span>
-             <p class="hidden" id="table_id"><%=@table_id%></p>
-             <p class="hidden" id="table_type"><%=@table.type%></p>
-             <p class="hidden" id="booking_id"><%=@booking_id%></p>
-             <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
-          </div>
-          <% end%>
-          
-        </div>
-        <div class="card-block">
-            <div class="card-text" id="order-detail-slimscroll" data-height="180">
-               <table class="table table-striped summary-items" id="order-items-table" >
-                 <thead>
-                   <tr>
-                     <th>#</th>
-                     <th class="item-name">Items</th>
-                     <th class="item-qty">QTY</th>
-                     <th class="item-attr">Price</th>
-                   </tr>
-                 </thead>
-                 <tbody class="font-13" >
-                 
-                 </tbody>
-               </table>
-            </div>
-            <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
-            
-               <table class="table" id="order-charges-table" border="0">
-                 <tr>
-                   <td style="padding:2px;" width="5%"></td>
-                   <td style="padding:2px;" width="15%"></td>
-                   <td style="padding:2px; text-align:" class="charges-name" width="25%"><strong>Total:</strong></td>
-                   <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total">0.00</strong></td>
-                 </tr>
-               </table>
-               <% if type && modify_order%>
-                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
-                  
-                    <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
-              <%elsif !modify_order && type%>
-                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
-                    <% if current_user.role != "waiter"%>
-                       <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
-                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
-                    <%end%>
-                    <% if current_user.role == "waiter"%>
-                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
-                    <%end%>
-               <%else%>
-               <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
-               <%end%>
-
-                
-            </div>
-        </div>
-    </div>
-
-    <!-- Modal -->
-    <div class=" modal" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="sx_itemModalLabel" aria-hidden="true" style="">
-      <div class="modal-dialog custom-modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-          <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title"></h4>
-          </div>
-          <div class="modal-body">
-            <table width="100%" class="table table-striped">
-             <thead>
-               <tr>
-                 <th style="">Item Name</th>
-                 <th style="">Quantity</th>
-                 <th></th>
-               </tr>
-             </thead>
-             <tbody>
-               <tr>
-                 <td class="item_name" id="modal-item-name"></td>
-                 <td>
-                   <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
-                 </td>
-                 <td>
-                   <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
-                 </td>
-               </tr>
-             </tbody>
-             </table>
-         </div>
-          <div class="modal-footer">
-          <div class="row">
-            <div class="col-md-5">
-              <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
-            </div>
-            <div class="col-md-5">
-              <button type="button" class="btn btn-primary " data-dismiss="modal" id="save">Update</button>
-            </div>
-          </div>
-            
-            
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- Menu Item modal -->
-
-    <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-      <div class="modal-dialog custom-modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
-            <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
-               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
-                
-            </div>
-            <div class="modal-body">
-                <div class="row no-set-item">
-                  <div class="col-md-5">
-                      <p style="text-align: center;" id="modal_box_img"></p>
-                
-                      
-                        <!-- <label class="col-md-6" style="margin-top:5px">Quantity</label>
-                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="change_qty" value="" min="1" max="100"> -->
-                       
-                        <div class="input-group">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-danger btn-number"  value="-" id="minus">
-                               <i class="material-icons">remove</i>
-                                
-                              </button>
-                          </span>
-                          <input type="text" value="1" id="count" class="change_qty keypress_qty form-control col-md-12 ">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-success btn-number" value="+" id="plus">
-                                 <i class="material-icons">add</i>
-                              </button>
-                          </span>
-                      </div>
-                      
-                        <p class="hidden" id="unit_price"></p>
-                        <p class="hidden" id="instance_code"></p>
-                        <p class="hidden" id="instance_name"></p>
-                        <p class="hidden" id="promotion_price"></p>
-                        <p class="hidden" id="item_instances"></p>
-                        <p class="hidden" id="item_code"></p>
-                  </div>
-                  <div class="col-md-7 item-detail">      
-                      <h5>Attributes</h5>           
-                     <div class="attributes-list">
-                     </div>
-                     <hr>
-                     <h5>Options</h5>
-                     <div class="options-list">
-                     </div>
-                     <hr>
-                  </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <div class="mr-auto">
-                  <h4 class=" pull-left">Total : <span id="total_price"></span></h4>
-                </div>
-               <div class="row">
-                <div class="col-md-4">
-                  <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
-                </div>
-                <div class="col-md-6">
-                    <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order</button>
-                </div>
-              </div>
-            </div>
-        </div>
-      </div>
-    </div>
-
-
-     <!-- Large modal -->
-    <div class=" modal sx_item_set_detailModal" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
-      <div class="modal-dialog custom-modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
-            <h4 class="modal-title" style="color:#fff;" id="set_name"></h4>
-               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
-                
-            </div>
-            <div class="modal-body">
-                <div class="row set-item">
-                  <div class="col-md-4">
-                  <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
-                      <!-- <div class="form-group">
-                        <label class="col-md-6" style="margin-top:5px">Quantity</label>
-                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">
-                      </div>  -->
-
-                      <div class="input-group">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-danger btn-number"  value="-" id="set_minus">
-                                <i class="material-icons">remove</i>
-                              </button>
-                          </span>
-                          <input type="text" value="1" id="set_count" class="set_change_qty keypress_qty form-control col-md-12 ">
-                          <span class="input-group-btn">
-                              <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
-                                  <i class="material-icons">add</i>
-                              </button>
-                          </span>
-                      </div>
-
-                        <p class="hidden" id="set_unit_price"></p>
-                        <p class="hidden" id="set_instance_code"></p>
-                        <p class="hidden" id="set_instance_name"></p>
-                        <p class="hidden" id="set_promotion_price"></p>
-                        <p class="hidden" id="set_item_instances"></p>
-                        <p class="hidden" id="set_item_code"></p>
-                        <p></p>
-
-                        <div class="options-list">
-                        </div>
-
-                  </div>
-                  <div class="col-md-8">       
-                     <div class="instance-list row"></div>
-                  </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <div class="mr-auto">
-                  <h4 class=" pull-left">Total : <span id="set_total_price"></span></h4>
-                </div>
-
-               <div class="row">
-
-                <div class="col-md-4">
-                  <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
-                </div>
-                <div class="col-md-6">
-                    <button type="button" class="btn btn-primary set_order" data-dismiss="modal" id="set_order">Add to Order</button>
-                </div>
-              </div>
-               
-            </div>
-        </div>
-      </div>
-    </div>
-    
-    <% if type && !modify_order%>
-    <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header" style="margin-top: -1rem;">
-            <!-- <h4 class="modal-title" id="TableModalLabel">Select Table</h4> -->
-             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
-          </div>
-          <div class="modal-body" style="margin-top: -0.75rem;padding-top:5px">
-          <%@zone.each do |zone| %>
-            <h5>Zone : <%=zone.name%></h5>
-            <div class="card-columns" style="column-count: 7;">
-              <%zone.tables.each do |table| %>
-                 <% if table.status == 'occupied' %>
-                          <% if table.get_booking.nil? %>
-                            <% if table.get_checkout_booking.nil? %>
-                              <%  color="red"%>
-                            <% else %>                            
-                              <%  color="orange"%>
-                            <% end %>                         
-                                
-                          <% else %>         
-                            <% if table.get_checkout_booking.nil? %>
-                              <%  color="blue"%>
-                            <% else %>                       
-                              <%  color="orange"%>
-                            <% end %>
-                          <% end %>
-                      <% else %>
-                         <%  color="green"%>
-                      <% end %>
-                <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
-                  <div class="card-block">
-                    <%= table.name %>
-                    
-                  </div>
-                </div>
-              <%end%>
-           </div>
-        <%end%>
-         <div class="modal-footer  p-r-30">
-              <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
-              &nbsp;  &nbsp;
-              <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
-        </div>
-      </div>
-    </div>
-    </div>
-    </div>
-    <% end %>
-<script>
-    jQuery(function(){
-        id = "<%=@menu[0].id%>";
-       jQuery('.first_'+id).click();
-    });
-    $(document).ready(function () {
-    $(".tables").on('click', function () {
-        $('.tables').css('background-color','');
-        $('.tables').removeClass('purple')
-        var dining_id = $(this).attr("data-id");
-        var name = $(this).attr("data-name");
-        var type = $(this).attr("data-type");
-        $(this).css('background-color','purple');
-        $(this).addClass('purple')
-        $('.confirm_table').attr("data-id",dining_id)
-        $('.confirm_table').attr("data-name",name)
-        $('.confirm_table').attr("data-type",type)
-
-    });
-    $(".confirm_table").on('click', function () {
-        var dining_id = $(this).attr("data-id");
-        var name      = $(this).attr("data-name");
-        var type      = $(this).attr("data-type");
-        $('#table_id').val(dining_id)
-        $('#table_type').text(type)
-        $('.select_table').text(name)
-
-        console.log(type)
-
-    });
-
-    $('#pending_order').on('click', function () {
-      window.location.href = '/origami/quick_service/pending_order';
-    });
-
-    $(document).on('click', '.menu_click', function(event){
-      var menu_id = $(this).attr("data-id");
-      var name = $(this).attr("data-name");
-      var url = "get_menu/"+menu_id;
-      show_menu_cat_list(name, url); 
-    }); 
-  //End menu category Click
-
-    //show menu item list when click menu category
-    function show_menu_cat_list(name, url_item){ 
-      var menu_list = $('.menu_items_list');
-      menu_list.empty();
-
-      var menu_cat = $('.category_list');
-      menu_cat.empty();
-
-      $(".main_menu").text(name)
-      if (modify_order=="true" && type =="true") {
-         url_item = '../../../addorders/'+url_item;
-       }if(modify_order=="false" && type =="true"){
-         url_item = 'addorders/'+url_item
-       }else{
-         url_item = url_item;
-       }
-
-      //Start Ajax
-      $.ajax({      
-        type: "GET",         
-        url: url_item, 
-        data: {},
-        dataType: "json",
-        success: function(data) {
-
-          for(var i in data) {  
-            if (data[i].is_available == true) {
-              
-              row = '<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="'+ data[i].id +'">'
-                       +' <div class="card-block custom-card-block">'
-                         +'  <p>'+ data[i].name +'<p>'
-                         +'  <p>'+ data[i].code +' <p>'
-                       +'  </div>'
-                    +'   </div>';
-              $('.menu_items_list').append(row);
-
-              list = '<li class="nav-item menu_category sub_click" data-id="'+ data[i].id +'">'
-                        +'<p class="hidden menu-id">'+ data[i].id +'</p> '
-                          +'<a class="nav-link" data-toggle="tab" href="" role="tab"> '+ data[i].name +''
-                           +'<ul class=" sub_category_list hidden fadeInTop animated"' 
-                           +'id="sub_category_list">'
-                          +'</ul>'
-                        +'</a>'
-                      +'</li>';
-              $('.category_list').append(list);
-            }
-            
-          }
-        }
-      });
-      //end Ajax 
-    }
-    //end show list function
-  });
-</script>
\ No newline at end of file
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 1e96edc7..9190ccf7 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -1,3 +1,582 @@
 <%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
-<%= render 'add_order' %>
\ No newline at end of file
+<div id="oqs_loading_wrapper" style="display:none;">
+  <div id="oqs_loading"></div>
+</div>
+
+<% type = request.path_info.include?('quick_service')%>
+<% modify_order = request.path_info.include?('modify_order')%>
+<input type="hidden" name="type" id="role" value="<%= current_user.role%>">
+
+<div class="row m-t--20">
+    <div class="col-lg-2 col-md-2 col-sm-2">
+        <!-- <a href="javascript:void(0);" class="dropdown-toggle waves-block p-t-15 p-l-15 p-b-15" data-toggle="dropdown" aria-haspopup="" aria-expanded="true" style="background-color: #eeeeee;border-bottom: .214rem solid #fff;border-left: 1px solid #54A5AF;
+    border-right: 1px solid #54A5AF;"> 
+            <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
+        </a>
+        <ul class="dropdown-menu menu_list" style="width:90%">
+           <% @menus.each do |menu| %>
+              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>">
+                   <a class="nav-link" data-toggle="tab" href="" role="tab"><%=menu.name%></a>
+              </li>
+           <%end%>
+        </ul>  -->  
+        <li class="list-menu">
+        <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
+          
+          <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
+         <!--  <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
+        </a>
+        <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
+          <% @menus.each do |menu| %>
+              <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
+                   <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
+              </li>
+           <%end%>
+        </ul>
+      </li> 
+        <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
+            <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
+              <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
+            </li>
+            <% @menu.each do |menu| %>
+              <% if !menu.valid_time.nil? %>
+                <% if menu.menu_category_id.nil? %>
+                <!--if type quick_service or cashier for table -->
+                  <% if type %>
+                    <% if !menu.code.include? "SPL" %>
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                          <p class="hidden menu-id"><%= menu.id  %></p> 
+                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                             <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                            </ul>
+                          </a>
+                        </li>
+                    <% end%>
+                  <!-- else quick_service or cashier for table -->
+                  <% else %>
+                    <% if @table.get_current_checkout_booking.nil? %>
+                      <% if !menu.code.include? "SPL" %>
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                          <p class="hidden menu-id"><%= menu.id  %></p> 
+                          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                             <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                            </ul>
+                          </a>
+                        </li>
+                      <% end%>
+                    <% else %>
+                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                          </ul>
+                        </a>
+                      </li>
+                    <% end%>
+                    <!-- end quick_service or cashier for table -->
+                  <% end %>
+                <% end%>
+              <% end %>
+            <%end %>
+        </ul>
+    </div>
+
+
+
+    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
+      <div class="card">
+        <div class="card-block">
+          <div id="custom-slimscroll">
+             <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
+               <!-- append data -->
+               <% @menu.each do |menu| %>
+                    <% if !menu.valid_time.nil? %>
+                      <% if menu.menu_category_id.nil? %>
+                      <!--if type quick_service or cashier for table -->
+                        <% if type %>
+                          <% if !menu.code.include? "SPL" %>
+                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                              <div class='card-block custom-card-block'>
+                                <p><%=menu.name%> <p>
+                                <p><%=menu.code%> <p>
+                              </div>
+                            </div>
+                          <% end%>
+                        <!-- else quick_service or cashier for table -->
+                        <% else %>
+                          <% if @table.get_current_checkout_booking.nil? %>
+                            <% if !menu.code.include? "SPL" %>
+                              <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                                <div class='card-block custom-card-block'>
+                                  <p><%=menu.name%> <p>
+                                  <p><%=menu.code%> <p>
+                                </div>
+                             </div>
+                            <% end%>
+                          <% else %>
+                            <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
+                              <div class='card-block custom-card-block'>
+                                <p><%=menu.name%> <p>
+                                <p><%=menu.code%> <p>
+                              </div>
+                            </div>
+                          <% end%>
+                          <!-- end quick_service or cashier for table -->
+                        <% end %>
+                      <% end%>
+                    <% end %>
+                  <%end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
+        
+        <% if type && modify_order%>
+          <button type="button" class="btn btn-lg btn-default waves-effect col-md-4" id='back'>
+           <!--  <i class="material-icons">reply</i> -->
+             Back
+          </button>
+          
+           <button type="button" class="btn btn-lg btn-primary waves-effect col-md-7" id='pending_order'>Pending Order
+          </button>
+         
+        <%elsif !modify_order && type%>
+            <button type="button" class="btn btn-lg btn-default waves-effect col-md-2" id='back' style="    padding: .5rem 0.15rem !important;">
+             <!--  <i class="material-icons">reply</i> -->
+               Back
+            </button>
+            
+                <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
+                </button>
+           
+            <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
+            <input type="hidden" name="table_id" value="" id="table_id">
+
+         <%else%>
+            <button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
+                <i class="material-icons">reply</i>Back
+            </button>
+         <%end%>
+          <br>
+        <div class="card-header" style="padding: 0.5rem 0.25rem">
+          <% if type %>
+            <div class="row clearfix">
+               <div class="col-md-6 col-lg-6 col-sm-12">
+                 <strong id="order-title" class="font-13">ORDER DETAILS </strong>
+               </div>
+
+               <% if modify_order %>
+                    <% if @table.nil? %>
+                       <div class="col-md-6 col-lg-6 col-sm-6">Table : </div>
+                       <p class="hidden" id="table_id"><%=@table_id%></p>
+                       <p class="hidden" id="table_type"></p>
+                    <% else%>
+                      <div class="col-md-6 col-lg-6 col-sm-6">Table : <%=@table.name%></div>
+                      <p class="hidden" id="table_id"><%=@table_id%></p>
+                      <p class="hidden" id="table_type"><%=@table.type%></p>
+                    <% end%>
+                     
+                     <p class="hidden" id="booking_id"><%=@booking_id%></p>
+                     <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : '---'%></p>
+                     <p class="hidden" id="sale_id"><%=@sale_id%></p>
+              <% else%>
+                <p class="hidden" id="table_type"></p>
+              <% end%>
+            </div>
+          <% else %>
+            <div>
+             <strong id="order-title" class="font-14">ORDER DETAILS </strong>| <span class="font-14">Table-<%=@table.name%></span>
+             <p class="hidden" id="table_id"><%=@table_id%></p>
+             <p class="hidden" id="table_type"><%=@table.type%></p>
+             <p class="hidden" id="booking_id"><%=@booking_id%></p>
+             <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
+          </div>
+          <% end%>
+          
+        </div>
+        <div class="card-block">
+            <div class="card-text" id="order-detail-slimscroll" data-height="180">
+               <table class="table table-striped summary-items" id="order-items-table" >
+                 <thead>
+                   <tr>
+                     <th>#</th>
+                     <th class="item-name">Items</th>
+                     <th class="item-qty">QTY</th>
+                     <th class="item-attr">Price</th>
+                   </tr>
+                 </thead>
+                 <tbody class="font-13" >
+                 
+                 </tbody>
+               </table>
+            </div>
+            <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
+            
+               <table class="table" id="order-charges-table" border="0">
+                 <tr>
+                   <td style="padding:2px;" width="5%"></td>
+                   <td style="padding:2px;" width="15%"></td>
+                   <td style="padding:2px; text-align:" class="charges-name" width="25%"><strong>Total:</strong></td>
+                   <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total">0.00</strong></td>
+                 </tr>
+               </table>
+               <% if type && modify_order%>
+                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
+                  
+                    <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_pay_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Update Order & Pay</button>
+              <%elsif !modify_order && type%>
+                  <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
+                    <% if current_user.role != "waiter"%>
+                       <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+                    <%end%>
+                    <% if current_user.role == "waiter"%>
+                    <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+                    <%end%>
+               <%else%>
+               <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+               <%end%>
+
+                
+            </div>
+        </div>
+    </div>
+
+    <!-- Modal -->
+    <div class=" modal" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="sx_itemModalLabel" aria-hidden="true" style="">
+      <div class="modal-dialog custom-modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+          <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h4 class="modal-title"></h4>
+          </div>
+          <div class="modal-body">
+            <table width="100%" class="table table-striped">
+             <thead>
+               <tr>
+                 <th style="">Item Name</th>
+                 <th style="">Quantity</th>
+                 <th></th>
+               </tr>
+             </thead>
+             <tbody>
+               <tr>
+                 <td class="item_name" id="modal-item-name"></td>
+                 <td>
+                   <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
+                 </td>
+                 <td>
+                   <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
+                 </td>
+               </tr>
+             </tbody>
+             </table>
+         </div>
+          <div class="modal-footer">
+          <div class="row">
+            <div class="col-md-5">
+              <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
+            </div>
+            <div class="col-md-5">
+              <button type="button" class="btn btn-primary " data-dismiss="modal" id="save">Update</button>
+            </div>
+          </div>
+            
+            
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Menu Item modal -->
+
+    <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+      <div class="modal-dialog custom-modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
+            <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
+               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+                
+            </div>
+            <div class="modal-body">
+                <div class="row no-set-item">
+                  <div class="col-md-5">
+                      <p style="text-align: center;" id="modal_box_img"></p>
+                
+                      
+                        <!-- <label class="col-md-6" style="margin-top:5px">Quantity</label>
+                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="change_qty" value="" min="1" max="100"> -->
+                       
+                        <div class="input-group">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-danger btn-number"  value="-" id="minus">
+                               <i class="material-icons">remove</i>
+                                
+                              </button>
+                          </span>
+                          <input type="text" value="1" id="count" class="change_qty keypress_qty form-control col-md-12 ">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-success btn-number" value="+" id="plus">
+                                 <i class="material-icons">add</i>
+                              </button>
+                          </span>
+                      </div>
+                      
+                        <p class="hidden" id="unit_price"></p>
+                        <p class="hidden" id="instance_code"></p>
+                        <p class="hidden" id="instance_name"></p>
+                        <p class="hidden" id="promotion_price"></p>
+                        <p class="hidden" id="item_instances"></p>
+                        <p class="hidden" id="item_code"></p>
+                  </div>
+                  <div class="col-md-7 item-detail">      
+                      <h5>Attributes</h5>           
+                     <div class="attributes-list">
+                     </div>
+                     <hr>
+                     <h5>Options</h5>
+                     <div class="options-list">
+                     </div>
+                     <hr>
+                  </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <div class="mr-auto">
+                  <h4 class=" pull-left">Total : <span id="total_price"></span></h4>
+                </div>
+               <div class="row">
+                <div class="col-md-4">
+                  <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
+                </div>
+                <div class="col-md-6">
+                    <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order</button>
+                </div>
+              </div>
+            </div>
+        </div>
+      </div>
+    </div>
+
+
+     <!-- Large modal -->
+    <div class=" modal sx_item_set_detailModal" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
+      <div class="modal-dialog custom-modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
+            <h4 class="modal-title" style="color:#fff;" id="set_name"></h4>
+               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+                
+            </div>
+            <div class="modal-body">
+                <div class="row set-item">
+                  <div class="col-md-4">
+                  <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
+                      <!-- <div class="form-group">
+                        <label class="col-md-6" style="margin-top:5px">Quantity</label>
+                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">
+                      </div>  -->
+
+                      <div class="input-group">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-danger btn-number"  value="-" id="set_minus">
+                                <i class="material-icons">remove</i>
+                              </button>
+                          </span>
+                          <input type="text" value="1" id="set_count" class="set_change_qty keypress_qty form-control col-md-12 ">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
+                                  <i class="material-icons">add</i>
+                              </button>
+                          </span>
+                      </div>
+
+                        <p class="hidden" id="set_unit_price"></p>
+                        <p class="hidden" id="set_instance_code"></p>
+                        <p class="hidden" id="set_instance_name"></p>
+                        <p class="hidden" id="set_promotion_price"></p>
+                        <p class="hidden" id="set_item_instances"></p>
+                        <p class="hidden" id="set_item_code"></p>
+                        <p></p>
+
+                        <div class="options-list">
+                        </div>
+
+                  </div>
+                  <div class="col-md-8">       
+                     <div class="instance-list row"></div>
+                  </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <div class="mr-auto">
+                  <h4 class=" pull-left">Total : <span id="set_total_price"></span></h4>
+                </div>
+
+               <div class="row">
+
+                <div class="col-md-4">
+                  <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
+                </div>
+                <div class="col-md-6">
+                    <button type="button" class="btn btn-primary set_order" data-dismiss="modal" id="set_order">Add to Order</button>
+                </div>
+              </div>
+               
+            </div>
+        </div>
+      </div>
+    </div>
+    
+    <% if type && !modify_order%>
+    <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header" style="margin-top: -1rem;">
+            <!-- <h4 class="modal-title" id="TableModalLabel">Select Table</h4> -->
+             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
+          </div>
+          <div class="modal-body" style="margin-top: -0.75rem;padding-top:5px">
+          <%@zone.each do |zone| %>
+            <h5>Zone : <%=zone.name%></h5>
+            <div class="card-columns" style="column-count: 7;">
+              <%zone.tables.each do |table| %>
+                 <% if table.status == 'occupied' %>
+                          <% if table.get_booking.nil? %>
+                            <% if table.get_checkout_booking.nil? %>
+                              <%  color="red"%>
+                            <% else %>                            
+                              <%  color="orange"%>
+                            <% end %>                         
+                                
+                          <% else %>         
+                            <% if table.get_checkout_booking.nil? %>
+                              <%  color="blue"%>
+                            <% else %>                       
+                              <%  color="orange"%>
+                            <% end %>
+                          <% end %>
+                      <% else %>
+                         <%  color="green"%>
+                      <% end %>
+                <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
+                  <div class="card-block">
+                    <%= table.name %>
+                    
+                  </div>
+                </div>
+              <%end%>
+           </div>
+        <%end%>
+         <div class="modal-footer  p-r-30">
+              <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+              &nbsp;  &nbsp;
+              <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
+        </div>
+      </div>
+    </div>
+    </div>
+    </div>
+    <% end %>
+<script>
+    jQuery(function(){
+        id = "<%=@menu[0].id%>";
+       jQuery('.first_'+id).click();
+    });
+    $(document).ready(function () {
+    $(".tables").on('click', function () {
+        $('.tables').css('background-color','');
+        $('.tables').removeClass('purple')
+        var dining_id = $(this).attr("data-id");
+        var name = $(this).attr("data-name");
+        var type = $(this).attr("data-type");
+        $(this).css('background-color','purple');
+        $(this).addClass('purple')
+        $('.confirm_table').attr("data-id",dining_id)
+        $('.confirm_table').attr("data-name",name)
+        $('.confirm_table').attr("data-type",type)
+
+    });
+    $(".confirm_table").on('click', function () {
+        var dining_id = $(this).attr("data-id");
+        var name      = $(this).attr("data-name");
+        var type      = $(this).attr("data-type");
+        $('#table_id').val(dining_id)
+        $('#table_type').text(type)
+        $('.select_table').text(name)
+
+        console.log(type)
+
+    });
+
+    $('#pending_order').on('click', function () {
+      window.location.href = '/origami/quick_service/pending_order';
+    });
+
+    $(document).on('click', '.menu_click', function(event){
+      var menu_id = $(this).attr("data-id");
+      var name = $(this).attr("data-name");
+      var url = "get_menu/"+menu_id;
+      show_menu_cat_list(name, url); 
+    }); 
+  //End menu category Click
+
+    //show menu item list when click menu category
+    function show_menu_cat_list(name, url_item){ 
+      var menu_list = $('.menu_items_list');
+      menu_list.empty();
+
+      var menu_cat = $('.category_list');
+      menu_cat.empty();
+
+      $(".main_menu").text(name)
+      if (modify_order=="true" && type =="true") {
+         url_item = '../../../addorders/'+url_item;
+       }if(modify_order=="false" && type =="true"){
+         url_item = 'addorders/'+url_item
+       }else{
+         url_item = url_item;
+       }
+
+      //Start Ajax
+      $.ajax({      
+        type: "GET",         
+        url: url_item, 
+        data: {},
+        dataType: "json",
+        success: function(data) {
+
+          for(var i in data) {  
+            if (data[i].is_available == true) {
+              
+              row = '<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="'+ data[i].id +'">'
+                       +' <div class="card-block custom-card-block">'
+                         +'  <p>'+ data[i].name +'<p>'
+                         +'  <p>'+ data[i].code +' <p>'
+                       +'  </div>'
+                    +'   </div>';
+              $('.menu_items_list').append(row);
+
+              list = '<li class="nav-item menu_category sub_click" data-id="'+ data[i].id +'">'
+                        +'<p class="hidden menu-id">'+ data[i].id +'</p> '
+                          +'<a class="nav-link" data-toggle="tab" href="" role="tab"> '+ data[i].name +''
+                           +'<ul class=" sub_category_list hidden fadeInTop animated"' 
+                           +'id="sub_category_list">'
+                          +'</ul>'
+                        +'</a>'
+                      +'</li>';
+              $('.category_list').append(list);
+            }
+            
+          }
+        }
+      });
+      //end Ajax 
+    }
+    //end show list function
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/origami/addorders/index.html.erb b/app/views/origami/addorders/index.html.erb
deleted file mode 100755
index c45339c2..00000000
--- a/app/views/origami/addorders/index.html.erb
+++ /dev/null
@@ -1,111 +0,0 @@
-<div class="row">
-  <div class="col-lg-11 col-md-11 col-sm-11">
-      <ul class="nav nav-tabs" role="tablist">
-          <li class="nav-item">
-            <a class="nav-link active" data-toggle="tab" href="#table" role="tab">Tables</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" data-toggle="tab" href="#room" role="tab">Rooms</a>
-          </li>
-      </ul>
-      <div class="tab-content" style="max-height:650px; overflow:auto">
-
-          <div class="tab-pane active"  id="table" role="tabpanel" style="max-height:; overflow:auto">
-          <% @tables.each do |zone| %>
-                <h3>Zone : <%=zone.zone.name%></h3>
-              <div class="card-columns" style="padding-top:10px; column-gap: 2.2rem;">
-
-                <% @all_table.each do |table| %>
-                <% if zone.zone_id == table.zone_id %>
-                <div class="card click_table <%= table.status=="available" ? "available" : "occupied"%>" data-id = "<%= table.id %>">
-                  <div class="card-block">
-                    <p class="hidden table-status"><%= table.status  %></p>
-                    <p style="text-align: center"><%= table.name %></p>
-                    <p style="text-align: center">Seat : <%= table.seater %></p>
-                  </div>
-                </div>
-               <% end %> <% end %>
-              </div>
-              <% end %>
-          </div>
-
-          <div class="tab-pane"  id="room" role="tabpanel" style="max-height:; overflow:auto">
-            <% @rooms.each do |zone| %>
-                <h3>Zone : <%=zone.zone.name%></h3>
-              <div class="card-columns" style="padding-top:10px; column-gap: 2.2rem;">
-
-                <% @all_room.each do |room| %>
-                <% if zone.zone_id == room.zone_id  %>
-                <div class="card click_table <%= room.status=="available" ? "available" : "occupied"%>" data-id = "<%= room.id %>">
-                  <div class="card-block">
-                    <p class="hidden table-status"><%= room.status  %></p>
-                    <p style="text-align: center"><%= room.name %></p>
-                    <p style="text-align: center">Seat : <%= room.seater %></p>
-                  </div>
-                </div>
-               <% end %> <% end %>
-              </div>
-              <% end %>
-          </div>
-
-      </div>
-  </div>
-
-  <div class="col-lg-1 col-md-1 col-sm-1">
-    <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
-      <i class="material-icons">reply</i>
-       Back
-    </button>
-  </div>
-</div>
-<script>
-  $(document).on('click',".click_table",function(){
-
-    var dining_id = $(this).attr('data-id');
-    var status     = $(this).find(".table-status").text();
-
-    if (status == "available") {
-      $.confirm({
-          title: 'Confirmation !',
-          content: 'Are you sure to assign this table',
-          buttons: {
-            confirm: {
-              text: 'Ok',
-              btnClass: 'btn-green',
-              action: function(){
-                 window.location.href = '/origami/addorders/'+dining_id;
-               }
-            }  
-          }
-        });
-    } else {
-      $.confirm({
-          title: 'Alert!',
-          content: 'You cannot assign this table',
-          buttons: {
-            confirm: {
-              text: 'Ok',
-              btnClass: 'btn-red',   
-            }  
-          }
-      });
-    }         
-  })
-</script>
-<style type="text/css">
-  .card-columns {
-  -webkit-column-count:5;
-        -moz-column-count:5;
-        column-count:5;
-}
-
-.occupied{
-  color: #fff !important;
-  background-color: red;
-}
-.available{
-  color: #fff !important;
-  background-color: #009900;
-}
-
-</style>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 60ea300a..cb213a38 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -324,10 +324,6 @@
     <i class="material-icons">reply</i>
      Back
   </button>
-    <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
-      <i class="material-icons">reply</i>
-       Back
-    </button>
     <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
     <button type="button" class="btn bg-red btn-block" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
   <% if @cashier_type=="quick_service" %>
@@ -775,7 +771,7 @@ console.log("fffffffffffff")
         var cash = $('#grand_total').text();
         var sub_total = $('#sub-total').text();
         var sale_id = $('#sale_id').text();
-        var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark };
+        var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark,'type':cashier_type };
 
         if ($(this).attr('active')=== "true") {  
           swal({
@@ -798,7 +794,11 @@ console.log("fffffffffffff")
                        title: "Information!",
                        text: 'Thank You !',
                        }, function () {
-                        window.location.href = '/origami';
+                        if (cashier_type=="cashier") {
+                           window.location.href = '/origami';
+                         }else{
+                           window.location.href = '/origami/quick_service';
+                         } 
                       });
                   }
                 }
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index c400071e..d94a81d5 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -153,7 +153,7 @@
    <% if current_user.role != "waiter" || @status != "sale"%>
    <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
    <%end%>
-   <% if current_user.role != "waiter"%>
+   <% if current_user.role != "waiter" && @status != "order"%>
       <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
    <%end%>
    <% if @status != "sale"%>
diff --git a/app/views/origami/quick_service/_menu_item.json.jbuilder b/app/views/origami/quick_service/_menu_item.json.jbuilder
deleted file mode 100755
index a18645c8..00000000
--- a/app/views/origami/quick_service/_menu_item.json.jbuilder
+++ /dev/null
@@ -1,119 +0,0 @@
-# Format for attributes json
-attr_format = []
-# Format for attributes json 
-if item.item_attributes.count > 0   
-  item.item_attributes.each do|attr_id|      
-    menu_attr = MenuItemAttribute.find(attr_id)
-    if attr_format.count == 0
-      attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] })
-      next
-    end
-
-    attr_format.each do |af|
-      if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]}
-        if menu_attr.attribute_type == af[:type]
-          af[:values].push(menu_attr.name)
-        end
-      else 
-        new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] }
-        attr_format.push(new_attr) 
-        break      
-      end          
-    end
-  end
-end
-
-# Format for option json
-opt_format = []
-# Format for attributes json 
-if item.item_options.count > 0   
-  item.item_options.each do|opt|      
-    menu_opt = MenuItemOption.find(opt)
-    if opt_format.count == 0
-      opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
-      next
-    end
-
-    opt_format.each do |of|
-      if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
-        if menu_opt.option_type == of[:type]
-          of[:values].push(menu_opt.name)
-        end
-      else 
-        new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
-        opt_format.push(new_opt) 
-        break
-      end
-    end         
-  end
-end
-
-#Menu Item Information
-json.id           item.id
-json.code    item.item_code
-json.name         item.name
-json.alt_name     item.alt_name
-json.image        item.image_path.url
-json.description  item.description
-json.information  item.information
-json.type         item.type
-json.account_id   item.account_id
-json.min_qty      item.min_qty
-json.is_available item.is_available
-json.is_sub_item  item.is_sub_item
-json.unit         item.unit
-
-# Item Sets of Menu Item 
-json.item_sets item.item_sets do |its|
-  json.id                 its.id
-  json.name               its.name
-  json.alt_name           its.alt_name
-  json.min_selectable_qty its.min_selectable_qty
-  json.max_selectable_qty its.max_selectable_qty
-  json.instances its.menu_item_instances do |i|
-    json.id  i.id
-  end
-end 
-
-json.attributes attr_format
-json.options opt_format
-# json.min_selectable_item item.min_selectable_item
-# json.max_selectable_item item.max_selectable_item
-
-#Item instance
-# if item.menu_item_instances.count == 1 then
-#   item_instance = item.menu_item_instances[0]
-#   json.price = item_instance.price
-#   json.is_available = item_instance.is_available
-#   json.is_on_promotion = item_instance.is_on_promotion
-#   json.promotion_price = item_instance.promotion_price
-#   json.item_attributes = item_instance.item_attributes
-
-json.instances item.menu_item_instances do |is|
-  if is.is_available
-    # Convert id to name for attributes
-    instance_attr = []
-    is.item_attributes.each do |ia|
-       mItemAttr = MenuItemAttribute.find(ia).name
-      instance_attr.push(mItemAttr)
-    end
-    
-      json.id is.id
-      json.code is.item_instance_code
-      json.name is.item_instance_name
-      json.price is.price
-      json.is_available is.is_available
-      json.is_default is.is_default
-      json.is_on_promotion is.is_on_promotion
-      json.promotion_price is.promotion_price
-      json.values instance_attr
-      # json.item_sets is.item_sets
-  end
-end
-
-#Child Menu items
-# if (item.children) then
-#   json.set_items item.children.each do |item|
-#     json.partial! 'api/restaurant/menu/menu_item', item: item
-#   end
-# end
\ No newline at end of file
diff --git a/app/views/origami/quick_service/get_all_product.json.jbuilder b/app/views/origami/quick_service/get_all_product.json.jbuilder
deleted file mode 100755
index 01921c59..00000000
--- a/app/views/origami/quick_service/get_all_product.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-
-json.array! @product, :id, :item_code, :name, :alt_name,:image_path,
-						 :description,:information,:taxable,:unit_price, :created_at,
-						 :updated_at, :created_by
\ No newline at end of file
diff --git a/app/views/origami/quick_service/get_menu.json.jbuilder b/app/views/origami/quick_service/get_menu.json.jbuilder
deleted file mode 100644
index bbe18fff..00000000
--- a/app/views/origami/quick_service/get_menu.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.array! @menu_category
\ No newline at end of file
diff --git a/app/views/origami/quick_service/get_menu_category.json.jbuilder b/app/views/origami/quick_service/get_menu_category.json.jbuilder
deleted file mode 100755
index 91f659e8..00000000
--- a/app/views/origami/quick_service/get_menu_category.json.jbuilder
+++ /dev/null
@@ -1,8 +0,0 @@
-if @menu.menu_items
-    json.menu_items @menu.menu_items do |item|
-    	if item.is_available
-    		json.partial! 'origami/addorders/menu_item', item: item
-    	end
-		
-    end
-end
diff --git a/app/views/origami/quick_service/get_menu_sub_category.json.jbuilder b/app/views/origami/quick_service/get_menu_sub_category.json.jbuilder
deleted file mode 100644
index d391e4c5..00000000
--- a/app/views/origami/quick_service/get_menu_sub_category.json.jbuilder
+++ /dev/null
@@ -1,9 +0,0 @@
-if @sub_menu
-	json.sub_category @sub_menu.each do |sub_cat|
-		json.id                 sub_cat.id
-		json.code               sub_cat.code
-		json.name               sub_cat.name
-		json.menu_id            sub_cat.menu_id
-		json.menu_category_id   sub_cat.menu_category_id
-	end
-end
diff --git a/app/views/origami/quick_service/index.html.erb b/app/views/origami/quick_service/index.html.erb
index 7108125b..e69de29b 100644
--- a/app/views/origami/quick_service/index.html.erb
+++ b/app/views/origami/quick_service/index.html.erb
@@ -1,3 +0,0 @@
-<%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
-<%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
-<%= render 'origami/addorders/add_order' %>
\ No newline at end of file

From 8e4c3864daf111cf42ca09834f8325c75fdfa870 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 15:27:29 +0630
Subject: [PATCH 345/651] check query for product sales

---
 app/models/sale.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 7aa18282..2138405c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -852,7 +852,7 @@ def self.get_menu_item_query(order_by)
                       acc.title as account_name, 
                       mii.item_instance_code as item_code, " +
                      "(CASE WHEN si.qty > 0 THEN SUM(si.qty) ELSE 0 END) as total_item," +
-                     "(CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END) as unit_price," +
+                     "(CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END) as unit_price," +
                      "(CASE WHEN (si.qty * si.unit_price) > 0 THEN (si.qty * si.unit_price) ELSE 0 END) as grand_total," +
                      "mii.price as unit_price, menu_items.name as product_name, 
                      mc.name as" +
@@ -862,8 +862,8 @@ def self.get_menu_item_query(order_by)
                " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
                " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
                " LEFT JOIN sales s ON s.sale_id = si.sale_id")
-          .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
-          .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
+          .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)")
+          .order("menu_items.menu_category_id #{order_by}, si.qty #{order_by}")
 end
 #product sale report query
 
@@ -1080,7 +1080,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed' or i.remark!='void'")
                 .group('mi.name')
                 .order("SUM(i.qty) DESC").limit(20)
     else
@@ -1088,7 +1088,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed' or i.remark!='void'")
                 .group('mi.name')
                 .order("SUM(i.qty) DESC").limit(20)
     end
@@ -1100,7 +1100,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) ASC").limit(20)
     else
@@ -1108,7 +1108,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) ASC").limit(20)
     end

From 07c3bcd7a7a676ba7f8dc6895090589f7fe48114 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 28 Feb 2018 15:31:55 +0630
Subject: [PATCH 346/651] Change Dashboard, Account in login, Shop name,
 Reference no for other charges

---
 app/assets/stylesheets/login.scss             |  10 +
 app/controllers/base_controller.rb            |   7 +
 app/controllers/base_crm_controller.rb        |   7 +
 app/controllers/base_inventory_controller.rb  |   7 +
 app/controllers/base_oqs_controller.rb        |   7 +
 app/controllers/base_origami_controller.rb    |   9 +
 app/controllers/base_report_controller.rb     |   7 +
 app/controllers/base_waiter_controller.rb     |   6 +
 app/controllers/crm/bookings_controller.rb    |   5 -
 app/controllers/crm/customers_controller.rb   |   7 +-
 .../crm/dining_queues_controller.rb           |   7 +-
 app/controllers/crm/home_controller.rb        |   5 -
 app/controllers/home_controller.rb            |  15 +-
 app/controllers/install_controller.rb         |   7 +
 app/controllers/oqs/backhome_controller.rb    |  11 -
 app/controllers/oqs/edit_controller.rb        |   5 -
 app/controllers/oqs/home_controller.rb        |   6 -
 app/controllers/oqs/print_controller.rb       |   5 -
 .../origami/addorders_controller.rb           |   5 -
 .../origami/bank_integration_controller.rb    |   5 -
 .../origami/card_payments_controller.rb       |   5 -
 .../origami/cash_ins_controller.rb            |   7 +-
 .../origami/cash_mgmt_controller.rb           |   5 -
 .../origami/cash_outs_controller.rb           |   5 -
 .../origami/check_in_process_controller.rb    |   5 -
 .../origami/credit_payments_controller.rb     |   6 -
 .../origami/customers_controller.rb           |   7 +-
 .../origami/dashboard_controller.rb           |   4 -
 .../origami/discounts_controller.rb           |   6 +-
 app/controllers/origami/home_controller.rb    |   6 -
 app/controllers/origami/home_controller_bk.rb |   5 -
 .../origami/in_duties_controller.rb           |   5 -
 app/controllers/origami/jcb_controller.rb     |   5 -
 app/controllers/origami/master_controller.rb  |   5 -
 .../origami/moveroom_controller.rb            |   6 -
 .../origami/movetable_controller.rb           |   7 +-
 app/controllers/origami/mpu_controller.rb     |   5 -
 app/controllers/origami/orders_controller.rb  |   7 +-
 .../origami/other_charges_controller.rb       |   7 +-
 .../origami/others_payments_controller.rb     |   5 -
 .../origami/payments_controller.rb            |   7 +-
 .../origami/paypar_payments_controller.rb     |   5 -
 .../origami/pending_order_controller.rb       |   5 +-
 .../origami/product_commissions_controller.rb |   5 -
 .../origami/redeem_payments_controller.rb     |   7 +-
 .../origami/request_bills_controller.rb       |   7 +-
 .../origami/room_invoices_controller.rb       |   5 -
 app/controllers/origami/rooms_controller.rb   |   5 -
 .../origami/sale_edit_controller.rb           |   7 +-
 app/controllers/origami/sales_controller.rb   |   5 -
 app/controllers/origami/shifts_controller.rb  |   5 -
 .../origami/split_bill_controller.rb          |   6 -
 app/controllers/origami/surveys_controller.rb |   7 +-
 .../origami/table_invoices_controller.rb      |   5 -
 .../origami/unionpay_controller.rb            |   5 -
 app/controllers/origami/visa_controller.rb    |   5 -
 app/controllers/origami/void_controller.rb    |   7 +-
 app/controllers/origami/voucher_controller.rb |   5 -
 app/controllers/print_settings_controller.rb  |   7 +
 .../reports/bksaleitem_controller.rb          |   6 -
 .../reports/commission_controller.rb          |   7 +-
 .../reports/credit_payment_controller.rb      |   5 -
 .../reports/dailysale_controller.rb           |   7 +-
 .../reports/payment_method_controller.rb      |   5 -
 .../reports/receipt_no_controller.rb          |   7 +-
 .../reports/saleitem_controller.rb            |   7 +-
 .../reports/shiftsale_controller.rb           |   5 -
 .../reports/stock_check_controller.rb         |   7 +-
 .../reports/void_sale_controller.rb           |   5 -
 app/controllers/sym_control_controller.rb     |   7 +
 app/views/home/dashboard.html.erb             |  14 +-
 app/views/layouts/login_dashboard.html.erb    | 198 +++++++++---------
 app/views/origami/dashboard/index.html.erb    | 118 +++++------
 73 files changed, 278 insertions(+), 486 deletions(-)

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 030b0fe1..66252d60 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -75,3 +75,13 @@
   background-color: #fff;
   border-top: none;
 }
+
+.p-card{
+  margin: 20px 0;
+  text-align: center;
+}
+
+.p-name{
+  padding-bottom: 20px;
+  font-size: 14px;
+}
diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
index 1bf5b4d4..aad5c676 100755
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,5 +1,12 @@
 class BaseController < ActionController::Base
   layout "installation"
   protect_from_forgery with: :exception
+
+  helper_method :shop_detail
+  
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
   
 end
diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index e66c67b9..675b3060 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -5,6 +5,8 @@ class BaseCrmController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
+  helper_method :shop_detail
+
   rescue_from CanCan::AccessDenied do |exception|
   	flash[:warning] = exception.message
   	redirect_to root_path
@@ -23,5 +25,10 @@ class BaseCrmController < ActionController::Base
   def current_user
   	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
+
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
   
 end
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index 4059ac25..b3a9141d 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -5,6 +5,8 @@ class BaseInventoryController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
+  helper_method :shop_detail
+
   rescue_from CanCan::AccessDenied do |exception|
   	flash[:warning] = exception.message
   	redirect_to root_path
@@ -14,4 +16,9 @@ class BaseInventoryController < ActionController::Base
   	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
+
 end
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index db9f8231..436be205 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -4,6 +4,8 @@ class BaseOqsController < ActionController::Base
 
   #before_action :check_installation
   protect_from_forgery with: :exception
+  
+  helper_method :shop_detail
 
   rescue_from CanCan::AccessDenied do |exception|
   	flash[:warning] = exception.message
@@ -24,4 +26,9 @@ class BaseOqsController < ActionController::Base
   	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
+
 end
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index c6a302a4..fdd0a57b 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -6,6 +6,9 @@ class BaseOrigamiController < ActionController::Base
 
   #before_action :check_installation
   protect_from_forgery with: :exception
+
+  helper_method :shop_detail
+
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     # redirect_to origami_root_path
@@ -24,4 +27,10 @@ class BaseOrigamiController < ActionController::Base
   def get_cashier
     @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
   end
+
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
+  
 end
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index af9ec4fc..16c68397 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -5,6 +5,8 @@ class BaseReportController < ActionController::Base
 	#before_action :check_installation
 	protect_from_forgery with: :exception
 
+  	helper_method :shop_detail
+
 	rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     redirect_to root_path
@@ -86,5 +88,10 @@ class BaseReportController < ActionController::Base
 
 
 	end
+
+	#Shop Name in Navbor
+  	def shop_detail
+    	@shop = Shop.first
+  	end
   
 end
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index e86433dc..1a8a7648 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -5,5 +5,11 @@ class BaseWaiterController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
+  helper_method :shop_detail
+
+  	#Shop Name in Navbor
+  	def shop_detail
+    	@shop = Shop.first
+  	end
 
 end
diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb
index 30a9eb92..7e6c3c83 100755
--- a/app/controllers/crm/bookings_controller.rb
+++ b/app/controllers/crm/bookings_controller.rb
@@ -15,9 +15,4 @@ class Crm::BookingsController < BaseCrmController
 	    end 
     end
     
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 12944632..0168e326 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -398,10 +398,5 @@ end
       params.require(:customer).permit(:id, :name, :company, :contact_no, :email,
                 :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type)
     end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end    
+   
 end
diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb
index 4b1eddcc..e52abeea 100755
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -142,10 +142,5 @@ class Crm::DiningQueuesController < BaseCrmController
     def dining_queue_params
       params.require(:dining_queue).permit(:customer_id, :name, :contact_no, :queue_no,:status,:seater,:remark)
     end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end    
+  
 end
diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb
index b5acf59a..398fc96a 100755
--- a/app/controllers/crm/home_controller.rb
+++ b/app/controllers/crm/home_controller.rb
@@ -56,10 +56,5 @@ class Crm::HomeController < BaseCrmController
   #     end 
   # end
   
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 1c006be1..357bb0b7 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,8 @@
 class HomeController < ApplicationController
   # layout "application", except: [:index, :show]
-  skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]  
+  skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] 
+
+  helper_method :shop_detail 
 
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")
@@ -126,12 +128,6 @@ class HomeController < ApplicationController
     render :json => {:status=> "Success", :url => root_path }.to_json
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
-
   private
 
   # Never trust parameters from the scary internet, only allow the white list through.
@@ -170,4 +166,9 @@ class HomeController < ApplicationController
     end
   end
 
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
+
 end
diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index 353509c3..195c3379 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -2,6 +2,8 @@ class InstallController < BaseController
   skip_before_action :verify_authenticity_token
   # before_action :check_license
 
+  helper_method :shop_detail
+
 	def index
 	end
 
@@ -74,4 +76,9 @@ class InstallController < BaseController
  #      return nil
  #    end
  #  end
+ 
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/oqs/backhome_controller.rb b/app/controllers/oqs/backhome_controller.rb
index 990fa459..4ac5f0a2 100755
--- a/app/controllers/oqs/backhome_controller.rb
+++ b/app/controllers/oqs/backhome_controller.rb
@@ -30,12 +30,6 @@ class Oqs::HomeController < BaseOqsController
     @queue_stations_items
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
-
   # Get Order items
   def get_order_items
     items = []
@@ -129,9 +123,4 @@ class Oqs::HomeController < BaseOqsController
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index f8bef2de..cda55f31 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -51,9 +51,4 @@ class Oqs::EditController < BaseOqsController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 371425ca..e71075ec 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -226,10 +226,4 @@ class Oqs::HomeController < BaseOqsController
     .group("order_queue_stations.id")
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
-
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 5f973c7a..baa4af40 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -102,9 +102,4 @@ class Oqs::PrintController < ApplicationController
     end              
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
\ No newline at end of file
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index add3065b..13c1e246 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -208,9 +208,4 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   #    @dining = DiningFacility.find(params[:id])
   # end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/bank_integration_controller.rb b/app/controllers/origami/bank_integration_controller.rb
index 6dde10da..cb735873 100644
--- a/app/controllers/origami/bank_integration_controller.rb
+++ b/app/controllers/origami/bank_integration_controller.rb
@@ -96,9 +96,4 @@ class Origami::BankIntegrationController < ApplicationController #BaseOrigamiCon
 		render json: response 
 	end
 
-	#Shop Name in Navbor
-	helper_method :shop_detail
-	def shop_detail
-		@shop = Shop.first
-	end
 end
diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb
index cd08c16a..e0c56971 100755
--- a/app/controllers/origami/card_payments_controller.rb
+++ b/app/controllers/origami/card_payments_controller.rb
@@ -24,9 +24,4 @@ class Origami::CardPaymentsController < BaseOrigamiController
   def create
   end
 
-	#Shop Name in Navbor
-	helper_method :shop_detail
-	def shop_detail
-		@shop = Shop.first
-	end  
 end
diff --git a/app/controllers/origami/cash_ins_controller.rb b/app/controllers/origami/cash_ins_controller.rb
index 4d7c2b64..441cd94e 100755
--- a/app/controllers/origami/cash_ins_controller.rb
+++ b/app/controllers/origami/cash_ins_controller.rb
@@ -14,10 +14,5 @@ class Origami::CashInsController < BaseOrigamiController
     shift.cash_in = shift.cash_in + amount.to_i
     shift.save
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
+  
 end
diff --git a/app/controllers/origami/cash_mgmt_controller.rb b/app/controllers/origami/cash_mgmt_controller.rb
index 1f48370e..916f5d8b 100755
--- a/app/controllers/origami/cash_mgmt_controller.rb
+++ b/app/controllers/origami/cash_mgmt_controller.rb
@@ -8,9 +8,4 @@ class Origami::CashMgmtController < ApplicationController
   def create
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/cash_outs_controller.rb b/app/controllers/origami/cash_outs_controller.rb
index cc22516c..8c81b5cb 100755
--- a/app/controllers/origami/cash_outs_controller.rb
+++ b/app/controllers/origami/cash_outs_controller.rb
@@ -13,9 +13,4 @@ class Origami::CashOutsController < BaseOrigamiController
     shift.save
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 48d55c9a..ad3efee0 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -36,9 +36,4 @@ class Origami::CheckInProcessController < BaseOrigamiController
 		end
 	end
 
-	#Shop Name in Navbor
-  	helper_method :shop_detail
-  	def shop_detail
-    	@shop = Shop.first
-  	end
 end
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index 4fd9ba71..d70ef870 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -47,10 +47,4 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-    helper_method :shop_detail
-    def shop_detail
-      @shop = Shop.first
-    end
-
 end
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index db89b1d0..d93e5040 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -136,10 +136,5 @@ class Origami::CustomersController < BaseOrigamiController
         render json: JSON.generate({:status => false, :error_message => "Record not found"})
     end
   end
-
-  #Shop Name in Navbor
-    helper_method :shop_detail
-    def shop_detail
-      @shop = Shop.first
-    end   
+   
 end
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index e47a8e48..a7f6ff15 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -57,8 +57,4 @@ class Origami::DashboardController < BaseOrigamiController
     @print_settings = PrintSetting.get_precision_delimiter()
   end
 
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 46dd65d0..87931f8c 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -355,9 +355,5 @@ class Origami::DiscountsController < BaseOrigamiController
 
   #   redirect_to origami_path(sale_id)
   # end
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end    
+   
 end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 3a7501e6..43fb104f 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -131,12 +131,6 @@ class Origami::HomeController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
-
 private
 
 def set_dining
diff --git a/app/controllers/origami/home_controller_bk.rb b/app/controllers/origami/home_controller_bk.rb
index 3e414665..4839f15c 100755
--- a/app/controllers/origami/home_controller_bk.rb
+++ b/app/controllers/origami/home_controller_bk.rb
@@ -81,9 +81,4 @@ class Origami::HomeController < ApplicationController
      end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb
index 945f3bd9..9846516e 100755
--- a/app/controllers/origami/in_duties_controller.rb
+++ b/app/controllers/origami/in_duties_controller.rb
@@ -169,9 +169,4 @@ class Origami::InDutiesController < BaseOrigamiController
     params.require(:in_duty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time)
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end 
 end
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index 0604535e..e17c773e 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -58,9 +58,4 @@ class Origami::JcbController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 25bebf55..95710f11 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -57,9 +57,4 @@ class Origami::MasterController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb
index 5b53f68c..316ab894 100755
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -35,11 +35,5 @@ class Origami::MoveroomController < BaseOrigamiController
          end
     end
   end
-  
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end 
 
 end
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 8da417ac..dfdfcabf 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -70,10 +70,5 @@ class Origami::MovetableController < BaseOrigamiController
 
      @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
    end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end   
+      
 end
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index ce0dccce..6eb2a0a0 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -57,9 +57,4 @@ class Origami::MpuController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 13f5b684..3181d470 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -80,10 +80,5 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+ 
 end
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index d15edb5e..e7f9f9b2 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -76,10 +76,5 @@ class Origami::OtherChargesController < BaseOrigamiController
 		end
 	    
 	end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end	
+	
 end
\ No newline at end of file
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index ab755ea1..e4a39662 100755
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -37,9 +37,4 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   def create
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index cd32b418..beb95671 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -416,10 +416,5 @@ class Origami::PaymentsController < BaseOrigamiController
         end
       end
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+ 
 end
\ No newline at end of file
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 04a52f0f..faaeca8e 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -29,9 +29,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 
 	end
 	
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index a1942a27..4333046c 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -17,8 +17,5 @@ class Origami::PendingOrderController < BaseOrigamiController
       @dining  = nil
     end
   end
-   helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
+   
 end
diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index 2ab9a618..2f209a7a 100755
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -137,9 +137,4 @@ class Origami::ProductCommissionsController < BaseOrigamiController
     params.fetch(:product_commission, {})
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
 end
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 76517e8a..347fd3ea 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -68,10 +68,5 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
      		end
      		@out = false, 0
      	end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end        
+        
 end
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index ad46ede6..10c1dc9f 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -53,10 +53,5 @@ class Origami::RequestBillsController < ApplicationController
 
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+ 
 end
diff --git a/app/controllers/origami/room_invoices_controller.rb b/app/controllers/origami/room_invoices_controller.rb
index 9c3b16a6..8d805771 100755
--- a/app/controllers/origami/room_invoices_controller.rb
+++ b/app/controllers/origami/room_invoices_controller.rb
@@ -37,9 +37,4 @@ class Origami::RoomInvoicesController < BaseOrigamiController
     @customer = @sale.customer
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 03e864fa..d4f1cd67 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -131,9 +131,4 @@ class Origami::RoomsController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index f78c0f53..524f4895 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -166,10 +166,5 @@ class Origami::SaleEditController < BaseOrigamiController
       ProductCommission.remove_product_commission(item)
     end
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+  
 end
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 513bdb2c..eee75e37 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -56,9 +56,4 @@ class Origami::SalesController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 435a98d1..cb2cc830 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -108,9 +108,4 @@ class Origami::ShiftsController < BaseOrigamiController
     
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 4c74d4a7..db9e0418 100644
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -360,10 +360,4 @@ class Origami::SplitBillController < BaseOrigamiController
     	orderItem.save!
 	end
 
-	#Shop Name in Navbor
-	helper_method :shop_detail
-	def shop_detail
-		@shop = Shop.first
-	end
-
 end
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 02ec9795..0e4ecd7b 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -137,10 +137,5 @@ class Origami::SurveysController < BaseOrigamiController
     def survey_params
       params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, :dining_name,:receipt_no,:shift_id,:created_by,:total_customer,:total_amount,:survey_id)
     end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end    
+        
 end
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index f2dd132a..880df1c7 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -67,9 +67,4 @@ class Origami::TableInvoicesController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index 89adfd3e..905a1ffb 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -57,9 +57,4 @@ class Origami::UnionpayController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
 end
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 5404789c..f04ec001 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -57,9 +57,4 @@ class Origami::VisaController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index e4190cf7..df9aa439 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -139,10 +139,5 @@ class Origami::VoidController < BaseOrigamiController
       end
     end
   end 
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+ 
 end
\ No newline at end of file
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 750189df..c4b3c840 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -78,9 +78,4 @@ class Origami::VoucherController < BaseOrigamiController
     end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index a72319b3..710e6ea4 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -2,6 +2,8 @@ class PrintSettingsController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_print_setting, only: [:show, :edit, :update, :destroy]
 
+  helper_method :shop_detail
+
   # GET /print_settings
   # GET /print_settings.json
   def index
@@ -72,4 +74,9 @@ class PrintSettingsController < ApplicationController
     def print_setting_params
       params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
     end
+
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/reports/bksaleitem_controller.rb b/app/controllers/reports/bksaleitem_controller.rb
index 118269bb..0f91681d 100755
--- a/app/controllers/reports/bksaleitem_controller.rb
+++ b/app/controllers/reports/bksaleitem_controller.rb
@@ -16,10 +16,4 @@ class Reports::SaleitemController < BaseReportController
   	
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
-
 end
diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb
index 9e13bd75..9a7f4ca1 100755
--- a/app/controllers/reports/commission_controller.rb
+++ b/app/controllers/reports/commission_controller.rb
@@ -49,11 +49,6 @@ class Reports::CommissionController < BaseReportController
       format.json { render json: out }
     end
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+  
 end
 
diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb
index abf7a6af..f46b008f 100755
--- a/app/controllers/reports/credit_payment_controller.rb
+++ b/app/controllers/reports/credit_payment_controller.rb
@@ -60,9 +60,4 @@ authorize_resource :class => false
 	    end
 	end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end	
 end
\ No newline at end of file
diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb
index d43355fa..4f6d8e68 100755
--- a/app/controllers/reports/dailysale_controller.rb
+++ b/app/controllers/reports/dailysale_controller.rb
@@ -19,10 +19,5 @@ class Reports::DailysaleController < BaseReportController
   def show
   	
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+ 
 end
diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index 0262594f..928f17d6 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -62,9 +62,4 @@ class Reports::PaymentMethodController < BaseReportController
 	    end
 	end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end	
 end
\ No newline at end of file
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index ead85d72..cff7887c 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -61,10 +61,5 @@ authorize_resource :class => false
 	      format.json { render json: out }
 	    end
 	end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end	
+	
 end
\ No newline at end of file
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 58421342..daeb86f4 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -76,10 +76,5 @@ class Reports::SaleitemController < BaseReportController
         format.json { render json: out }
       end
   end
- 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+   
 end
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index cf722495..21ca498b 100755
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -48,10 +48,5 @@ class Reports::ShiftsaleController < BaseReportController
       end
   end
 
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
 end
 
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index 9a033956..9d5ee37d 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -46,11 +46,6 @@ class Reports::StockCheckController < BaseReportController
       format.json { render json: out }
     end
   end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end  
+ 
 end
 
diff --git a/app/controllers/reports/void_sale_controller.rb b/app/controllers/reports/void_sale_controller.rb
index 50a7c57d..32926d63 100755
--- a/app/controllers/reports/void_sale_controller.rb
+++ b/app/controllers/reports/void_sale_controller.rb
@@ -59,9 +59,4 @@ authorize_resource :class => false
 	    end
 	end
 
-  	#Shop Name in Navbor
-  	helper_method :shop_detail
-  	def shop_detail
-    	@shop = Shop.first
-  	end	
 end
\ No newline at end of file
diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb
index 8ef6fd78..d2923bf2 100644
--- a/app/controllers/sym_control_controller.rb
+++ b/app/controllers/sym_control_controller.rb
@@ -2,6 +2,8 @@ class SymControlController < BaseController
   skip_before_action :verify_authenticity_token
   http_basic_authenticate_with name: "vip", password: "!abcABC01"
 
+  helper_method :shop_detail
+
   def run
   	sym_path =  File.expand_path("~/symmetric/")
   	check_sym_proc_str = `#{"sudo service SymmetricDS status"}`
@@ -43,4 +45,9 @@ class SymControlController < BaseController
     end 
   end
 
+  #Shop Name in Navbor
+  def shop_detail
+    @shop = Shop.first
+  end
+
 end
\ No newline at end of file
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 104c4c67..c3dce804 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -135,7 +135,7 @@
                   <td align="right"><%= @summ_sale.total_receipt %></td>
                 </tr>
                 <tr>
-                  <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
+                  <td><%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : </td>
                   <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
@@ -147,7 +147,7 @@
                   <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
                 </tr>
                 <tr>
-                  <td><%= t("views.right_panel.detail.grand_total") %> : </td>
+                  <td><%= t("views.right_panel.detail.total_sale") %> : </td>
                   <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
                 </tr>
               </table>
@@ -157,7 +157,11 @@
                     <% if !@sale_data[0].empty? %>
                       <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %>
                         <tr>
-                          <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
+                          <% if payment.payment_method == 'paypar' %>
+                            <td>Redeem Sale : </td>
+                          <% else %>  
+                            <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
+                          <% end %> 
                           <td align="right">
                             <% @sale_data.each do |data| %>
                               <% pay_mth = payment.payment_method %>
@@ -172,7 +176,7 @@
                   <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
                       <% if !total_card.nil? %>
                       <tr>
-                        <td><%= t("views.right_panel.detail.card_sale") %> : </td>
+                        <td><%= t("views.right_panel.detail.other_payment") %> : </td>
                         <td align="right">
                             <%= total_card["card"].to_f %>
                         </td>
@@ -185,7 +189,7 @@
           </div>
         </div>
       </div>
-      <% end %>
+    <% end %>
 
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 24b0f2e5..4c2dda42 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -57,15 +57,15 @@
 
     <!-- #END# Page Loader -->
     <div class="container">
-    	<div class="row">
-	    	<div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
+        <div class="row">
+            <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
                 <img src="/image/SX-logo.png" width="150px" height="150px">
-	    		 <p>
-		            <small>Version - 1.0.1</small>
-		        </p> 
-	    	</div>
-	    </div>
-	    <div class="row bg-white">   
+                 <p>
+                    <small>Version - 1.0.1</small>
+                </p> 
+            </div>
+        </div>
+        <div class="row bg-white">   
             <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
                 <div class="row justify-content-center form-group">                    
                     <input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
@@ -102,112 +102,112 @@
                  </div>   
                  </div>              
 
-                
-            </div>         
+            </div>      
             <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
-                <div class="row justify-content-center form-group">                    
-                	<input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
-                </div>                
-
-            	<div class="row">
-                    <div class="col-1 col-black">
-                        <span>Supervisor</span> 
-                    </div>
-                    <div class="col-11">
-                        <hr />
-                    </div>
-                </div>
-
-                <div class="row m-b-15">
+                <ul class="nav nav-tabs" role="tablist">
                     <% @employees.each do |employee| %>
                         <%if employee.role == "supervisor" %>
-                            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
-                                <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
-                                </form>
-                                <div class="card emp-body">
-                                    <div class="body bg-teal">
-                                    <%=  employee.name%>
-                                </div>
-                                </div>
-                            </div>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#supervisor" role="tab"><b>Supervisor</b></a>
+                                <% break %>
+                            </li>
                         <% end %>
                     <% end %>
-                </div>
 
-                <div class="row">
-                    <div class="col-1 col-black">
-                        <span>Cashier</span> 
-                    </div>
-                    <div class="col-11">
-                        <hr />
-                    </div>
-                </div>
-
-                <div class="row m-b-15">
                     <% @employees.each do |employee| %>
                         <%if employee.role == "cashier" %>
-                            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
-                                <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
-                                </form>
-                                <div class="card emp-body">
-                                    <div class="body bg-teal">
-                                    <%=  employee.name%>
-                                </div>
-                                </div>
-                            </div>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#cashier" role="tab"><b>Cashier</b></a>
+                                <% break %>
+                            </li>
                         <% end %>
                     <% end %>
-                </div>
 
-                <div class="row">
-                    <div class="col-1 col-black">
-                        <span>Accountant</span> 
-                    </div>
-                    <div class="col-11">
-                        <hr />
-                    </div>
-                </div>
-               
-            	<div class="row m-b-15">
                     <% @employees.each do |employee| %>
-	                    <%if employee.role == "account" %>
-		                    <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
-		                        <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
-		                        </form>
-		           				<div class="card emp-body">
-		           					<div class="body bg-teal">
-		           					<%=  employee.name%>
-		           				</div>
-		           				</div>
-		           			</div>
-		           		<% end %>
-           			<% end %>
-                </div>
+                        <%if employee.role == "account" %>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#accountant" role="tab"><b>Accountant</b></a>
+                                <% break %>
+                            </li>
+                        <% end %>
+                    <% end %>
 
-                <div class="row">
-                    <div class="col-1 col-black">
-                        <span>Waiter</span> 
-                    </div>
-                    <div class="col-11">
-                        <hr />
-                    </div>
-                </div>
-               
-                <div class="row m-b-15">
                     <% @employees.each do |employee| %>
                         <%if employee.role == "waiter" %>
-                            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
-                                <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
-                                </form>
-                                <div class="card emp-body">
-                                    <div class="body bg-teal">
-                                    <%=  employee.name%>
-                                </div>
-                                </div>
-                            </div>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#waiter" role="tab"><b>Waiter</b></a>
+                                <% break %>
+                            </li>
                         <% end %>
                     <% end %>
-                </div>
+                </ul>  
+
+                <div class="tab-content" style="max-height:650px; overflow:auto">
+
+                    <div class="tab-pane"  id="supervisor" role="tabpanel" style="max-height:; overflow:auto">
+                        <% @employees.each do |employee| %>
+                            <%if employee.role == "supervisor" %>
+                                <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                    <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                    </form>
+                                    <div class="login_dashboard p-card">
+                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                        <div class="p-name"><b><%=  employee.name%></b>
+                                        </div>
+                                    </div>
+                                </div>
+                            <% end %>
+                        <% end %>
+                    </div>                
+
+                    <div class="tab-pane"  id="cashier" role="tabpanel" style="max-height:; overflow:auto">
+                        <% @employees.each do |employee| %>
+                            <%if employee.role == "cashier" %>
+                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                    <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                    </form>
+                                    <div class="login_dashboard p-card">
+                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                        <div class="p-name"><b><%=  employee.name%></b>
+                                        </div>
+                                    </div>
+                                </div>
+                            <% end %>
+                        <% end %>
+                    </div>   
+
+                    <div class="tab-pane"  id="accountant" role="tabpanel" style="max-height:; overflow:auto">
+                        <% @employees.each do |employee| %>
+                            <%if employee.role == "account" %>
+                                <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                    <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                    </form>
+                                     <div class="login_dashboard p-card">
+                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                        <div class="p-name"><b><%=  employee.name%></b>
+                                        </div>
+                                    </div>
+                                </div>
+                            <% end %>
+                        <% end %>
+                    </div>   
+
+                    <div class="tab-pane"  id="waiter" role="tabpanel" style="max-height:; overflow:auto">
+                        <% @employees.each do |employee| %>
+                            <%if employee.role == "waiter" %>
+                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                    <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                    </form>
+                                    <div class="login_dashboard p-card">
+                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                        <div class="p-name"><b><%=  employee.name%></b>
+                                        </div>
+                                    </div>
+                                </div>
+                            <% end %>
+                        <% end %>
+                    </div>     
+                </div>                                         
             </div>
             <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
         </div>
@@ -237,6 +237,10 @@
             $(item).submit();
         });
 
+        $('ul.nav.nav-tabs li a').click(function() {  
+            $(this).parent().addClass('login_dashboard').siblings().removeClass('login_dashboard');
+        });
+
         $("#emp_id").focus();
         $(".pin_pad").click(function (event) {
             event.preventDefault();                
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 8f58ceb0..4c712015 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -88,69 +88,69 @@
 
       <% if !@summ_sale.nil? %>
 
-      <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
-        <div class="card">
-          <div class="body">
-            <h6><%= t :sale %></h6>
-            <table class="table">
-              <tr>
-                <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.receipt") %> : </td>
-                <td align="right"><%= @summ_sale.total_receipt %></td>
-              </tr>
-              <tr>
-                <td><%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : </td>
-                <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
-              </tr>
-              <tr>
-                <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
-                <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
-              </tr>
-              <tr>
-                <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
-                <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
-              </tr>
-              <tr>
-                <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
-                <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
-              </tr>
-              <tr>
-                <td><%= t("views.right_panel.detail.total") %> <%= t :redeem %> : </td>
-                <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
-              </tr>
-            </table>
-            <table class="table">
-              <% if !(@total_payment_methods.nil?) %>
-              <% @total_payment_methods.each do |payment| %>
-              <% if !@sale_data[0].empty? %>
-              <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
-              <tr>
-                <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
-                <td align="right">
-                  <% @sale_data.each do |data| %>
-                  <% pay_mth = payment.payment_method %>
-                  <%= data[""+pay_mth+""] %>
-                  <% end %>
-                </td>
-              </tr>
-              <% end %>
-              <% end %>
-              <% end %>
+        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+          <div class="card">
+            <div class="body">
+              <h6><%= t :sale %></h6>
+              <table class="table">
+                <tr>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.receipt") %> : </td>
+                  <td align="right"><%= @summ_sale.total_receipt %></td>
+                </tr>
+                <tr>
+                  <td><%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : </td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
+                </tr>
+                <tr>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
+                </tr>
+                <tr>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
+                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
+                </tr>
+                <tr>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
+                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
+                </tr>
+              </table>
+              <table class="table">
+                <% if !(@total_payment_methods.nil?) %>
+                <% @total_payment_methods.each do |payment| %>
+                <% if !@sale_data[0].empty? %>
+                <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
+                <tr>
+                <% if payment.payment_method == 'paypar' %>
+                  <td>Redeem Sale : </td>
+                <% else %>  
+                  <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
+                <% end %>  
+                  <td align="right">
+                    <% @sale_data.each do |data| %>
+                    <% pay_mth = payment.payment_method %>
+                    <%= data[""+pay_mth+""] %>
+                    <% end %>
+                  </td>
+                </tr>
+                <% end %>
+                <% end %>
+                <% end %>
 
-              <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
-              <% if !total_card.nil? %>
-              <tr>
-                <td><%= t("views.right_panel.detail.other_payment") %> : </td>
-                <td align="right">
-                  <%= total_card["card"].to_f %>
-                </td>
-              </tr>
-              <% end %>
+                <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
+                <% if !total_card.nil? %>
+                <tr>
+                  <td><%= t("views.right_panel.detail.other_payment") %> : </td>
+                  <td align="right">
+                    <%= total_card["card"].to_f %>
+                  </td>
+                </tr>
+                <% end %>
 
-              <% end %>
-            </table>
+                <% end %>
+              </table>
+            </div>
           </div>
         </div>
-      </div>
       <% end %> 
       <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
         <div class="card">

From 7c8b5def810f66c1561383faa5355ba254d2da21 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 15:42:07 +0630
Subject: [PATCH 347/651] check product sale

---
 app/models/sale.rb                            | 4 ++--
 app/views/reports/product_sale/index.html.erb | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 2138405c..e433a999 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -862,8 +862,8 @@ def self.get_menu_item_query(order_by)
                " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
                " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
                " LEFT JOIN sales s ON s.sale_id = si.sale_id")
-          .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)")
-          .order("menu_items.menu_category_id #{order_by}, si.qty #{order_by}")
+          .group("si.qty, mc.id, menu_items.name, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)")
+          .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
 end
 #product sale report query
 
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
index eb797122..b8ab6598 100755
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -69,12 +69,7 @@
 
 									<tr>
 										<td>&nbsp;</td>
-										<% if !cate_arr.include?(sale.menu_category_id) %>	
 										<td><%= sale.menu_category_name %></td>
-										<% cate_arr.push(sale.menu_category_id) %>
-										<% else %>
-										<td>&nbsp;</td>
-										<% end %>
 										<td><%= sale.item_code rescue '-' %></td>
 										<td><%= sale.product_name rescue '-' %></td>
 										<td><%= sale.total_item rescue '-' %></td>

From 32818abf4917fb63c36c6317786a359c2310ac2c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 15:44:15 +0630
Subject: [PATCH 348/651] change in xls

---
 app/views/reports/product_sale/index.xls.erb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/views/reports/product_sale/index.xls.erb b/app/views/reports/product_sale/index.xls.erb
index 7123588c..f0410810 100755
--- a/app/views/reports/product_sale/index.xls.erb
+++ b/app/views/reports/product_sale/index.xls.erb
@@ -34,12 +34,7 @@
 
 									<tr>
 										<td>&nbsp;</td>
-										<% if !cate_arr.include?(sale.menu_category_id) %>	
 										<td><%= sale.menu_category_name %></td>
-										<% cate_arr.push(sale.menu_category_id) %>
-										<% else %>
-										<td>&nbsp;</td>
-										<% end %>
 										<td><%= sale.item_code rescue '-' %></td>
 										<td><%= sale.product_name rescue '-' %></td>
 										<td><%= sale.total_item rescue '-' %></td>

From bb6b3794b3ca213c97654fcbf285f56ebd7d73fa Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 28 Feb 2018 16:16:14 +0630
Subject: [PATCH 349/651] Edit in dashboard Total Sale->Net Sale, Grand
 Total->Gross Sale to same with close_cashier_customise_pdf.rb

---
 app/views/home/dashboard.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 91cce7e3..a30cae23 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -164,7 +164,7 @@
                   <td align="right"><%= @summ_sale.total_receipt %></td>
                 </tr>
                 <tr>
-                  <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
+                  <td><%= t("views.right_panel.detail.net") %> <%= t :sale %> : </td>
                   <td align="right"><%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
@@ -176,7 +176,7 @@
                   <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
-                  <td><%= t("views.right_panel.detail.grand_total") %> : </td>
+                  <td><%= t("views.right_panel.detail.gross_sale") %> : </td>
                   <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
               </table>

From 2f7d9523ec9c9571937703b51732562072d15955 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 16:26:40 +0630
Subject: [PATCH 350/651] check product sale

---
 app/models/sale.rb                            |  9 +++--
 app/views/reports/product_sale/index.html.erb | 38 ++++++++++---------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index e433a999..4a12715f 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -851,18 +851,19 @@ def self.get_menu_item_query(order_by)
   query = MenuItem.unscoped.select("acc.id as account_id, 
                       acc.title as account_name, 
                       mii.item_instance_code as item_code, " +
-                     "(CASE WHEN si.qty > 0 THEN SUM(si.qty) ELSE 0 END) as total_item," +
+                     "(CASE WHEN si.qty != '' THEN SUM(si.qty) ELSE 0 END) as total_item," +
                      "(CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END) as unit_price," +
                      "(CASE WHEN (si.qty * si.unit_price) > 0 THEN (si.qty * si.unit_price) ELSE 0 END) as grand_total," +
-                     "mii.price as unit_price, menu_items.name as product_name, 
+                     "mii.price as unit_price, mii.item_instance_name as product_name, 
                      mc.name as" +
-                     " menu_category_name,mc.id as menu_category_id, si.remark as status_type, si.price as price ")
+                     " menu_category_name,mc.id as menu_category_id, si.remark as status_type, 
+                     si.price as price ")
           .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + 
                " LEFT JOIN menu_categories mc ON mc.id = menu_items.menu_category_id" +
                " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
                " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
                " LEFT JOIN sales s ON s.sale_id = si.sale_id")
-          .group("si.qty, mc.id, menu_items.name, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)")
+          .group("mc.id, mii.item_instance_name, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
           .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
 end
 #product sale report query
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
index b8ab6598..a62e0d73 100755
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -47,6 +47,7 @@
 								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
 								<th><%= t("views.right_panel.detail.unit_price") %></th>
 								<th><%= t("views.right_panel.detail.total") %></th>
+								<th><%= t("views.right_panel.detail.remark") %></th>
 							</tr>	
 						</thead>
 						<tbody id="tbd_data">
@@ -58,24 +59,25 @@
 								<% total_qty = 0 %>
 
 								<% @sale_data.each do |sale| %>
-									<% if sale.status_type != "Discount" && sale.status_type != "foc"
-										total_qty += sale.total_item
-										grand_total += sale.grand_total
-									end %>
-									<% if sale.status_type == "foc" && sale.price > 0
-										total_qty += sale.total_item
-										grand_total += sale.grand_total
-									end %>
+										<% if sale.status_type != "Discount" && sale.status_type != "foc"
+											total_qty += sale.total_item
+											grand_total += sale.grand_total
+										end %>
+										<% if sale.status_type == "foc" && sale.price > 0
+											total_qty += sale.total_item
+											grand_total += sale.grand_total
+										end %>
 
-									<tr>
-										<td>&nbsp;</td>
-										<td><%= sale.menu_category_name %></td>
-										<td><%= sale.item_code rescue '-' %></td>
-										<td><%= sale.product_name rescue '-' %></td>
-										<td><%= sale.total_item rescue '-' %></td>
-										<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
-									</tr>
+										<tr>
+											<td>&nbsp;</td>
+											<td><%= sale.menu_category_name %></td>
+											<td><%= sale.item_code rescue '-' %></td>
+											<td><%= sale.product_name rescue '-' %></td>
+											<td><%= sale.total_item rescue '-' %></td>
+											<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+											<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
+											<td><%= sale.status_type rescue '' %></td>
+										</tr>
 									<!-- sub total -->
 								<!-- end sub total -->
 								<% end %>
@@ -84,7 +86,7 @@
 								<td><strong>Total</strong></td>
 								<td><strong><%= total_qty %></strong></td>
 								<td></td>
-								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
+								<td colspan="2"><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
 							</tr>
 							
 						<% end %>

From d9afdc7df5955412efcbd884d3cacb71dca02abf Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 28 Feb 2018 16:44:32 +0630
Subject: [PATCH 351/651] update product for account id 3

---
 app/models/product.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/product.rb b/app/models/product.rb
index 3c915a38..2d8cc013 100755
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -9,7 +9,7 @@ class Product < ApplicationRecord
     mt_instance = Product.find_by_item_code(item_code)
     if (!mt_instance.nil?)
       menu_item_hash[:type] = 'Product'
-      menu_item_hash[:account_id] = 1
+      menu_item_hash[:account_id] = 3
       menu_item_hash[:item_code] = mt_instance.item_code
       menu_item_hash[:item_instance_code] = mt_instance.item_code
       menu_item_hash[:name] = mt_instance.name.to_s

From 4bb597cb9dbced4beffbe0e9fd079c6bc624b3b7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 10:28:36 +0630
Subject: [PATCH 352/651] update saleitem migrate for status

---
 db/migrate/20170403161857_create_sale_items.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/migrate/20170403161857_create_sale_items.rb b/db/migrate/20170403161857_create_sale_items.rb
index 27cf7ac4..2135e715 100755
--- a/db/migrate/20170403161857_create_sale_items.rb
+++ b/db/migrate/20170403161857_create_sale_items.rb
@@ -8,6 +8,7 @@ class CreateSaleItems < ActiveRecord::Migration[5.1]
       t.string :product_name, :null => false
       t.string :product_alt_name, :null => false
       t.integer :account_id, :limit => 8, :null => false, :default => 1
+      t.string :status
       t.string :remark
       t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00

From 2c1f599990e00d1694da0c9f94f56ba1ea03a066 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 13:53:25 +0630
Subject: [PATCH 353/651] update license

---
 app/controllers/install_controller.rb    |  2 ++
 config/initializers/action_controller.rb | 11 +++++------
 config/secrets.yml                       |  4 ++--
 config/shops.json                        | 13 +------------
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index 353509c3..5aa7af06 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -1,4 +1,5 @@
 class InstallController < BaseController
+  skip_before_action :lookup_domain
   skip_before_action :verify_authenticity_token
   # before_action :check_license
 
@@ -34,6 +35,7 @@ class InstallController < BaseController
     if response[:status]
       redirect_to root_url, notice: response["message"]
     else
+      byebug
       redirect_to activate_path, notice: response["message"]
     end
 	end
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 7cabe7f7..8f310dab 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -1,5 +1,4 @@
 class ActionController::Base
-
   before_action :lookup_domain, :set_locale
 
   private
@@ -21,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 
diff --git a/config/secrets.yml b/config/secrets.yml
index b74dcdbc..7930204e 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: 192.168.1.125:3002/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
@@ -24,7 +24,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+  sx_provision_url: connect.smartsales.dev/api #192.168.1.147:3002/api
   server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
diff --git a/config/shops.json b/config/shops.json
index dc0e3b46..1e141bc9 100644
--- a/config/shops.json
+++ b/config/shops.json
@@ -1,18 +1,7 @@
 {
   "data": [
     {
-      "lookup": "chromis-1.zsai.ws",
-      "value": {
-        "key": "877eY5iPvpVzaYnIkc2FgIy0U85FtqpTpQGqoM/RCG0=\n",
-        "iv": "qSVQaKzOm3TYmRP3DhHdig==\n"
-      }
-    },
-    {
-      "lookup": "gw2a-13.zsai.dev",
-      "value": {
-        "key": "R0uRkGlvCD5DGaPV4SkhGlwaMR0ohYBBmNna+tpRXMc=\n",
-        "iv": "AP5iuLM36oJmnvLsWCo9+Q==\n"
-      }
+      
     }
   ]
 }

From c1b112636cecf3190c2ab35882ec316c1fe51602 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 13:54:52 +0630
Subject: [PATCH 354/651] update license

---
 config/license.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 config/license.yml

diff --git a/config/license.yml b/config/license.yml
new file mode 100644
index 00000000..40543709
--- /dev/null
+++ b/config/license.yml
@@ -0,0 +1,15 @@
+iv_key: KoQBUN3M44TXHKj9dlZk7w==
+shop_name: sx_license_test
+email: aungmyo.zaw@code2lab.com
+telephone: 0099404923
+fax: 49494949432
+address: Yangon
+dbhost: 8j/QXxl+Gpvz0/9BXMP8Uw==
+dbschema: Egf4CfJLOWC8qaNVS3NyXQ==
+dbusername: BbdbUXyfb8O0g61L8Bo1hQ==
+dbpassword: lGn1m2/5wouc1J+1qDKuAQ==
+api_token: MWEvlKvhPjwJNvhAjdgYCwWJxMaaFpDoMtgmuvCs
+app_token: rXkavjsHhCeOnTuOBSZhKBmudIJpFWHQxtSzSO
+plan_sku: 4JRlspPt+MaMfNIpk9tZHw==
+renewable_date: e5ZXSh24RJBzqIxNCTPrtQ==
+plan_name: qZgXEt61vcVSzD3d63NCHA==

From 2d62750caafeefbd4e330da8a3a7e8f862a53559 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 14:04:38 +0630
Subject: [PATCH 355/651] update delete license

---
 config/license.yml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 config/license.yml

diff --git a/config/license.yml b/config/license.yml
deleted file mode 100644
index 40543709..00000000
--- a/config/license.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-iv_key: KoQBUN3M44TXHKj9dlZk7w==
-shop_name: sx_license_test
-email: aungmyo.zaw@code2lab.com
-telephone: 0099404923
-fax: 49494949432
-address: Yangon
-dbhost: 8j/QXxl+Gpvz0/9BXMP8Uw==
-dbschema: Egf4CfJLOWC8qaNVS3NyXQ==
-dbusername: BbdbUXyfb8O0g61L8Bo1hQ==
-dbpassword: lGn1m2/5wouc1J+1qDKuAQ==
-api_token: MWEvlKvhPjwJNvhAjdgYCwWJxMaaFpDoMtgmuvCs
-app_token: rXkavjsHhCeOnTuOBSZhKBmudIJpFWHQxtSzSO
-plan_sku: 4JRlspPt+MaMfNIpk9tZHw==
-renewable_date: e5ZXSh24RJBzqIxNCTPrtQ==
-plan_name: qZgXEt61vcVSzD3d63NCHA==

From 4b26c7617cc5028fb19b5ee718119e3b779b4598 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 14:10:38 +0630
Subject: [PATCH 356/651] update remove byebyg

---
 app/controllers/install_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index 5aa7af06..1ff003db 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -35,7 +35,6 @@ class InstallController < BaseController
     if response[:status]
       redirect_to root_url, notice: response["message"]
     else
-      byebug
       redirect_to activate_path, notice: response["message"]
     end
 	end

From 5eec1ad37714329f956278af1f47228207ef1a42 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Mar 2018 14:12:30 +0630
Subject: [PATCH 357/651] check product sale query

---
 app/models/sale.rb                            |  9 +++++----
 app/views/reports/product_sale/index.html.erb | 13 ++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 4a12715f..32f196ff 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -851,10 +851,10 @@ def self.get_menu_item_query(order_by)
   query = MenuItem.unscoped.select("acc.id as account_id, 
                       acc.title as account_name, 
                       mii.item_instance_code as item_code, " +
-                     "(CASE WHEN si.qty != '' THEN SUM(si.qty) ELSE 0 END) as total_item," +
+                     "(CASE WHEN si.qty IS NOT NULL THEN SUM(si.qty) ELSE 0 END) as total_item," +
                      "(CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END) as unit_price," +
-                     "(CASE WHEN (si.qty * si.unit_price) > 0 THEN (si.qty * si.unit_price) ELSE 0 END) as grand_total," +
-                     "mii.price as unit_price, mii.item_instance_name as product_name, 
+                     "(CASE WHEN si.qty IS NOT NULL THEN (SUM(si.qty) * si.unit_price) ELSE 0 END) as grand_total," +
+                     "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE mii.item_instance_name END) as product_name, 
                      mc.name as" +
                      " menu_category_name,mc.id as menu_category_id, si.remark as status_type, 
                      si.price as price ")
@@ -863,7 +863,8 @@ def self.get_menu_item_query(order_by)
                " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
                " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
                " LEFT JOIN sales s ON s.sale_id = si.sale_id")
-          .group("mc.id, mii.item_instance_name, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
+          .where("(CASE WHEN s.sale_status IS NOT NULL THEN s.sale_status='completed' ELSE 1 END)")
+          .group("mc.id, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE mii.item_instance_name END)")
           .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
 end
 #product sale report query
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
index a62e0d73..ffad886a 100755
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -47,7 +47,6 @@
 								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
 								<th><%= t("views.right_panel.detail.unit_price") %></th>
 								<th><%= t("views.right_panel.detail.total") %></th>
-								<th><%= t("views.right_panel.detail.remark") %></th>
 							</tr>	
 						</thead>
 						<tbody id="tbd_data">
@@ -59,24 +58,28 @@
 								<% total_qty = 0 %>
 
 								<% @sale_data.each do |sale| %>
+										<% grand_total += sale.grand_total %>
 										<% if sale.status_type != "Discount" && sale.status_type != "foc"
 											total_qty += sale.total_item
-											grand_total += sale.grand_total
 										end %>
 										<% if sale.status_type == "foc" && sale.price > 0
 											total_qty += sale.total_item
-											grand_total += sale.grand_total
 										end %>
 
 										<tr>
 											<td>&nbsp;</td>
+											<% if !cate_arr.include?(sale.menu_category_id) %>	
 											<td><%= sale.menu_category_name %></td>
+											<% cate_arr.push(sale.menu_category_id) %>
+											<% else %>
+											<% cate_arr = Array.new %>
+											<td>&nbsp;</td>
+											<% end %>
 											<td><%= sale.item_code rescue '-' %></td>
 											<td><%= sale.product_name rescue '-' %></td>
 											<td><%= sale.total_item rescue '-' %></td>
 											<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 											<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
-											<td><%= sale.status_type rescue '' %></td>
 										</tr>
 									<!-- sub total -->
 								<!-- end sub total -->
@@ -86,7 +89,7 @@
 								<td><strong>Total</strong></td>
 								<td><strong><%= total_qty %></strong></td>
 								<td></td>
-								<td colspan="2"><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
+								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
 							</tr>
 							
 						<% end %>

From 00271e9e213409327d97f1d2b472b0a0bba0728c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 14:35:04 +0630
Subject: [PATCH 358/651] update license

---
 config/license.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 config/license.yml

diff --git a/config/license.yml b/config/license.yml
new file mode 100644
index 00000000..32094fb3
--- /dev/null
+++ b/config/license.yml
@@ -0,0 +1,15 @@
+iv_key: l6jSSxA1D2hcajRgfsd6Nw==
+shop_name: sx_license_test2
+email: aungmyo.zaw@code2lab.com
+telephone: 0099404923
+fax: 49494949432
+address: Yangon
+dbhost: oUG2cXgGsuNxgiItgwvhIQ==
+dbschema: IQzxsvLca7eq6Qa2SAplwg==
+dbusername: Nm1E9EzonZwRbJZIGpFxBg==
+dbpassword: kdoY1Z4Mvq06eqa1BxAcug==
+api_token: uGrwtgWHsDEBNrdZIckHgRItdUIGnDcIGYYIZJM
+app_token: aJPiVvXbAfdPDqGppRPZnxlFTBkMIwk
+plan_sku: qDklFYomm87GBgerRT+fBA==
+renewable_date: mbE4vFnUpFhPpoRehP/HQw==
+plan_name: /CnVZqmB4N4B2t1gaw0Geg==

From 9f59962b8f93b36560a9a032940e4dcfff1dbcdb Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 14:46:50 +0630
Subject: [PATCH 359/651] update addorder js

---
 app/assets/javascripts/addorder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index de1024ea..69ac19d4 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -761,7 +761,7 @@ $(function() {
     
     type = window.location.href.indexOf("quick_service");
 
-    if (type != 'true') {
+    if (type != -1) {
       type = 'quick_service'
       var table_type = $('#table_type').text();
       var table_id    = $('#table_id').val();

From dfb80de435f41dc22c839dc071377a68b9f3628b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Mar 2018 14:49:01 +0630
Subject: [PATCH 360/651] change product account

---
 app/models/product.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/models/product.rb b/app/models/product.rb
index 2d8cc013..9482b376 100755
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -5,11 +5,18 @@ class Product < ApplicationRecord
   mount_uploader :image_path, ProductImageUploader
 
   def self.search_by_product_code(item_code)
+    account = Account.where('title','like','%Product%').first()
+    if !account.nil?
+      account_id = account.id
+    else
+      account_id = 1
+    end
+    
     menu_item_hash = Hash.new
     mt_instance = Product.find_by_item_code(item_code)
     if (!mt_instance.nil?)
       menu_item_hash[:type] = 'Product'
-      menu_item_hash[:account_id] = 3
+      menu_item_hash[:account_id] = account_id
       menu_item_hash[:item_code] = mt_instance.item_code
       menu_item_hash[:item_instance_code] = mt_instance.item_code
       menu_item_hash[:name] = mt_instance.name.to_s

From e252c0acc3719fbc8a13f1fffbfa7fe258962906 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Mar 2018 15:00:18 +0630
Subject: [PATCH 361/651] check product account

---
 app/models/product.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/product.rb b/app/models/product.rb
index 9482b376..3256fe17 100755
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -5,13 +5,13 @@ class Product < ApplicationRecord
   mount_uploader :image_path, ProductImageUploader
 
   def self.search_by_product_code(item_code)
-    account = Account.where('title','like','%Product%').first()
+    account = Account.find_by_title('Product')
     if !account.nil?
       account_id = account.id
     else
       account_id = 1
     end
-    
+
     menu_item_hash = Hash.new
     mt_instance = Product.find_by_item_code(item_code)
     if (!mt_instance.nil?)

From 4b311789e19c42500241878603d1d8c471942f6b Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 5 Mar 2018 15:59:31 +0630
Subject: [PATCH 362/651] Declare Move_down with variable

---
 app/pdf/receipt_bill_a5_pdf.rb | 92 +++++++++++++++++----------------
 app/pdf/receipt_bill_pdf.rb    | 93 ++++++++++++++++++----------------
 2 files changed, 96 insertions(+), 89 deletions(-)

diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 6125078b..4851aa0a 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -1,6 +1,6 @@
 class ReceiptBillA5Pdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
-  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
@@ -15,6 +15,7 @@ class ReceiptBillA5Pdf < Prawn::Document
 
     self.description_width = 500
     self.price_num_width = 100
+    self.line_move = 10
     # @item_width = self.page_width.to_i / 2
     # @qty_width = @item_width.to_i / 3
     # @double = @qty_width * 1.3
@@ -91,20 +92,20 @@ class ReceiptBillA5Pdf < Prawn::Document
   end
 
   def header (shop_details)
-    move_down 10
+    move_down line_move
     text "#{shop_details.name}", :size => self.header_font_size,:align => :center
-    move_down 10
+    move_down line_move
     text "#{shop_details.address}", :size => self.item_font_size,:align => :center
     # move_down self.item_height
-    move_down 10
+    move_down line_move
     text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
-    move_down 10
+    move_down line_move
 
     stroke_horizontal_rule
   end
 
   def cashier_info(sale_data, customer_name)
-        move_down 12
+        move_down line_move
         # move_down 2
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
@@ -113,7 +114,7 @@ class ReceiptBillA5Pdf < Prawn::Document
         bounding_box([self.item_description_width, y_position], :width => self.item_description_width, :height => self.item_height) do
             text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
         end
-        move_down 10
+        move_down line_move
 
         y_position = cursor
         bounding_box([0, y_position], :width =>self.item_description_width, :height => self.item_height) do
@@ -122,7 +123,7 @@ class ReceiptBillA5Pdf < Prawn::Document
         bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
               text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right
         end
-        move_down 10
+        move_down line_move
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.page_width - 20, :height => self.item_height) do
@@ -136,7 +137,7 @@ class ReceiptBillA5Pdf < Prawn::Document
         #          :size => self.item_font_size,:align => :right
         # end
 
-        move_down 10
+        move_down line_move
         stroke_horizontal_rule
   end
 
@@ -153,9 +154,9 @@ class ReceiptBillA5Pdf < Prawn::Document
             item_label_total_front_width = (self.item_width+self.price_width) + 5
             item_label_total_end_width = self.total_width + 4
         end
-        move_down 10
+        move_down line_move
         y_position = cursor
-        move_down 10
+        move_down line_move
         pad_top(15) {
             # @item_width.to_i + @half_qty.to_i
             text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
@@ -163,7 +164,7 @@ class ReceiptBillA5Pdf < Prawn::Document
             text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
             text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
         }
-        move_down -5
+        move_down line_move
         stroke_horizontal_rule
         add_line_item_row(sale_items,precision,delimiter)
     end
@@ -183,7 +184,7 @@ class ReceiptBillA5Pdf < Prawn::Document
             item_total_end_width = self.total_width + 4
         end
         y_position = cursor
-        move_down 10
+        move_down line_move
         sub_total = 0.0
         sale_items.each do |item|
             # check for item not to show 
@@ -214,25 +215,25 @@ class ReceiptBillA5Pdf < Prawn::Document
                             end
                         end
                     end
+                    move_down line_move
                 }
-                move_down 10
             end
         end
 
         stroke_horizontal_rule
 
-        move_down 10
+        move_down line_move
         y_position = cursor
         bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
             text "Sub Total", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.description_width,y_position], :width =>self.label_width) do
             text "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}" ,:delimiter => ',', :size => self.item_font_size,:align => :right
-         end  
-        move_down 10      
+         end      
     end
 
     def all_total(sale_data,precision,delimiter)
+        move_down line_move
         item_name_width = self.item_width
         y_position = cursor
         if sale_data.discount_type == 'member_discount'
@@ -250,7 +251,7 @@ class ReceiptBillA5Pdf < Prawn::Document
 
         if sale_data.sale_taxes.length > 0
             sale_data.sale_taxes.each do |st|
-                move_down 10
+                move_down line_move
                 y_position = cursor
 
                 bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
@@ -275,7 +276,7 @@ class ReceiptBillA5Pdf < Prawn::Document
         # end
 
         if sale_data.rounding_adjustment != 0.0
-                move_down 10
+                move_down line_move
             y_position = cursor
 
             bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
@@ -286,16 +287,16 @@ class ReceiptBillA5Pdf < Prawn::Document
             end 
         end
 
-        move_down 10
+        move_down line_move
         y_position = cursor
-        move_down 10
+        move_down line_move
         bounding_box([0,y_position], :width =>self.description_width) do
              text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
         end
         bounding_box([self.description_width,y_position], :width =>self.label_width) do
             text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
         end
-        move_down 10
+        move_down line_move
         
         sale_payment(sale_data,precision,delimiter)
        
@@ -303,7 +304,7 @@ class ReceiptBillA5Pdf < Prawn::Document
 
     def sale_payment(sale_data,precision,delimiter)        
         stroke_horizontal_rule
-        move_down 10
+       # move_down 10
         sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method").where('sale_id = ?', sale_data.sale_id).group("payment_method")
         sale_payments.each do |payment|
             y_position = cursor
@@ -320,18 +321,18 @@ class ReceiptBillA5Pdf < Prawn::Document
             bounding_box([self.description_width,y_position], :width =>self.label_width) do
                 text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
-            move_down 10
+            move_down line_move
         end
         if sale_data.amount_received > 0   
             y_position = cursor
-            move_down 10
+            move_down line_move
             bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
                  text "Change Amount", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.description_width,y_position], :width =>self.label_width) do
                 text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
-            move_down 10
+            #move_down line_move
         end        
     end
 
@@ -358,7 +359,7 @@ class ReceiptBillA5Pdf < Prawn::Document
 
                          rebate_balance = rebate_balance + res["deposit"]
 
-                        move_down 10
+                        move_down line_move
                         y_position = cursor
                         bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
                             text "Rebate Earn", :size => self.item_font_size,:align => :left
@@ -371,7 +372,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                 # Total Rebate Amount if birthday
                     if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate"
                          rebate_balance = rebate_balance + res["deposit"]
-                        move_down 10
+                        move_down line_move
                         y_position = cursor
                         bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
                             text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left
@@ -383,7 +384,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                 #end Total rebate if birthday
                 end
 
-                 move_down 10
+                 move_down line_move
                     y_position = cursor
                   bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
                      text "Redeem Amount", :size => self.item_font_size,:align => :left
@@ -393,7 +394,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                   end
 
                  if current_balance != nil
-                     move_down 10
+                     move_down line_move
                     y_position = cursor
                      bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
                          text "Old Balance", :size => self.item_font_size,:align => :left
@@ -415,7 +416,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                     
                 end
             end
-            move_down 10
+            move_down line_move
             y_position = cursor
             bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
                  text "Total Balance", :size => self.item_font_size,:align => :left
@@ -428,21 +429,22 @@ class ReceiptBillA5Pdf < Prawn::Document
     end
 
     def customer(customer_name)
-        move_down 10
+        move_down line_move
         y_position = cursor
+        move_down line_move
         bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
                 text "Customer Name", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.description_width,y_position], :width =>self.label_width) do
              text "#{ customer_name }" , :size => self.item_font_size,:align => :right
         end
+        move_down line_move
     end
 
 
     def discount_account(discount_price_by_accounts,precision,delimiter)
-        move_down 10
         stroke_horizontal_rule
-        move_down 10
+        move_down line_move
         y_position = cursor
         discount_price_by_accounts.each do |ipa|
             y_position = cursor
@@ -452,13 +454,13 @@ class ReceiptBillA5Pdf < Prawn::Document
             bounding_box([self.description_width,y_position], :width =>self.label_width) do
                 text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
             end  
+            move_down line_move
         end
     end
 
     def items_account(item_price_by_accounts,precision,delimiter)
-        move_down 10
         stroke_horizontal_rule
-        move_down 10
+        move_down line_move
         y_position = cursor
         item_price_by_accounts.each do |ipa|
             y_position = cursor
@@ -468,27 +470,27 @@ class ReceiptBillA5Pdf < Prawn::Document
             bounding_box([self.label_width,y_position], :width =>self.description_width) do
                 text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end  
+            move_down line_move
         end
     end
 
     #individual payment per person
     def individual_payment(sale_data, survey, precision, delimiter)
         per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
-        move_down 5
         stroke_horizontal_rule
-        move_down 5
+        move_down line_move
         y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width+50) do
             text "Individual amount for #{survey.total_customer} persons", :size => self.item_font_size+1,:align => :left
         end
 
         bounding_box([0,y_position], :width =>self.label_width) do
-            move_down 15
+            move_down line_move
             text "Total", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
-            move_down 15
+            move_down line_move
             text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)} per person", :size => self.item_font_size,:align => :right
         end
     end
@@ -532,9 +534,9 @@ class ReceiptBillA5Pdf < Prawn::Document
     end
 
     def footer(printed_status)
-        move_down 10
+        move_down line_move
         stroke_horizontal_rule
-        move_down 10
+        move_down line_move
 
         y_position = cursor
         bounding_box([0, y_position], :width =>self.item_description_width) do
@@ -544,15 +546,15 @@ class ReceiptBillA5Pdf < Prawn::Document
             text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :right
         end        
 
-        move_down 10
+        move_down line_move
     end
 
     #start card sale trans data
     def card_sale_data(card_data)
         if card_data != nil && !card_data.empty?
-            move_down 5
+            move_down line_move
             stroke_horizontal_rule
-            move_down 5
+            move_down line_move
 
             y_position = cursor
             card_data.each do |data|
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 2f7fa0eb..4c6c51f7 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -1,6 +1,6 @@
 class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
-  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
@@ -15,6 +15,7 @@ class ReceiptBillPdf < Prawn::Document
 
     self.description_width = 150
     self.price_num_width = 50
+    self.line_move = 2
     # @item_width = self.page_width.to_i / 2
     # @qty_width = @item_width.to_i / 3
     # @double = @qty_width * 1.3
@@ -91,20 +92,19 @@ class ReceiptBillPdf < Prawn::Document
   end
 
   def header (shop_details)
-    move_down 5
     text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
-    move_down 5
+    move_down line_move
     text "#{shop_details.address}", :size => self.item_font_size,:align => :center
     # move_down self.item_height
-    move_down 5
+    move_down line_move
     text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
-    move_down 5
+    move_down line_move
 
     stroke_horizontal_rule
   end
 
   def cashier_info(sale_data, customer_name)
-        move_down 7
+        move_down line_move
         # move_down 2
         y_position = cursor
         bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
@@ -116,7 +116,7 @@ class ReceiptBillPdf < Prawn::Document
          end
         end
         
-        move_down 5
+        move_down line_move
 
         y_position = cursor
         bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do
@@ -125,7 +125,7 @@ class ReceiptBillPdf < Prawn::Document
         bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
               text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right
         end
-        move_down 5
+        move_down line_move
 
         y_position = cursor
         if sale_data.bookings[0].dining_facility_id.to_i > 0
@@ -145,7 +145,7 @@ class ReceiptBillPdf < Prawn::Document
         #          :size => self.item_font_size,:align => :right
         # end
 
-        move_down 5
+        move_down line_move
         stroke_horizontal_rule
   end
 
@@ -162,9 +162,9 @@ class ReceiptBillPdf < Prawn::Document
             item_label_total_front_width = (self.item_width+self.price_width) + 5
             item_label_total_end_width = self.total_width + 4
         end
-        move_down 5
+        move_down line_move
         y_position = cursor
-        move_down 5
+        move_down line_move
         pad_top(15) {
             # @item_width.to_i + @half_qty.to_i
             text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
@@ -172,7 +172,7 @@ class ReceiptBillPdf < Prawn::Document
             text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
             text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
         }
-        move_down -5
+       # move_down line_move
         stroke_horizontal_rule
         add_line_item_row(sale_items,precision,delimiter)
     end
@@ -192,7 +192,7 @@ class ReceiptBillPdf < Prawn::Document
             item_total_end_width = self.total_width + 4
         end
         y_position = cursor
-        move_down 5
+        move_down line_move
         sub_total = 0.0
         sale_items.each do |item|
             # check for item not to show 
@@ -223,25 +223,27 @@ class ReceiptBillPdf < Prawn::Document
                             end
                         end
                     end
+                    move_down line_move
                 }
-                move_down 5
+                
             end
         end
 
         stroke_horizontal_rule
 
-        move_down 5
+        move_down line_move
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
             text "Sub Total", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
             text "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}" ,:delimiter => ',', :size => self.item_font_size,:align => :right
-         end  
-        move_down 5      
+         end        
     end
 
     def all_total(sale_data,precision,delimiter)
+
+        move_down line_move
         item_name_width = self.item_width
         y_position = cursor
         if sale_data.discount_type == 'member_discount'
@@ -259,7 +261,7 @@ class ReceiptBillPdf < Prawn::Document
 
         if sale_data.sale_taxes.length > 0
             sale_data.sale_taxes.each do |st|
-                move_down 5
+                move_down line_move
                 y_position = cursor
 
                 bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
@@ -284,7 +286,7 @@ class ReceiptBillPdf < Prawn::Document
         # end
 
         if sale_data.rounding_adjustment != 0.0
-                move_down 5
+                move_down line_move
             y_position = cursor
 
             bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
@@ -295,16 +297,16 @@ class ReceiptBillPdf < Prawn::Document
             end 
         end
 
-        move_down 5
+        move_down line_move
         y_position = cursor
-        move_down 5
+        move_down line_move
         bounding_box([0,y_position], :width =>self.item_description_width) do
              text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
             text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
         end
-        move_down 5
+        move_down line_move
         
         sale_payment(sale_data,precision,delimiter)
        
@@ -312,7 +314,7 @@ class ReceiptBillPdf < Prawn::Document
 
     def sale_payment(sale_data,precision,delimiter)        
         stroke_horizontal_rule
-        move_down 5
+        #move_down line_move
         sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method").where('sale_id = ?', sale_data.sale_id).group("payment_method")
         sale_payments.each do |payment|
             y_position = cursor
@@ -329,18 +331,18 @@ class ReceiptBillPdf < Prawn::Document
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
                 text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
-            move_down 5
+            move_down line_move
         end
         if sale_data.amount_received > 0   
             y_position = cursor
-            move_down 5
+            move_down line_move
             bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                  text "Change Amount", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
                 text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
-            move_down 5
+          #  move_down line_move
         end        
     end
 
@@ -367,7 +369,7 @@ class ReceiptBillPdf < Prawn::Document
 
                          rebate_balance = rebate_balance + res["deposit"]
 
-                        move_down 5
+                        move_down line_move
                         y_position = cursor
                         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                             text "Rebate Earn", :size => self.item_font_size,:align => :left
@@ -380,7 +382,7 @@ class ReceiptBillPdf < Prawn::Document
                 # Total Rebate Amount if birthday
                     if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate"
                          rebate_balance = rebate_balance + res["deposit"]
-                        move_down 5
+                        move_down line_move
                         y_position = cursor
                         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                             text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left
@@ -392,7 +394,7 @@ class ReceiptBillPdf < Prawn::Document
                 #end Total rebate if birthday
                 end
 
-                 move_down 5
+                 move_down line_move
                     y_position = cursor
                   bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                      text "Redeem Amount", :size => self.item_font_size,:align => :left
@@ -402,7 +404,7 @@ class ReceiptBillPdf < Prawn::Document
                   end
 
                  if current_balance != nil
-                     move_down 5
+                     move_down line_move
                     y_position = cursor
                      bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                          text "Old Balance", :size => self.item_font_size,:align => :left
@@ -424,7 +426,7 @@ class ReceiptBillPdf < Prawn::Document
                     
                 end
             end
-            move_down 5
+            move_down line_move
             y_position = cursor
             bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                  text "Total Balance", :size => self.item_font_size,:align => :left
@@ -437,21 +439,23 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     def customer(customer_name)
-        move_down 5
+      # move_down line_move
         y_position = cursor
+        #move_down line_move
         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                 text "Customer Name", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
              text "#{ customer_name }" , :size => self.item_font_size,:align => :right
         end
+        move_down line_move
     end
 
 
     def discount_account(discount_price_by_accounts,precision,delimiter)
-        move_down 5
+
         stroke_horizontal_rule
-        move_down 5
+        move_down line_move
         y_position = cursor
         discount_price_by_accounts.each do |ipa|
             y_position = cursor
@@ -461,13 +465,13 @@ class ReceiptBillPdf < Prawn::Document
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
                 text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
             end  
+            move_down line_move
         end
     end
 
     def items_account(item_price_by_accounts,precision,delimiter)
-        move_down 5
         stroke_horizontal_rule
-        move_down 5
+        move_down line_move
         y_position = cursor
         item_price_by_accounts.each do |ipa|
             y_position = cursor
@@ -476,16 +480,16 @@ class ReceiptBillPdf < Prawn::Document
             end
             bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
                 text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
-            end  
+            end
+            move_down line_move  
         end
     end
 
     #individual payment per person
     def individual_payment(sale_data, survey, precision, delimiter)
         per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
-        move_down 5
         stroke_horizontal_rule
-        move_down 5
+        move_down line_move
         y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width+50) do
             text "Individual amount for #{survey.total_customer} persons", :size => self.item_font_size+1,:align => :left
@@ -541,10 +545,11 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     def footer(printed_status)
-        move_down 5
+        move_down line_move
         stroke_horizontal_rule
-        move_down 5
+        move_down line_move
 
+        move_down line_move
         y_position = cursor
         bounding_box([0, y_position], :width =>self.label_width) do
             text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
@@ -553,15 +558,15 @@ class ReceiptBillPdf < Prawn::Document
             text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left
         end        
 
-        move_down 5
+        move_down line_move
     end
 
     #start card sale trans data
     def card_sale_data(card_data)
         if card_data != nil && !card_data.empty?
-            move_down 5
+            move_down line_move
             stroke_horizontal_rule
-            move_down 5
+            move_down line_move
 
             y_position = cursor
             card_data.each do |data|

From 779ef9a4ba4903738b76ba1a912580ece09f794e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Mar 2018 16:26:19 +0630
Subject: [PATCH 363/651] remove conflict data

---
 app/controllers/home_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index cf18ae9b..df00e24c 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,12 +1,8 @@
 class HomeController < ApplicationController  
   # layout "application", except: [:index, :show]
-<<<<<<< HEAD
   skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] 
 
   helper_method :shop_detail 
-=======
-  # skip_before_action only: [:index, :show, :create, :update, :destroy]  
->>>>>>> 311bef44119baa113cfadf226d6d34e04cfbe991
 
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")

From ebf01a5d95e5d4e85abcdde64da7d42a48b5bfb4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Mar 2018 16:28:34 +0630
Subject: [PATCH 364/651] change action

---
 app/controllers/home_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index df00e24c..d59a5af3 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,6 @@
 class HomeController < ApplicationController  
   # layout "application", except: [:index, :show]
-  skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] 
+  # skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] 
 
   helper_method :shop_detail 
 

From 981aef32ba26cccbb40fd3a7c76b8b878bb3c256 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 5 Mar 2018 16:35:50 +0630
Subject: [PATCH 365/651] update license check offline

---
 app/models/license.rb | 26 ++++++++++++++------------
 config/license.yml    | 22 +++++++++++-----------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/models/license.rb b/app/models/license.rb
index 1cbce908..7d935185 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -70,13 +70,11 @@ class License
   # For Local System
   def detail_with_local_file()    
     renewal_date_str = read_license("renewable_date")
-    
     if check_expiring(renewal_date_str)   
       # return for all ok 
       return 1
     else
       has_license = verify_license()
-
       if has_license
         # return for expiring 
         return 2
@@ -137,23 +135,27 @@ class License
     api_token = read_license_no_decrypt("api_token")    
     @params = { query: {lookup_type: "application", api_token: api_token} }
     response = self.class.get("/verify", @params)
-    @varified = response.parsed_response
 
-    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-    if (@varified["status"])
-      if (!check_expired(@varified["renewable_date"]))
-        return true
-      end
-    else
-      delete_license_file
-    end  
+    rescue SocketError => e
+      Rails.logger.debug  "In Socket errror"
+      return true
+    rescue => e
+      @varified = response.parsed_response
+      Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+      if (@varified["status"])
+        if (!check_expired(@varified["renewable_date"]))
+          return true
+        end
+      else
+        delete_license_file
+      end  
     return false  
   end
 
   # Check Expired before 30 days
   def check_expiring(renewal_date_str)        
     if !renewal_date_str.empty?
-      renewal_date = DateTime.parse(renewal_date_str)      
+      renewal_date = DateTime.parse(renewal_date_str)    
       renewal_date >  Date.today.advance(:days => 30)
     end
   end
diff --git a/config/license.yml b/config/license.yml
index 32094fb3..fefa7d40 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -1,15 +1,15 @@
-iv_key: l6jSSxA1D2hcajRgfsd6Nw==
-shop_name: sx_license_test2
+iv_key: f3ICP0M2HJLIeXURn3yv5A==
+shop_name: sx_license_test3
 email: aungmyo.zaw@code2lab.com
 telephone: 0099404923
 fax: 49494949432
 address: Yangon
-dbhost: oUG2cXgGsuNxgiItgwvhIQ==
-dbschema: IQzxsvLca7eq6Qa2SAplwg==
-dbusername: Nm1E9EzonZwRbJZIGpFxBg==
-dbpassword: kdoY1Z4Mvq06eqa1BxAcug==
-api_token: uGrwtgWHsDEBNrdZIckHgRItdUIGnDcIGYYIZJM
-app_token: aJPiVvXbAfdPDqGppRPZnxlFTBkMIwk
-plan_sku: qDklFYomm87GBgerRT+fBA==
-renewable_date: mbE4vFnUpFhPpoRehP/HQw==
-plan_name: /CnVZqmB4N4B2t1gaw0Geg==
+dbhost: m4ZCds3ANyqjqCgZVSTfRQ==
+dbschema: +mvY73HAjWqMrby9Zu+tBg==
+dbusername: UO2rBxhoSfDEKutK2OEL4A==
+dbpassword: sVpy+Lj6i3MpT+CjoJrDOw==
+api_token: srTutEOCzphDFOXQqVWnZwQDTXiHdzwzY
+app_token: pSzbojYfXLNpSLmhdNTfLCtxfzeUahO
+plan_sku: +53eC6oiOsBRxtBgVjyULw==
+renewable_date: hon6p5jvfirTFniaFrH0qw==
+plan_name: eaMIWzHlTnljCEkE2oxoHg==

From 85431d09c72fc4c94f533ef22c2c5a4f78794393 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Mar 2018 16:40:16 +0630
Subject: [PATCH 366/651] comment employee crete in seed

---
 db/seeds.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index 1de300a1..df707508 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -193,9 +193,9 @@ activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_pr
 
 #Create Adminstrator employee
 admin_employee = Employee.create({name: "Administrator", role: "administrator", password: "99999", emp_id:"999", created_by: "SYSTEM DEFAULT"})
-admin_employee = Employee.create({name: "Waiter", role: "waiter", password: "11111", emp_id:"111", created_by: "SYSTEM DEFAULT"})
-admin_employee = Employee.create({name: "Waiter 2", role: "waiter", password: "22222", emp_id:"222", created_by: "SYSTEM DEFAULT"})
-admin_employee = Employee.create({name: "Cashier", role: "cashier", password: "33333", emp_id:"333", created_by: "SYSTEM DEFAULT"})
+# admin_employee = Employee.create({name: "Waiter", role: "waiter", password: "11111", emp_id:"111", created_by: "SYSTEM DEFAULT"})
+# admin_employee = Employee.create({name: "Waiter 2", role: "waiter", password: "22222", emp_id:"222", created_by: "SYSTEM DEFAULT"})
+# admin_employee = Employee.create({name: "Cashier", role: "cashier", password: "33333", emp_id:"333", created_by: "SYSTEM DEFAULT"})
 
 order_item_printer=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
 order_summary_printer=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})

From 8dbe7e20c448e703ec7d34b2fd3c26d12ce63ca0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 5 Mar 2018 16:58:11 +0630
Subject: [PATCH 367/651] check dining facility in transactions

---
 app/views/transactions/bookings/index.html.erb | 2 +-
 app/views/transactions/bookings/show.html.erb  | 2 +-
 app/views/transactions/orders/index.html.erb   | 2 +-
 app/views/transactions/orders/show.html.erb    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/transactions/bookings/index.html.erb b/app/views/transactions/bookings/index.html.erb
index 7c587d32..463ab27c 100755
--- a/app/views/transactions/bookings/index.html.erb
+++ b/app/views/transactions/bookings/index.html.erb
@@ -64,7 +64,7 @@
                     <tr>
                       <td><%= link_to booking.booking_id, transactions_booking_path(booking) %></td>
                       <td><%= link_to booking.sale_id, transactions_sale_path(booking.sale_id) rescue '-' %></td>
-                      <td><%= booking.dining_facility.name %></td>
+                      <td><%= booking.dining_facility.name rescue '' %></td>
                       <td><%= booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></td>
                       <td><%= booking.checkout_at.utc.getlocal.strftime("%I:%M %p") rescue '-'  %></td>
                       <td><%= booking.checkin_by rescue '-' %></td>
diff --git a/app/views/transactions/bookings/show.html.erb b/app/views/transactions/bookings/show.html.erb
index 06668d5e..67065b1c 100755
--- a/app/views/transactions/bookings/show.html.erb
+++ b/app/views/transactions/bookings/show.html.erb
@@ -46,7 +46,7 @@
                 <tr>
                   <td><%= @booking.booking_id%></td>
                   <td><%= link_to @booking.sale_id, transactions_sale_path(booking.sale_id) rescue '-' %></td>
-                  <td><%= @booking.dining_facility.name %></td>
+                  <td><%= @booking.dining_facility.name rescue '' %></td>
                   <td><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></td>
                   <td><%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") rescue '-'  %></td>
                   <td><%= @booking.checkin_by rescue '-' %></td>
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb
index 2fdef7bf..41aa63e6 100755
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -66,7 +66,7 @@
 
                 <tr>
                   <td><%= link_to order.order_id, transactions_order_path(order) %></td>
-                  <td><%= @dining.type %>-<%= @dining.name %></td>
+                  <td><%if !@dining.nil? %> <%= @dining.type %>-<%= @dining.name %> <% else %>&nbsp; <% end %></td>
                   <td><%= order.waiters %></td>
                   <td><%= order.order_type %></td>
                   <td><%= order.customer.name rescue '-' %></td>
diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb
index 0a487437..1d260383 100755
--- a/app/views/transactions/orders/show.html.erb
+++ b/app/views/transactions/orders/show.html.erb
@@ -29,7 +29,7 @@
 
             <tbody>
                 <tr>
-                  <td><%= @dining.type %>-<%= @dining.name %></td>
+                  <td><%if !@dining.nil? %> <%= @dining.type %>-<%= @dining.name %> <% else %>&nbsp; <% end %></td>
                   <td> <%= @order.waiters rescue '-' %> </td>
                   <td><%= @order.order_type %></td>
                   <td><%= @order.customer.name rescue '-' %></td>

From 1d15c9ed769153171d98774420decec614b75157 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 6 Mar 2018 10:48:34 +0630
Subject: [PATCH 368/651] Add First active tab action in
 login_dashboard.html.erb

---
 app/views/layouts/login_dashboard.html.erb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 4c2dda42..54bc8b95 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -113,8 +113,8 @@
                             </li>
                         <% end %>
                     <% end %>
-
                     <% @employees.each do |employee| %>
+
                         <%if employee.role == "cashier" %>
                             <li class="nav-item">
                                 <a class="nav-link" data-toggle="tab" href="#cashier" role="tab"><b>Cashier</b></a>
@@ -126,7 +126,7 @@
                     <% @employees.each do |employee| %>
                         <%if employee.role == "account" %>
                             <li class="nav-item">
-                                <a class="nav-link" data-toggle="tab" href="#accountant" role="tab"><b>Accountant</b></a>
+                                <a class="nav-link" data-toggle="tab" href="#account" role="tab"><b>Accountant</b></a>
                                 <% break %>
                             </li>
                         <% end %>
@@ -147,7 +147,7 @@
                     <div class="tab-pane"  id="supervisor" role="tabpanel" style="max-height:; overflow:auto">
                         <% @employees.each do |employee| %>
                             <%if employee.role == "supervisor" %>
-                                <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                     <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                     </form>
                                     <div class="login_dashboard p-card">
@@ -176,10 +176,10 @@
                         <% end %>
                     </div>   
 
-                    <div class="tab-pane"  id="accountant" role="tabpanel" style="max-height:; overflow:auto">
+                    <div class="tab-pane"  id="account" role="tabpanel" style="max-height:; overflow:auto">
                         <% @employees.each do |employee| %>
                             <%if employee.role == "account" %>
-                                <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                     <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                     </form>
                                      <div class="login_dashboard p-card">
@@ -238,6 +238,8 @@
         });
 
         $('ul.nav.nav-tabs li a').click(function() {  
+            var bb = $('.nav-item').children()[0]; 
+            $(bb).removeClass('login_dashboard');
             $(this).parent().addClass('login_dashboard').siblings().removeClass('login_dashboard');
         });
 
@@ -280,6 +282,11 @@
             }
         });
 
+        var aa = $('.nav-item').children().attr('href').replace('#','');
+        $('#'+aa).addClass('active');
+        var bb = $('.nav-item').children()[0]; 
+        $(bb).addClass('login_dashboard').siblings().removeClass('login_dashboard');
+
     });     
 
     function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {

From 80a0cba537d8c9f2933571fe9ca6e6036ada1605 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 6 Mar 2018 11:19:19 +0630
Subject: [PATCH 369/651] For Pull from master

---
 app/models/license.rb                         | 26 ++++++++++---------
 .../transactions/bookings/index.html.erb      |  2 +-
 app/views/transactions/bookings/show.html.erb |  2 +-
 app/views/transactions/orders/index.html.erb  |  2 +-
 app/views/transactions/orders/show.html.erb   |  2 +-
 config/license.yml                            | 15 +++++++++++
 6 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 config/license.yml

diff --git a/app/models/license.rb b/app/models/license.rb
index 1cbce908..7d935185 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -70,13 +70,11 @@ class License
   # For Local System
   def detail_with_local_file()    
     renewal_date_str = read_license("renewable_date")
-    
     if check_expiring(renewal_date_str)   
       # return for all ok 
       return 1
     else
       has_license = verify_license()
-
       if has_license
         # return for expiring 
         return 2
@@ -137,23 +135,27 @@ class License
     api_token = read_license_no_decrypt("api_token")    
     @params = { query: {lookup_type: "application", api_token: api_token} }
     response = self.class.get("/verify", @params)
-    @varified = response.parsed_response
 
-    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-    if (@varified["status"])
-      if (!check_expired(@varified["renewable_date"]))
-        return true
-      end
-    else
-      delete_license_file
-    end  
+    rescue SocketError => e
+      Rails.logger.debug  "In Socket errror"
+      return true
+    rescue => e
+      @varified = response.parsed_response
+      Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+      if (@varified["status"])
+        if (!check_expired(@varified["renewable_date"]))
+          return true
+        end
+      else
+        delete_license_file
+      end  
     return false  
   end
 
   # Check Expired before 30 days
   def check_expiring(renewal_date_str)        
     if !renewal_date_str.empty?
-      renewal_date = DateTime.parse(renewal_date_str)      
+      renewal_date = DateTime.parse(renewal_date_str)    
       renewal_date >  Date.today.advance(:days => 30)
     end
   end
diff --git a/app/views/transactions/bookings/index.html.erb b/app/views/transactions/bookings/index.html.erb
index 7c587d32..463ab27c 100755
--- a/app/views/transactions/bookings/index.html.erb
+++ b/app/views/transactions/bookings/index.html.erb
@@ -64,7 +64,7 @@
                     <tr>
                       <td><%= link_to booking.booking_id, transactions_booking_path(booking) %></td>
                       <td><%= link_to booking.sale_id, transactions_sale_path(booking.sale_id) rescue '-' %></td>
-                      <td><%= booking.dining_facility.name %></td>
+                      <td><%= booking.dining_facility.name rescue '' %></td>
                       <td><%= booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></td>
                       <td><%= booking.checkout_at.utc.getlocal.strftime("%I:%M %p") rescue '-'  %></td>
                       <td><%= booking.checkin_by rescue '-' %></td>
diff --git a/app/views/transactions/bookings/show.html.erb b/app/views/transactions/bookings/show.html.erb
index 06668d5e..67065b1c 100755
--- a/app/views/transactions/bookings/show.html.erb
+++ b/app/views/transactions/bookings/show.html.erb
@@ -46,7 +46,7 @@
                 <tr>
                   <td><%= @booking.booking_id%></td>
                   <td><%= link_to @booking.sale_id, transactions_sale_path(booking.sale_id) rescue '-' %></td>
-                  <td><%= @booking.dining_facility.name %></td>
+                  <td><%= @booking.dining_facility.name rescue '' %></td>
                   <td><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></td>
                   <td><%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") rescue '-'  %></td>
                   <td><%= @booking.checkin_by rescue '-' %></td>
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb
index 2fdef7bf..41aa63e6 100755
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -66,7 +66,7 @@
 
                 <tr>
                   <td><%= link_to order.order_id, transactions_order_path(order) %></td>
-                  <td><%= @dining.type %>-<%= @dining.name %></td>
+                  <td><%if !@dining.nil? %> <%= @dining.type %>-<%= @dining.name %> <% else %>&nbsp; <% end %></td>
                   <td><%= order.waiters %></td>
                   <td><%= order.order_type %></td>
                   <td><%= order.customer.name rescue '-' %></td>
diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb
index 0a487437..1d260383 100755
--- a/app/views/transactions/orders/show.html.erb
+++ b/app/views/transactions/orders/show.html.erb
@@ -29,7 +29,7 @@
 
             <tbody>
                 <tr>
-                  <td><%= @dining.type %>-<%= @dining.name %></td>
+                  <td><%if !@dining.nil? %> <%= @dining.type %>-<%= @dining.name %> <% else %>&nbsp; <% end %></td>
                   <td> <%= @order.waiters rescue '-' %> </td>
                   <td><%= @order.order_type %></td>
                   <td><%= @order.customer.name rescue '-' %></td>
diff --git a/config/license.yml b/config/license.yml
new file mode 100644
index 00000000..fefa7d40
--- /dev/null
+++ b/config/license.yml
@@ -0,0 +1,15 @@
+iv_key: f3ICP0M2HJLIeXURn3yv5A==
+shop_name: sx_license_test3
+email: aungmyo.zaw@code2lab.com
+telephone: 0099404923
+fax: 49494949432
+address: Yangon
+dbhost: m4ZCds3ANyqjqCgZVSTfRQ==
+dbschema: +mvY73HAjWqMrby9Zu+tBg==
+dbusername: UO2rBxhoSfDEKutK2OEL4A==
+dbpassword: sVpy+Lj6i3MpT+CjoJrDOw==
+api_token: srTutEOCzphDFOXQqVWnZwQDTXiHdzwzY
+app_token: pSzbojYfXLNpSLmhdNTfLCtxfzeUahO
+plan_sku: +53eC6oiOsBRxtBgVjyULw==
+renewable_date: hon6p5jvfirTFniaFrH0qw==
+plan_name: eaMIWzHlTnljCEkE2oxoHg==

From 6cc2ba511083a9f96c9545a9d20f73981dac1e13 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 6 Mar 2018 18:24:19 +0630
Subject: [PATCH 370/651] To add only  Other Payment Name beside SX Resturant

---
 app/controllers/origami/jcb_controller.rb          |  1 +
 app/controllers/origami/master_controller.rb       |  1 +
 app/controllers/origami/mpu_controller.rb          |  3 ++-
 .../origami/redeem_payments_controller.rb          |  1 +
 app/controllers/origami/visa_controller.rb         |  1 +
 app/pdf/receipt_bill_a5_pdf.rb                     |  2 +-
 app/pdf/receipt_bill_pdf.rb                        |  2 +-
 app/views/layouts/_header.html.erb                 | 11 ++++++++++-
 app/views/origami/jcb/index.html.erb               |  1 -
 app/views/origami/master/index.html.erb            |  1 -
 app/views/origami/mpu/index.html.erb               |  1 -
 app/views/origami/redeem_payments/index.html.erb   |  1 -
 app/views/origami/visa/index.html.erb              |  1 -
 config/initializers/action_controller.rb           | 14 +++++++-------
 14 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index e17c773e..06ee6087 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -9,6 +9,7 @@ class Origami::JcbController < BaseOrigamiController
     @jcbcount = 0
     others = 0
 
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 95710f11..77ae99d2 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -9,6 +9,7 @@ class Origami::MasterController < BaseOrigamiController
     @mastercount = 0
     others = 0
     
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 6eb2a0a0..c3f74133 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -7,7 +7,8 @@ class Origami::MpuController < BaseOrigamiController
     total     = sale_data.grand_total
     @mpucount = 0
     others    = 0
-
+    
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 347fd3ea..bcb8f9ae 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,6 +6,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
+        @payment_method_setting_nav = PaymentMethodSetting.all
         @shop        = Shop::ShopDetail 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index f04ec001..788704eb 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -8,6 +8,7 @@ class Origami::VisaController < BaseOrigamiController
     @visacount = 0
     others = 0
 
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index fbe28541..ee9a1bda 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -2,7 +2,7 @@ class ReceiptBillA5Pdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
 
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 15
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 99ae474d..0f02d506 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -2,7 +2,7 @@ class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
 
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 0
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 5f1fe42d..907c5e88 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -23,6 +23,11 @@
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
             </a>
+            <% if @payment_method_setting_nav.present? %>
+                <span class="navbar-brand m-0">/ &nbsp;
+                    <span id="otherPayment"></span>&nbsp; Payment
+                </span>
+            <% end %>    
                        
         </div>
         <!-- Start Shop Info -->
@@ -73,4 +78,8 @@
             </a> -->
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
+<script type="text/javascript">
+    var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
+    document.getElementById("otherPayment").innerHTML = otherPayment;
+</script>
\ No newline at end of file
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 1fe49080..f7f43812 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -12,7 +12,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>JCB Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-3">	
 			<span class="hidden" id="membership_id"><%= @membership_id%></span>
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 2e663b7a..03d90a07 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -12,7 +12,6 @@
       </span>
     </ol>
   </div> -->
-  <h5>Master Payment</h5>
   <div class="row">
    <div class="col-lg-5 col-md-5 col-sm-3">
     <span class="hidden" id="membership_id"><%= @membership_id%></span>
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index f95b3773..caa0c9e9 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -12,7 +12,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>MPU Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-5">
 			<span class="hidden" id="membership_id"><%= @membership_id%></span>
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 1d29e563..169eb026 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -9,7 +9,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>Reedem Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-5">
 			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 60f62caa..3cdca7df 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -12,7 +12,6 @@
       </span>
     </ol>
   </div> -->
-  <h5>VISA Payment</h5>
   <div class="row">
    <div class="col-lg-5 col-md-5 col-sm-5">
     <span class="hidden" id="membership_id"><%= @membership_id%></span>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8f310dab..3f69a55e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -18,13 +18,13 @@ class ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
-    else         
-      # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+    # else         
+    #   # check for license file
+    #   if check_license
+    #     current_license(ENV["SX_PROVISION_URL"])
+    #   else
+    #     redirect_to activate_path
+    #   end      
     end    
   end
 

From 5cc369114b249205c02e05f157cbe10d2b097534 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 6 Mar 2018 18:31:09 +0630
Subject: [PATCH 371/651] Remove config

---
 config/initializers/action_controller.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 3f69a55e..8f310dab 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -18,13 +18,13 @@ class ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
-    # else         
-    #   # check for license file
-    #   if check_license
-    #     current_license(ENV["SX_PROVISION_URL"])
-    #   else
-    #     redirect_to activate_path
-    #   end      
+    else         
+      # check for license file
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From 9f29bbef5a03360ed5fb1cb7890445813a27ca3b Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 7 Mar 2018 12:41:49 +0630
Subject: [PATCH 372/651] To add image field in shop

---
 app/controllers/settings/shops_controller.rb |   2 +-
 app/models/shop.rb                           |   3 +
 app/uploaders/shop_image_uploader.rb         |  59 ++++++++
 app/views/settings/products/_form.html.erb   |   2 +-
 app/views/settings/shops/_form.html.erb      | 144 +++++++++++--------
 app/views/settings/shops/show.html.erb       |   6 +-
 6 files changed, 149 insertions(+), 67 deletions(-)
 create mode 100644 app/uploaders/shop_image_uploader.rb

diff --git a/app/controllers/settings/shops_controller.rb b/app/controllers/settings/shops_controller.rb
index a48bcb9a..f69aaac6 100644
--- a/app/controllers/settings/shops_controller.rb
+++ b/app/controllers/settings/shops_controller.rb
@@ -71,6 +71,6 @@ class Settings::ShopsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def shop_params
-      params.require(:shop).permit(:name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info)
+      params.require(:shop).permit(:logo, :name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info)
     end
 end
diff --git a/app/models/shop.rb b/app/models/shop.rb
index c722adc2..0fd9ed0e 100755
--- a/app/models/shop.rb
+++ b/app/models/shop.rb
@@ -1,3 +1,6 @@
 class Shop < ApplicationRecord
 	ShopDetail = Shop.find_by_id(1)
+
+	# Shop Image Uploader
+  	mount_uploader :logo, ShopImageUploader
 end
diff --git a/app/uploaders/shop_image_uploader.rb b/app/uploaders/shop_image_uploader.rb
new file mode 100644
index 00000000..63a01c21
--- /dev/null
+++ b/app/uploaders/shop_image_uploader.rb
@@ -0,0 +1,59 @@
+class ShopImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  def root
+    Rails.root.join 'public/'
+  end
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "image/shop_images"
+    # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # def cache_dir
+  #   '/tmp/images'
+  # end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url(*args)
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process scale: [200, 300]
+  process :resize_to_fit => [200, 150]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process resize_to_fit: [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_whitelist
+    %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end	
+
+end
\ No newline at end of file
diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb
index f9ad882b..bea0f004 100755
--- a/app/views/settings/products/_form.html.erb
+++ b/app/views/settings/products/_form.html.erb
@@ -12,7 +12,7 @@
           <%= f.input :unit_price %>
           <%= f.input :description %>
           <%= f.input :information %>
-          <%= f.input:taxable %>
+          <%= f.input :taxable %>
         </div>
 
         <label>Product Image</label>
diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb
index 5a353b9b..b615d189 100755
--- a/app/views/settings/shops/_form.html.erb
+++ b/app/views/settings/shops/_form.html.erb
@@ -1,68 +1,86 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
-   <%= simple_form_for([:settings,@settings_shop]) do |f| %>
-   <%= f.error_notification %>
-   <div class="form-inputs p-l-10">
-    <%= f.input :name ,:input_html=>{:class=>"col-md-10"},:required=>true%>
-    
-    <%= f.input :address %>
-    <%= f.input :city %>
-    <%= f.input :township %>
-    <%= f.input :state %>
-    <%= f.input :phone_no %>
-    <%= f.input :reservation_no %>
-    <%= f.input :license %>
-    <%= f.input :license_data %>
-    <%= f.input :base_currency %>
-    <%= f.input :cloud_token %>
-    <%= f.input :cloud_url %>
-    <%= f.input :owner_token %>
-    <%= f.input :id_prefix %>
-    <%= f.input :is_rounding_adj %>
-    <%= f.input :quick_sale_summary %>
-    <%= f.input :calc_tax_order %>
-    <%= f.input :show_account_info %>
+    <div class="card">
+      <div class="body">
+        <%= simple_form_for([:settings,@settings_shop]) do |f| %>
+        <%= f.error_notification %>
+        <div class="form-group p-l-15">
+          <%= f.input :name ,:input_html=>{:class=>"col-md-10"},:required=>true%>
+          <%= f.input :address %>
+          <%= f.input :city %>
+          <%= f.input :township %>
+          <%= f.input :state %>
+          <%= f.input :phone_no %>
+          <%= f.input :reservation_no %>
+          <%= f.input :license %>
+          <%= f.input :license_data %>
+          <%= f.input :base_currency %>
+          <%= f.input :cloud_token %>
+          <%= f.input :cloud_url %>
+          <%= f.input :owner_token %>
+          <%= f.input :id_prefix %>
+          <%= f.input :is_rounding_adj %>
+          <%= f.input :quick_sale_summary %>
+          <%= f.input :calc_tax_order %>
+          <%= f.input :show_account_info %>
+        </div>
 
-    
-  </div>
-  <div class="form-actions">
-    <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
-  </div>
-  <% end %>
-</div>
-<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
-  <div class="card">
-    <div class="body">
-      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        <p>
-        1) address - to write shop's address <br>
-        2) city - to write city <br>
-        3) township -  to write township <br>
-        4) state -  to write  state <br>
-        5) phone_no -  to write shop's phone_no <br>
-        6) reservation_no -  to write shop's reservation_no <br>
-        7) license - to write license <br>
-        8) license_data -  to write license data <br>
-        9) base_currency -  to write base currency <br>
-        10)cloud_token -  to write cloud token <br>
-        11)cloud_url -  to write cloud url <br>
-        12)owner_token -  to write shop's owner token <br>
-        13)id_prefix - to write id prefix <br>
-        14)is_rounding_adj -  to check for calculate rounding adj of shop <br>
-        15)quick_sale_summary -  to check for view Quick Sale Summary  <br>
-        16)calc_tax_order -  to check for tax calculation of shop  <br>
-        
-        </p>
-        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
-        <p>
-        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.shop_txt") %> <br>
-        </p>
-        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
-        <p>
-          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
-          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.shop_txt") %> <br>
-        </p>
+        <label>Shop Image</label>
+          <div class="panel padding-10">
+            <div class="form-group">
+              <div class="menu-item-img">
+                <% if f.object.logo? %>
+                  <p><%= f.object.name %></p>
+                     <%= image_tag f.object.logo.url, :class => "img-thumbnail" %>
+                <% else %>                
+                  <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+                <% end %>          
+              </div>
+              <%= f.file_field :logo, :class => "img-thumbnail" %>
+            </div>
+          </div> 
+
+        <div class="form-actions p-l-15">
+          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+        </div>
+      <% end %>
+      </div>
     </div>
-  </div>  
-</div>
+  </div>
+
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) address - to write shop's address <br>
+          2) city - to write city <br>
+          3) township -  to write township <br>
+          4) state -  to write  state <br>
+          5) phone_no -  to write shop's phone_no <br>
+          6) reservation_no -  to write shop's reservation_no <br>
+          7) license - to write license <br>
+          8) license_data -  to write license data <br>
+          9) base_currency -  to write base currency <br>
+          10)cloud_token -  to write cloud token <br>
+          11)cloud_url -  to write cloud url <br>
+          12)owner_token -  to write shop's owner token <br>
+          13)id_prefix - to write id prefix <br>
+          14)is_rounding_adj -  to check for calculate rounding adj of shop <br>
+          15)quick_sale_summary -  to check for view Quick Sale Summary  <br>
+          16)calc_tax_order -  to check for tax calculation of shop  <br>
+          
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.shop_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.shop_txt") %> <br>
+          </p>
+      </div>
+    </div>  
+  </div>
 </div>
diff --git a/app/views/settings/shops/show.html.erb b/app/views/settings/shops/show.html.erb
index 8fd9c5f0..bea0ab38 100755
--- a/app/views/settings/shops/show.html.erb
+++ b/app/views/settings/shops/show.html.erb
@@ -96,8 +96,10 @@
               <td><%= @settings_shop.calc_tax_order %></td>
             </tr>
             <tr>
-              
-
+              <td style="width:20%">Shop Image</td>
+              <td><%= image_tag @settings_shop.logo, :size => '200x200'%></td>
+            </tr>
+            <tr>
               <td><%= link_to t("views.btn.edit"), edit_settings_shop_path(@settings_shop),:class => 'btn btn-primary btn-sm waves-effect' %>
               </td>
             </tr>

From aedd79376f54f36b007f0ff22cbb08057c4fff0b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 7 Mar 2018 15:36:05 +0630
Subject: [PATCH 373/651] receipt no and print pdf

---
 .../origami/payments_controller.rb            |  22 +-
 app/models/printer/receipt_printer.rb         |  33 ++-
 app/models/sale.rb                            |  17 +-
 app/pdf/receipt_bill_a5_pdf.rb                |  15 +-
 app/pdf/receipt_bill_pdf.rb                   |  17 +-
 app/views/origami/home/show.html.erb          |   4 +-
 app/views/origami/payments/show.html.erb      | 196 ++++++++++++++----
 app/views/origami/rooms/show.html.erb         |  14 +-
 config/initializers/action_controller.rb      |  10 +-
 config/routes.rb                              |   2 +
 db/migrate/20170530072247_create_shops.rb     |   3 +
 .../20170628103624_create_print_settings.rb   |   4 +-
 ...receipt_bill_OSK-OSK(TMW)-20180307-271.pdf | Bin 0 -> 26054 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-272.pdf | Bin 0 -> 25998 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-273.pdf | Bin 0 -> 26033 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-274.pdf | Bin 0 -> 26034 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-275.pdf | Bin 0 -> 25738 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-276.pdf | Bin 0 -> 25738 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-277.pdf | Bin 0 -> 26479 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-278.pdf | Bin 0 -> 25724 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-279.pdf | Bin 0 -> 25740 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-280.pdf | Bin 0 -> 25728 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-281.pdf | Bin 0 -> 26501 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-282.pdf | Bin 0 -> 26054 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-283.pdf | Bin 0 -> 26025 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-284.pdf | Bin 0 -> 25760 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-285.pdf | Bin 0 -> 25729 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-286.pdf | Bin 0 -> 25731 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-287.pdf | Bin 0 -> 25731 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-288.pdf | Bin 0 -> 25398 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-289.pdf | Bin 0 -> 25698 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-290.pdf | Bin 0 -> 25731 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-291.pdf | Bin 0 -> 25731 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-292.pdf | Bin 0 -> 25729 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-293.pdf | Bin 0 -> 25731 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-294.pdf | Bin 0 -> 25731 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-295.pdf | Bin 0 -> 25731 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-296.pdf | Bin 0 -> 25729 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-297.pdf | Bin 0 -> 26464 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-298.pdf | Bin 0 -> 25760 bytes
 ...receipt_bill_OSK-OSK(TMW)-20180307-299.pdf | Bin 0 -> 25729 bytes
 41 files changed, 252 insertions(+), 85 deletions(-)
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-271.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-272.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-273.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-274.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-275.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-276.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-277.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-278.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-279.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-280.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-281.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-282.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-283.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-284.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-285.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-286.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-287.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-288.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-289.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-290.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-291.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-292.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-293.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-294.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-295.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-296.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-297.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-298.pdf
 create mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-299.pdf

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 970095e9..c446af72 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -95,7 +95,6 @@ class Origami::PaymentsController < BaseOrigamiController
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
-      render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil
 
       # For Cashier by Zone
@@ -151,7 +150,9 @@ class Origami::PaymentsController < BaseOrigamiController
         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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+        filename, sale_receipt_no, print_copies, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+
+        render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :count => print_copies, :printer_name => printer_name})
 
         if params[:type] == "quick_service"
           booking = Booking.find_by_sale_id(sale_id)
@@ -438,6 +439,23 @@ class Origami::PaymentsController < BaseOrigamiController
       end
   end
 
+  #print function for receipt
+  def print    
+    # byebug
+    filename      = params[:filename]
+    receipt_no    = parmas[:receipt_no]
+    print_copies  = params[:print_copies]
+    printer_name  = params[:printer_name]
+    
+    puts "print params"
+    puts params    
+
+    print_receipt_pdf(filename,receipt_no,print_copies,printer_name)
+
+    redirect_to origami_path
+    # render json: JSON.generate({:status => true})
+  end
+
   #Shop Name in Navbor
   helper_method :shop_detail
   def shop_detail
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 0cf6526f..dac1778f 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -197,17 +197,28 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     print_settings.print_copies = 1
     print_settings.save!
 
+    directory_name = 'public/receipts'
+    Dir.mkdir(directory_name) unless File.exists?(directory_name)
+
     begin
       if count == 1
-        pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf"
-        self.print("tmp/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+        filename = "/receipts/receipt_bill_#{sale_data.receipt_no}.pdf"
+        pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
+        if printed_status != 'Paid'
+          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+        end
       else
-        pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
-        self.print("tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+        filename = "/receipts/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
+        pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
+        if printed_status != 'Paid'
+          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+        end
       end
 
       count -= 1
     end until count == 0
+
+    return filename, sale_data.receipt_no, count, cashier_terminal.printer_name
   end
 
    # stock check
@@ -247,4 +258,18 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     self.print("tmp/print_call_waiter.pdf")
   end
 
+  #print receipt pdf from js
+  def print_receipt_pdf(filename,receipt_no,print_copies,printer_name)
+    begin
+      if print_copies == 1
+        self.print("public"+filename, cashier_terminal.printer_name)
+      else
+        filename = "public/receipts/receipt_bill_#{receipt_no}_#{print_copies}.pdf"
+        self.print(filename, cashier_terminal.printer_name)
+      end
+
+      print_copies -= 1
+    end until print_copies == 0
+  end
+
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 54c60eb3..8252d343 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -548,11 +548,26 @@ class Sale < ApplicationRecord
 
   #Generate new Receipt No when it is not assigned
   def generate_receipt_no
+    #shop_code and client_code
+    shop_details =  Shop::ShopDetail
+
     #Date-Shift-
     if self.receipt_no.nil?
       prefix = DateTime.now().utc
       #self.receipt_no = prefix.to_s + "/" + self.shit_id.to_s + "/" + SeedGenerator.new_receipt_no().to_s
-      self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+      if !shop_details.nil?
+        if !shop_details.client_code.nil? && shop_details.shop_code.nil?
+          self.receipt_no = shop_details.client_code + "-" + prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+        elsif shop_details.client_code.nil? && !shop_details.shop_code.nil?
+          self.receipt_no = shop_details.shop_code + "-" + prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+        elsif !shop_details.client_code.nil? && !shop_details.shop_code.nil?
+          self.receipt_no = shop_details.client_code + "-" + shop_details.shop_code + "-" + prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+        else
+          self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+        end
+      else
+        self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+      end
 
       self.receipt_date = prefix
       Rails.logger.debug "Receipt No #{self.receipt_no} | Date #{ self.receipt_date.to_s}"
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index b3302485..11ad8100 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -110,19 +110,20 @@ class ReceiptBillA5Pdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
             text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
         end
-        if sale_data.bookings[0].dining_facility_id.to_i > 0
-            bounding_box([self.item_description_width, y_position], :width => self.item_description_width, :height => self.item_height) do
-                text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
-            end
-        end
         
         move_down 10
 
         y_position = cursor
-        bounding_box([0, y_position], :width =>self.item_description_width, :height => self.item_height) do
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+            bounding_box([0, y_position], :width => self.item_description_width, :height => self.item_height) do
+                text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :left
+            end
+        end
+
+        bounding_box([self.item_description_width, y_position], :width =>self.item_description_width, :height => self.item_height) do
             text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
         end    
-        bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
+        bounding_box([self.item_description_width - 2,y_position], :width =>self.item_description_width, :height => self.item_height) do
               text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right
         end
         move_down 10
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 0ae57fea..c34ce3e4 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -107,19 +107,20 @@ class ReceiptBillPdf < Prawn::Document
         move_down 7
         # move_down 2
         y_position = cursor
-        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+        bounding_box([0,y_position], :width =>self.description_width + self.price_num_width, :height => self.item_height) do
             text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
         end
-        if sale_data.bookings[0].dining_facility_id.to_i > 0
-          bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do
-            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
-         end
-        end
-        
+
         move_down 5
 
         y_position = cursor
-        bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+          bounding_box([0,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :left
+          end
+        end
+
+        bounding_box([self.label_width, y_position], :width =>self.label_width, :height => self.item_height) do
             text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
         end    
         bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index bd682b96..981ddb06 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -196,7 +196,7 @@
               <div class="card-title">
                 <div class="row p-l-5 p-r-5">
                   <% if (!@sale_array.empty?) && (!@date.nil?) %>
-                    <div class="col-lg-6 col-md-6 col-sm-6">
+                    <div class="col-lg-8 col-md-8 col-sm-8">
                       &nbsp; Receipt No: <span id="receipt_no">
                          <% if @status_sale == 'sale' %>
                           <%= @sale_array[0].receipt_no rescue '' %>
@@ -204,7 +204,7 @@
                        </span>
                        <br>
                     </div>
-                    <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+                    <div class="col-lg-4 col-md-4 col-sm-4 text-right">
                       Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %></span>
                       <br>
                     </div>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index cb213a38..44b50bf6 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid" data-no-turbolink="true">
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
@@ -384,7 +384,43 @@
       </div>
     </div>
   </div>
-</div>       
+</div>  
+
+<!-- pdf light box -->
+<div class="modal fade" id="pdfModal" tabindex="-1" role="dialog" data-turbolinks-partial="pdfModal" >
+  <div class="modal-dialog modal-md" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="pdfModalLabel"></h4>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" name="sale_receipt_no" id="sale_receipt_no">
+        <input type="hidden" name="filename" id="filename">
+        <input type="hidden" name="printer_name" id="printer_name">
+        <input type="hidden" name="print_copies" id="print_copies">
+        <p id="changed_amount"></p>
+        <div class="text-center">
+          <iframe id="receipt_pdf" src="" style="width: 400px; height: 600px;"></iframe>
+         <!-- <object id="receipt_pdf" data="" type="application/pdf" width="400" height="600"></object> -->
+        </div>
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <% if ENV["SERVER_MODE"] != 'cloud' %>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-red waves-effect" id="print_pdf">Print</button>
+          </div>
+          <% end %>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>     
+
 <script>
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
@@ -402,7 +438,6 @@ var cashier_type = "<%= @cashier_type %>";
           console.log("ssssssssssss")
           payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
           if (member_id && member_discount) {
-console.log("fffffffffffff")
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
             } else{
@@ -529,6 +564,9 @@ console.log("fffffffffffff")
           $('#cash').text(input_value);
           update_balance();
         }else{
+          if($('#cash').text() == '0'){
+            $('#cash').text("");
+          }
           $('#cash').append(input_value);
           update_balance();
         }
@@ -638,7 +676,6 @@ console.log("fffffffffffff")
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",
               data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type,
-              async: false,
               success:function(result){
                 /* start delete receipt no in first bill*/
                 if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
@@ -654,45 +691,65 @@ console.log("fffffffffffff")
                 else{
                   var msg = '';
                 }
-                $( "#loading_wrapper" ).hide();
+
+                $("#loading_wrapper" ).hide();
+
+                //PDF lightbox data
+                $("#sale_receipt_no").val(result.receipt_no);
+                $("#filename").val(result.filename);
+                $("#print_copies").val(result.count);
+                $("#printer_name").val(result.printer_name);
+                $("#receipt_pdf").attr("src", result.filename);
+                $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
+                $("#pdfModalLabel").text("Payment Successful!");
+                $("#changed_amount").text("");
                 if($('#balance').text() < 0){
-                  swal({
-                    title: "Payment Successful!",
-                    text: 'Changed amount  ' + $('#balance').text() * (-1),
-                    html: true,
-                    closeOnConfirm: false,
-                    closeOnCancel: false,
-                    allowOutsideClick: false
-                  }, function () {
-                    if (cashier_type=="cashier") {
-                      window.location.href = '/origami';
-                    }else{
-                      window.location.href = '/origami/quick_service';
-                    }                    
-                  });
-                }else{         
-                  $('#pay').text("Pay");
-                  swal({
-                   title: "Payment Successful!",
-                   text: 'Thank You !',
-                   html: true,
-                   closeOnConfirm: false, 
-                   closeOnCancel: false,
-                   allowOutsideClick: false
-                 }, function () {
-                  if (cashier_type=="cashier") {
-                    window.location.href = '/origami';
-                  }else{
-                    window.location.href = '/origami/quick_service';
-                  }                  
-                });
+                  <% if precision.to_i > 0 %>
+                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
+                  <% else %>
+                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
+                  <% end %>
                 }
+                //PDF lightbox data 
+
+                // if($('#balance').text() < 0){
+                //   swal({
+                //     title: "Payment Successful!",
+                //     text: 'Changed amount  ' + $('#balance').text() * (-1),
+                //     html: true,
+                //     closeOnConfirm: false,
+                //     closeOnCancel: false,
+                //     allowOutsideClick: false
+                //   }, function () {
+                //     // if (cashier_type=="cashier") {
+                //     //   window.location.href = '/origami';
+                //     // }else{
+                //     //   window.location.href = '/origami/quick_service';
+                //     // }           
+                //   });
+                // }else{         
+                //   $('#pay').text("Pay");
+                //   swal({
+                //    title: "Payment Successful!",
+                //    text: 'Thank You !',
+                //    html: true,
+                //    closeOnConfirm: false, 
+                //    closeOnCancel: false,
+                //    allowOutsideClick: false
+                //  }, function () {
+                //   // if (cashier_type=="cashier") {
+                //   //   window.location.href = '/origami';
+                //   // }else{
+                //   //   window.location.href = '/origami/quick_service';
+                //   // }                
+                // });
+                // }
               }
             });
           }
         }
     });
-
+  
     // $('#void').on('click',function () {
     //   if ($(this).attr('active') === "true") { 
     //         var sale_id = $('#sale_id').text();
@@ -809,7 +866,7 @@ console.log("fffffffffffff")
         }else{
           swal("Oops","You are not authorized for foc","warning")
         }
-      });
+  });
 
   function calculate_member_discount(sale_id) {
    var sub_total = $('#sub-total').text();
@@ -823,14 +880,61 @@ console.log("fffffffffffff")
      }else{
       is_card = true
      }
-    $.ajax({
-      type: "POST",
-      url: "/origami/" + sale_id + "/member_discount",
-      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
-      async: false,
-      success:function(result){ 
-      }
-    });
+      $.ajax({
+        type: "POST",
+        url: "/origami/" + sale_id + "/member_discount",
+        data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+        async: false,
+        success:function(result){ 
+        }
+      });
+    }
   }
-}
+
+  //print pdf function
+  $(document).on('ready page:load',function(){
+    $(document).on('click', "button#print_pdf",function(){
+  // $('#print_pdf').click(function(){
+      var filename = $("#filename").val();
+      var printer_name = $("#printer_name").val();
+      var receipt_no = $("#sale_receipt_no").val();
+      var print_copies = $("#print_copies").val();
+      var params = { turbolinks: false, remote : true, 'filename':filename, 'receipt_no':receipt_no, 'print_copies':print_copies, 'printer_name':printer_name };
+      // swal({
+      //     title: "Alert",
+      //     text: "Are you sure want to print?",
+      //     type: "warning",
+      //     showCancelButton: true,
+      //     confirmButtonColor: "#DD6B55",
+      //     confirmButtonText: "Print",
+      //     closeOnConfirm: false
+      // }, function (isConfirm) {
+      //   if (isConfirm) {
+            $.ajax({
+              type: "POST",            
+              url: "<%= origami_payment_print_path %>",
+              data: params,
+              success:function(result){
+                console.log(result);
+                // if (cashier_type=="cashier") {
+                //   window.location.href = '/origami';
+                // }else{
+                //   window.location.href = '/origami/quick_service';
+                // } 
+              }
+            });
+      //   }
+      // }); 
+      
+    });
+  });
+  
+
+  $(".btn_pdf_close").on('click',function(){
+    if (cashier_type=="cashier") {
+      window.location.href = '/origami';
+    }else{
+      window.location.href = '/origami/quick_service';
+    } 
+  });
 </script>
\ No newline at end of file
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4cd6a846..7291581c 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -193,12 +193,15 @@
          <div class="card-title row p-l-5 p-r-5">
            
             <% if @status_sale == 'sale' %>
-            <div class="col-lg-6 col-md-6 col-sm-6">
+            <div class="col-lg-8 col-md-8 col-sm-8">
             &nbsp;  Receipt No: 
               <span id="receipt_no">
                  <%= @obj_sale.receipt_no rescue '' %>
               </span>
               </div>
+              <div class="col-lg-4 col-md-4 col-sm-4 text-right">
+                Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
+               </div>
              <% else %>
              <div class="col-lg-7 col-md-7 col-sm-7">
              &nbsp; Order No: 
@@ -206,17 +209,10 @@
                  <%= @obj_order.order_id rescue '' %>
               </span>
               </div>
-            <% end %>
-           <% if @status_sale == 'sale' %>
-            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-            Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
-           </div>
-             <% else %>
-               <div class="col-lg-5 col-md-5 col-sm-5 text-right">
+              <div class="col-lg-5 col-md-5 col-sm-5 text-right">
                 Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-'%></span>
                </div>
             <% end %>
-           
          </div>
          <div class="card-title row customer_detail p-l-5 p-r-5" >
            <div class="col-lg-6 col-md-6 col-sm-6">
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8f310dab..02e35bb8 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index 340dc914..2254bb2f 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -177,6 +177,8 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
 
+    post 'payment/print' => 'payments#print'
+
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/MPU' => "mpu#index"
diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb
index bd25c970..1c87b505 100755
--- a/db/migrate/20170530072247_create_shops.rb
+++ b/db/migrate/20170530072247_create_shops.rb
@@ -3,6 +3,9 @@ class CreateShops < ActiveRecord::Migration[5.1]
     create_table :shops do |t|
       t.string :logo
       t.string :name, :null => false
+      t.string :shop_code, :null => false
+      t.string :client_name, :null => false
+      t.string :client_code, :null => false
       t.string :address, :null => false
       t.string :township, :null => false
       t.string :city, :null => false
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index 329d3a7c..672953fc 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -6,7 +6,9 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :template  
       t.string  :font, :default => ""    
       t.string  :printer_name, :null => false
-      t.string  :api_settings
+      t.string  :api_settings,
+      t.string  :brand_name
+      t.string  :type
       t.decimal :page_width, :null => false, :default => 210
       t.decimal :page_height, :null => false, :default => 1450
       t.integer :print_copies, :null => false, :default => 1
diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-271.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-271.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e6522c392a7becd8a1e46764ab3412477eea9074
GIT binary patch
literal 26054
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-272.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-272.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a28fd1c29e2cbb660d636f8886006d540f2b472a
GIT binary patch
literal 25998
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
XdR@SNof#+)N5VirS=rL=h`|2<*OQa-

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-273.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-273.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..8a399a2bb038e0b5809f9cc24962b9ebcf41eb07
GIT binary patch
literal 26033
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-274.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-274.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..acbd2b0e620f790a06a14987584b66cb01aaf36b
GIT binary patch
literal 26034
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
M@+&D>*dF2kABo7DoB#j-

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-275.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-275.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4cba74f85fc791403baa94805988863b2285fd48
GIT binary patch
literal 25738
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
CQ(id$

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-276.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-276.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fe8237d86f0ede51d07ab31a30033544acac4216
GIT binary patch
literal 25738
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-277.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-277.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c8f521627f0baf0fbdfbe7002cc39dba97376675
GIT binary patch
literal 26479
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
Lk~(F6n)AN_n6&F{

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-278.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-278.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9912eb678a53476904d498a8e249f61817a9dbe8
GIT binary patch
literal 25724
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
F{{cxJTWJ6Q

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-279.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-279.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..bb24abd2804ab8aec356aff7aab1b6fc93e6baae
GIT binary patch
literal 25740
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
JwzNAU@IQYUUc>+Z

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-280.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-280.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7f031a920ab2062b99f80d186cdf72ee984c9d44
GIT binary patch
literal 25728
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
G5%?cYfLtyB

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-281.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-281.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6c563973f96b9082a74822121deaa58d1a282b38
GIT binary patch
literal 26501
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
TR%BqnkpttElRIL0l=puC>IU!=

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-282.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-282.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c720a73cb51095d5b89751881137f4d1b213d396
GIT binary patch
literal 26054
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-283.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-283.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..ec721a029ae08152026561923c21ebea12f7f326
GIT binary patch
literal 26025
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
F{{UUtnT`Me

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-284.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-284.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..641da314c3308a7dd3fd5d98d67effd71751bd88
GIT binary patch
literal 25760
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
P=#1I|%F32@M+E*4!M<Z9

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-285.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-285.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c62d3e90d9c581702bd70b4a442be8064e3f5152
GIT binary patch
literal 25729
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-286.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-286.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..931d3c38817f839be862b0cbba7f6695d7cc3fb8
GIT binary patch
literal 25731
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
E2hwg_#{d8T

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-287.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-287.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fcd786fd1f1645971c0463965a1832df5f0cbfc9
GIT binary patch
literal 25731
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
F{{vH*T+09e

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-288.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-288.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d26390ac4c6d51909f8a78529f837a97c3889eb9
GIT binary patch
literal 25398
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
Lq@_=r8*%&-eUJ?C

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-289.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-289.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..de3f773abed71c971ed2ab26640c2845ccab4b6e
GIT binary patch
literal 25698
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-290.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-290.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4d436a855ca2e4add614b0f819de9e010c1be1bb
GIT binary patch
literal 25731
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
BT+RRh

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-291.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-291.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9395d1044570397a935b5fccdfd7b3d93fb25f66
GIT binary patch
literal 25731
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
F{{XD}T-*Qv

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-292.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-292.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..68200458edd152d8dde65ee4e618f9b89e3fa4cf
GIT binary patch
literal 25729
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-293.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-293.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..adad2fa74716e03649f596324adc0bf76ae24827
GIT binary patch
literal 25731
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
I?T!fiAFs7s%m4rY

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-294.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-294.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..f1ed65befff619ef3cf9c9dbb138103301883ea7
GIT binary patch
literal 25731
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
E0WyDF*Z=?k

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-295.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-295.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a9c349a8ca6fbf90bacf270d21fa21291127f34f
GIT binary patch
literal 25731
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
A%m4rY

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-296.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-296.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..3278789da16cdb7819f7b34a24d5628c04548235
GIT binary patch
literal 25729
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

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-297.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-297.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1e30ab849d7a210995fa806a33d40b16649bb449
GIT binary patch
literal 26464
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
DjveSv

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-298.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-298.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..df122cb2af3907e5040a65d265dcbcec28a00e6b
GIT binary patch
literal 25760
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
M0?Nvkc1HyM4<@N&E&u=k

literal 0
HcmV?d00001

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-299.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-299.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5af5c4bde9bf11553d923c0b08bb7f92fc862a5b
GIT binary patch
literal 25729
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
BTx9?N

literal 0
HcmV?d00001


From 2942ceab71de9122302abcdaa375d2e911f3cda9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 7 Mar 2018 15:37:47 +0630
Subject: [PATCH 374/651] remove receipts files

---
 .gitignore                                      |   1 +
 .../receipt_bill_OSK-OSK(TMW)-20180307-271.pdf  | Bin 26054 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-272.pdf  | Bin 25998 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-273.pdf  | Bin 26033 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-274.pdf  | Bin 26034 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-275.pdf  | Bin 25738 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-276.pdf  | Bin 25738 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-277.pdf  | Bin 26479 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-278.pdf  | Bin 25724 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-279.pdf  | Bin 25740 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-280.pdf  | Bin 25728 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-281.pdf  | Bin 26501 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-282.pdf  | Bin 26054 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-283.pdf  | Bin 26025 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-284.pdf  | Bin 25760 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-285.pdf  | Bin 25729 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-286.pdf  | Bin 25731 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-287.pdf  | Bin 25731 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-288.pdf  | Bin 25398 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-289.pdf  | Bin 25698 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-290.pdf  | Bin 25731 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-291.pdf  | Bin 25731 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-292.pdf  | Bin 25729 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-293.pdf  | Bin 25731 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-294.pdf  | Bin 25731 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-295.pdf  | Bin 25731 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-296.pdf  | Bin 25729 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-297.pdf  | Bin 26464 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-298.pdf  | Bin 25760 -> 0 bytes
 .../receipt_bill_OSK-OSK(TMW)-20180307-299.pdf  | Bin 25729 -> 0 bytes
 30 files changed, 1 insertion(+)
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-271.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-272.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-273.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-274.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-275.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-276.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-277.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-278.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-279.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-280.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-281.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-282.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-283.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-284.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-285.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-286.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-287.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-288.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-289.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-290.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-291.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-292.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-293.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-294.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-295.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-296.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-297.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-298.pdf
 delete mode 100644 public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-299.pdf

diff --git a/.gitignore b/.gitignore
index 8489e37c..b404db53 100755
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ capybara-*.html
 /public/assets/*
 /public/uploads/*
 /public/swf/*
+/public/receipts
 /coverage/
 /spec/tmp/*
 *.orig
diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-271.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-271.pdf
deleted file mode 100644
index e6522c392a7becd8a1e46764ab3412477eea9074..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26054
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-272.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-272.pdf
deleted file mode 100644
index a28fd1c29e2cbb660d636f8886006d540f2b472a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25998
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
XdR@SNof#+)N5VirS=rL=h`|2<*OQa-

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-273.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-273.pdf
deleted file mode 100644
index 8a399a2bb038e0b5809f9cc24962b9ebcf41eb07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26033
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-274.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-274.pdf
deleted file mode 100644
index acbd2b0e620f790a06a14987584b66cb01aaf36b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26034
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
M@+&D>*dF2kABo7DoB#j-

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-275.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-275.pdf
deleted file mode 100644
index 4cba74f85fc791403baa94805988863b2285fd48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25738
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
CQ(id$

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-276.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-276.pdf
deleted file mode 100644
index fe8237d86f0ede51d07ab31a30033544acac4216..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25738
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-277.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-277.pdf
deleted file mode 100644
index c8f521627f0baf0fbdfbe7002cc39dba97376675..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26479
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
Lk~(F6n)AN_n6&F{

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-278.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-278.pdf
deleted file mode 100644
index 9912eb678a53476904d498a8e249f61817a9dbe8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25724
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
F{{cxJTWJ6Q

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-279.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-279.pdf
deleted file mode 100644
index bb24abd2804ab8aec356aff7aab1b6fc93e6baae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25740
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
JwzNAU@IQYUUc>+Z

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-280.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-280.pdf
deleted file mode 100644
index 7f031a920ab2062b99f80d186cdf72ee984c9d44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25728
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
G5%?cYfLtyB

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-281.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-281.pdf
deleted file mode 100644
index 6c563973f96b9082a74822121deaa58d1a282b38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26501
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
TR%BqnkpttElRIL0l=puC>IU!=

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-282.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-282.pdf
deleted file mode 100644
index c720a73cb51095d5b89751881137f4d1b213d396..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26054
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-283.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-283.pdf
deleted file mode 100644
index ec721a029ae08152026561923c21ebea12f7f326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26025
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
F{{UUtnT`Me

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-284.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-284.pdf
deleted file mode 100644
index 641da314c3308a7dd3fd5d98d67effd71751bd88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25760
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
P=#1I|%F32@M+E*4!M<Z9

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-285.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-285.pdf
deleted file mode 100644
index c62d3e90d9c581702bd70b4a442be8064e3f5152..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25729
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-286.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-286.pdf
deleted file mode 100644
index 931d3c38817f839be862b0cbba7f6695d7cc3fb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25731
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
E2hwg_#{d8T

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-287.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-287.pdf
deleted file mode 100644
index fcd786fd1f1645971c0463965a1832df5f0cbfc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25731
zcmb4p1z41A(>5uBfOH8+ckV6=O9~?0-Mw^3Nv9yv-O?p3B_X1KbV;YuAs`(}$bX|x
z`MkW}_kV)Nx;NJ~bI!~;v4iwV;u7rK9AFIkE8q_XHx(C^gNZeUpdc0JLnpYgi-QxD
zpgG*!oQsQxi;IgF#Ki^W23~oASGX_+r;?L{nX4)Me>@~Ci~+YdyOs+2hjcZM$8bQ0
zv5T>-g9RYS*aGfM1qKeNVEldI`u(49eqH!^4ukWdgR8v@6*mT_td*HFl`hZqJ^g=N
zg#6>89NgZ*#gYmFg~F~+IJ*FL*<m<hV2G(<@PIf#PzV(_1kA+&f>EiNVQ@-tb8t~{
zb5W_8W9SM(%z41VR8S5+Fb|AM5W)>HfpCMkAm$K09x#LtVh-XHrecS2@IrZ@RDwJZ
zVJdEJF5obXk4g~A4K)*{f^hKhfq-|sz!4BkSf5Hw2IG+$#!uzkfZur`P(b_jC2r8)
z>iPcA4u_fxQ}J=|^1-;N1VL~R7Z?QQ0YgEi00t9bDi8pShldA{4g)m9IJh9-pL$_X
z6X1)R7YtwkF7beXpYm~VK><qzq2|Ct$hCz374EMSTp$i0_SXiP14h6Bp?pvnFBc#Z
z!odyY0s+9Tg#ielU=A1*^2>BMlo!wh|J`6-Zr}hPh>9Bw195->m;L4MKMei}>2HNR
zP*bomU^EwS-t4F8d|)UTKmdGkgSr0}&UGC!FdrBQCLfg@1_<!yKOWd(sABx~;Kmcz
zbog}&3g!3*75;?wn-h5e2t3zr;DrF80K#;Q^O`KzVd3EdBE}7b0%Z2<(Z5&%G2`I{
z{j!J)u!9e<4-EX}{b?f~nD=kH{>B8k5!1g32ZEXcG~)u9T}KxX3Gn52VL<Nw^vuoT
zc!jCJyd2zIFn}jN4FU-CE8b85@xLTNfnf4n$MObQf)MZx_o>vZ|Kk2H7yyC)?P);>
z1W*dOHsg=jU;72{&`<CD^cU#bV<50G7%&kqlnY|^^Th8@06zYq?w2ZV=)cJE$AfEf
z{Ox8gz^H$*QV;^Wh66R@1uDTmEa2wm;ef%e9dOen9-vl2Vb?7A{Sv?pK0Yw_&9`&~
zc>vRess1b|KwAG^F!*>lxIuhCy}C&!aQm7Mf2WT*fSVg?`nQaqo&drA<%vHZ{N@P|
z-;JK&fk1d5W)L_~3C$opKN$wS=G$*Z{!#<w<A6XQ|LM#>hzW(j05Sg*#QmEPZf-CK
zH*g=Y_XZ?jZjdQJ0e}v_U*ZAkEfA9ba_9H6e4ziEf?sCwz<yS)ze)(`j|abd4+7zU
z@d1_N&wlb}5drh^KtX?$-v1#`*M#K$3*U{x1pkW*exU>siwAr|Low%t3RCf3Hyfa9
z{7h;pZe9*9zCRk4DbUS8954`!7x?LQlYsy=?z-HX1GwS55U}yzWcr2iS`W~{KsPEB
z1o2&0Z-5|wXX9VF2I2x*67LN?07x@nB7yM$S@IJiFVMKJ6A6HG-Fvu!O7vG-1-c9m
zFBnj8tq8~p(0?{rK0d%80O5`5054wC=r>~g^dL7Mj01Xu0|8e+&491#diXaAFn|!q
zv_As-j}d?u!1WUw&ke|6K)>PxCWf0-2?Acf2^P>of%g5M#QLo}{frhAh#eGY!+_g>
z8&G3jz)?U!0H9w-^51d%BNw=Dlz;6d7zhs3TR_b}O5iU~0VNF#{YM=Cnw@yBee_Ry
z!GXc!KZlBc6{(-R;sx5!wQFvc{fqlQ8{A)beqn(CV;nG7{FR;De?0gtI|1?oMfg9n
z6QI}6c6Z%VfZ+;A1PH(!V37NJ0_27LZw|as_Dz8QN(62$UJk&s|B5NlLa)hw9l@W}
z2d2qCv+ysQf4U0B%W*xy{ue1Xk%$Wzlwkjnd4R${D00nkfZqUd-~a&N-@hy51zH#v
zFVMnnmIJgQV2=39dqAf!{nt?RkJ0hE3H(jPpD_eRs-MyMD~5kQ_$`K9P%aK&`uL9m
zdt(O#ECI^iUyy(lHos=#zpES2;D2woFm6BxK*JlA0mTidH#ZbEE(lOjZ_3gCh7HIP
z_CG%-0FM73EA%fi{HrYgci=Zd`R~ZVU=AoS>i_?G^?JzpM->E|3bYBJ$oyYid!x$#
zju6Df!To=T`|pVikQ(S_z{isR3&0yS{&#>}P!6E({(rj=!o$nQ3;9=}ye^V}5FqpZ
zFF<e9{BNMwDF(YP89<o-%&<S-|1-g0*B_?-v(Ma+NB_#1Kc<!&@Bb=;|2ek(1O)}A
zUSPESH}@d_$L#nQoL|)ucB62?8;T>02g(5ka{k{i{u|YAR(GS28`VKT9DKYt)Un?h
z&|kd0S=)^=Zqx>XaR9@>e;D__knm=$H_G~_)}K)Yvgg{Je^Kp^_rFn%3#d9kxBtuK
ze-048CoeaU5&s@ru19Dp7#HwC>_3eHQs`IzGy&4-dOHE&;o$?;G}mnu1k8iio1K3Q
zn%Bv8y+`?LI=()3Jv;FNO%Rx*{`P`0#`Qw$k3G^KtF7w|)PHWOuJ>9_a9~sQYq7;C
z4>z+i7ISc?(&Ylq18WLkiNeFB5A3s?93J2FT+9{@H@oQvYED*mH$4}1a=Gd8LkD{o
z0EaWx^<qo~gHr|W?BMET3as3&H+{es&r}ueLZ!<IYy+t{)!^<fRGiXwz)DW+kJpEP
zyh;ODB>-7Jul?MVL4OJa_G-Vr|8U3k)8E~3eG7wA%-9+J^FF63gxeUx&8lPUX5nGQ
zu4oU(;8b-rarwCwRC98LU$6Uq=@N%Kn>txNzFtN0{X#Ec<>c)0(9+n63Jk*Flr#S0
z4Ty&agHzMW%*E3AdV%-TP&Eg2dn;21GdLCOPoRH5<oyT4Un@dxDi9yQF+k$4jUg}$
zf`E4tR<<s{hEtbQ!q(UYE)Ktz_H)<x2Ls$+ynT!AP4K9N&tQB~Zb&HAi=n6A%t<k>
zhr3aVN*+5ZNcOg*{{tjxDXtg<L=@%6ca4YFJ<DHJh?wb5p5I2q)gn63OIi;;E!iq5
z<;Yaj$XeQuk^3=UvXhDV+~Kr-_wfAgmmLR9O?6G5-Q9ZYTS2&D5^B%gYu&z=ocsu3
zZ(>Sl4#iQ>8Gci|HCX<28o@70X_VrvPv30(yN^F^=X{xbm~r2=lB}VvWl#t;hm`2$
z)2259v*mp}>bD1iyb@YUF2j6J?hOnrW*(8Iz!+7$ml6%PL(a_`vL@&2?fpIUr;tzY
zwqEL&&T6{u>?^({%h9gEsm=`9;Wq#aHsj^MM;AP_uVw~+(4+R<e|DZl^}%6t)3C~#
zeDs7}?9-msOM@0;s>hGkdDd}t^doT&5ow;%96szu$oBuShz5Rag1h9tp_un5SHXcR
zt)IvyPQJp(jZfb`dNMgeMddQUNQX&?7C(nAq1+`V{@!4pBx-D1?oynkl{T#8CAp@$
zkgwQ)i0|o@;{9h-;!jaPidfYm99-lyk}G4nMH|I0xh%1Czzab+6ODF)XHj~%2(?1|
zSnm9-@1$lq6Z+ZuxZ3m#!e<(|W;^ebQ6!1y6_D=}Wd^*dze^G+Mu@OW!9~Kfw`S@o
zgg`UqJ%>X0D7?G&8SUcZ1|DzE6-Wt86|b0?<%8|>x?maEz0ege6+@pB?H?VxnM=Jx
zj|^^&<W&s6v-11~mWuB0M*GGoDw$7_tMM_^zSV}q)kdGces*<W*nHDzF7>l?C$o96
zOQvH$W0x8DUPLEG{IoqNmG?WZnJtC`(-J63Vk(ubz4}KUjj6f(%-*oS<N+6@;;?c$
z$0r;p_bpXX4kw)#5u>RYHeBfD;bz8cJ&oooX!-f8Ix&xK-wsA%71xoK85Gx9<Seen
zV?b8QPgE#9mXnY4wqs|R8zc^@H*`g+H+h32)5jK>lt>@|ek>)|+%?><l(z6nKsKxo
z&ltK@g?4}1Z?9GIS<38C)+M`*QDG_SJSjt^7I(pq1H$;m89oA^(;<hJ<H36l*jeES
zG+F99d$FI~wx?ZZGljVG5vVxdR$;H@8%bhA)LF)*9>~fmkcGcw?OI6~Fh5kCV!n`A
zmMG0`oyukxzw}2oJJD@G=z7d0l48nJLTzS?+V;$mDZWZ4u2+_vp$wNKM5re*OuxV9
z^#1o~5$qPfX?C7*c~wTWd10Z6eL-Jr%|)gkqlZn!UG)Z}UY9#)rbYGo-|u5RmvW|!
z_-fDpx+5gk&c$5>GlHIt_!feagYzqFU4}t3uw80Yk9+kp#y&<KHM;Y&d@_4h%*fI6
z;hf=hI*LWn5n3m0<Fds&Xc6oY3~Ky{$;tGI5~*cKFVuCG<V<#izi*t6?vn5tTQ7gx
zuUC9p1s<=mF!31LBFmg{!8(~g*L~3l@9Vks>97ikf8ySr_6sB@6&Co)5|?TiOX@91
zaB8?t3O2;w1+#r{nMM#(tjnGB8Db}*MAZxSs2Jntd}i$yruRPyK3A2P;1XfX)9)tW
z=Jhu>RSu(D(lKXEMMS<m<?t#A9Lr^OABJ51v_N$2S*%4Wlj;%480=Q${X)~87?*y*
zGJ1!BE~-Qj!`YrjzfmAs+skYuu?f73J&P<+e3nCJiTTx|3kxa->Z72Q=SwU;$o69n
zuMd{V3tA;4AI2bi{Lphs?_VuLRfuY*!58e`>=(T=gF!(~=7UOrsEYc2J^MD(-X`MP
zOr%|<@dt>xYzTaut34<OsHYh1NVHl~rmbQ+7z!hDTrnkq0ks6rpHLs82BPQH=~2xD
zdEcfj!I3Ll!$f!#T>fBQiOje=Zi!A1F<Al}&`G6BhJR}xX#xd(`RKmi_hYmbl1I$;
zZr0X{hcEgrixqUKRu4R!IV^;ujyrsxRdx#OvAg?hZyuuEn}2heyvrk>4s-6Tjka%D
zE`W`$_vZ_qQ@)&ecu{Kfv?2lY?P(xYwdV;=48o%1A~%lMm`%@zBSdne`T!z+$eCLh
z8-ht(rl1Ly+2CWpq}(usxKJv8L4U9fNGG0Uyg2Cvx+amNKk-C%TI^;TUK=i~fk4gE
z%2C@Rl&71Ltf!-Jiuhf#^abI>j=9Jbx8G<ZqY+o>`xD2DbtZhfB$;L_(u!9i<YjAp
zdWkt!7j%<jN;NjdkCk<bN(XosW;Wh{Uhxc=*QZChlQ1mbo-oHzKH6emO--FKl0WD-
zW0;nGmbKmgn4t#u)?ILlQ|X{oL!E16DIH#HC<-k*LkaFn<cFxkZ(`Wg$VKn-Zy#a*
z2qbrFvG{Iuh^$*ZA{O2!t4X*%_;`!4x$YuZ(Rl>i)W!b&Re;A~2mRf;A3L8|8QAuV
z3eUDD#I{&}l+^o*Tur2f&N8^XWmZ0`jc)1lMRHF1s9Zd6)l1+^4$A>m@mc9Hr5W;9
zh?Xf@V~(#+MyIoKxNu+&4Cv}XEasf525RT#7QdjE6Q9f5^rwq4V|!_TS$vJ5r;Iyh
z1KD_<+0)$(!y8Lfw?Z!{37i1ENtBO9vGJbuju?{0S*9hR&qrO*4Xv(K+!}pdu<R1Z
z@U}{jVoz1<mADpPk2)y~KdPGn4_nNcsl1F%&<8QoKLovmJR1)0MtR<k!Xx1!5H-ie
z5v)tvnFoJ6+}6|cEY$Do_8d>k>zxXo*uFa$ojhZ5g0(GI0}QGItgKyzsqq>2dIt10
zdF!8?UwT-jhJWX;Y|pgtf~lqAbIet3^wLtsrx0U1IP5n2nOx>q_b1;;t2sE(FnFTv
zW?izCX$P3^?DbWx$baZVaBK9(fGdx>1f+OQV#pKGk0dCOmVy!7T~%aB<1`AU*;CZF
z!6;l9mQ@;0*iu*!TC&f?OG|JOgxz0Isg&|y#NuiH(3LHbY)c&XZzOx5T?fyf(b1O1
z<Z??~MS0m5!-LWmAX`Q+%DUEe{!CH>Tz`Lt_}oLTE1LxKgx>t<;;=tImiGBUKhZ)e
zr}6gp4eVk*O#ua6^U5QL_11P|X7G&px!91*SMzde94Xj~4EFr{=+*og$Ir9x1naeu
zSt_U%WR^U9ntNxcq-k$^S#2MVf>c6uJEljK9p^y+6c@kC>YXJUF?{fL$dI_2dJ)$x
zIme(WoF#2KoX@V*Uqg+wpGIY?!%0s1o}u%+yVr2>-HKtd*>b#kf853yRNV$!EG;yA
z;)bgWaWXy2PpI=MgbsdiIHD{m&BE>Ro+f(@(_3t7#;P%Yf(pK*6at@F+WIep`dD|6
zYX?x@EFz1rBS$_|l*Tdv-FMO!?1@r>KXI&epBvkrvAk>`GH-!Dv3%kw`I6R$DlLI#
zg#sHTh^}bVi!QX7k8Ok8UQ98B7C!>L@Y!;Re5hFt108)}*i$d8_FJ6~T;lNi^8#jY
zkn5;#SwCDDwvtxdv&+u4cs?5zx3t8k(*EHwf^g_7L~G6mHVmp{@+_RPjJI8a%wCji
zjOmS(d@Gc8J#}&U@!I_CLfe_6eWPW`Lv(nOXQ%r-s;9oL|7w3_x+asEtxtzC;|M?0
zxN|*(IMHDL&PBbeqMU7to}n8lG|L-F6T57>Wb{6-SIc=}118Fksi+R!1EiBVTZ^bG
z&8{$-)VsKp`q&3>G)lsc5au?Th*PdI3O(!(uO!`*hO0?}QxP8vkVIt@qBe*rEX_37
zkq;>=1~CzTWTyhtPV_ds!>~u+=ioc<P7>k1`y#sPyn(X?yl)j9_dM6}$j*H|xjRVZ
zBj2{j2Eqpnlp&*fgpZ~E3aH{HJxTaXlR7WiA%vb`;q>KZae{Rn?C#X_W%}0oDYawc
z+g1vx@!+ETy5@(IUpBE`!#Rd@4W^VQR2%879)4~T^Gj-1Vqrip-d;wH*i|aQMhy#N
zA)hvO=CXd}uacB;rx3$GnW-iwuIu(VD+-8Y(-6nYroi_RmmcmDw9~@7Mc^+90df-u
zF1-)FsF{s2BNyO5%fn1iAZ7B22zbBoY&H9q34#)I0p3e_d*iVYwGR8vM|=x+q}R&N
zdUEH)<}M*lcZ?r+Fu!G*7!o~#nY2&Z>$!ef>G@GU{2f28s7y*1>@gTPujg^RGbQPR
zR*)7tsn_TU-@ZHKUFUloT@iW7Sf8^z!`ejl#;I(4qRH=`c1=TlTT-&lk1fJkG`9|e
z;tZwB*^czgVxs&{HoIQyil;6wn20+?4r-RGNXAE9^Zb^@_b#`o+8OCXSx40Q!kY<U
zq|2%MGb)!Zh0?Rx4o}#-wX~{U9vp;y?j4ZxODmtU5Z2R4qbEP%_79=eZd#%vs6}y9
zBAm}=X%SWTe#-JFuo0z_6r~?)Ev(hI3)*GS_3EiJpR_C*PX@LOqNH9Bh1woPEH_dR
z9G8-rgJCeZjF=En;}Mu6IhzoiyCP>cnY!`{Osv(P@ASO_p+@DA^5?c{RtFBYK3mpg
zd-ksF+p`eIwjUj=I}{>5J1_dyE+<>IgSGjGdJph-Q!G9~+y<kbY1d4vzloN-Gm5sW
zUkw}D?H=MH{;KU(mh-yGcxiiTa)>-i=(V*`jU}J`fyvro_0rMCxA`95(`2gdUB`0B
zghFzJJ7xQwL-+Dqt9P_qJss)vgjD1`!gZ?gSRFslpJNJ_1*x{2W4SJ+4p)laZ^k%#
zfJ}6n;e(_)*}T9-kd=6W;+O(@rO~yOyO2ZE@1&Cthv8a15T7rUkS4(L+=RC{^&a#x
zE8Q`YMa*kYGIn?1+m0vm$TtNmaX|20b$kUvU;+&_xe8Mitz@sxQo8s%1K!Fp3<fB@
z#O39R-1e+Z<+(j9Mj_6?uN<OHWFTiYNUhVSJz)g>hQ;%&{8`pL_Zq}JDVx$nmetKP
znWf7ZC95~^d{=jOtrp7=M;qDO$qP95%&I82_9iX%Cpqnbf%a?vkg$7}-@YEoZe$&|
zYN{!1o&U7He{vS00XY*z;sPe~`+MZi*dD@_^WIija)5`1@n^P&;pw+A;>tXR)j+Sc
z&1;kr(@La6t*0+uN^B9_K6??BFKCw3U(;VUZB=z!-JG%5qLAh33dI5&4r7O0X}VRG
zc@0B*z)NMfr1s-@<orlHBIUf3VC!9l(twd!>+GZ21UfXCf;E-mqwgwEo}mgD#B&G1
zLjYlZWDo+0p~|p~$fusm;**-O;?GU0EdCHdpjz9T1>V=9!6aIc)6&pWdh)Cx&A3eG
z!E+`&efhF)2^!kjw#1*EL~JtW1e*n*#D;F`8LAdMC+z262C5WCYwqy6-1n+?6{Qn#
zR#_aAGMs$#?#HlQBBAny+C1`V-RebnRN0=ZtmjUs<!CgxvpSU{iyAtRlvZuFGC5ER
z5-N=4ozvFtYxN(GY8evx;1?$I@ttg<j)LhpQ4_3kH1pn*!u2TUq!oo~g-|v#BBw*w
z!}6r@*X7Vo^Fs+NIbB~r;rOg9(ntKdhy@R=VR~7K%DPGjFFV#${JxB+5P4TQt0ZJ|
zEle>P1z6KiKR{L~Nk_pKZ8oCOVpK%cQJ@`lW9kg9c)4oJN16EyZjY_m_nq1k3ALlk
z=gxR~_D;v?CAvEYqq<y*$JSb<j!qK0{+QDf&CzI941sXA&(rFOlN?%S{%YW2<+R81
zaUQ&yNkdMl;cJR1Q|r1DpQA>jeqak|x*YM9uX)c~?3`tbcy-oV-Jko`S6|2jUA=XI
zub<WA^c9<N_z@MOw{SOl)mJxJ(RbqImMW<ZG9z^J7|+}SnHnAt^hep(#y-1nyd_);
z+GAuv_R9tBZN;U6_AuT}bABf!Ui?f_UP1j;4VrY65UsxBqq6u}4K>+9hY+gK=AFCT
zuBEXAisz4q5LeS?UCnMycwcC3`wFfX45c~D9nQ`CNJXpoRJX;*Xi>RgF6<3`V!6K}
z_M;>1prA^m<>X`Xad6}OC11VMNY~gEBfly6f><<E%HEE7h_-^D#)Nr<CLkYCI{^3S
z!*gZy$x5!Y$Q0tQQW^JD)+L-NJi`bg17jIC=9EH=<v@r?A+_p+4^s@#kLOlRiO<tx
zaSj){_14&bbhK)nE_B;G?InpfilEV<)&8#XY<NM1y>yr+>7`chx<;-;W+GcP#&G(v
zuTc9Qam>Pb+6p@ADZhtz$r4p@5t*yI7Uew@b-fWO{2H(Pb2=~j`w{Gv<jeuo%H$J)
zhWmuwHq>Wt)C}bsrMoaD2qw1rU6XY4JmSm6b=JRdxasYH%#&qce2iWGuV-Gdy{4wA
zguw#Y`=XrK8!`E?vbr5rI3C{0Dy`P7AeUBNpzo2A$V%6><wy!kC1}%8%Ty)bx{~&I
ztw%TXh`6_=<WVasqMkU@00OVmONH-oin8yh9!n9}n?=e(QSwDu6Kyr7@CEA4q$Stm
z9%<DVSy{;MC#FtBq^g$eYJJn$PM5A5F||qCEsprqMQ35pp4CKMU^ngb!gm`%;fvnu
z5i4-=jPM<ef&%ldsLqz=uNkDHoX&6dd7>k1Ur7uoFoqo--U-TbT;Zmr58kH2tSZnk
z*<myLp~GG|`YL6T2JdO_1uGsi<6T5P#VV}#OdU{!EG2>f-W-i0g*(Mj=oYb?DYbdn
zw?BNXW(=ts&W3x`VcjS8%T%4fQ&92?T93TNvvoZ2SnvuCE6`IKcs#&Wr}HRSxCc>H
znUM<g#7qg<J`|54^`+jEz<e2r+fmzlX;Y#qovP9a1u?G#_61AeP>0q<sy#l(h6TO0
zw~w9727BWB+Zj_uqRsX>qsUDPyT93?qIxop6TgeaWhE7_&@yth<(`NOnkRNCfmB-1
ztHRkKL&<W^-XRi(9(oFgk@9?)qxVRkiGb>>s|IV&-tr3!ZNH8E)Q4ToW|JHGFn|HK
zSSv=Mo7{qQTBD$50^C7sVPs$tws_Y(@u_TUC>s{PkwJe3ZC4b9sdY5P?7*ex>CSFa
z=l4}Y{;cTy4oXK#1GegEli(?)C*dOahQz283LTUT#6?@Ijs;pJSz$$CSZ5s#s_#$@
znbW8-zrH8g4Z*H8c>qZaKPP<~HIB7`NP!W16rsRa$}9_uJSM#S7FANoK}9&O*<4bI
z=iZsU7hwzfCSJ!9ZY>@3p&_9V0-drarTi?2_r$p!!Jg8}6+gsjV1_(`C*k9Qwo~N?
z3CYhHck>NS3~Aq_b|pm$Vvc3D3kp`#a42q1`roG<5bAzqbg$NhfxqN&baCljvcahF
z9DLl^BQ=SmFurcuPKrRmC9q3_cvg%p$0Fa!*5Nzho(nv|nRmUrD-Ho}WRI&?(u&#%
z<xmX^w@lBzK|g7jv(8uIGv~!Bz!36fkOm0XzYuLsW6`X+E|h@v@RHjTosRXuZm^<7
zBr{v`qTz713Cl+rnX9BGox+J_YSt($k0MM)g;nfy=0b#uNO+%$HQ%MXpW#*1W19v?
zQi(U{CY3Ukt^MYRd{oYcLzX!<{E8TcAQ7Bq95=0L9LSn1GkUw>72Qf_xee}^_8p|~
zhbbuxxM<&X6*^z*;m&%Jr0*dZ1lS3B`4Z1M+XwmWU)-PCcQm-q@Pr^)7JQ@zv;S!H
zw6jQhQk(}XO*@UUP`@TrJ8w9Z8}DL@#cb)N5@$ayN0(h2(cImU5Lkfr^K}eNq6iH<
zyDzJ*cW~T<=APP3V6d&#BAG*~84@X|dZdc%9wMUVWR)`g(8)m{e7vH@griDPHWd)g
zjlHIibT}BRv4ZJP=V%@BBFvE^$}x)Cl}`r7BqYr}SZsb}5)mELJ|PYZ^yg}RBF}1V
zN6#O(bk9BMp0AhLvGGUD!@GxbjfWTE^R7<skPNGy9O?U_UcsDl$d4qMU*da&Xu9wb
zg*j7*S&y}vJ$jUp-YI9_MY!+|2U}G`{IhbhjIesLgs@Py<p3|efO<M>+uAD;J^asP
zYyHM?+M2e$O{RII>CBt`W4BX^S9w*_9SWiIwnYJCbr<I2Yw2&Cx)>CEzBQaOhsZ3n
zEq|aB3uJYW?Z+5FW!iZ^M<2e<d3La-Z`hwz-{AVWnbTp`=d}u%rmKV7ZY87IxcBA7
zq2YdNpNYeL54MxFgPm3Vj6TPiWl2Y;$pb=G$)r!7O;%?|g{h;$4a_IWQ>qQ*%q{$y
zXo5DPzDF+;cn5_!3VJ>#fcnO4cOZtbWyj*Now=#S#yn)h6ysI76EdI3N@-iU1qG7y
z)l)XLNpqfaSW*!{(5fU&iPb;jhHB*S%MlRVrP{&o-llzmLg2tm{h3ZGFDj3`zpo0O
zQY|M&<H{CQW<w%!87#0X5XyV8(!Bzc&17W{*BkddJz=$H@9kS-`+7Gz3u?NecoFXL
zC^6aq>|@t7FL3Z!!|{hqVDiiqp*QEAHk2$xIJqSKX-4a@C{#c|sCQEpRha-aMAC&{
z=Yt0}HIla`qIa@2K2C2Aey`&<aq3_mhXdoR-az3*R3DZ*XHwY;$xcgb8@kGN6(>(^
zZOhmC#~UDnfdvVu_@o@MxXWeet7C*xMy(~`+Iz^Pw+1X=$P)6>ym6TJk=0~WVAGur
zHt7R>A_;s$DkkH1U3uOP)14(=hGV3kmMS>cI~r>}cH&MI_Lw>5kD9g(>UUS~q(YyR
z_P89y687Ow)kVH?+^(#ma3y3n@C%dd+Ij2mm-T^=<?6sb*l#}8oG0a;3JJx@f}kLF
zWY_59JRfTNs``ArD9st(#mFSquja6T4u3^sQKCrRUMZ9eoWX`Xq;U80aYXKvSWh2`
zTrD4zA&ImRo)L93+OO{|YxmGWd->aONR?h3M_>X|p|v=co#3{4+Kz-b(t&K0$r`LM
zg1Er^ieN925YdN$7Pw(x0qFw01ir;jRl`~*UX1&%?d}exRBdEtxe*eqoeaVDyXPo^
z7s<^hx~Z;AoTT?NkKNvBhwY|LkxD&@6ig=Tp@{K`{gSuqTt~+lSR@@!(@E~dr`MxK
z))yyRLza3=KQD*c!`jnlLd-m~qNDkv5U+={XVI&XiLDJMHwHI&{i-Xmy_CXdTe5ER
z>UItMkY)(-8r9)(k%UTpVRdn_l`?0|vo4o&MWwOi!?^7n8)~V%atyuVV$U$+w@>M`
z=`t)iIkQ)olz7nyaP9^wmHUg^1~DLbKX`=hPrM?BIMCJ42Iu2=s+1EWIPiGe6|0FP
zIoM@AcN$7O@VfD(TqBc@{?S*C80k%<#sq!*3aLPn*avoOcZe8R%Ra<rzq!4#BA1fz
zl9>z+Q#VkIzmmxd4HuQMH`EV=_wJnOhFDG4Z|$@=i0Zb_c#QH&V#vHY<<z`%E%rE=
zO?MOiSXH}bbo`Z9E~!v(t(5ibiR1dvneLg-lgd%yoQ92}!~5qY4GaArPHa4rPQ1z&
z^Si6I)<l$e9PtVcH<&gqLacmG5$QWW-f2iMQ}w`#PkGG8>eb1VZFwB6t|=M?!a=gh
zmLO%E=a-)FvrLFBbFm<@5r1ZwUj+_lWAe8b_rfh&<L-_t#M8Re2dNaHG;QJ6hsg=f
z@CiAk<zq-ly%as6i;+Y80Wx2p3?==xut4Qr6XfuAfvQN!Ps1;!ZllcQ`^F(M%Evg=
zF(H(tX*y^my9IGoa*eK5B$1%{-Q|@wIsWA0QlnlM)fDC>x{TK6$M3l@hpezXIg<y>
z9bqPg6=|VPt4+*vW}nn9kqXnbbKVBd_UQG!9emsQuJAnOO6eTyheTG%Bw7EeXGSLX
zl#!ke?q?HXcWN~FqOGv1rMP@UrUOo`4$+(`9R@_A@ZREs(CtT04}K8S4+qQnszzEB
zhte~ncudNO50cf6<Uet(TdJ_HkBHHG?Sx)mA!;@*MR)ImSc5p7Us}S{;JZ$Ph_^o^
zw!4P>o%($+)|d6-7S{~EbKGq%)!P~0RcSnB^7BT$a1>ck4X1=fK#Yp>Toy6Br#$78
z%`=`&-X>#D&6ap|NPc%1eN8J9UiXEmAKV;|0ongb7=mXk;4l$OVaU_;7Fa1YIa|L@
zi~k<ckd!dA@IxJT+UCe#rC6^{Y;n6<@GcPxCJEKnA&0h5RE$f@6A}h?JWYSO<ToM=
znGvB5OLpIM9)HXt(eBV27$p5-YEJ_-o!fY`?Yo0v_5l8k$knHvE6M6Y{Ig-eD`ktr
z=&m4PW-~LQ2;2|3Q%TyY@4qn2^wvW4ty1qN4wJ@^!Ee!U!s(9WXu(XZrA(9VnBp%4
zk77euNbU|Cc|K@Wf*rWC^mgUCqIw#qtk7GtInh+s5z-{)%TzaERE6#u1&b3GtsXJe
zsb)pM70_eQBHqn^q5kq^=rp|PfUAFrJHC!Q`ZWGK-Mxra-*@Fk<{X0q^rNB-DcJqe
zl0}E*ki;XyHTL7Q0XcQ%PwA>GF;TMTEP_Pw1#_l|s}xDy%w_u?FY+@(_-QG1X5+=J
zz0UgJU`B_^IDFbg>!#aqcIHsVW~m4zH7S;*$9IzAwGWmG!`pJc;aO;VexIrc3KC+Q
zz&W)0RGd}_fBT7@ccP)Nh`1igYa6<f%&yyrlBZiUI{K!M5u4+qWR_Nwz2d;P&3WT{
z9QfqW$&p68zCt&xE=G^|yx736^2qO)G12P2)Fs38*UBQ6*N%>)S_gz^Uo;QCHa*g>
zka~r@o4>Fhb|Qy2XImcaY!aejIx0;>0V)}eQ|3`aXcomvRF+pFk&cQz!<5Jq885F2
zF!7EUdj(rcn-smYXz)t|g|#m#s!uJK@9jM{dA5#86~9fw&dfqS#@mDG^E$VKk?@RO
zj0}b@f}Kp#D<|JD@zE$Pc`mWpfY#SxJLn8rlI0^Iqn@Yg7`$=`mY~Uk%<xw1x4-%l
z1xcS2MfOI++M_5{MK3_lA>0h%B%v1fd;o7MEU)UV$VbJ+vyqw!ih+cFoo)6xyNYF~
zta!V>!)RhC(zuaE*1j;@b9!{~1FP^`&w5cpwC$Y&!Sk%DcU{j8z<Gf_D}=?c!j<q+
z2@x}g1!&+14-)}PxRy0rM8|ds_hT#O03+iV^ujT!;TK6s@m~q!EH{%X-lO*rb95**
z-w{(d2}UYe;Ili54@)vmnPuL~v>8;(w5DGhQd?y{kUy1bAu_K}kjfK|=;>7}kf!1l
zE!jElbP7jd1UDY~>*=tWhmPeu#Jn}SG8|i!Y9a%}bhg4iIYW`bX_XxvRO?6Klovj=
zV0~VA5>SCV9BF9WA&K~+e$SCKF4){QLn^8E+kw($)8eydR$v>Os|NG^r>>q}^1c(j
zx#_1u4PN^~al(zT^2ccw2MNr6jmJrvMG6_D@?O(v>(xaq$45Q&h3fBY`*GyWW8zsp
zRuzdV2r}VYu&TZC8YM07gS+L8=?H{~cGmKzWxZ0pYFq6fN}Iq-Xx`Q4*)6qHji{*!
zWYFm{V|10P%?ZWp%ePjIXBOD<njy$vC5UV&{*0JBt0Tsgn9d%KDj<v_e=ivZR?2$K
zti24c73S{^-DEPhbgX)BAU;k$!YsNwU*J;Wd0zcg7@s~SRD(+yDU~Te?owOEeg}z=
z$wsu42A{oE>C2-Tg~EiopgIPeFd-j^B8J6Ksoqg(^}(i<>+*erndXAUjbUjYe21p<
z%`Gwq-E?KkdRU>n-NoU%PX{w)#lY_&_P#i;r)K4QTzPLsb52mpWZmWaU?*D46roFa
z#@9a1fZt2P`52M+$r~Y!1<~mFm;6BzJh~QYnyV3;8vG^rF4Y`;LwC||SF11wYsqjV
z^%A9vkFpoboUF>zt7l{pGZI_YagSsqG&ZQ~vm8hVcw3)<`oDjE+1NT4cOtuks1Uz+
z%XEzyW#|sd$!u4Dl2Zy=EV)A*78mD`RO%oG@`?L}L3P%hHF5S0G`f~smh!&x!r19-
zpkXaWkA4-W>VzORdPZ64zLWLhp2f#J17BV+$GYvXzS(>(bf-^z6}j75v^r6yRaASd
zlgQK#J-m+0Tz$KAD$8**<dauvX~E&Tf}o(Wsc{covTy@iX)~M`Uka-tWnv6}Z~(t~
z;XUjX;iS6k$fC`gAA5S$qlB+BK;{9g9T$!>oBeam7mq)$#-o>;vTs{u*CEopAq$?!
z(W6{{tipg|)fCE{7KfLPf_wi!#mR$IjDvHEgIU~i<v2+qoCooY?EyXKgZKxCEPjYw
zb_odq53F1wycw6GBAV{h1yKgY;L8-x$>ZeCSU;?DNc)(bVcmdXs7@zC&nI^BOi{iy
znJlM~q@4=gixi!w`LiHrjw)qr8^-48N7M*GnS$n)ktLHz&Ii(@+4-1CDz})Jk!w}5
z4fV}KL|Ld|QWjgmPwf-kp5o8biQ+i6Y4q$vtlG4e#dHl!=+nEXPfTkV?aI!+f6~+!
zIo70Qw2O@02;8`kw?f>lP1n5d=OAG>@GyMcA@S(Eg(Bn9h&GBV!-|<RgYV!&!<23L
zkWnqc%E}Rxt+c$gN6YP#jl8P)iWyO+Vt7WB&sW#X>=S!5?S}~ZTOSaEn<U;o(zRKZ
zBe993d;cwopUBMhD}}4;S6x?j_6oRSA6`V&ES&qL9cE_(*o1%}H8}$}Z}=;jvxHg`
zKD%tcH=H}CCeoFU;vRWf$4ktvm+++zrp?b)o~>o0JHFgv-+e+z@aZhntf1-jke%}D
z7O%(;Chk%XX<eZawH2{B3cc3J)f40u8pSfE1!Nuq#FkoHQ%M@*(~tS5Dx=dVDyHKZ
zFHH`H^9I~F&%WZC_Z?-KudhMWvqWwUb`%$C`}szl`RO7qI)8r`<D<b>W~95ag_^Wj
zl|)-*$AG1eGxV`6n!^|tXTPxs;}JX)(?2808`SQ3)RR|06cb;s%e><8#W9s1o%@ve
z_8Vp+nDnqhqS=z=AO!;a0Zoas3PUTN8{<$6Ugp}#cc{2ySTlH^in5c_2zxXrsqqEJ
zYdrFJIAd-vV(wHY!E6fc6oY9hvjdoNB)zY_9DSaR4_{ao|El-Z?IqdXp5)p>av^K)
zWA%z-H@|GJft}F01zLYaG<S?jsa4^Uh2yD^_7vCgH`=o(0+quXHd=X~Dnl(vB4w%C
zRa77@qd{8=jI9E2gCbQ^i}>4a@xE~@^rjfztiyGAbh~-j+f=u!;(W;qgM0$5b0<W<
z$KV7u)Qnvv4Ui)^eB92+8**#a@#WiQiFNhO=gHlsRy#@BI}*?dJ^#`Z$o!~dQ5EfC
z6ns3W;->m$*2<U6Fx=3G=kbNKXhSqHxO!A`$jssG)1}Z}zGQSzMb|Px1-L3gV`!h>
z;AsyTljZv^D>40$*ffp8KI>far-x>xFZ!*_Ixb#RZ!j}y_Y`p&FfoGUUv#Nf;>A*G
zwAp2?^q3oT`Qd8go;zYJ^R6v3yW@YRio?a+W&Cp2l{h+S&lxL{^cc(YnX%U6jBd~l
zVpE`Ol0#w@xW>hfU!rI$Bs49OgtU$gE;rE^e-Rm}6jrp|rP{fyd5`H#w6~nT+~rPn
zbFLa~CDU;5bmfYxHVlk_D7i&u)E1OD-S1!`doP-@LsB?25!Aw5<=yJ*i{&enq`2=R
z^r8@<Mf+$M)N+?ArDEVmxJsXMsEX`6k+t|2wL`K!3!*Wtse&y^m_8zO&jh<lL3~Nf
zv6Cs*1k<!mj8n0_vSO&;kWsa!KQT9|K5cR-DuniF-|Jrr)T{QdH7{4xMc5UQ8ZGV4
z4`is(M13n<oxmE7F~Z`WbB>1Cs~-1^lew|&c`Ap=2r6b6ZH=xrtJk8VhnwjKNjAjd
zg>VOlJ>^@++`UdcHMJ!}nk1o$V=RW{rs@1EBGw^NNF7eM$hYZwn+t-~-tAEfPvSbQ
zm_GwKvtE+vdnPfeFP9Ajh8}irkFKf4tvvNn=^yzX-V(HrKE03jkwd>}GCxsB0*qTi
zMV*ui1*?k1O1HtrOA{{%v$o|&A7!T`NV1$+8gxjqezPR_Ivd<i<ow<{&*Ni%`ap2(
zgT)Ck*qw<Iwy@xE_G;G}4UNu++txAuo3Wc8o}2W~4U_i-PYh9ev6#XLe8XGK9m+^g
zM|)C)WLozpC&-0n+($1~-}PsDO^z_%J2(hWu_?OZqZM#=%HY8xL1%FrEg8JOtWys$
zc>TCz1pd8){>@}0%5n?(-pr{F{$hwvyz|v*OX!K;R{GvT`a*+4;8oTcL&sHu!_qfK
zZ~O<1OKJWNDzGz-bu_)L*gNNHwgT2#<&6?6m`u`AbA)?e0=@|&cBpyhb9`>0Lp6(a
zy)(8-{IZYp<A(fW*7-a&FfHY2N8If;NtI*^GdH@;obQZxUB8veDa(!-tlEOcbvM7t
zEAWFzat0S3>V)k=P^Wiae(85sLGR$zuM)Kp^u4QafS$l-4Gl7X(2RcX;Ovu(3(@@7
zV*3-i`DwdWx@kHz_;dMhC6M)KpC6yQsw!W7{dD?jHB^Xq-f2Cfe$Ita73ZAl2?n|M
zohQrHQ{bw*R~H9;e!gFZ{Bpm)*Fw`o;j5=xK`!?UsGCgVi#?Std&#4PzyD+SbdT~%
zWovd5FIPl;cjTpB#c*e%o@}FDsZ*oI`O_~C(sZ*sKQgW|nj^?Ms;el=P}s}FsQ_!U
z{+aMDGGfG1&WazOpF2ECoI}@@p7>^*lF-g$(DYFZW+)4M_tmLoSgpEHtzMYWW8o=~
z=e@X_pz7~9sAz(ZAEc+eU23szTPon`GV(N|y;7*^yG4z!^5m4N-=Thg?NnD)7pTV6
z<HE19GWDJp^+{HjVWu8;wa}+?>$%U|mCof%=wD;KyDhnIMFdL>Ql;U}^j^L&ZSc%U
zB~FaglwNfamCz2Xx(CsLhYY~14<H6-$M8+TFqc9ap0-@u;xE|GQsmf&v$rkXbv_Tj
znjtcLejgowDA;}kDfpAjJCMXjoU=@ObAw43O{-OX>j%vXCm9(TJg@Ng6AFS?)RUe=
zxeQ74ho$#?vfjRUgOs@V2?LFRSo`g?9tOrOFhl-h@}eyN5B`b1cc*m3=k!1$G)>WQ
z5w*{SnQ5fS$##he)e~x_4WibNHkyKy*QT0XBn;HQz5V>bH5}j6`b50#Q~_S;Skr8z
zOzrU5^$u?3EN;)(N>DE(F-M}Xb-t~(A^oz3Mo6yc9oWyq48NxJ3jaz`Od<Nya&Ogo
zL&>%}N9&Fg#ckrL_Qk;C#jUnU!dHt($r%rsd2cx`sZAp=TObEcZnCPha4OTy5<inW
zWK;k0h|cOk@^Sb^7(qY(?0P{dErVnuZ|K<mh&m=`<lW}6HLt{SrhOsimD1OyhP8GD
zr7g4asK%q}N%)qLZF3g|@3d13d=0nIk^=Tye~3u&pMI!rbHzV+BS?KUHgOb?YlmFq
zH}9!7B0pXK%5}DOZH_Qex1xlt^7Cq`g4eXhf@2|!t-`Xl;xm1dJn1`~w_94G8^ygd
zq+muKzGLk8t4?;+3TCFL-s(k?%ODT``KRyW<3TEPn>M$^ePA!i>;o0r-+VeDqnpS#
z;vLaFLKG_1EC+q6Qz)-C$jSv{e8A7|GYgCjix@8DzT->%z8WcAI^L>;9X|dEm+jLn
zan+}{;EWm(y%=u<v?D9SbW4YVXpO_!ILqm{AGWbBt%-M=kWABONSl=4l{SwHwXmnr
zP3_&Q7pZmKQf}sY5^YqkkgmlwRLH5n>V0(Dzv{LSTD9yJ@gnsNp8&x@=xKU6%Kcf1
zdH5A}Q`^(<@kG&lxv7UohIj#U&4^1j#HN+2t{ff$pkqA}dPj=$%&UW_&3E6L8GHoK
zR9?egp6OMddJs~Ft(UjAZ}x^>j2E|eOD544pA8!ne4@kVYkVm9#E>uB;Vz2;=69rz
zrxz*TWOC^4jSFXOwr?)~2+!m%@JwU;sLEbp_*LE2O;EltqP&TR+OM3hGJwqV-k9vv
zyZae_lCxtr7<Xi&$@D8yBeC4%1e@S9{cV;mLu6};v?5m8S;T{x$~_Y_a(+&0HrWCG
zElO7Jk)2al;NB7o+L_cXGafzivArJ?Fxt^#==KmbmXMmy<RO`p)(DB2Qd8$ilRmv$
zRZPjMAMUvz>lCkHozsb+C<hXM_T{|0pO6gK;&rN;W(xllx!b-X>yjmv+oLkbCx4VI
zj^MGvYt>D$L<*v@=2dwl2_z*x)aG*L`IF+;ihX{aCP^H*Rk4pt&&q4lzU_2z>9;x*
zR9S~tn-BR?=(_mX_JA8mBpW7necS6Y--YYb^x3kAA95o4V!B60WIZj@oj%@+ZQ5F-
zWtO5AdVc?LY4;s2F@tbS&yTDwl4Ve8REM!re*H>br_B~`3Ir!EMlyn~<#1$-y||?S
zx{DVmj#u5r9<1KI2O3K(E6gyW_(;(drz-m+-87q=#lu^@h9sRYamAH)+p$}7978F6
zC<o!7203B<dlQn5goe@S-@Z2lXI1Ws>bujAwz?it%p{tG>^NN#nNzr-z7u_;P5#kt
z#DaRF&Ah5CAVzJO&|Q>u6BoG~$DdK0B0G4bPwWdEH2RjvjzJ;j^!Vd|AdiM?2;xPK
z#->2Y8y4FJl-X~|Cc7ed=WHj2ce_3d>`Su!z|f7tF{vtFM{nIRo9z*`Dn!owL10;^
zDRlTWLev3wg-)6wfW)A36(vdu!v<EaV1|PA)W1=i-IO<$!dfZOTC!7W^uC|>osVS~
zIpP;*`Pw?=&-TEKAk2xaBdIRyo{MAtd}DuY)J%LX(KbYdTIUzHnMTNQUg_g-QQW!&
ze*HRjyIErhOg^GayU8@EJRdUiID^|n&w3kN-DdaVtQ19$&Rgeu64@tpeR*gx!b@*z
zZ?AxKgW4qPuk?cuRndLflQN@|(YvNsgy-KBzcE(X-8Z3q{f_Jn**v~(_X>!<ivC+g
zEbncDU@f$9Lb9X$gk=Jj;103M_a0Mn{jbP#pulg$L~&Sn*wZMnN~yQ0_QVG~q#a2`
zqIZ#emR7Z}S2FrUQ^|>wT_;c&qvjgbw9#H0lSWx!vLW+{VHj*wP()WV_OhAOY!K5f
zsZ=Shh%9pvD+d`EvwAFtv3x6EH2z*zU?}zIVCcINA(zvxs$!>x@YC?eK<7|+YPeKA
zcokbtqeF#ol_V-&jdK6J!?JTkGVDXz6osCU8?j+$79j@2exNk%aE8L9l0(}qd8e%9
zb2gZqyO1;_A}j4l`n>@|t%}!!uYJ>xip!^;eEz&O^+j)6#`W@(&&*+%TT$hd8|eGy
zilXYMis9)z`Nr*LybBsT=a>9Pwr4`5HDIcRF(jH)y9Mp}5Ct292l{2G$8E#iM{WDK
zI=3fH=kOqCQKt)9sFDKY(~oTfOgYH=7A=GFqC8N2dV~bdcux6dI)p;3zpFofixDMQ
z8=iIdl=UOWnxOS6cDDYun`Ls0Y@gfyX`W7nWTP+g@nqhYxrcdqX-+GvJ0zE3tfI>e
z2DMK=g_JDlbR;rQVp*d3qT0b3qCU507VRCkQP)0AaK58NZ`Iz6_SODbl~4q^QVZ55
zI`BV~6EDev(2Wir-q!JMxlMiVN8w>QWBGc5Va&aAsakQdyJ9X=h__7_SaKS((R+ie
zKeP#%JG|$mp|tuw`yJ0{9rJtd&La_%6H(;1@2dpSaAgE$ntjseN|Rm`4x#(kJq#E=
zG@1P_F-HBm3JsYg`c`$~yg}Z5_k%pyAFuCy7rIB}_%WH1G={Vj{s=1W%ib5N*BvR?
zeTUK*BqRET2^l^zU*0F$$P{s)gcz1BrWO>Yj2@P&qV}wJm`^QoQyDoeh#`;pB`!~n
zl_h^#fO)R=1_*L*AV7QQ;o&gSSRhgEBTH_IM?s{-UD`wxxNG9?+io?)_lY_zUF9X1
znsuGBtYVHV%nv&SK0@{lY!htd@{MXkV)sjLBh&eT9?VR*2P;s#l}bVp?3ypUT=*(;
z%y@*^HhWbWBb|v&c}i?nA@3E|0-ZT^@Yh-e&R~k#ELNuN{8a&_?HoIYf>+TKjp1#~
zwSzdpmjuERi!M4>Rv7Cl-&`@)RZ}iHi6?rOMP!Z7IFgn|AM|M>2Y=CfUmok&O#@D^
zSO`FE;ZW`sovle`UL~)t2~TjMgiQ+<ypZ(RR!nq4)D~?q(|TH1qsZh6*`OaROR$NJ
z^3r6U%pITeV_BtfI%Jn=eBShpN2ZYy_H8o3NvL;KMBOOkTg*bUh!Uo~nUV2%Ct<oL
zhK3t90Sd#($*qZ#vJFZtVy)T63g@rS2BVN%L|%5A7>$b=jUc?z7npgjkuCocP0O8U
zQyf_-4ZTZzEc{HFSMV;v=<D_xY`)XBDs=1KA+N<IBAp6<Ph?Aqw_8CrjC#E98<DNa
zTDy54mfDYnXbgY$w3J7}dhqti%W>(fvPa3IP6veuI@rhOi~6RQZX*Z2Ow@|q0=E`C
z5O$h2NW8MKJYGj7#dwS%))H;@=A~fQN$(!KLHcOJnGgf(U8Xj@T0G^*+dU)Rr&p!-
zTiYDG<Jpa-j^NY3qgT~Z@563+3pA%*t9{>t8rpV8Lo6|Rk;Ds%W>C^%#J*|dU~yXY
z&LX<qF-53N7$vO$-{4hd%SD?(myy$?bC1QYfl?*$nT+>+pXIwp(|25<^q-xJ^>8OY
z$gg#_Hy#A?;*4D?ae^0`13<S@j}bOIpMIO9YAiL@z|Wb`Ntw0gFTB6A7`I14+L=f|
z@QCx#9i<ui2h%hJmswU4Gic^Vb{l$iWzKfl4NTEtSu;fL{>@L2SGVB_nxSKa0XffQ
z=MOBEy=s{RPtv%VxO`O4H`Tw|AUkWGvh8kdV7eTaQ{Fzp;okXbYdATLtM!^$bOiZp
zslbD&^Eb1|qlmV<cJpd`e)P^)T7hSlrHC(w(P}swr0~?{E}eJ38}{I&?ux`5Bc!Z`
z!-cL4eI2lydAZ(M@Z|J7cz_|NCxDYOQtzwJSPpwIh3`2dCHYaoHBRp9l@%r;*O|~B
zUG^CDa?A$bgo-;xKU`=$5B3Qe`Er>iHu4@XkuBxJ2fRLxB3w2oKkV|aFg~uy%I&F`
z_2!D7t&bU_sc(oAR<s1sG>?g!(fIkX1aS=zXan#h>9yb_+Qn`U23C7@)xaO`!uwuU
z=t$1~pj9t>eJ;6X!&3fMk5p11qoZlpI42yWj^N!eeiSMgR#kt*ykaPOzFDYcgC=Dj
z=&ClyE9P<6hyU3)2midfn%r~$mq-#33Y;0Av?9etldz`mrj7|ey6q?R0^U@qG382;
z(ZP@5I>PHVyl<P^Sr<O|kkUq=xgcaPbFZyqN>_4TI6LCOjw$T}76%uE=2&67!n8N|
z6$b*H-;5{-Q|gGP%DLG%pX$6tSXJ^aDY%EIBPl65Q`d!cjNrqoEJP6|P#u-@gmvw0
z`T=5<O;BM5`Z9xQPl#7zmqPC(h0BvmjP(`esDzFeMw%3*a^TdfN#-X-$!$VZi3b9n
zOP4(-KEa?G)`a!VW{qLq%AypFVxf@NNndgX>0*)b=uiCGoD7;T8N$M!@E5{sCv<uT
zOx@MGYN95#-rjywYIS$>0`JR+!u+G!$ZgYF)gNT>x~>;CU*ZviPob<TwV0g>?sgAa
zQ!ZL$nJ>Z{OXK)!H<^B<5`hsU5xFK%jiS10NBL1LK#Jv>?$0fsQCffOGLPwgTM|X5
zGL~ob<iTP)R<FJn(mT87L-lBxIAkZI22f@`?c=vUCc9jpm%Uwo@1dagZ2beAPg$~i
z`9)#M&Uk`CJmHRl%j+$Ikosg5+wXTR!8FbpSMND&^V7<blgbKS$h~^YKPbeaXfWkl
zo?GD8{es~@vmR-cmEX(%;QSz*{MbO|9kz}Is@-_rUV-;Kx>M0DT#uu#K4JCD(Oj~_
zTGiN@@>Ncapb2qVXzY?DsgJ^0DpEn;Mn5k@L}O}H)4E@PX5u;rr3J$H=x1oB1r*=?
z!CLEJLo-Lw;YN{G>~Y`wM<jz`TQ4cY3Z9g_!;`F0NOjBoq%B##6RfcsI7KIVsGnBP
z>D`rL_eELfi4y-wF1K#8L99~aWMkMd%~uUpXVMyd=MC376YX=3k2RsMy(lt{&rpap
zvCJoxd}^Ul`ia<=`$}$gxjd^+O4zB7-z>#SE{%?(zonZ=Ln2$PN!35Ss$jM#ZaiaM
z$&+S3>fVbra}sK~>XM#!$$SS39ahNIMxxKEtJLNXIzO>kPmbOCf9>6QJXGud0C1C~
z>|JC@7)4nw#xM+HX)MKDB0^G@GImCpVMdlhGbBqwNwRdyy={~18B0|5%#b@GI~gYX
zRtEDs(_O!}-|K$Ae}4b?&g=C!=lOh|^PJ~AFLTcMXWmbGyG!^k^82n-!67&;*?O*E
z_uJAD25I~lJhf@j1<vD53=`h>!)TwtPJP2`Q$otcnR0xdU+gndcIXgMMFQz}`SZH^
zJZ4vNW7DJxyGA_I6Qt(W@vQ?=a}jU`uH|f@#;LVrLkB8Zh@3B!X5=S#p{3!uVvRW{
zbN#LJ<vr%tp}Y{ZLqVXGu0z2YUPBV9O#+N?0Xgh|w7gX$H*2}%5pueH%u;sXC#1^e
zD`}$@^K{u(+_ZhTb~Gf+Z^%rh&%@Qp8BR;`ZT#MMhotX*$pyH0a6I=y8X}!ngs+xs
zDq>dxg1CWTBp(uf{|OBp!K!h2#&eaMJID2lb1`hnyc^ToZ7(mHM{<QKrdn;BWs?+e
zpG_lwrYgX%s$WjcqQ*|{X0F-28&x}PQ#YK}J{ph^sH!RdoOM84I5h3Nj3)A+N=jp|
z2z~!)sQ2OzM?-mEeCJ~I-J8wImSO4Xl(LoQQXY>M>o;!G>u2pg+l4OH6ImWjcBWa(
z*o~jtt`?VUw{9G2O-ogXaxBa4j7o}G)WN9~S9L%oq%(*<!mFaevi%5M_(~%cVg6#Y
zu#03BJl)ppX|^31bayJhx#La^R@3pk5q&sf-!Ng5Hg5C9i)6Zlh+4VT&SsrE#x5B~
zY#tTqT2nB(GakDcTEgDFkMx83Rxj-J_9AS2OFSTM`^9aE*x=3}wgp@X9)L>TdaW$C
zozeYMy>9=fwCo2P9*K40TSllDt{C>^YpN5n#Vpa2W@zsp;-@e9X(C4Q#$vr-F}}ii
zSE_O$Q+sdyQb>!v`D$CqlV~!sYeOTa_pE~}TdSmO$L-aKU}paStnamPKY?=N?cA)0
zUvEVFFK)N$WY4pO@yyi-_pYFUWZHArcH+$vhl{a@bFLC6vE%zI225VpE2Ku%^yd3^
zEs$ojwolh|vgx0?p65)JwqEJ1aNE4N0~b?o+^dif*x)`}--8&KU$tFhQF>#@wSDuK
z!u41du^EHR%0?QdIV1Y)85yx>GEE*lbk8OBZlkMd<5P>icnN05u3SZv$Dk*rdyKE9
z-kYNN`bkV<&sGn2+;aU$_(%xPltCNBmt;(-xjqoP*XC+u!t-S3jobE)VY3CoO}JyT
zCMEC>x_#O;YsKs}jB0!(tkWG*rEz~UU2^7o=~wZeiP^~Do_)L)-ZH*}T$@j1rM+eO
zt`O(ekcubjQ$O5lNl`r^+E9?w@X_8_zDyr0+Hbx(iW_|;x}xZjWp`^+*$ByOy7^g%
z8qu>(T0AU`JaEbkvA_6P<kfngkqkLiyJ>7=fs^cuQJ$Xkz#Gc(i=9s6YU*w6sC&w<
zEw5aU+oXhs91C~$ITER&A-z!iK#4_>uWX-wHjwdHvb5EY%CvZLWW*r*rHZKN3#R0!
zWxvKcPe@+|`NKsmih{S!_Z~buk9YHCMM=R>bqtfqBG$XlTi1}@3U?$PJ~|{fZ+^o>
z+M)s(q+l_j(WfUj^rLP7<D^UgLuTb2uB;rHypgU9fln_dLM8gwO=_QNo}mBS-eu0h
zMslrkAqTgk@!dQ&ARmXOs%W9^z01pdHyYz@j&K_|i=gP`pxqBicSn+fKk-}jttO@I
z)^$|O6&ghrhS-}A%Q9p#`*+fCm!k<y2(qa+vc12Nm}-BNb++L&;@WwIvpRcU<nqhQ
zw$Of&lb$FDi(Eol7Zf6%=~z%{)Iq)}d*iYf-UbrMIKhgYr096-&|v8@;?6_nDXqD7
ztiC+qxw~A|gVkXdJwxZwf@1l6t=0GMzZT{mdcQkPq_C8jRSww`p=4@z_eR{M)QYT$
zJoSNAxU4f@xI5jtInr2;`$<1lIKiKNv^;z+h_MTXEsJ>9R!bK~b*{wSmeMQ`=Xuv#
zsbY!Z#W&Ip1+Qu#W!{5lao(PVYmxajYk2EihaJ4aGfiAFFHbN$A<v8;i9TApki7yI
zW*#3#+;p-3$Y0^<2Mc`M3(oiA=M9g!!gt<{(NQdwU8b&VMx0c)Xs|A{4n{;A6W~2K
z8#M4f#t%F2+`d7qznc8Bzi+I$ECnaY*so%GArBMUy{ZwPT@hj=5^4wc?Eb_Ht1BqC
ztj)VWwBJ+J^Lyhw5l_(e12w4zXn;Fc8)0|n8R{6fkp?(ar(r1zA_fWJrJh8}zC7-0
zxz89UAT1;|N101c$bQ*5QqeBivOY4yBBo35a~t=!-0)gWI;Tl^ZW}Fz8Ip{v+*c5D
z@0@+E3|q(TP6cu9e0<**Q=_@ee9`_H$!8`HEQ!(zKY-6jE7e9)_wd0H6!F9bGe4@B
z{DhPc>!I5YNp(Livs#0~2knxYyL3NY3%h)}s3UU$^epnH+Ka{eQ3=ypXHY?;YyOQT
z;BGqTO{In#zYTZnEM0t6{DZ&DofRBa>Vv<qGOyYJ@1MNsR%32XuXzND!##G*R|VxK
zM0B`TjXdKmY)JjcYcAw7(;wircE72Vm&9Gr<gaRuvR16-PnUgXQ5BU)>)xnq5;GfM
zIHpQcS(7A45&BfQ(7j2Lbah8jwzmD7R<xMLf&3^%r)SIg%UT!Qs+`x97bd9;(!KdN
zPZM#kPW5@v%7+K2+zg0e(%oe8aRo~|Dw9t)fk@MldhFp5A7Z&);7gPBob2riDcfnB
z$Or1@r8-p!VvzdX-8Hl=#&=~3a>&@Ki2(fA6#9!PG_FfQ8j*c;0gz6##&Dnc7zC+@
zS7Hx|pZauoz+QQiC1rxo%xU`tBADZwldm0ZQ+>KEi1=Q(RI6mY$bSJNU5nawc`zUS
z^d&omEj#vT9fYwP_kbLtnKRs19HqN#A<W^%GYb8wF{v?E*4#gw=xcSW*3wilOprf9
zFM7?;x->0L9Xpk%!haAGx9ns^qO^2Xs^Sz5M{KE=ZpAK+W<%0I6(Q(jCFLE*ebQ4P
z`z}fh^K6EvPTI?E23}sY<2J$;9&BhfW|)jTe&jdKyj)783O6WBl=5v4rq)@S`p93}
zVA3MjL@IXOm9reDL8Fv`pCzNPyXTSfg;y5H3Y#743kqB;Y6b$e9r%(hswt3A`YqhT
zAw|BGO8zuQel<vrc?APn@&99%a4-`92th-^98Uz0RX72&uLO$*K(fIA*$d!rpime<
zy+CwyIebcxmoMP30Ne={9qbH-2xwUY2D1M-WQcDN8Vn#c0$Rwha~w2A8_@U!v^YcI
z)HHPUbO0#EE7S_@@9Xz__T+Ch$Y1bdj&$<-CH+pBK;e4-iDZJNw}%WIktUATJ~eB{
zerFYS5Y%+|dI*I9!d(P~VR_zVfYk+uqrcRO|L89ZexsFihfwFyq=@^xveMJ@1v{(|
zQ*&k}tbV?E`a{Up?9!w&t8V3H55f0SUEa(V@SE{p=uv}m6*uyShv&9dr;RjOB+}sM
z`fO7rYc`ra+8nOB1=Q(o%*viGX!dBAUDp6}N{i0)*ecJTXN}J-o*&-m<J&Osh;1cD
z$BvYx*#)yUv9au`yydR%VksW1p{0Hso7%GN@Xqq#r7!pA<x`uRN!s!eTOYQUuN%lu
zsiNO?ebEy&4q?kzcH8gG%I<!M%{+F$ctwpHZ7-vGugxOogl1-PTh;}q9M#e`GuIQ&
zZ4aLx*UQR#{%BvOThY#VdQ0HKUV^au0rJbh2^c<w!biSNAAv3Hr5thp$7C|SEpYJ^
zLBn00{5o*59RGwONzS5=l`oy5IJ^I2l0<K1E*KKz+z*kPm=idB9z}$FgFcE|GNc@H
z|Hot+y`8xjNicTTA~!Q9SMjwJdGbyA`07$5#ohg%l0%pDTVxmb2;4(pOoQx%Fg~6F
z!ldhu2ruzbkpG-a)NhkrJVH1yq=I=>v(+22jC1)itSN3SmZg-Tq-L#TeImmu<0qx-
zO2@7DTNh<mWLPLCDJ7xA{@x%-$=X`XIwJ!(N*Oq6CaN)a!WMsn!jH+&AGKXNNU<JD
z&~MFMI7kp5Qo{UeQWGylkfJydc`?1O1cx5Jm!#NU21*MrrYA^n=q(737$2Jzs2`a{
zQATEGn&K*Tw1?il!Xw1Tf#?_z{k2@J9-AF|jIR+Re=VeR^&!Qks}Z}Z$K=eO;z?(L
z0)#Gu=67FsjTjk`gHCh?PQAUeD2bxDmZB-H#B2KMQ6hKVfbhveG8o6JK-KL{F1jU`
zew(m&s7OKv<IGz6Se`AYG5+LQa^>`;{p87QhX*bxYS}%yC(mcjnCG~oHr!P1iHtmT
z7mL?!Y^*7gBAm%8YzeH6mY}%WYTyO$Z!lY&KSrikc5Jt~xr$njI|JwLeeV$s+M}gU
zS0lSBKbj$<$Di~(I<LMpXt+M8DLz)OpMx4tZW*vF)JoEERdLNxLngZLJFE^mOQIa(
zAI3>nj2f!o4xcMruqZj>rPe#^qq^ru1JsknkE-`E-%H3J=s(?e%EUHB)TwabbYFnI
z<GAoeE64FE+lPCyRsw1gD>E+o1ZG})MmRc}6zmqMW;q|`#T+z|x_WS~=TXnbN`Nws
z@?j1kcptjMJw5M@3ty94@9^8kr%T}*ZhPvwwxM&M$j@;bZdpa8_O}h+Pc=Gs6c+bh
zF%hEJ5?`A6LxnV7JxFT)z<5VeB#$n71GC{tq+}aoIs~tucNxlx@J1a`$+Xdy(%Y#!
z<WxXY&A~$~H)23Di>FMv>WnMsT9pH9uilb*<a<}sV+_|Zrb<t5K6=~Dt_MvKm+iiN
zMtsGjICoSx0Nn)x6g6-!hj4D_zyINAnt#@G0D_oP{t^M0bO3Y(17PH@QJ5|a{GSv+
zd;d!}e|Gri9?ZZ141*g0ycq<nrw<3i^t8bMZwA)W(+BD>0QCN?2N+x*3{ci!!0!K=
z1nhD!45kg{Yyra=*azzHzn;zj!a+WPegTv6-;CndW&jun18_zFbp5)8L4P}p6XbLc
z<va@E+Q2Y4k3={afbxGmtu813+tldjLBN2_2~0DmH_n*hV1Seawy>}Je_s0k_Wt@m
z_`lisFPM!pzb|!xzkv1;00yKj0DOUd`+)UeFdZ1!2mD7&8(;%DA8^PYF+kt{HU<OU
zQvcQt`t7m01^~tVw{{%V@SB(pa0~d?c2KB3{O@CdLJa^`@o(*Pb%3wrA2I9&FW}wx
z!q??O9Q`BFoa@zcz+kXo&Qc%1+pu+r4+hLxROIWb9${Fo3)rtS0|gX#sDQGvrQH#M
F{{vH*T+09e

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-288.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-288.pdf
deleted file mode 100644
index d26390ac4c6d51909f8a78529f837a97c3889eb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25398
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
Lq@_=r8*%&-eUJ?C

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-289.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-289.pdf
deleted file mode 100644
index de3f773abed71c971ed2ab26640c2845ccab4b6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25698
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-290.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-290.pdf
deleted file mode 100644
index 4d436a855ca2e4add614b0f819de9e010c1be1bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25731
zcmb4p1z41A(>5uBfOH8+ckV6=O9~?0-Mw^3Nv9yv-O?p3B_X1KbV;YuAs`(}$bX|x
z`MkW}_kV)Nx;NJ~bI!~;v4iwV;u7rK9AFIkE8q_XHx(C^gNZeUpdc0JLnpYgi-QxD
zpgG*!oQsQxi;IgF#Ki^W23~oASGX_+r;?L{nX4)Me>@~Ci~+YdyOs+2hjcZM$8bQ0
zv5T>-g9RYS*aGfM1qKeNVEldI`u(49eqH!^4ukWdgR8v@6*mT_td*HFl`hZqJ^g=N
zg#6>89NgZ*#gYmFg~F~+IJ*FL*<m<hV2G(<@PIf#PzV(_1kA+&f>EiNVQ@-tb8t~{
zb5W_8W9SM(%z41VR8S5+Fb|AM5W)>HfpCMkAm$K09x#LtVh-XHrecS2@IrZ@RDwJZ
zVJdEJF5obXk4g~A4K)*{f^hKhfq-|sz!4BkSf5Hw2IG+$#!uzkfZur`P(b_jC2r8)
z>iPcA4u_fxQ}J=|^1-;N1VL~R7Z?QQ0YgEi00t9bDi8pShldA{4g)m9IJh9-pL$_X
z6X1)R7YtwkF7beXpYm~VK><qzq2|Ct$hCz374EMSTp$i0_SXiP14h6Bp?pvnFBc#Z
z!odyY0s+9Tg#ielU=A1*^2>BMlo!wh|J`6-Zr}hPh>9Bw195->m;L4MKMei}>2HNR
zP*bomU^EwS-t4F8d|)UTKmdGkgSr0}&UGC!FdrBQCLfg@1_<!yKOWd(sABx~;Kmcz
zbog}&3g!3*75;?wn-h5e2t3zr;DrF80K#;Q^O`KzVd3EdBE}7b0%Z2<(Z5&%G2`I{
z{j!J)u!9e<4-EX}{b?f%%=Ncje`A8&i0R*i13^sznsI^5uA>Wx1cd%B49MM|p1D~Z
zuP_yumxG%N2JqykK>&e%#TyDB{+A>u5KNxySl%E@5CXp8K9!pFU)=u%10e9fJuL`<
z07@a(X8aNRYrg;<`stmY{sLWl3<Nd?QUORt9xjO4&lA5t0r>cbx?ifeq5mSs9}lj{
z@wc0~0HglJN<j$h8V=Nq7pMgPuz;JJhXV$?cEC-Scz{|7g<Z4c_e%gb`1ruwH{a3~
z<N-_<ruws>0BQYu!QkWJ;0Eyl_39>_!0l^3{GC4L0B&xm>EAMbdIALdmnZ&w@S7(<
zd^dW62Lj=Nm_gt`B{YNZ{A3vPns2`u`AZFyj{^dM{HHVjASM(71H}AO5ch9FxVga`
z+`xUn-W!krfj0#x0MOz0OFTfm1w!&)?)-k15A=Ui@XIV7*w4!KR|x_A@!)swK_DD3
zKA>{^*-!o~B4Az~DCm#U`#%KgnvmRo;k!|o;D2$!FO)!H@qlk=DCWFSVJhD1W&?DM
zpGi%{&C9{X_eaAr1-coC0|tWe0zbWOG7zA~U6)&P05_Z$0yh4eOusN*>j63#=thNt
zAinGB4G`q-Z2T+NKwLme;=Q2<0BHtHBrqVke?jC08uxV~0dTH+4>wSW{%Wg0m*L?B
z0}8Gc0a*e1&nC;q2N(n(yipzC#cLY<MvR{x<mQ8MKyPp$;0mZ2@O51e|3(1@5CWO@
zM_~Uk0`LO3eq!Uf0T~SFSA4+4aFZ%Q!0R``0$M20zW<Y0zjddd(Sic8g92?Ba2s#~
zYRn5b3MdEw^y^6eJC1+k0{4ybue}5V!NCwPpynSX@Rz56k_LwUBaVN~PQ2GX`X{~M
zz~J$pL&d*})K6aV0&VEpH8;!t#r>ZR?k_yQut0z@4wx(c%1-V-9{iS_0QrF;{GZtg
z(CcTryY4B#a0Mg+1Yiy@$o)M5^1}W%2i_?ACcu9s0yh^g2jJO%#T00v*JQtr;7{rU
z)8wC7_?OK;T?OOixSnADi<Fy4#03mWu>Z(BK;a)0xn?-PZ-6*(008js-xcx#EsTp7
zXkj<Y0oo8SNBreIpi`LsYbg51=y=@({-)y37y={J&*=OW!#^MV7DFy57Y8tX{6~Sk
zu>%5@0A=qlNI(jkUo-LF)eUIyzqeZ$H=qNc;f>0G;s(^48wwj21gNMt<>-II24o5Q
zpPv%|$N!HN`WG4gRhIud@Ef80cjRC&2NW3f|9`!DJ>>kO3Ia|A+5}K!{x7b*QRRO}
z2;$=4{y)V1_e2Ir4RkZ$W6A#o;EfvpJ3uZd2T*tazg-C7;pO9n{Hsu27fC<}ka_<X
zpf_s%H_+=8gI$*lAk2Se*q`tJnP9N%4^#iyXKu)&f91>{Q_GF_f0e=i9NT_^f&x=7
zFxvi`dyxNQcKi#@uj&Z9QMlj@#Sz8><p2XY|8E%ojp{e6yHUuE>L4HvKHeMZ*l!K!
zFW%m)?M4|lY6HPIfMMW2jQd|mc(c|UW&Km@&!_^~bM4N*sP@PE->Aj~R2`t(|K;*O
z2Z-O3mmA24e~&HKBQzC^3-}=RpGE;G^s9fG0O@qSodEFg@BwR@>oy9y{^0ogpn08a
z*L#$|rsL~l*RvBZ&;)@=>TfS7V_Yw^{@5e^vD&)cK>g>Y>Uyu`1P3-%zZP4Z@^CXN
zV=)JJDqSw%Jg}w!mMA=2`oKQR$>H%$&&6!vaI>3!pyp&{chhrGCzqQZKXkBn0dP1|
zT`$H|FgR7<&JM0lrohVWdeaAN@k~|WE>yalz&4PIQw{F!Ld7X<2dw18{&;=($E!4e
zRRWOp^V-i%8T6+>V6XP;`ww?qKmFYu*S9b@#f+WdKksvzLb#0~+^jmrZWbO^?27hq
z3{F*76PKS`K{Y2=`1QK)mo9O*v#FES<Lgx<-!JqMR!+_?4=s(IsK6i$PC4U0-hg;`
zFgP`>%v>y;uNQbf4OMecx3@BNFoRRU{sj65MBaZu{Iw$FrULN+90Mf&+86@EAP9IT
zVP)$AY&dl}C2Wmd;NtLWX+L+3e=xxP#oM>&-UN?Y_zcD;<%Wb(y%>7>&72hDdbk^<
zsN}Juf@E(?`aeLDmg0&*Ktxe~eAjq*-Lw2vg@~E{<oRtxTrHvly`=Tv(~_-{QjSbT
zjjW~p7`Y$wB|Djz&mB(dcMs3+e%W!*)Ku5>+1;(Tz7>QkCZYD+z1Hn}$;pop_9mu;
z=1?33o#8jdTZ83arxE<3ltwAu`t;4lzx(*(cFvc{hZ*->E6Ez#S_Xwsb4ZC^K5cp<
zFk9ZoqkelJ$Sa|x<TA|n<ley0V&)NP3XD<3dnwUyJLKHFA!~BJ-rnCse+v2ZZtJCf
z>8z&f&c5PXvK;Lioa)Sw9ex9_U^8A0e00G>`)X$J2R&-v{b%P{R398RHw~+-$wyDv
z#Xjw6y)<Ysrh5Enoo5|aM?Vth5Rv97&EdmtglzvGi)i4-Cb&!P8;W_4aupo7()x*P
z;^Zrg-1zkEqbHLiR8%eljC7cUXz_E{63Sg-;_nUiNutKK<u1ipT4}>dUXp973;Bu-
zi1?mfDc*lZCH@ozq=;25!ofvOBe^oBTeMO9lFJfH2fPrJGtp=#cowCHi%=`XkLAwa
z`c7(=GohcYkE>13Abh5QYqs+~8AXzKUIF<&QD(rK`nx2NVuT306kH@sduyhiLI^Zt
z-g78~kHWiapV2NpZs76uT!ECpRPl<LSw7f4uM3uu-3wjuQZe*7(f-k~o4M3G^vK}W
zNM6P8J1fs`V5#W-ZnSTlqLTR(xf&ls?OSa)Ty6CE>t|O7hRrvf=2AaPcQTt7yJR{B
zG<KPR??rTC#82CUQhC4gn%QDFFfD<iB&Jf?+N*!$(U_Xc&+HBROCE4hDh?~Bb9};q
za^F%F<#5t@5iy#YVZ()P9&TpL*3)Rdf|j4ZsuT0*_U&LKR&gC!nL%-#Mb6@CJO*T?
z{6vM)V>$UqZ##CDxk2KfdP7&FdXqOeGJR~3Nr?mk;Kx#O&0WL&N@)wP1Z2bd@Qk5b
zRcQC8{q|ZVpQX$WWnHq{7!{VH&XY1!YH=6*I3SE~oZ%zzIURCnIUc;{fSnbNK$E4u
zvlsixZF|~vHdBZ@AAySVZ58%fzL6w0M4e?^>Vd4B0$KP=)~=O=0rNxEDdr1_Wr@=4
z)~RfE@k@VXvlHD0gs#V2A}OXkCDdlNsBO<2nc}N-;(BGt8Om@;LWFt}!}R-mPVaw@
z7Qt@un`Y-3mse#}n-><E*cbH0)?8%zF?!fk+*NNt>UFt;W?EFQ|NTDJb17%qh_Cki
zuRB6w?OfbNFeB*Mh;Jb%IXJ(<)@2wp1KXuW^|)6rW9(z(QKLIQ%O|sE#f%(1AI=$G
zr=wUD9ies7HZEJdgBHOa!Jx*En4C<XD3Mx*^g>-{NzP<P`1{8B=q?GbvGww|{d&cx
zRp9X|3loo_EwaoR7p#-{bKMt>@V=f~pAM^#_$Th|X}>^nQelCwEODuZv83LD1gD1U
zq+mn*T`=1RmuUns#k$-{pCNW4N>sgIkBTvV&S%zcVS4|Q;B!@p2`&-FJpFD0ZeD+L
zQ{^zaB^`6tR7B+4Qx30^z_DCb_hHE8PYXoXp2b?EGN~SsjKOY2-Y+!miE-%{ETeZA
z=%PvlF`Vsb^cw}DwY|(n5}Uxg*t5tI#b-HmmY82Xy0D;fpgsy(dA`KrgKR(M@cLkx
zyr5M=@?i|J#}7TH^#0W{RE4N^8hpY2&3@54GZ+-)WIm__h^naX*RyXk?QJ5y%|zN&
z8h?P8%Z9+mx!QwrfO?A2jzp^^W!fsHgP|}Y#}!i&7*I>_{0a3jY9M-EogURpkoRrc
z5*)d*HB5v@!Q~I;mB@^{<Cf?I5tAjr0i9I3WcauCktR^kmyhoIeLqH9A$i1X?`CbS
zc=)34vRFZvYW2XwnZrUj>bS%AS!Jid9=p5G_U0klz4<qn$-6xA=`iQc+GzWh<pS8~
zdVjv)IpxclhZm(rPb(5Y-<}3iRePS`#2_q6E^_0DjoI{kI6@>hst+LIhn%^Eu_2hm
zWeS>LnGHVnOUeyHhzq6i7xV|)fOO(n#*33)plcFI`V&uNr^Rlj;kDty8VJ-ptsJ#I
zLV3C=$$B~pr-<J*OJ5L9?3jy8ar=!nG8%D}zCUriSZBhwOOk1}BCU8OLSDAkr<a&x
zbwM{drc`5N{8(A1sC0mLVP@kE=oQa^d3}16I|;+`?Fn-n<)bb3)zs7(Bl&}VGlpr|
zXIb0*j~QxkZ`}o_IF$}cHPpFAmeS$HhN952GnC-IM1F`m{3eD?ja>9T|Mn5~k3e#_
z7K`sjhse6sBVyrwvYLeJgO9fuo9ixu6`e=GO<nBYUj=v^cF^Cg`?2$hm4R))sPJri
zLTromM@hY}$kjwz=q!WFTW006+US-(UnJ+GkIKdKR=oty<ggr26`z$JQ<@=vg=m?g
zHRkyGWOO<!hYJVhz<{nE#A42=YM^#*Zt)9xIq|u?O@F!=Gq#uZm&Ml@ddj$CHjs_y
znLXXzFubuubu09OlE4Yjn?(6&6dUhZ?}#C3oMl=9`h3&{-O%b<#jVlT1<Njh3~#Fh
zDfU#wUWse*^{A7=@T0mJ@UX?4naa!P1bq-Q{X@`8$g|<_Zj|T!C_EA#0#S2Z9KpJz
zoq6!L!)-l1&qDpaZqM<wyxytciS4_C(aAF=Cs^BZHNc=cz{=WXm>QpPuV+AClehlK
z`K5<dYWR2l%JxhPFPK^?KF3_uMlUU8d<rqPgTrpKpUGu@b${}mw3>qh4TC4zZq_AR
znRbBr&R$>Diu{K@1h+<i47l>BOF)X}B!)Z@{YZimX(<@N-Bm@FG)|*nnmt8*8;rt*
zVOgc|ge`>yp(XoFytD)tLD>BTl}afOMl7E84_(<3$+pCC|3<P0+I8^!869nDOfI*?
zRg{-~F+3=30kUQEqO5Ce=g%ZH!1ecMh|fLby0S?yPw35$E)M(iV`-ls^b;+lavE=c
z-@q>B(-ct9HLpB^SZ{4dW(LogpNkF2d^Inp#*u=($Y9UEk6z86ar`{{POx4pnWchS
zL1xLrr@42AN}Bezm(}*+C`ctlw_|!#*>N5OKymTAtln9&5yJ;>hYX3UsTXnGl5-52
z!dcR$!};t={Wa7``)O3RI-KOB?-@GJyL$~6->n!Xn=Qwy_s4CVLDg-r#nM8<CvLd9
z5GT{K{DeBMLg?TJha<|8(k$E_?`g8vFuldLW~>_XC#c{{N+Ix>rLF%msE>6Axpn~c
z%_6c0J96YhMQJP((0wOu!Ja53_!Gxk_qnm{8OzHCBJ&pb6U!%_k}qj}sL~Q>Rw%Gh
zg6N7yz34)V`Peqd?Zp&BXz?S^3!g2A$cLKcFwoHlhCTJdYQNR_z$Fg9KQCYg2f2>=
zmi5DhVJm6HJ-h5&i|4apaZ5{lD(xR0BM67SLbT?5V8ftFCeOkt%Xr%*$m~VQ#+cqn
z$+tpj*HaglAFs{NF0`FF+BaI3JVb{ld3L(bqk8J=`mgp^rfV{p+4^)SGmh{>jXT#v
zh!YL=?_AWoD$3cW=oz|^LbJS)G_lL3OGfYWdbOMvHejOsn2PGqJwQ5{v$cr2((DSO
zNxh3psgHdCN24VC2w`rci8$pdqtL_t@JiA>X}FpsI2G}+07+CfA!>t|!qQBG9r=*5
zVh|JYM|LVO?L=?GI}CgDeGb0!?j#ZJyDy@v&Ko#e!24FwanExdkL=vnle>ddKJsmg
zY#@BVKp8TsNBCIkuYf9U(vyVGG^z8F9YW|C7EWJo7AIKO!R}5yU#4%ZpHe$EzHOzD
z8V@eYuWNod`DGL9HJoEe*I-I{LbZ|J>fz@mF~6jCB^Czs;_YSBh+U-;Y}BwY7V>Fh
zXD;hk{whfscM385lbLE_;<|2+v!Z}VHVtvSYzllIap~bcK|3wHTLk`+5Fj^k;L`ix
zi<;ReGjaj`vpmcM1yUxTh=BJS&sMW<nII@Z7vQ~=w>KUeQR}epe8jhKM|!RNtS5I)
zZ0-``bjSFC2lHE|i6PM=m`VGjy`Jl*m7X8v!{71aipr#P!5)Kw^Lie~J5!QAXa#AZ
zlX{Jw@a?-p-gUmm(G`)GjP*IoGptQyZ=A};Cz|~3Y1cH=w<RU({MaI#MRV&gD9%v2
zob5=@EGEkTWV7qFu6XM5f{D0O<e+A`ie!A$HP3HZeD89bs-2NOlyyX%FT9x$M!KB3
zKcjN#QYbx}?eK)XTT83z<-tMN=iUK1zqIlx3t>H-G<xzAZvPNk?WQF<f?5<uCBpe^
zmKITU@24z}0vk~(Nm2T-*1}qSyP#bLU9X-x^GVC1@nm4jAWG^5QK;=v#Bw7A!Eq^>
zIT!|m%ZLdPH6DRElCufHxhryJlc_7Oz{Fbp`A**}5NcE&DSvLOW_93T>$7D|wrB6!
zzC8<ZZ2Qr{x<eu2v-6^F?Q*hZJ6M~4sP_PWH^t%;#BDI@nRd;z`kQFUJELg3`qi+Z
z-R>bS;;-6nWjU{_jF+~jCWpwQgkD=4)mZY`ADFBiRxcfGe4Fp_Jx!+S-gPX8OeiEr
zxKp;@Idm_-wR%U()zgtqPe?`HBV4B%kJa(>{5hs@S&(YWIhN~E>Tsp#{br1_2gpRH
z89qp=lg$fU1X+m}D2^$hR~lVgxeGZo{Z2aha2T%D1M&Gn326c>&rNuXQ}019v(g<S
zS;V~dBx836zU_E2k9<?G5(fm|RmWE#1SZf>ldCXQ(MtB}ETxOTGvKWp!(f2YOI%*A
z$ZgNsRG!<zVie*G{K_HPL<VwZgVZ{G+7m|5Z&*Cf%AaN3bFV?nld>sIWLe!zlUcfq
zQL=gi&v$iq*J`m0akP=WoxFf^&#a1aYj4tGf0EN47-+xt4+*<x`R(hW>_*mctEQUL
z*7;BC`zL218jv$lBraewzrRQRjO`&@Iqz+iB?owD7=LDa7@mF`Bd*M2SPk@A+q_08
zF|9;8)Oz~jrNkD&?XwqA`GRIi{Wbk%(^gft)y)};Eectlu23wn;V^c{m8M%|nb$D1
z2fS2vOKLxkN6wGLBT~*g3AWx<C=D2ywaz}OO`t=QDOgh}KKiZ#<r%7gK|FU5JOmKt
zM+PB~7^)1*h<xg~EIz3jEB@T1%Hj_Z1gf>YS>Syw8cd=EIV}x6r6<oC(u~V=9z18l
z)0Z#%mY|`XZA<*wNyH{|POw=3N^I!1o}p^NbHaZ9WuQuNwB`=4%YCnUS5Z0<XO+b<
zDZ|M(?|uy1B@!xMsLdm<)~#NIN0sfl%6jgET8>78JF8PUvZ$d0Nomz)E0Y7IAfduo
z-Z^dUzE=P7sFoq24}M`XAK%F)>L{3w6E(pqM>Fp|DO`_oPFhi@RtRM?BXT-)JuFWe
ze_amkG(VKUlGF9|6OPZyB7MZKi&*f`8m5<(sI04m@Umk~#qZ0A3Xyk}vr0lX*TNK&
zQGhiK^#f#;l5`Y&(PkqWEk;FD9R=D^H>S?uikGXle3Y5b;P%*>ec!1)kx)CjeC~{=
zXYX{JUZT5mFsjR?cx<gz>gXh~>yJ4-(HxCt#SjQ*`#i0lILV=P=C1}WR!)07ALqfV
znKa~-8os8OGPSNd@i}TV>Ib%frppmu`I`5<#m-r_h*xK=)&03|ef5Pr(A8TP`1)B*
zPG7MZhaXWfdJA`>SABJp6@4dOZmE*$ATvTYkMYbckg4GTL4TBeZS1oP$6Laspgl$w
zWWQX{-d0>HXb<DvH0O6x;>FJ-<rUOl)u2g73DN31J}Qf!)licybO@muZQi-d?OGa3
zpm_dx2yr!S*46CRg!hHkwy)rN!BCpR+~M5Jk5sgZPjy?2j24v}=EC04CzkswVm~_4
z4hpJ7T24MD9|t$iU-H#EjdYD&G4h*|FNj4$rR?pPhiEGZYD}0%Xae#PwF7XEK0H@O
zpRD9ci%cQ@DwT0hWnIFV!ZVB@GBB2LV@@f=SPq1U6jG~B_%Ou){djKGl=wV77UyuG
zTW^j1M@OsH=|Z>7(_WHzqX-%uTJ7&D&xRLN*h`0Ll3r@{u508vWG1pzV+^Ms`wF%1
z5yvc?r>&r)p7MKmmn=~g7m>NTYf;`qQP&%h!mshlKd1AezaPO)NzNQVtxP@<Xt+<<
zZ9{$bM$J&JQMwCbf?#5+-!(}$&m+EETxb0YhnwCG$UIpF#>d#@|9a*X+iPl?N*FAV
zy)Vj%y%CcSE34a4h2!C^tkP=T3UX=X1^ON-iL7*8TaKi#RDw1gwM<p=tt)Ad*LrkA
zkBEC~N*=YMBI=1V4IuD3y;S%frzrc5>ai4oy;-Cz6eVAjHPKdM3SXe!Oj>e1?vYk~
zk(Gt~eq!oGM5=1ZuGTl5?R4q75mTGA-QtK(U33=q>{(6J1$NU;FMPKV6u#)a9<c%^
z&j{bqC@3)Rit21>{+dBL%IW-OpC>xP_Land0%O?W;hmr?#}#f``rvIU%&Gz%lN~m*
zA3E%nqpwmXY4D!*Ua;aZGu}nyQ>?;z&(r}$$WkH*;LXt}Qn*tbg>DhMnNpjFefz`L
zYQ~VN;cU1^9oBtfzf9E$JOw4cp!LXGJX^;Tj|H#bumU}$fyV<}bvloNg?kWHl^Ll(
zPt25%?L+Y>QeWyl3Cx#~xE-~<mo_D;(y1z)P!RJ<U|+BV4s~c<q}t<iY*^51d;8eQ
zY_KQ3znw8vB-(7BGm6}#u=|@GDyk>rIPtq!Tvk%?3N0g7TkeUtpm}1K5=f;5y(*j?
zGL$Um>>VOu=%J@@7%9((IeL%unFy%9x@xfY>@B~*(DvKdPkq?cY&N-}4+9u*i?w1D
zy2&j_r!@*{CcquE7DfgZVT*Uo6Q9bqhO%Mt8yWOx&~`;pm|90u%nn?7p6=`>b$(wZ
z<j;!E@1S&~G+?WqHVK|$dJ-;zZ%B+vq0m9eKwPxN>R6yvk`-1IhIQ7_p!yEgkU5PS
z^Xq$(-4N_rlLwH*@N?3)QR7$}h!hyHM-d8)rOdLh$Ya9GZ&4+c98`qkn$0DZc<!Cq
zdl9yvZ{l?<;nvbY9~u%0A<!v%Qp(SQcu$<$5$q|gT=7Gk24=`3coIG?XggJYkdXYG
zaW~)K#E|w)YFAREAm&(RyP#k-4Ts|Pr2l=&0io_!M)zu682C#bM;DjgB^!(y&%wuy
zJyMf63ghdh?W714Tmri^h-byvaxC(lY#qK6?zzAdoO#!~yW$YwM)tURC9SBPP!83w
zaLe@U8}yTgIqQ5SK675I0t_Kv25EqB{R`3NG#1U8>p}@w4==er(dk$Z>;@}ZL^87_
zFB%SKo3MP8k-180(kYx+re=-8@+iV&R9MAMXD&pjh=lj4So2-F`x#zEJ+^6ZB$arB
zZc-^z+1hW8$VcUDIAob)!>@>82ok|*#&Oe{#(}KKGNZQ}UeT>|mfPTtY2QH#f0&ZO
zfQ$BBSE2K@9`39sN%|gwL4cj0moM?Gvwe`?{>A;NeMf`)3{MD>Wx+>kF#C^2PdkgG
zC&hWN(zMek3-xP4weyBkx$!QhSj?7QDslGXa&+0X5zXBl34sM@KVQedB#O|$v-`5@
zdI!f%Xzr=q1P0q$Es{B;njw*bsz<8G?ja&-PF5+?51kwY!pAFWOgO3(Wm5s++}LaS
zNQZ;58Y`F%b&l2{FTxx-q8y{BUHN2SOhVG!gT>}oCK1s=?Gxg#K!2|0C-SV;cJ%yl
zOZVK9?)iF|9UFhdJiL22*LZjlKJV)E4#}|U$&tP<>J`i>hx|yA`6a$bh^7l4QJ6D@
znDtnz*`r4p>78=+U4#qoaIjT1#6K%1%LuC{O9%^PTMqEj3#g~FwynJq(Zl~tw$^VP
zr>$x0+hm$Yn$Eo0KXyB%c$HT*-JuXVZ(9^VR(D}OzLx&Rsf$6u=Uc-mbBN4B+wuoG
zu|QS_*?x=>RHmKxbM)csoM#7X`iA{k^$o6{n>ih3eO{}OX}UVN?N&0XjeB2S92)MY
z_L(@`_h36&JJ?y(&**cUS(bEknmiz6l}!5N*<^KgRG2y{+`xR2Jf+$|&fLPUi6&?x
z>U;Dufp<`tqoC(=0;q4yb_Ze@TXrlS+nJkMY|KM8Ofg=SJ0bIltdzEuTTmcLUp-}0
zn>6P+hb0vO1g%Qalvw>UZm32MzZ?O<U8)`Y?rqv9C<G47)Sv03@}ly{`}?ZkDb;df
zG_Gt>Wi})tm%#$N0-?MYE8QzF*-TdUaJ_NQ(-T&E_TIiVwy$@iv!JFciWlJ?j}oH|
zz&>_O^8yEtH5`A)1SZc+5qfj(X+z0Egp*6spJucki$VnignBnsQI!c$LnK}Jbv}4t
zQzLn6B6=rV<Ky(^;P*Oy6Q>U5aX2u}>J1c5MD=00b0(FoknFU?wxO$RS8?*x*0y}D
zf4l)Q7+8>iiciWBi@RKgzB)!IWz<>{uDyp$dTYP}hAbg3%^QblA6ZRC1vcI3V3R)3
zCz8N7q+&9D*Olk(Fx^?=WjIFqX{my9y`!<#V<+xZVUL+({-|l&pniAtPAc?CX^+cM
zEMXu1R9)mN$L-203RgmQ1HUlIuAR63epw#~S*{N3gZ<`X&3RJpsgO{dEC>o>M|O=q
z&hw$Rud2`2i_)CoU5rd({b~*i=<ruG7A1=0?Uh2wz!_}FLkf2<A4lX)iS_i6$kp;e
z8InjF;Tcgkqy75cvUU$0w3ojfhg9jsaReqX6<Uj9*$Hl&r|n31BOS;_nXJJIBZv#k
zuL$-c2@!o5Xn`9B7LYE`OW<4lR5h%1;>EcC+V1X9O4UYYmK!0#+Q|@Xzk7}%c#+(E
zqMPc<#7TNT^Vsd3cGzy}6sgpcNWo;X9*P*B*e`jz&UJL0fko2sG@ayLe0n`<WPNe6
zHDsx`^z(A4J*+)_CdAA$D>|A#3h{bKdltPKnb_KJa$|6V*RQ$~+e;~Ywk7K}uWr}C
z4{3%VuTdQy7fGnp7giS+TPbtaJnM2fS5z8HK8)MWv7wgAE630)F7^yFe*2V8n=ZqW
zlQVmTNr@MY0OxL?Qn|mlZ4d*3_k&01{=_SChyz{yY;Zn~r%E|7f&-7YU9p--l7n5=
zbEl!i1Fsuj$~7|i=pTLMh>_kzYE00_uaF8PiG5(lc87?8wd_M|_M6))D{?6bFPX{U
zFm(gP_$!&b&~Q;1dqe#|c<;`cZiv-%{nk#4gQ#x%jK?UiB!<kZQ%=oG*J6)@*>pGI
zk5#p6M#o=y<&p{o*GgH>o;a=#o#~$WJgFQN&S}^vI=p{g(y-9~;l#!>>BOsiF~7TN
zYfVIn#}TjKaD!>%BE-t~6p_C3<DG^CGgS|)_>{+dtX`c=*_OxA>YAcaARHu{Yzb1v
zd4A~$Kg)#JG8YRX8}Vm``BmU>HYR_2aWCAWHSX@XLOiWYeUM5KO4Am8eVCl!44;rw
zT0Vw^)JxG5x)?dcA0YDu%23j83ky{4H9-z<7pRJq{51Sx>Nd(;zHb~NqkN1*9TP%X
znx=zBvRe>WCD-U`MG^_B-(6m5ljBb=E;Z_PQB7f9qRVJ~e*B&rbI1zIlQVh1+!1C{
zSdkX$wA#cxXZA_$5~(m<JLhfSY>!^w+rhV;?+VXju9VKPen@1MOp^7ldS+yDPZ{ay
z;C?nCcBe*zFWL&LT8hgzWIEu~>JZJD(qTX(3hymG2;F}4^xy|E{cy0HuWF=KaVR}A
zipQjk_#j#BNd6Pox}^&H`iL04*G}m56{2S2Qgrt|h&71Q`K2XH4ZiC%h<N)$V!La|
z->KgRV|`gKZgI`vJICGTQoWt=U6saDCO>b~3rCR!)o@B!1jMK~&t(zAd&*Nj**xRf
z<ZUwc)NF}YhvavM(bu#x;dNh_`oYcd7?Az1gdupw0uB?g6ox!aZ-JFkle6{fwD|84
z4M_<@3qRChr)`e>Rf_fM#1^-!1@98EV3JU69dc+3Ma8(ZJRxCV$J6weOMWB5kQou`
zuw?g5=kdoZ673GXfkDzQruH;Y)47c|+rB#(W)I-sh+KWzxst3d#6KGbyi&F}jP42&
zW;Qb;iopGlJC&rZ`u+>UOm8hz-zxQf;xK6p8T=LvC!Fp`juy<sTFNx(jw${^@F+Hf
zh2-wQk>`U}CD?&GOK(@ME2^h)$_l+Tn-fiC9U)C(zD#u!MpfvpQLs31(drRXooZGD
zTmd}>E#lq$7wRuxhEBtq4!HW4xZ~@{qfg_%)7^_$^?g@vWX>@-KtC$Vkb>PWEm?F}
z4oN&RTw^~@8<10H{*<oD5)&nR&LT(@UodBixJr@K&0Mzc@ghGngrAmDXEt8k+Uu+j
z4rX+yjKim0v~Ic$XJ-y&Y?g{pQj=m?dVD7-Ui)CFFuX128=i%>=l7|KpdcZ(37kW_
zPsM44@VB4Xc_$hQi-_x?ytbh$$?Up~D0#XyqoZ&77_m7%N@i&_*((lw+nhJP$AM1{
zog8Vj>nn8A>SFYW&x;NGDv$h*856DUOI<Qdf2}NHdF|*(s&zn!_C@pHYttkB3aMAf
zyZH<IVJC8UbGGHt&L$xmrlZnC6rhsfIAtC+gl18!L}hs;66vVeGfas*k@51X02A+s
zu~)FAv`NuRiw3_mP+0q-qWaWw`QF}RlV|IgRPoy+?943WW4t|>KCg2-7zxkl#mHdj
zBG}0!y>jvm6CaJzlIIee4QPEGwu8=~C0RZaGU|D%j=?LJU<sNm$P91Ae*3F0QIPaW
zQDkp4tUZcSRrCV%9Ky{IP7-Qy&j;|P!t$!#ihNXDJR7N*pcqK#*V$&Dv#VH!%8Ix9
zJB%iVB8?kqWbF&XJ*P((Kd=hF^{f{qMBCme5IoPSde`;r0Gt=-vqD%5D_jXLl@Kv=
zSbzqO@Guduglk!|MRaVJa6h(U4lpu~K`$Jm8h(+K6#tbl&T=!U;yro~F-M0|^BpmT
zlVGHh1wOl@_^>47lv(DzOq)TqOl$hJA+=TJ1Nl>_79#Ts1*tsYh@M`x0%<B<(UP6x
zPN#4bMsVYyzn%`8dFWWqL(E&FE5orxsU|WoOlK?XlQR?<oL1S<LA8DqPI=)|3)bg_
zCjk|>!;yx@9g>JI>h~N;<ATj?Go+Ggza1!DHZ4ATW(BsfxoR-qf9mS#CGR`Yo11<r
z)Zn!*6ervWD}S73agf05*La+yS)`CbD(^L&wq9M-a(vWNU#R}hwjW2{JSLvyV^xu;
zf*=#V1*_UCuTj$SKDb-nn2tb*XlE^dTGlJotG3k+qO=LTgyvmsp50PQ)rgv!Kn9&I
zGe%dr+MH0lzI<!dcxHhuuNi{;Rf5Qd;?Ic5vpQl-iRtX&r~<+`^7oQqV5O|r%-YNF
zT4Da)&`l;|OUJ7B2IAx7Bg~?^^93#?p6At1h4JZQLN&OQky4og<Sw;k?01j|nQTN$
zY4F)wmA*WhQ7BBP3#wzl2@~>xC}LO)mFgXpRv&Cyxh~%~m}xFp+!&Vj!FOmn-`pZ|
z&`npitcMlK+g%*K`*bi<Rt)?eV(*LddTLg_$CdYHH0K1hOx9h#4|bx(OcA<-XMFAB
z4EVhyoR1NCpS%&$SP+e#f5{&t!J})Trnwrisli`@?^4atH*_cccC`v~u$Bx*QZG@u
z_$Yg^%*m=ey?RC#F(a{M9rs8^LSuuvKFfi0fVcGtsQ>%tmyNA+aVN4nhzjwGw@lZV
zQHJiIoXmFhCpo2{#gaS3VR3N|Nu>^AAfLEj7*uE7Srcd9K%;B9Whw6~FN~ee1{&64
z^ypV{s!j-Eqi2+r?mJm8?pb`yGw|gFbFAAA>zmEzLU;PaSCPA|MXM8KT1B<TI*Cl}
z(8KG<%+<F`r?MP3Lq2(xmKGeYD+mf2n;Q4fB?~vOl{Uk9@ujdTQYOam2M6$*7v95O
z5l*Vhjx5@|`LU;0JxcgG17se++Hv7Hv)Mn_eDV16YCL+mDf_lnb{!(k8?xYu96ieQ
z$0`gcR!yPIX>oYzD7g0zRGd6W#W*;pIGDvPSB{e;!g&zS*dEYxK8SyS$l`~{WtWf;
z@W9F?!kcj^Dx&F5T@YnZ48Bb9oIFnMjP=7hhqRB`8P*LLhU#=O^n79`&lKfblgV-#
zN!qE<y-3k{nm-G2=BQG}wqb0ZengEBlqqO#8Cf!k<a{7anw^iSq;iXi8M#&^+fd&;
zM3jXZCS|b|{M0_t?J52|ohXiDn?}z*#HvkeSxnc!gg(8C`oy$`(XQ<5`zK9(kz-9-
zM!U$^jlhiyc`L--+H}qPehw0L0}sR39TJbuTPQLvjcB8|GOU<6Gx!cZG)&o+4;j@G
ztgIYC*-Fb>d$im>*~qJ!ub2^KDu!o7`FwTF%s#P4(|(Aczx4qzxJlyeBVC(iITD*l
zy7%9b_=(J1zf!ome${nlXRm-O_TfcT&BD1~+F^D!fK3PpQj;@q^M=2YIZLQD;j_#3
zd&9YNY9d|vDDIJ$b-cvvdI?|pVA}j#<=I*`y5q|&_T49h1fR}A%?g@c57{ZdZt;rz
zVB#+Ikk%C%QCkt4qtI)eTs=Wvp;0VjT0rI@Ky0bCHI<|>KK+<~sxmr_qGCFp@zUgA
zIB&p>^Xx0GdEZf%`T80}Jxk=)U`KJGwx4g*nV&A=qVxB6F+Li6Wk$LyTc}BkRY|l}
zb_`hhI71)HqB)FVarPUFFdo4(G5s@=yg}`rM?HB3L^1L8y38vcUmR2U(Ya5VZ@*zS
zf=Lf6B$_Q*4pJb%AJCLIt1z_UxiJpK;AO6ze20oVhBbrtsVF-+jj%_9k{Vxdyv8Gs
zhco8(BIZtY63nL1PBECKGCP1NN7DP+%hBiA`0#~g@vnMc-CmOI?MbdJBp0&wK31<d
zcJs^j8rTV~TcGt<M03Zelv))oSvZ~wX-{z-f1^E%B2YQJVWXAzsWQ}(BvO{DT}1`r
zG8(j{z}PAPHz-mywTQp%7VjIkLT`%U%{p9{N4J}Yy-jtyD$bX@Fvus+I(I_!dkjus
zL(SM#(f~Pv!^iE6ydk$%9bdj}mRMKce4gBGYPFN3y(0mg(DN@nfy|FO7FE$MM#0B}
zDsHN8X03e548sk5cphI!i#9|PgR4h1hs+$_K3xj!<x55fRdg*ARDi1@G=}#14W9Op
zF<HLvvJ%q|iA~ce?6b}#e|l(E`l8>;tmEQE^#(JOc25zf0TUxg{zaE+C0;D0Mw?yM
zN{_igmmjV+?ztnzGVj_lvpfE0syJNCUB)kWU5TTU_MEXINsqBSpBZaC&gcg1AT|Zc
zCOITlfoojs_$7+ALPFCbNl5G1;Bpgv@fVSiN?}FYU8<eSn)jH_M0?BW%U$kNH|MI+
zRx%9-PgkzEYQw+?h>}}mMr}cf)BO%6viG7XJ0yie6G1J^Ro<<>zF59ONs9YELN5vt
zTC|ULK`nQ=QYr?1gsb#9hpNcF6IqLYQ9C5tvmhGNnkv|$gy|zf_e`*>6vUUr96Om}
zO)yRC#5fh(D=UWj4H;Ey`V(`b>eD8dqC#k&_Pze4K)q`JTJv&6U4&f`snOEz{6K~p
zP1Lu-)d{TO7$Yq1Ip=7Iz3Oq#IGG#Uo~Lq{jG$tM(bni{vwAH$dbpW>kYqzFUI=$^
z*i*iB%-!qMQ&U?qq)8I0IL2aFZko=&B4QmPh1B76i+r1|x49r#?cE-=@FcF&iup5;
zGwUUpzGo7n`f}MoVCZ4@_UM{w+{#lQmHv_M;VnV?=+paXA35}!Ci4@8B*3^ORMbhS
zP_U|4taKY}yfpEWFl$?W^ig(7f+WkCr9p=z>o-e+ud~7ZM9%NM^E^KGrw;_jK3JR(
zgWZ`ZVG9cmXRmgx(a`98xNRNdzZtvv;kilw+%S1h@Wc?c7mF#3z&E_r+@Xy0bhIZ$
zNTzjva)MlF#(nf+^<96a*W?KEy@P}B6q}+eK3V~1rwkrE5_A@~(UQUY%R2QCgV&Ec
zM&RE&=-*66qAa(d@6DY0;4g;w#5-S|wuGMeZKdxmq%Sl$1YTvGF?3udI4pf*^u~YC
zxRmDapaMJNSVz;_ioJ8LW-DN=Ro*DEg2^N;HAlGjCE%MdVuzY{KF8-4I#jb**E?gY
z#4r0eKW@lBW}VMd1JhETcEsIolT=BzFmt2Z%=ylE*Y#VeoU-hg!Ky82TzB)UyaGRn
zBxi8pp-$K?1a*4%<(GbE74!~X{VGu#LEpOy2j~fW*3cmH2hHgB4$eNwxDd^MEw(?Q
zo1eC8rJJThgFl!5Rsva%_WAL-tE%$V*H5RfRzrn&=bhFw>gQY-RdLR#o?wuB-+8iJ
zJq511dv$Tp=jZ!n$S?Q%do46g6ux@8736ZyfV#;vzSvXgvX?ws`1?PGPxmOVRJLX}
z@p47fcSm08RSb7F>d7|hl{z(QoIm~YAWb*B^CRObqd9`Cqq>T+428W+oC>fu>z@hl
zA|pmD<*fMe`MJZR#5r_b>4|T~DGBX722CHuV1}~5cVC@ahSjPI)#`-_Jr<q<dESe=
z399~%gNi2j_(6Kg+ocxkwxt4|E+bDf+AD>szFXAzDo;+S`W@=`*G_d+b%AP3Judtz
zD^u@zQJ-XW8D{EnR||bQx1RgVUFlrTg#I<wyW5icRz$GGAXOUfOz-6j(+1CsRN}-)
zP3ct^Q3>t9s(TO}c*p?E`T$~Zb`0MX409=@;c3gYE&hW2EJcoeID6aDUFY-gs~IB0
z=l9X^hl1@#kb*zSyaP#m#5v2fH#eAs(X?9Cw|>yPaFUUc!Sf1#KcOIaMLp>`l*^Dr
ze^`3YC+qEtH%N(#pD@rEh_&BN>tSHr0yE@4CNIkJ|KOkKdv{7ld`=HELemr-7g76M
zn3+bJoNSkvP(7h$+8}BTX`?APd2OoMMZ!S++uP3{T*L8Atxv?;P8Hyljy26j%G3^@
zUGLyl&f@lrtpxQ#5_2R9Tj$$q8`3XpXoTd7-hur*%<yYkukf!F#T24HE%#QfH<WCv
zbF}U_QQRh;YF`XIUfgP%Bz(1ql$`O9nfI3ClG-!^vjuYC<R+_13#T&OEb%kBLpJp<
zkLau(Bp-)wgc0=f&#o7g(lSUk@`jG>kEmmEM&4~6Tk}dRXWAEHUMYQTYFKMmP}(vp
zk7_)so`i21**14k@J>6mz}IjKEh%8X^@oTQ|LKS7Hdp+EH-gkxV-rUKxpv4!e)FDc
zBl6SruUuzq*X9Tlbt_8PDnGB5DtJw6EI1az*eWb*D?ZaV$&<d*dAp@0x>4LaLkec(
z;XB5Tzv^UHtzc$~>aAWRxeW5~pMUy3J|3h(w`p@r+z0lO%sx<|{mrKnGP;R;Bi<3+
zBSfK6&2rGEI)(CTgRERI#s~cTKC{5su!!MO?mNEJ@2ip0rQ@wi*x}=!aM?cH5?6hC
z3(lw!(Tnj$Ks&NBOt*9>h}JlqjkBDN`(YdF(wca;3CT2lhO|iuUTO2VPz!q+-PGQ_
zdXZY!E#+peC(%ar3h7#0Lxr6BtKLVa{i|*Zp;gOn5ie5T@Cgtcgr26CquigBn1^3s
zH?=(tA5Rp`mz#QcWQZ3q*NnJiLu^{P>dN6E06Nwqp?9P>&%8Q_+I;t|nZZZ!OyxD~
z<(XdPsRto-*m`+;`(|(G#dvXhw`3A+@!7CJ!6!OwzQ%`wPYn689qzIyV17sXczTiY
zO(uu#-nekqX8Y#ykMK<X0?#zYkE-kyhF{fP-2~+eBg&h2sQt?6Dg($&?~Tb$y}O^`
zCpkN2gK<YTnoPeUH4@8BPOu3+)8A(4GDNnfNGoEcokcvDsoXO`Bj@L|W|JM@-=bvo
z9@#l{1@0}epq)wGGUL%BAKUve0izu)hHej0V+pDGOdgUsX^oJWDK&MTH0jg3RmGI7
z`r)1nvQF_D);XOBigF<FXJ5{{`w7W#EncUpX{PW`k-P0HvMyOtxjia_eDX)h;s_oq
zyjI;5OQawgYhIN{l0Z`8Lv1c+o<Avmt=Q++X_CZ|TNV4b^sKx#?b}Wlmwu~5L6voQ
zwfT@Qg|3UAZ4bDCM6zLG*SEbc^If<;O`k1`_#r2vFQ$8BMAp+X-Ra}K*ru&TT4pI~
zq38D>mv-Ob5;F+L^!&)`B3TBdMs*k~<=3y|b=qw4ra*AwVk9HzS`J6X*o#{Vpu2d1
z;&|0<?7`~Yd!Vtzvce1_ijNdcajLRE(oM6;Sv<VeYe>@h5?5S#w;j7R$1#-BhjI`O
zYLFAwzc(T2NN5<H{_T51a8~86sJ=V>XshcX#Z00}$d1z`kvWAM>O0Xl+T<VYMl7f&
z+RUrU0%Fvb3Ef3mH*t}>ar_y@DYAn{`ozA#L8EVp>=+bcPLDqh2=ZvSh9F+#Xlx3U
zykW6zK$-oPY_cnYcg}WVc(?1bz`i8g4-DNX9FwZ@b@bL9v)LX|t3u?=9|V?#nnH(9
zBSal=SLmb}0!R!hS5cyrFl=Du3T7x+PyHLU*-d$4DXf(ettC69M(_K1-}zW}kt2R_
zmanZ-{%jA-2*RA$I+E(L?zuST&o}nhM$N?M5^Y0NsC9mEn`wj`=aoJV7sahh;McEX
zx0^MFz~m#!w3|$m%JU&Jk2APU^sKkR)ope!&Pq}A=)85lCy{+p*O!MDBfRvc_Vx-$
zH>gdr{z^XxQ5D^nJt;Ff8NF+IMR@*A@f%~6-F*|<*YC*Qkj>-kcCUcwtLVQ~#PZ%Y
z2-ZRyCnP({Pgo{k3GNW9eD5(O*Z+z<2MYW~OcaNOhdqrFtCV`1YEOK?L)wv4BzhOg
zXK7UndnKb!G?kn<*>wViF>0<+O&jgCF=><qCL1!J7>2<{1x0i<V=tRY%?2^;l1i20
zipVk-v2u`sF{{UN7|XZvMdR;f1%^_O4u-xf5pp^0sw#GB2tN&f40H~Kr-n<_gIBTT
zG&)oWS4pDc)hPGhJ1jd#B*Q+WO;P9xxe*(7W)WgQ><3EI4reG#Dmk>>l6T5lK4*i;
zxeG}{BC^t+q~9Ab)T($r_}Vx9sJMLk$>+~oQ(yG9Wn3>m`OF-KxfNATxq-fKt|+RG
zsu-TmlW*K^#=D@gbAHKxWP2t=S_7t97(=2-wOi1h4^gl&c%WZ~dfYbLebly(t8;tO
zbPf-K7InIyg(@jPKK<A>z?6f$Z_zR+FUkYer$<QOjOUbZrb8&i`n&q$w-`}^wc%NJ
zPgy^5tO;7LVrT1byICg3$o9GIpXTXQNH+Q+A5Z3enR}R*m*%vxx<hgq#wxnpU{L$?
zQ%K2zPDdj1B$g$bFRC4!A?kB`X3^ep8+Gl|1m`<S^j7W7XkYE0RS89qE45&4q67a!
zIq{M#2;J!5;cXr7mfO_#eiR<2GnTI>7{=T?m#P&PyDR20g?QU^fhDIg8@)Hk`a_$L
zxx;&28cM70v)}QI)-k{L?mQAPIT1yE`@TvL4Od2Brr9Tbt~BXI;Sjoi-NS(4LzCI>
z5@Xb_tI&{1qHk3v&Ku<2cR$FJ{qg$VccFVkjvtdLNn=Pm;g6u=zU+OWdfkzN-FGOB
zK{BFWn2_Nk^W}Y_jZ6^-N{C_EVroHQ%IIOaDr(PqhxybZH<gjof*A6cU*huQSXuI?
z1(@e*Z-5~81_HE)9v%)OjRg|rKC<MdcoalR+@(!Kfx9ODzU@{+e4nVp(p6r9sae-4
z%PQu`!u+sP;3H(;z&62FF5jp&BzC{_HZq+b=)uf{d$0n<Td5=z!LIqj%Z0Bp$Bajq
zZL?REG18gXl&8dI74lwTEzp@$2Y;<q;0&gy&0=NR&R-Q^+Rm|aD0me;(HP#wTsw#p
zd`TcIvFM_6WreY>^34@vT{Y#RlX#+cSwz<Oj3a4j^g*9Ca_|?u_vNvU-8A6ziiH5w
z77pcJ(b<}0=2i0Qn(zcCO4zh;!3#-`ZN)?<L~YR)Gp(nEHHu8GkPZ65vILvhC@)Rs
z$=vZdKbBP*r$cs`#^+7ncw`zWVc#YboP>H;MbwQlzQrswizs2*n;99OcM_(1VraNw
z6QD4hoZOl?DchjbBG#I1tZ@GNY%mJRMdW3-iP5;2(FnpTeSw+h8rkwM(X`xoHpP*Z
z($Kra$HLE)c?ItxjJ|HK!R9+{t3tQ#9r9XiBGRew_e8d&c)Jy3!>Gsmz7g4)thJl>
zVX6ICh{o_|PfK|utOswOyd0O#DtnYX>U2<upo4vUzNl|{={9oU%S5f%EpThW17W9W
zgTyNv%j0!aQjEtKVlB~TZ(a&^o%HU(8>EjmoCz_o-eqdjtHo1}yxlY6eR@@TzqQT5
zJD%NW>IgplJ9<?u^*-#Dw?K31wc7VRsG)6lG{h347fHOJXa*%MM(mqL4i=|X?<}I*
z9aDtbgi+E8@C{yNwp_FsbQw8KI`>%Y8Yoo~pUHUN_gTJsG=0YvO8?opSPysdgZx@&
zd*eYMFV5Jd5+`_}IRJDk^%!BZ^Xa!qs>V`d4g8!5os?N?{=)k^i*b7-q@9Tb1dli$
z-BFsMe=to$aG7N#F@t7)WVfMLSLSS&-M|zbmNi4<?%(_bd376}pcy(w7?AT^cK*Op
z*{haG@Fb0!iOWazd{h0a4YIT5DckPW2Byn#Ipysm9PXX3wuY0_xLU87MMsdomI^$W
zI)5{ZJc?+$Yd5d9=SS~+r4@K)S&H~_7_El0K?+Z8?$UYpyI~Jb>aIx4F+$2}I9%w;
z(ANRGnV0LG1y4@Tg9jLLdIC5pBlW)ejODNgQ}~`UQj#APT;t@vURhxxa-9k7(PfWO
zFUM@~O{lnI^uvY5^I)HlkuR5NVk7VI64_Ede8B7DD8glf^209w3ghFNtlXZ8S#PfR
z+4`6<n)-$~VMR+2P4k$z8I7MGOAyxpfi?h7l3oi=qFwCvU|_XZR}K8}F1+t$g^uLx
z4_fuI*XNRJHZ0|D^++WJGCG=ejdQ|5>ImKq<42)_VO8}<%qxbn=bMFEHfU1jfv#$E
zykZ`AefXb^bMVirtI0k0e~Ba!p}?8(Nh?xZGzn|^Zt9ruquYK`FW^m;8dI(m86Er>
zt|Po|!~3?mops@Z4=HT~nhQb(Gxyp$rgSCeg|j0b?3mI%U~zCkXpR-OD@=QXUvVJN
z`OS!eFr|)os+^mR^Qq2TgjFT)l7f4PI+Bv2Gj&~9#|S>W%0d)j0@YDTPgvL9rXL_y
z*#s44pf59+_Jnvfb}95uQn)<1#8_WZj!NiwVWde>DhE!znq+=bl-wpnm3ScFxpdic
z;u8$2VNF=yY}Od&tt?8>C>9ENo%AJVkS-P(kN(83&B>tok|8Yo34bBHc0#9jz|>u>
zt0rn<>+S6~rB-)0FYvyMD9k^qjodb^RsBI0uj_hY^CccJ_!P>jQj6KC;BNPzHRYm3
zmiZ#Qu{4gqc9ZExDiIh#5|L{H)hMc~c9b900;E{3>HggE8Kw2dF7ue~w<S?@Dr0#@
zPaZ6`WA*BLA-%JEK2(pEi9>cWY5-;C(>{LtW3tQjdD+|b_Z|v*&(=S{`IIHQmtPd7
z?2IQU#1rl)xV+vX2&qq2vHgD65=`TqarK_VHb1Q_IjOARh1{#R{DVR)iUw1@<+%lZ
z-7gppH0zO8S^2&E56%z5$&U?W-eK!lpxTY+?G<>>qdOJd!u2@%>JwJa9L*&=tW}Mj
zDPQH(2$~R=g~l#flKLo|r6LvdZS?apL^P&GHLd#vXeO?6P+B02kA8-BT0rsLAFQ<w
zHZ*e-9c~n9#UA&)e?&4Ew)K)Stl&w>J3Pr6g;clPPuh~@JHZ;Ofm3v%hx%#toZek2
zc3+fro+$C3<Z|ma8^kI#PBw-e(|pxnbtbLRciwQVGtoZh_*fJA+KVFN_zZ<u6U%&3
z$)^??rJsm>xv%6_m&>#Iq=cRN_{~zR<kILk`dhl0G$gXsnpFMMs|sd|;>I)9l{{(o
zqwc*}Gbf>zt1jtzm&|vt&|!sKZ6x}vx=L;Spz{-p_2k&Cn7;ql-krxowf+wPH(AQw
zMV5q7l;vU!!!VY{Qp_bHBxNaMXOtOcWGOU5vLuuwOSjzHHp!l`L}kwmxg)ZZVX|*!
zFuyb1^?Uoh?)UrW_mA(qUXOF0&*wSMdCv1P=bV4${kVkhBERoS6&!-olC9?ocE2qh
zVUWg;!Bd+SUEn<4#4zD~KaBPX?9?~BHYKE7oGHiW`NcjXWrq$CRV0vpmp`wo&trBa
zH#SYGuxrFKJwa-29p5@2H5UPA;9AZWYMfe2Hguqpg~<6rX-0l>7g`#gE7q8UGS}Za
zU*2PW9m)$qI}`+3={gjg;WZ?o+9bdT7m&jaNXuJAa<i689wDdO$1G(BenP5jzLGXt
zF;ACm#ZB9XYez%E{D#bA`aE2noZ+-2-^TBKcS!o~mt2602gh?Sq#@FIMfhsDrXqGF
zAcz|XM)D!y_n*+v5v&@QXFONAxpQ2<I2XgF%)2qY-S+aLc_de;Vye}~SvE-l_t`Y^
zXQ~4Hs`};BENblJZswZZyHT~%Hg&^k?V|w+fvTGF&shh=g+tTM%V;7Gs-!gbiqQ9;
zhI%jla5R+n#dj`N-@VzaY#ElGPAOY?F6HrPv3}z=y?)m2vt8(7J(1<nWM`VijNSOT
z?P_t!cI(EW*0fZGD95tw&ZwlAMID?<aa9LYLOO%!BfKgaEZdLJg|9SH5#}#O3%f{G
z!P9Nco@U#TL3gL}n>+5*U^N}j8_|a&_6-v@Y2!9uyhx@?h^UoY?QGV$W9*V)#O6_v
zt~CXtJL9pNp(X6y`$#{iZ}q}nZ!f~ex5NYDwqM+qhz;%xVq3tK-~p)Qt=GzO+Zo+I
z)$8_uO3Qw*;gMJ;zGZ}p;fi5jzNR`MTg(zYX@>UxA%6OjpC)1?Z!Fde7UL_Nccm&9
zGPU>CFNL(&o3FN&Jc%YFyEZg(de1tzvb9RecHCZ#2xj&V!1`Vr_Y){L-p<X6`1MA#
z|KfJ5PWC)o7|&ddaPJBlNTxk^Z71F=akv<ZIOi&H5<9-XV!-5ey+UeKO>e$$*8*ua
zYx{IfC!7AM>v_&pY3r5F3b)ORJ8&`e#=Qy&fer4n^*xAz`BmFB7Ns|aT-!H)DO`_b
z5t}i{tZbxVnlqx$o{<rICe!4>L-$-_?>4%cHa@lJi<e+_?8;R%c?^0|y2tox>b)tN
zub;#;_H6ZV$1T^7gpY*qOc}I6d`ZTXn(G6xdu^^pCOl7e-neb=7&coV+=M$eYf=LL
zpxdWivsTPr!>Gnr!aCg{RT}pv(<NuVmwpxhnV5|X?%Bs{;Vt7k$hG-IR@z&Z?+S5l
z4XJpdKJ~+`mK4<!q74N(4Ik}|<;(Q3qW$KpqqxymqAQ9XS$4NJm5q?hrkkIIs1ZHu
zq{YM1$OEU$5c`XtMP9A<8Oe}SwVTE^7C6bi80G0n54@oqzu4(CuBP7Bj=HD(+VaZv
zxJ^oE$gyx|pCgef8qy2J50qFG`O5a`X9F3JB}-fVs7#9|M@9^?U#f_TzF<mzTJ~$K
z^Mv$ekUw11q9}OleDA@t^LRIJR+JPBRmU)yEMmR;ymbxft#C);;iE%x^X4~9q%A6t
zK?)WV8hv_lLqF;UFiy$@Fl1KV;mXR9$s6g)5cu?RB2=P(-K6%Z<_Y@G?Oo<9Y$Vqz
z7jker8sE)h1M+cbs)`os-n+caccU@h<_Ncevj~b_4%+>Ybax~v_!GZX-)d6YZe2&k
zT%l29VTir?uq;C+vwtTIcR8BSgdm%GBis8MiK+HSS!WwgBd(oSIIFYwMJ~U*Yzyrd
zIq8Xlu*fB(bwMHGnT`dOMjhmvvNtY!;cXz1j1#QbNs5lQ4h@zrBknw8p3<6Y$Lh-y
zp1aFcJy;!f(KB=&Ehv`H*IIr5{%c|Gq4&GvL<&oZS>=#D5lW_ZcW=a9O0CG6$WtF^
zh08kgg}c+On<I_oxS#Y>g%kYQN6W+Kf*8AC*s_RsZMAe^ROd?EZ7IzHah`X*l`57f
zUVJ0%Q1Ge-QszB)7U%6*xE7gjvxc|Mb=bixJk!J_^YR446Y|UmlIWwg3)w4hVdn8+
z#7!6bkNg#$ez3sDz2JN=e%|nyD}3kO7#+n@*=6d=X2eN#iw5gL>tIC0F#+C#vq1yz
zWBjlK&+Qw;`m4!5`}@Y4%TjQXjQuL67xFNn-K!e$*%cv1BB6G0&+bpWu)2bB%i6sA
zL;F2dJ-;{36Y&IXKTwlufCjj8wGnoAo}rF$8)<+;bsCnkAYzaZUg}At?91c6mivrx
z0@6ZabCkLCgzT4{BNgqEE$bsQEMmF@Keusz%MGv9q;r~t=eE&em?6oy%6$bf_s-ep
z%CL3Z?o<%x&d2wCF*TaY%opvSk$h(Iz>+Af@B{dav{G#(bq^mLK@m?}F!Q5|$xlcL
zu^zhZkW}~MGOINxe9$hbxl8xcwXn;li#jqFK+ht7s=ZjeAC)kzbp{ngy5`?l0`8`R
z-c)M1@!N36&eFwK#XtDV+*!d<r9SuzEAy%y@czl0ZZ+oS^qNPYINW2`d{t0>LPUpa
z)yOm6!iLn3yyikaGyMT>YxkQ<c}d&_P5!FpC~L)P{&d-Q7FAJ+wC;_%CNZ-ChGVKE
zl{HC%6roR*3*DO}Nmq9iWoz5NX+?`^9LSGSbb7X&zpQn^t;%^#d0~>uAl;jP^E46n
z>QtWxt$cWZ%FTcnCf!XYA6KxnqcZt)6Noe&smC53@gbJ$1->*{&&l4dkg}b|iF}}b
zUaC`-AO@-5-CaZ5VtiMoAcu^tnh3y;O`*S-LgTs=q!HOi7Xax*YYg|9k3o=ncqR6b
z_^D5a2kezMSyCqW%$&AgAc8r*Ir-YrHr1!wf{5>hOSMYYi~JWb(zU2<mk0CFPhYZA
z*s^1f)<GD%aSzBLnmNOL#ZkJ;7Q!5EJfqN`8j~7xWzGG=iN031YAsC_!vy&w^rF`c
ztxMD5)Ui{ED*OjAam!9tBuYzHr7BM0aKx5+=~nFGXf`AbR1tzcR#M(^+$TK+vhSkA
zFwbUq>ZHBwX5i&TJ8mOv;lYMxV}{Ad<41nu%*&-js&IqCL@D3)U}~MEsgL}n4JIve
zO{8MiT{+8f8Z=57_*pUvyL%ovUwCDKtgzX!zM#OxqGlja+kr3HqM8B;rQgCW98%<4
zspL;{<X3~_m{%~M75_hG2?sL)fDkkk%<)73S%niY`%18A03;g>ki7u@1`34%)C)vM
zm&2z7dHDhk3&5RV(ZSAOh=7(gU?BUSLx%VUp}_!BBcO#0JI6s|v;mDzK#MaJPEA8s
zPX~Zvyh5$e{=R;{XHWiCgZu?Q=13>MU()ZC2^6mPpGYQXdV9#g5ozLR?NhUM>~~gS
z2SH7TuZK_=AlyYz7?$T<23TEiIQmPi_>caw;5S-HcL;SJO^UeBD=R%cU$DapF*Rpq
z!s_Rnr$2;j%`Qzkv+7oE_7HqO)#c4>0lyjlg&s91S8*eMczAAWb=pXiMIsH3uFp1A
zvSy>%qs`%}TR@%e#;ol5f@Y6)*>w#tr?luykFE0jdDi&c;`!l?KE4eDkJwgnbnHl3
znq4q!6C2B}%3JRGE|%iK8d~bNv8gTF4(}`<Uixx>UOu(CnWQZrvGrkl`MQDplq&jN
z*B3oe;}EudWw-s_tnBWG*vw=1i&xaR(e^T`_u4FSPH1K(w`E;$%26$CGjl!R-1hMK
zalNd(=a2Sfx)tq=r?&(y>?H`hA0WRBoPgm|D17AW^by$7Udj>oe@rIR+X5F)5j5P@
z$*%(^%kfVrlH@G<SozW^inIGaCQ0;G=7J$X&ixR%i8+D8=TSt+H|V3dB}2+F_kT>L
z(c77ekpyFREpjt+aur`oktg4zkFPF8QrzADDLHgWzeRR|kH9?y#x%%I2;<`^AWXXc
zi0~301^Lg(MEy3|#Uq3RLn@e8HCw$Q%Q%-W!<ypOVp&QVN@~_h)+aKoGJaCJu5{db
zzjaZDMTUiPl2Q^%?C%Ydl&r1AtTQrzqm+T8W}+H%Cv5RIDEycV{ZZScgB0tb1pU_B
zg@Xj~AtlVeCN=R=1SyIWkr&hZN^t1mdr6AzWuUb1VtRrEhu(tli1D#mf%=hI6lG*~
zrYWvcM|<e)D?CDc9Egqq(O=8e>ap3e$M_mC^4CI2S07Srx*D;odQ8sjDV}r|C_v~k
zXnyyF*NBl3Ip{=Z;MChYi;^gcYbl!IO1!489wl<;4G5nsB!h9h3RK<R<f2=0>9+}c
zhl(U*FwU%{kLB5d8skr{C09;g+E1R`c6i{DqL$sGd-8ndjCqbbYQs(Cp2)~kcd>Zw
z#>Sc=DZ-ho!j{15XbFm|tp;B3{syzf`D0{yWyf}#o2#hhxHE9>-uE8SpgmgpbTzW8
z@}n6tdi+Vxqx0%pgNEyan&M;i`Z=ia<dy-;LaihnR~6SBHDsa-zr*UFvn0wf{$ZSS
z#i*eQ?(n(71&fk1UTVFwKB{|uG(bIB{HS^#^Sy-pf&SBdr%Y^9M4bu;PWJ`aJB|xq
zv~nDuvVFKGYbBs2u`=VLPhjS?XN04pNx^QBYL@e1Ud%xgsjCO)dLH#`tOO|IC?Dn!
zg7=|2+|%>kxbQW(^$x#ne7Y3A;kKu)Ya2TEiToV5;g(fYYJc1C{ZylKM`3aA6%!$f
zE%Bw9KU7Hb)q|ww4~%ytMe^vPH!vHXL`t?XrbF=hd6%KA2yfI8l}sCLDZQP#Lrw)W
z)f_y;aw7&bvv|sstIoKBu2ng(_UbK}N4|G8J;rbyW2*G@=A*aW?0V1?aoO(MXT(=b
zigQPG1JGSCKv4ttatP;!{`((}ruk=02Ox+!<u4I{Ne4hzFaSpW8inb?!2d}Bi0i*}
z^Jj;D?!gQUz%aN0z?(t9diroMOivpO@Md5=J$;}K13>TJdVs<8!2o3q2JHT?Nx&`#
z!(iHA&K5A7fqkG3|Lf@tAROcq=oc_4|IH|VZ3cjWFaT!+K-aHZ81%QpI6+SLP|l+e
zt_=)>^GJk)0Vx01)9P~azfFyf9s~@?oWL}5dgF{44hBd`U<>=Y|L3LuZ||@Fga4b2
z|AN^#^ZQa4_zP$s0boGd0>BsOw+~nk2GfCoeZYUjv;j7d^8tta5d-x7Z(}gvE%k5h
zpx+*=YXDH(e{07<4Zn%$0JngDZ3l(w!~Z@ODAWL875~;wR|oh?{t?4o@B-d_FMM4t
z#L+(z&ADDJ2Mh)a<}CFAybW82_+Y@CMMb`@>Jf(Zx`6#UGf+T*hYBbwTiP8F_&;zd
BT+RRh

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-291.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-291.pdf
deleted file mode 100644
index 9395d1044570397a935b5fccdfd7b3d93fb25f66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25731
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
F{{XD}T-*Qv

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-292.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-292.pdf
deleted file mode 100644
index 68200458edd152d8dde65ee4e618f9b89e3fa4cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25729
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-293.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-293.pdf
deleted file mode 100644
index adad2fa74716e03649f596324adc0bf76ae24827..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25731
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
I?T!fiAFs7s%m4rY

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-294.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-294.pdf
deleted file mode 100644
index f1ed65befff619ef3cf9c9dbb138103301883ea7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25731
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
E0WyDF*Z=?k

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-295.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-295.pdf
deleted file mode 100644
index a9c349a8ca6fbf90bacf270d21fa21291127f34f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25731
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
A%m4rY

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-296.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-296.pdf
deleted file mode 100644
index 3278789da16cdb7819f7b34a24d5628c04548235..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25729
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

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-297.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-297.pdf
deleted file mode 100644
index 1e30ab849d7a210995fa806a33d40b16649bb449..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26464
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
DjveSv

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-298.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-298.pdf
deleted file mode 100644
index df122cb2af3907e5040a65d265dcbcec28a00e6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25760
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
M0?Nvkc1HyM4<@N&E&u=k

diff --git a/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-299.pdf b/public/receipts/receipt_bill_OSK-OSK(TMW)-20180307-299.pdf
deleted file mode 100644
index 5af5c4bde9bf11553d923c0b08bb7f92fc862a5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25729
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
BTx9?N


From 5d8ba3c4169b271dd00a1cb9282e395eb5ea195e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 7 Mar 2018 15:55:55 +0630
Subject: [PATCH 375/651] remove comment in action controller

---
 app/views/origami/payments/show.html.erb | 359 +++++++++++------------
 config/initializers/action_controller.rb |  10 +-
 2 files changed, 182 insertions(+), 187 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 44b50bf6..d1ef34b4 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -408,7 +408,7 @@
         <div class="row p-r-20">
           <% if ENV["SERVER_MODE"] != 'cloud' %>
           <div class="col-md-5">
-            <button type="button" class="btn btn-link bg-red waves-effect" id="print_pdf">Print</button>
+            <button type="button" class="btn btn-link bg-red waves-effect" id="print_pdf" data-turbolinks="false" remote="true">Print</button>
           </div>
           <% end %>
           <div class="col-md-5">
@@ -421,7 +421,7 @@
   </div>
 </div>     
 
-<script>
+<script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
     /* start check first bill or not*/
@@ -471,152 +471,7 @@ var cashier_type = "<%= @cashier_type %>";
       $('#cash').text(localStorage.getItem("cash"));
     }
     update_balance();
-  });
 
-  // bind survey to order or sale
-  $("#survey").on('click', function () {
-    var sale = $('#sale_id').text();
-    if (sale) {
-      var sale_id = sale
-    } else {
-      var sale_id = $('#dining').text();
-    }
-    //var table_id = $('.tables').attr("data-id");            
-     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
-  });
-
-  // bind customer to order or sale
-  $("#customer").on('click', function () {
-    var sale = $('#sale_id').text();
-    if (sale) {
-      var sale_id = sale
-    } else {
-      var sale_id = $('#save_order_id').attr('data-order');
-     }
-    var table_id = $('.tables').attr("data-id");
-    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers"
-  });
-
-  // Add Other Charges
-  $('#other-charges').click(function () {
-    var sale = $('#sale_id').text();
-    if (sale != "") {
-      var sale_id = sale
-    } else {
-      var sale_id = $('#save_order_id').attr('data-order');
-    }
-    if (sale_id != "") {
-      window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/other_charges'
-    }
-    else {
-      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
-    }
-    return false;
-  });
-  // Discount for Payment
-  $('#discount').click(function () {
-    if ($(this).attr('active')=== "true") {
-      var sale = $('#sale_id').text();
-      if (sale != "") {
-        var sale_id = sale
-      } else {
-        var sale_id = $('#save_order_id').attr('data-order');
-      }
-
-      if (sale_id != "") {
-        window.location.href = '/origami/' + sale_id + "/"+cashier_type+'/discount'
-      }
-      else {
-        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
-      }
-    }else{
-      swal("Oops","You are not authorized for Discount","warning")
-    }
-    return false;
-  });
-
-  $('#edit').on('click', function () {
-    var dining_id = $('#dining').text();
-    var sale_id = $('#sale_id').text();
-    if ($(this).attr('active')=== "true") {
-      if (dining_id) {
-        window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
-      }else{
-        window.location.href = "/origami/table/sale/" + sale_id + "/"+cashier_type+"/edit";
-      }
-      
-    }else{
-      swal("Oops","You are not authorized for void","warning")
-    }
-  });
-
-  $(document).on('click', '.cashier_number', function(event){
-    if(event.handled !== true) {
-      var original_value;
-      original_value = $('#cash').text();
-
-      var input_type = $(this).attr("data-type");
-
-      switch (input_type) {
-        case 'num':
-        var input_value = $(this).attr("data-value");
-        if (original_value == "0.0"){
-          $('#cash').text(input_value);
-          update_balance();
-        }else{
-          if($('#cash').text() == '0'){
-            $('#cash').text("");
-          }
-          $('#cash').append(input_value);
-          update_balance();
-        }
-        break;
-        case 'add':
-        var input_value = $(this).attr("data-value");
-        amount = parseInt(input_value) + parseInt(original_value);
-        $('#cash').text(amount);
-        update_balance();
-        break;
-        case 'del' :
-        var cash=$('#cash').text();
-        if(cash.length == 1)
-          $('#cash').text("0.0");
-        else
-          $('#cash').text(cash.substr(0,cash.length-1));
-        update_balance();
-        break;
-        case 'clr':
-        $('#cash').text("0.0");
-        update_balance();
-        break;
-        case 'nett':
-          var credit1 = $('#credit').text();
-          var card1 = $('#others').text();
-          var paypar1 = $('#ppamount').text();
-          var visa1 = $('#visacount').text();
-          var jcb1 = $('#jcbcount').text();
-          var master1 = $('#mastercount').text();
-          var unionpay1 = $('#unionpaycount').text();
-          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
-          var total = $('#amount_due').text();
-          var amt = 0;
-          <% if precision.to_i > 0 %>;
-            amt = parseFloat(parseFloat(total) - parseFloat(othertotal)).toFixed(<%= precision %>);
-          <% else %>
-            amt = parseFloat(parseFloat(total) - parseFloat(othertotal));
-          <% end %>
-          $('#cash').text(amt);
-          update_balance();
-        break;
-      }
-      event.handled = true;
-    } else {
-      return false;
-    }
-  });
-
-  $( document ).ready(function() {
-     
     // Disable click event cash to prevent
     $(".payment .cash-color").off('click');
 
@@ -802,6 +657,148 @@ var cashier_type = "<%= @cashier_type %>";
     });
   });
 
+  // bind survey to order or sale
+  $("#survey").on('click', function () {
+    var sale = $('#sale_id').text();
+    if (sale) {
+      var sale_id = sale
+    } else {
+      var sale_id = $('#dining').text();
+    }
+    //var table_id = $('.tables').attr("data-id");            
+     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
+  });
+
+  // bind customer to order or sale
+  $("#customer").on('click', function () {
+    var sale = $('#sale_id').text();
+    if (sale) {
+      var sale_id = sale
+    } else {
+      var sale_id = $('#save_order_id').attr('data-order');
+     }
+    var table_id = $('.tables').attr("data-id");
+    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers"
+  });
+
+  // Add Other Charges
+  $('#other-charges').click(function () {
+    var sale = $('#sale_id').text();
+    if (sale != "") {
+      var sale_id = sale
+    } else {
+      var sale_id = $('#save_order_id').attr('data-order');
+    }
+    if (sale_id != "") {
+      window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/other_charges'
+    }
+    else {
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+    }
+    return false;
+  });
+  // Discount for Payment
+  $('#discount').click(function () {
+    if ($(this).attr('active')=== "true") {
+      var sale = $('#sale_id').text();
+      if (sale != "") {
+        var sale_id = sale
+      } else {
+        var sale_id = $('#save_order_id').attr('data-order');
+      }
+
+      if (sale_id != "") {
+        window.location.href = '/origami/' + sale_id + "/"+cashier_type+'/discount'
+      }
+      else {
+        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+      }
+    }else{
+      swal("Oops","You are not authorized for Discount","warning")
+    }
+    return false;
+  });
+
+  $('#edit').on('click', function () {
+    var dining_id = $('#dining').text();
+    var sale_id = $('#sale_id').text();
+    if ($(this).attr('active')=== "true") {
+      if (dining_id) {
+        window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
+      }else{
+        window.location.href = "/origami/table/sale/" + sale_id + "/"+cashier_type+"/edit";
+      }
+      
+    }else{
+      swal("Oops","You are not authorized for void","warning")
+    }
+  });
+
+  $(document).on('click', '.cashier_number', function(event){
+    if(event.handled !== true) {
+      var original_value;
+      original_value = $('#cash').text();
+
+      var input_type = $(this).attr("data-type");
+
+      switch (input_type) {
+        case 'num':
+        var input_value = $(this).attr("data-value");
+        if (original_value == "0.0"){
+          $('#cash').text(input_value);
+          update_balance();
+        }else{
+          if($('#cash').text() == '0'){
+            $('#cash').text("");
+          }
+          $('#cash').append(input_value);
+          update_balance();
+        }
+        break;
+        case 'add':
+        var input_value = $(this).attr("data-value");
+        amount = parseInt(input_value) + parseInt(original_value);
+        $('#cash').text(amount);
+        update_balance();
+        break;
+        case 'del' :
+        var cash=$('#cash').text();
+        if(cash.length == 1)
+          $('#cash').text("0.0");
+        else
+          $('#cash').text(cash.substr(0,cash.length-1));
+        update_balance();
+        break;
+        case 'clr':
+        $('#cash').text("0.0");
+        update_balance();
+        break;
+        case 'nett':
+          var credit1 = $('#credit').text();
+          var card1 = $('#others').text();
+          var paypar1 = $('#ppamount').text();
+          var visa1 = $('#visacount').text();
+          var jcb1 = $('#jcbcount').text();
+          var master1 = $('#mastercount').text();
+          var unionpay1 = $('#unionpaycount').text();
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
+          var total = $('#amount_due').text();
+          var amt = 0;
+          <% if precision.to_i > 0 %>;
+            amt = parseFloat(parseFloat(total) - parseFloat(othertotal)).toFixed(<%= precision %>);
+          <% else %>
+            amt = parseFloat(parseFloat(total) - parseFloat(othertotal));
+          <% end %>
+          $('#cash').text(amt);
+          update_balance();
+        break;
+      }
+      event.handled = true;
+    } else {
+      return false;
+    }
+  });
+
   function update_balance(){
     var cash = $('#cash').text();
     var credit = $('#credit').text();
@@ -891,42 +888,40 @@ var cashier_type = "<%= @cashier_type %>";
     }
   }
 
+  $('#print_pdf').off('click');
   //print pdf function
-  $(document).on('ready page:load',function(){
-    $(document).on('click', "button#print_pdf",function(){
-  // $('#print_pdf').click(function(){
-      var filename = $("#filename").val();
-      var printer_name = $("#printer_name").val();
-      var receipt_no = $("#sale_receipt_no").val();
-      var print_copies = $("#print_copies").val();
-      var params = { turbolinks: false, remote : true, 'filename':filename, 'receipt_no':receipt_no, 'print_copies':print_copies, 'printer_name':printer_name };
-      // swal({
-      //     title: "Alert",
-      //     text: "Are you sure want to print?",
-      //     type: "warning",
-      //     showCancelButton: true,
-      //     confirmButtonColor: "#DD6B55",
-      //     confirmButtonText: "Print",
-      //     closeOnConfirm: false
-      // }, function (isConfirm) {
-      //   if (isConfirm) {
-            $.ajax({
-              type: "POST",            
-              url: "<%= origami_payment_print_path %>",
-              data: params,
-              success:function(result){
-                console.log(result);
-                // if (cashier_type=="cashier") {
-                //   window.location.href = '/origami';
-                // }else{
-                //   window.location.href = '/origami/quick_service';
-                // } 
-              }
-            });
-      //   }
-      // }); 
-      
-    });
+  $("#print_pdf").on('click',function(){
+    var filename = $("#filename").val();
+    var printer_name = $("#printer_name").val();
+    var receipt_no = $("#sale_receipt_no").val();
+    var print_copies = $("#print_copies").val();
+    var params = { turbolinks: false, remote : true, 'filename':filename, 'receipt_no':receipt_no, 'print_copies':print_copies, 'printer_name':printer_name };
+    // swal({
+    //     title: "Alert",
+    //     text: "Are you sure want to print?",
+    //     type: "warning",
+    //     showCancelButton: true,
+    //     confirmButtonColor: "#DD6B55",
+    //     confirmButtonText: "Print",
+    //     closeOnConfirm: false
+    // }, function (isConfirm) {
+    //   if (isConfirm) {
+          $.ajax({
+            type: "POST",            
+            url: "<%= origami_payment_print_path %>",
+            data: params,
+            success:function(result){
+              console.log(result);
+              // if (cashier_type=="cashier") {
+              //   window.location.href = '/origami';
+              // }else{
+              //   window.location.href = '/origami/quick_service';
+              // } 
+            }
+          });
+    //   }
+    // }); 
+    
   });
   
 
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 02e35bb8..8f310dab 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From 9ec8c4d18c894622fb729b19e3dff3af63571420 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 7 Mar 2018 17:50:23 +0630
Subject: [PATCH 376/651] Photo Field in Customer,Employee and Commissionor

---
 app/assets/javascripts/CRM.js                 | 23 ++++++-
 app/assets/javascripts/application.js         | 60 +++++++++++++++++++
 app/assets/javascripts/origami.js             | 25 ++++++++
 app/assets/stylesheets/CRM.scss               |  1 +
 app/controllers/crm/customers_controller.rb   |  2 +-
 .../settings/commissioners_controller.rb      |  2 +-
 .../settings/employees_controller.rb          |  2 +-
 app/models/commissioner.rb                    |  3 +
 app/models/customer.rb                        |  3 +
 app/models/employee.rb                        |  3 +
 app/uploaders/commissioner_image_uploader.rb  | 59 ++++++++++++++++++
 app/uploaders/customer_image_uploader.rb      | 59 ++++++++++++++++++
 app/uploaders/employee_image_uploader.rb      | 59 ++++++++++++++++++
 app/views/crm/customers/_new_form.html.erb    | 16 +++++
 app/views/layouts/_header.html.erb            |  6 +-
 .../settings/commissioners/_form.html.erb     | 22 ++++++-
 .../settings/commissioners/show.html.erb      |  4 ++
 app/views/settings/employees/_form.html.erb   | 16 +++++
 app/views/settings/employees/show.html.erb    |  4 ++
 19 files changed, 360 insertions(+), 9 deletions(-)
 create mode 100644 app/uploaders/commissioner_image_uploader.rb
 create mode 100644 app/uploaders/customer_image_uploader.rb
 create mode 100644 app/uploaders/employee_image_uploader.rb

diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js
index 03450eb1..b616453c 100755
--- a/app/assets/javascripts/CRM.js
+++ b/app/assets/javascripts/CRM.js
@@ -23,6 +23,7 @@
 //= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
+//= require fileinput.min
 //= require BSBMaterial/turbolink_admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
@@ -34,4 +35,24 @@ $(document).on('turbolinks:load', function() {
         weekStart: 1,
         time: false
     });
-});
\ No newline at end of file
+
+    $("#customer_image_path").fileinput({
+	      previewFileType: "image",
+	      allowedFileExtensions: ["jpg", "gif", "png"],
+	      browseClass: "btn btn-success",
+	      browseLabel: "Pick Image",
+	      browseIcon: "<i class=\"fa fa-image\"></i> ",
+	      removeClass: "btn btn-danger",
+	      removeLabel: "Delete",
+	      removeIcon: "<i class=\"fa fa-trash\"></i> ",
+	      showUpload: false,
+	      // uploadClass: "btn btn-info",
+	      // uploadLabel: "Upload",
+	      // uploadIcon: "<i class=\"fa fa-upload\"></i> ",
+	      previewTemplates: {
+	        image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
+	                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
+	                '</div>\n',
+	    }
+	  });  
+});
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 76341958..590657ef 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -104,6 +104,66 @@ $(document).ready(function() {
     }
   });
 
+  $("#shop_logo").fileinput({
+      previewFileType: "image",
+      allowedFileExtensions: ["jpg", "gif", "png"],
+      browseClass: "btn btn-success",
+      browseLabel: "Pick Image",
+      browseIcon: "<i class=\"fa fa-image\"></i> ",
+      removeClass: "btn btn-danger",
+      removeLabel: "Delete",
+      removeIcon: "<i class=\"fa fa-trash\"></i> ",
+      showUpload: false,
+      // uploadClass: "btn btn-info",
+      // uploadLabel: "Upload",
+      // uploadIcon: "<i class=\"fa fa-upload\"></i> ",
+      previewTemplates: {
+        image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
+                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
+                '</div>\n',
+    }
+  });
+  
+  $("#commissioner_image_path").fileinput({
+      previewFileType: "image",
+      allowedFileExtensions: ["jpg", "gif", "png"],
+      browseClass: "btn btn-success",
+      browseLabel: "Pick Image",
+      browseIcon: "<i class=\"fa fa-image\"></i> ",
+      removeClass: "btn btn-danger",
+      removeLabel: "Delete",
+      removeIcon: "<i class=\"fa fa-trash\"></i> ",
+      showUpload: false,
+      // uploadClass: "btn btn-info",
+      // uploadLabel: "Upload",
+      // uploadIcon: "<i class=\"fa fa-upload\"></i> ",
+      previewTemplates: {
+        image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
+                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
+                '</div>\n',
+    }
+  });   
+
+  $("#employee_image_path").fileinput({
+      previewFileType: "image",
+      allowedFileExtensions: ["jpg", "gif", "png"],
+      browseClass: "btn btn-success",
+      browseLabel: "Pick Image",
+      browseIcon: "<i class=\"fa fa-image\"></i> ",
+      removeClass: "btn btn-danger",
+      removeLabel: "Delete",
+      removeIcon: "<i class=\"fa fa-trash\"></i> ",
+      showUpload: false,
+      // uploadClass: "btn btn-info",
+      // uploadLabel: "Upload",
+      // uploadIcon: "<i class=\"fa fa-upload\"></i> ",
+      previewTemplates: {
+        image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
+                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
+                '</div>\n',
+    }
+  });  
+
   // first input focus for all form
   $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus();
 
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index d7afc4db..0f5380a7 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -9,12 +9,37 @@
 //= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
+//= require fileinput.min
 //= require cable
 //= require turbolinks
 //= require BSBMaterial/turbolink_admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+
+$(document).on('turbolinks:load', function() {
+
+    $("#customer_image_path").fileinput({
+	      previewFileType: "image",
+	      allowedFileExtensions: ["jpg", "gif", "png"],
+	      browseClass: "btn btn-success",
+	      browseLabel: "Pick Image",
+	      browseIcon: "<i class=\"fa fa-image\"></i> ",
+	      removeClass: "btn btn-danger",
+	      removeLabel: "Delete",
+	      removeIcon: "<i class=\"fa fa-trash\"></i> ",
+	      showUpload: false,
+	      // uploadClass: "btn btn-info",
+	      // uploadLabel: "Upload",
+	      // uploadIcon: "<i class=\"fa fa-upload\"></i> ",
+	      previewTemplates: {
+	        image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
+	                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
+	                '</div>\n',
+	    }
+	  });  
+});
+
 $(document).on('turbolinks:load', function() {
 	$('.datetimepicker').bootstrapMaterialDatePicker({
 	  format: 'DD-MM-YYYY - HH:mm',
diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss
index 8b652eac..5bfab409 100755
--- a/app/assets/stylesheets/CRM.scss
+++ b/app/assets/stylesheets/CRM.scss
@@ -13,6 +13,7 @@
 @import "BSBMaterial/style";
 @import "BSBMaterial/themes/all-themes";
 @import "reset";
+@import "fileinput.min";
 
 .sx-margin-0 {
   margin: 0 !important;
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 0168e326..42ea4b2f 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -396,7 +396,7 @@ end
     def customer_params
 
       params.require(:customer).permit(:id, :name, :company, :contact_no, :email,
-                :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type)
+                :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :image_path)
     end
    
 end
diff --git a/app/controllers/settings/commissioners_controller.rb b/app/controllers/settings/commissioners_controller.rb
index 4f195f43..f8314bcb 100755
--- a/app/controllers/settings/commissioners_controller.rb
+++ b/app/controllers/settings/commissioners_controller.rb
@@ -91,6 +91,6 @@ class Settings::CommissionersController < ApplicationController
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def commissioner_params
-    params.require(:commissioner).permit(:name, :emp_id, :created_by, :commission_id, :joined_date, :resigned_date, :is_active)
+    params.require(:commissioner).permit(:name, :emp_id, :created_by, :commission_id, :joined_date, :resigned_date, :is_active, :image_path)
   end
 end
diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb
index 2bc81c51..cefb7b9c 100755
--- a/app/controllers/settings/employees_controller.rb
+++ b/app/controllers/settings/employees_controller.rb
@@ -68,6 +68,6 @@ class Settings::EmployeesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def employee_params
-      params.require(:employee).permit(:name, :role, :emp_id, :password)
+      params.require(:employee).permit(:name, :role, :emp_id, :password, :image_path)
     end
 end
diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb
index 2b262afc..68573460 100755
--- a/app/models/commissioner.rb
+++ b/app/models/commissioner.rb
@@ -7,4 +7,7 @@ class Commissioner < ApplicationRecord
 
   # validations
   validates_presence_of :name
+
+  # Commissioner Image Uploader
+  mount_uploader :image_path, CommissionerImageUploader
 end
diff --git a/app/models/customer.rb b/app/models/customer.rb
index fcdd7f31..7f5a7a63 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -2,6 +2,9 @@ class Customer < ApplicationRecord
 
   #self.primary_key = :customer_id
 
+  # Customer Image Uploader
+  mount_uploader :image_path, CustomerImageUploader
+
   before_create :generate_custom_id
   has_many :orders
   has_many :sales
diff --git a/app/models/employee.rb b/app/models/employee.rb
index a12521cb..c1f985ea 100755
--- a/app/models/employee.rb
+++ b/app/models/employee.rb
@@ -8,6 +8,9 @@ class Employee < ApplicationRecord
   validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true
   validates :password, numericality: true, length: {in: 3..9}, allow_blank: true
 
+  # Employee Image Uploader
+  mount_uploader :image_path, EmployeeImageUploader
+
   def self.all_emp_except_waiter
      Employee.where('role!=?','waiter')
   end
diff --git a/app/uploaders/commissioner_image_uploader.rb b/app/uploaders/commissioner_image_uploader.rb
new file mode 100644
index 00000000..639ce7d7
--- /dev/null
+++ b/app/uploaders/commissioner_image_uploader.rb
@@ -0,0 +1,59 @@
+class CommissionerImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  def root
+    Rails.root.join 'public/'
+  end
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "image/commissioner_images"
+    # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # def cache_dir
+  #   '/tmp/images'
+  # end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url(*args)
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process scale: [200, 300]
+  process :resize_to_fit => [200, 150]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process resize_to_fit: [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_whitelist
+    %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end	
+
+end
\ No newline at end of file
diff --git a/app/uploaders/customer_image_uploader.rb b/app/uploaders/customer_image_uploader.rb
new file mode 100644
index 00000000..1de0f3ad
--- /dev/null
+++ b/app/uploaders/customer_image_uploader.rb
@@ -0,0 +1,59 @@
+class CustomerImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  def root
+    Rails.root.join 'public/'
+  end
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "image/customer_images"
+    # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # def cache_dir
+  #   '/tmp/images'
+  # end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url(*args)
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process scale: [200, 300]
+  process :resize_to_fit => [200, 150]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process resize_to_fit: [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_whitelist
+    %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end	
+
+end
\ No newline at end of file
diff --git a/app/uploaders/employee_image_uploader.rb b/app/uploaders/employee_image_uploader.rb
new file mode 100644
index 00000000..fd64db42
--- /dev/null
+++ b/app/uploaders/employee_image_uploader.rb
@@ -0,0 +1,59 @@
+class EmployeeImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  def root
+    Rails.root.join 'public/'
+  end
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "image/employee_images"
+    # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # def cache_dir
+  #   '/tmp/images'
+  # end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url(*args)
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process scale: [200, 300]
+  process :resize_to_fit => [200, 150]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process resize_to_fit: [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_whitelist
+    %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end	
+
+end
\ No newline at end of file
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 2359ad57..3a953e81 100755
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -90,6 +90,21 @@
   <label><%= t("views.right_panel.detail.date_of_birth") %></label>
   <%= f.text_field :date_of_birth, :value=>"01-01-1990",:class=>"datepicker form-control col-md-12"%>
 </div> 
+
+<div class="form-group">
+  <label><%= t("views.right_panel.detail.customer_photo") %></label>
+    <div class="panel padding-10">
+        <div class="menu-item-img">
+          <% if f.object.image_path? %>
+            <p><%= f.object.name %></p>
+              <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+          <% else %>                
+            <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+          <% end %>          
+        </div>
+        <%= f.file_field :image_path, :class => "img-thumbnail" %>
+    </div> 
+</div>
    
 <div class="form-group">
   <label><%= t("views.right_panel.detail.select_customer_type") %></label>
@@ -164,6 +179,7 @@
   </div>
 </div>
 <script type="text/javascript">
+
   $(function() {
 // Read Card Reader
     $("#paypar_account_no").on('focus', function(e){               
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 907c5e88..15dfdfbe 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -80,6 +80,8 @@
     </div>
 </nav>
 <script type="text/javascript">
-    var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
-    document.getElementById("otherPayment").innerHTML = otherPayment;
+    if((document.getElementById("otherPayment")!=undefined) && (document.getElementById("otherPayment")!=null) && (document.getElementById("otherPayment")!="")){
+        var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
+        document.getElementById("otherPayment").innerHTML = otherPayment;
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb
index a337e47b..1d0823a5 100755
--- a/app/views/settings/commissioners/_form.html.erb
+++ b/app/views/settings/commissioners/_form.html.erb
@@ -1,11 +1,27 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <div class="card">
       <div class="body">
         <%= simple_form_for([:settings, @commissioner]) do |f| %>
         <%= f.error_notification %>
-        <div class="form-inputs">
+        <div class="form-group p-l-15">
           <%= f.input :name %>
+
+          <label>Commissioner Image</label>
+          <div class="panel padding-10">
+            <div class="form-group">
+              <div class="menu-item-img">
+                <% if f.object.image_path? %>
+                  <p><%= f.object.name %></p>
+                     <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+                <% else %>                
+                  <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+                <% end %>          
+              </div>
+              <%= f.file_field :image_path, :class => "img-thumbnail" %>
+            </div>
+          </div> 
+          
           <%= f.label :emp_id, 'Employee' %>
 
           <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
@@ -29,7 +45,7 @@
      </div>
    </div>
  </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
       <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb
index 49c7f2de..b9df0967 100755
--- a/app/views/settings/commissioners/show.html.erb
+++ b/app/views/settings/commissioners/show.html.erb
@@ -33,6 +33,10 @@
                 <td style="width:20%"><%= t("views.right_panel.detail.name") %></td>
                 <td><%= @commissioner.name %></td>
               </tr>
+              <tr>
+                <td style="width:20%"><%= t("views.right_panel.detail.commissioner_photo") %></td>
+                <td><%= image_tag @commissioner.image_path, :size => '200x200'%></td>
+              </tr>
               <tr>
                 <td style="width:20%"><%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name") %></td>
                 <td><%= @commissioner.employee.name rescue '-' %></td>
diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb
index 5d5fcb04..0b973416 100755
--- a/app/views/settings/employees/_form.html.erb
+++ b/app/views/settings/employees/_form.html.erb
@@ -12,6 +12,22 @@
           <%= f.input :password %>
 
         </div>
+        <div class="form-inputs p-l-15">
+          <label>Employee Image</label>
+          <div class="panel padding-10">
+            <div class="form-group">
+              <div class="menu-item-img">
+                <% if f.object.image_path? %>
+                  <p><%= f.object.name %></p>
+                     <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+                <% else %>                
+                  <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+                <% end %>          
+              </div>
+              <%= f.file_field :image_path, :class => "img-thumbnail" %>
+            </div>
+          </div>
+        </div>   
 
         <div class="form-actions p-l-15">
            <%= f.submit t('views.btn.submit'),:class => 'btn btn-primary btn-lg waves-effect' %>
diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb
index 0b26b1bf..0e57b032 100755
--- a/app/views/settings/employees/show.html.erb
+++ b/app/views/settings/employees/show.html.erb
@@ -44,6 +44,10 @@
           <th><%= t("views.right_panel.detail.updated_at") %></th>
           <td><%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
         </tr>
+        <tr>
+          <th><%= t("views.right_panel.detail.employee_photo") %></th>
+          <td><%= image_tag @employee.image_path, :size => '200x200'%></td>
+        </tr>
         <tr>
           <th></th>
           <td>

From d9a7e341fad7d3ab38d4749debdcfba76e6e356f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Mar 2018 10:01:54 +0630
Subject: [PATCH 377/651] cadd print pdf in payment page

---
 .../origami/payments_controller.rb            | 62 ++++++++++++----
 app/models/ability.rb                         |  5 +-
 app/models/printer/receipt_printer.rb         | 25 ++++---
 app/views/origami/payments/show.html.erb      | 74 ++++++++++++++-----
 config/routes.rb                              |  3 +-
 5 files changed, 125 insertions(+), 44 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index c446af72..06167bb5 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -28,8 +28,21 @@ class Origami::PaymentsController < BaseOrigamiController
       end
 
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
       # Print for First Bill to Customer
       unique_code = "ReceiptBillPdf"
+      if !receipt_bill_a5_pdf.empty?
+        receipt_bill_a5_pdf.each do |receipt_bilA5|
+          if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+            if receipt_bilA5[1] == '1'
+              unique_code = "ReceiptBillA5Pdf"
+            else
+              unique_code = "ReceiptBillPdf"
+            end
+          end
+        end
+      end
+
        #shop detail
       shop_details =  Shop::ShopDetail 
       # customer= Customer.where('customer_id=' +.customer_id)
@@ -117,7 +130,20 @@ class Origami::PaymentsController < BaseOrigamiController
 
       # For Print
       if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
         unique_code = "ReceiptBillPdf"
+        if !receipt_bill_a5_pdf.empty?
+          receipt_bill_a5_pdf.each do |receipt_bilA5|
+            if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+              if receipt_bilA5[1] == '1'
+                unique_code = "ReceiptBillA5Pdf"
+              else
+                unique_code = "ReceiptBillPdf"
+              end
+            end
+          end
+        end
+
         customer= Customer.find(saleObj.customer_id)
 
         # get member information
@@ -150,9 +176,9 @@ class Origami::PaymentsController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)
 
         printer = Printer::ReceiptPrinter.new(print_settings)
-        filename, sale_receipt_no, print_copies, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
 
-        render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :count => print_copies, :printer_name => printer_name})
+        render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
 
         if params[:type] == "quick_service"
           booking = Booking.find_by_sale_id(sale_id)
@@ -440,20 +466,30 @@ class Origami::PaymentsController < BaseOrigamiController
   end
 
   #print function for receipt
-  def print    
-    # byebug
+  def print 
     filename      = params[:filename]
-    receipt_no    = parmas[:receipt_no]
-    print_copies  = params[:print_copies]
+    receipt_no    = params[:receipt_no]
     printer_name  = params[:printer_name]
     
-    puts "print params"
-    puts params    
-
-    print_receipt_pdf(filename,receipt_no,print_copies,printer_name)
-
-    redirect_to origami_path
-    # render json: JSON.generate({:status => true})
+    receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
+    unique_code = "ReceiptBillPdf"
+    if !receipt_bill_a5_pdf.empty?
+      receipt_bill_a5_pdf.each do |receipt_bilA5|
+        if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+          if receipt_bilA5[1] == '1'
+            unique_code = "ReceiptBillA5Pdf"
+          else
+            unique_code = "ReceiptBillPdf"
+          end
+        end
+      end
+    end
+    # get printer info
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    printer = Printer::ReceiptPrinter.new(print_settings)
+    printer.print_receipt_pdf(filename,receipt_no,print_settings.print_copies,printer_name)
+    
+    render :json => {status: true}
   end
 
   #Shop Name in Navbor
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 33372ac9..29f66d34 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -65,7 +65,8 @@ class Ability
         can :create, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
-        can :foc, :payment        
+        can :foc, :payment  
+        can :print, :payment      
 
         can :move_dining, :movetable 
         can :moving, :movetable
@@ -122,6 +123,7 @@ class Ability
         can :create, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
+        can :print, :payment
 
         can :move_dining, :movetable 
         can :moving, :movetable
@@ -180,6 +182,7 @@ class Ability
         can :show, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
+        can :print, :payment
 
         can :manage, Commission
         can :manage, Commissioner
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index dac1778f..d544c908 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -218,7 +218,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       count -= 1
     end until count == 0
 
-    return filename, sale_data.receipt_no, count, cashier_terminal.printer_name
+    return filename, sale_data.receipt_no, cashier_terminal.printer_name
   end
 
    # stock check
@@ -260,16 +260,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
 
   #print receipt pdf from js
   def print_receipt_pdf(filename,receipt_no,print_copies,printer_name)
-    begin
-      if print_copies == 1
-        self.print("public"+filename, cashier_terminal.printer_name)
-      else
-        filename = "public/receipts/receipt_bill_#{receipt_no}_#{print_copies}.pdf"
-        self.print(filename, cashier_terminal.printer_name)
-      end
+    count = print_copies.to_i
+    # if count == 0
+    #   self.print("public"+filename, printer_name)
+    # else
+      begin
+        if count == 1
+          self.print("public"+filename, printer_name)
+        else
+          filename = "public/receipts/receipt_bill_#{receipt_no}_#{count}.pdf"
+          self.print(filename, printer_name)
+        end
 
-      print_copies -= 1
-    end until print_copies == 0
+        count -= 1
+      end until count == 0
+    # end
   end
 
 end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index d1ef34b4..6c467d66 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid" data-no-turbolink="true">
+<div class="container-fluid">
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
@@ -387,7 +387,7 @@
 </div>  
 
 <!-- pdf light box -->
-<div class="modal fade" id="pdfModal" tabindex="-1" role="dialog" data-turbolinks-partial="pdfModal" >
+<div class="modal fade" id="pdfModal" tabindex="-1" role="dialog">
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -397,18 +397,16 @@
         <input type="hidden" name="sale_receipt_no" id="sale_receipt_no">
         <input type="hidden" name="filename" id="filename">
         <input type="hidden" name="printer_name" id="printer_name">
-        <input type="hidden" name="print_copies" id="print_copies">
         <p id="changed_amount"></p>
         <div class="text-center">
           <iframe id="receipt_pdf" src="" style="width: 400px; height: 600px;"></iframe>
-         <!-- <object id="receipt_pdf" data="" type="application/pdf" width="400" height="600"></object> -->
         </div>
       </div>
       <div class="modal-footer ">
         <div class="row p-r-20">
           <% if ENV["SERVER_MODE"] != 'cloud' %>
           <div class="col-md-5">
-            <button type="button" class="btn btn-link bg-red waves-effect" id="print_pdf" data-turbolinks="false" remote="true">Print</button>
+            <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
           </div>
           <% end %>
           <div class="col-md-5">
@@ -419,11 +417,53 @@
       </div>
     </div>
   </div>
-</div>     
+</div>   
+
+<!-- customer light box -->
+<div class="modal fade" id="is_memberModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-md" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="is_memberModalLabel">Is Member?</h4>
+      </div>
+      <div class="modal-body">
+
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-4">
+            <button type="button" class="btn btn-link bg-green waves-effect">Yes</button>
+          </div>
+
+          <div class="col-md-4">
+            <button type="button" class="btn btn-link bg-red waves-effect" data-dismiss="modal">No</button>
+          </div>
+
+          <div class="col-md-4">
+            <button type="button" class="btn btn-link bg-primary waves-effect">Member</button>
+          </div>
+
+          <div class="col-md-4">
+            <button type="button" class="btn btn-link bg-primary waves-effect">QR</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>    
 
 <script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>"; 
+var customer_id = "<%= @customer.id %>";
+var customer_name = "<%= @customer.name %>";
+
   $(document).ready(function(){
+    console.log(customer_name);
+    console.log(customer_id);
+    // if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
+    //   $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
+    // }
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
         var member_discount = $('#member_discount').text();
@@ -552,7 +592,6 @@ var cashier_type = "<%= @cashier_type %>";
                 //PDF lightbox data
                 $("#sale_receipt_no").val(result.receipt_no);
                 $("#filename").val(result.filename);
-                $("#print_copies").val(result.count);
                 $("#printer_name").val(result.printer_name);
                 $("#receipt_pdf").attr("src", result.filename);
                 $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
@@ -566,7 +605,6 @@ var cashier_type = "<%= @cashier_type %>";
                   <% end %>
                 }
                 //PDF lightbox data 
-
                 // if($('#balance').text() < 0){
                 //   swal({
                 //     title: "Payment Successful!",
@@ -888,14 +926,14 @@ var cashier_type = "<%= @cashier_type %>";
     }
   }
 
-  $('#print_pdf').off('click');
   //print pdf function
-  $("#print_pdf").on('click',function(){
+  $(".print_receipt").on('click',function(){
+    var sale_id   = $('#sale_id').text();
     var filename = $("#filename").val();
     var printer_name = $("#printer_name").val();
     var receipt_no = $("#sale_receipt_no").val();
-    var print_copies = $("#print_copies").val();
-    var params = { turbolinks: false, remote : true, 'filename':filename, 'receipt_no':receipt_no, 'print_copies':print_copies, 'printer_name':printer_name };
+    var params = { 'filename':filename, 'receipt_no':receipt_no, 'printer_name':printer_name };
+    
     // swal({
     //     title: "Alert",
     //     text: "Are you sure want to print?",
@@ -908,15 +946,15 @@ var cashier_type = "<%= @cashier_type %>";
     //   if (isConfirm) {
           $.ajax({
             type: "POST",            
-            url: "<%= origami_payment_print_path %>",
+            url: "/origami/sale/"+sale_id+"/"+cashier_type+"/payment/print",
             data: params,
             success:function(result){
               console.log(result);
-              // if (cashier_type=="cashier") {
-              //   window.location.href = '/origami';
-              // }else{
-              //   window.location.href = '/origami/quick_service';
-              // } 
+              if (cashier_type=="cashier") {
+                window.location.href = '/origami';
+              }else{
+                window.location.href = '/origami/quick_service';
+              } 
             }
           });
     //   }
diff --git a/config/routes.rb b/config/routes.rb
index 2254bb2f..ee3a4c9e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -165,6 +165,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj', :as => "calculate_rouding_adjs"
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => {:format => 'json'}
     get 'sale/:sale_id/:type/payment' => 'payments#show'
+    post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
 
     post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
@@ -177,8 +178,6 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
 
-    post 'payment/print' => 'payments#print'
-
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/MPU' => "mpu#index"

From 23be4771fd53301486478491e13434938d8158e3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Mar 2018 14:57:45 +0630
Subject: [PATCH 378/651] add function for member card and qr code in payment

---
 app/controllers/crm/customers_controller.rb   |  10 +-
 .../origami/customers_controller.rb           |   1 +
 app/models/sale.rb                            |   6 +-
 app/views/crm/customers/index.html.erb        |   9 +-
 app/views/origami/customers/index.html.erb    |  87 +++++++---
 app/views/origami/home/show.html.erb          |   4 +-
 app/views/origami/payments/show.html.erb      | 156 +++++++++++++++---
 app/views/origami/rooms/show.html.erb         |   3 +-
 config/routes.rb                              |   4 +-
 9 files changed, 213 insertions(+), 67 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 12944632..83a437a2 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -167,7 +167,7 @@ class Crm::CustomersController < BaseCrmController
                   status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
 
                   if params[:sale_id]
-                      format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' }
+                      format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created.' }
                   else
                       format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'}
                   end
@@ -186,21 +186,21 @@ class Crm::CustomersController < BaseCrmController
                   if response["message"] == "Account has not exist."
                     customer.destroy
                     if params[:sale_id]
-                      format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]}
+                      format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer cannot created.' + response["message"]}
                     else
                       format.html { redirect_to crm_customers_path, notice: 'Customer cannot created.' + response["message"] }
                     end
                   end
 
                   if params[:sale_id]
-                      format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response["message"]}
+                      format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created.' + response["message"]}
                   else
                       format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response["message"] }
                   end
               end
           else
               if params[:sale_id]
-                  format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. noted'}
+                  format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created. noted'}
                 else
                   format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' }
               end
@@ -209,7 +209,7 @@ class Crm::CustomersController < BaseCrmController
 
           if params[:sale_id]
             flash[:errors] = @crm_customers.errors
-            format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'}
+            format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page]}
             format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
           else
             flash[:errors] = @crm_customers.errors
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index db89b1d0..f8036a2a 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -50,6 +50,7 @@ class Origami::CustomersController < BaseOrigamiController
 
     @sale_id             = params[:sale_id]
     @cashier_type        = params[:type]
+    @page                = params[:page]
     
      if(@sale_id[0,3] == "SAL")
        @booking          = Booking.find_by_sale_id(@sale_id)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 8252d343..591d460b 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -556,12 +556,8 @@ class Sale < ApplicationRecord
       prefix = DateTime.now().utc
       #self.receipt_no = prefix.to_s + "/" + self.shit_id.to_s + "/" + SeedGenerator.new_receipt_no().to_s
       if !shop_details.nil?
-        if !shop_details.client_code.nil? && shop_details.shop_code.nil?
-          self.receipt_no = shop_details.client_code + "-" + prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
-        elsif shop_details.client_code.nil? && !shop_details.shop_code.nil?
+        if !shop_details.shop_code.nil?
           self.receipt_no = shop_details.shop_code + "-" + prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
-        elsif !shop_details.client_code.nil? && !shop_details.shop_code.nil?
-          self.receipt_no = shop_details.client_code + "-" + shop_details.shop_code + "-" + prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
         else
           self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
         end
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index d05af387..372c05e9 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -23,10 +23,10 @@
                         <input type="hidden" name="type" id="type" value="">
                   </div>
                   <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
-                    <button type="submit" class="btn btn-sm bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
+                    <button type="submit" class="btn btn-sm bg-blue waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.search") %></button>
                   <!-- </div> -->
-                    <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
-                    <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
+                    <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
+                    <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
                 </div>
                 <% end %>
             </div>
@@ -145,7 +145,8 @@ $(function() {
     $("#qr_code").on('click', function(e){
         var code = "";        
         setTimeout(function(){
-           var hi=getQRCode();           
+           code=getQRCode();
+           setQRCode(code);           
         },100);
     });
 
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index eebaabbf..e144d848 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -34,12 +34,14 @@
                  <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
 
                </div>
-               <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-                <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
-              </div>
+               <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
+                <button type="submit" class="btn bg-blue waves-effect waves-effect" style="height: 30%;margin-right: 10px;">Search</button>
+              <!-- </div> -->
 
               <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>
 
+              <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
+
             </div>
             <% end %>
           </div>
@@ -114,6 +116,8 @@
 
           <span class="patch_method"></span>
           <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
+          <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
+          <input type="hidden" id="page" name="page" value="<%= @page %>" />
           <%if !@dining_facility.nil?%>
           <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
           <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
@@ -262,7 +266,8 @@
   </div>
 </div>
 <script type="text/javascript">
-  var cashier_type = "<%= @cashier_type %>"; 
+  var cashier_type = "<%= @cashier_type %>";
+  var page     = "<%= @page %>"; 
   $(function() {
       /*$('.datepicker').datepicker({
        setDate: '12-12-1999',
@@ -295,22 +300,23 @@
         getCardNo();
         $("#sxModal").hide();        
         customer_mamber_card_no = $("#search").val();
-
+        
         if(sale_id != 0 && customer_mamber_card_no != 0){    
           $.ajax({
             type: "POST",
-            url: "get_customer" ,
+            url: "/origami/"+sale_id+"/get_customer" ,
             data: { filter : customer_mamber_card_no ,type :"card"},
             dataType: "json",
             success: function(data) {
               if (data[0].customer_id == false) {
-                $.alert({
-                 title: 'Alert!',
-                 content: data[0].message,
-                 type: 'red',
-                 typeAnimated: true,
-                 btnClass: 'btn-danger',
-               });
+                swal("Alert!", data[0].message, "error");
+               //  $.alert({
+               //   title: 'Alert!',
+               //   content: data[0].message,
+               //   type: 'red',
+               //   typeAnimated: true,
+               //   btnClass: 'btn-danger',
+               // });
               }else{
                 customer_id = data[0].customer_id;
                 customer_name = data[0].name;
@@ -339,13 +345,33 @@
     }
   }
 
+  // QR Code Reader
+  $("#qr_code").on('click', function(e){
+      var code = "";        
+      setTimeout(function(){
+         code=getQRCode();  
+         setQRCode(code);         
+      },100);
+  });
+
+  // Read qrcode from java
+  function getQRCode(){
+    return code2lab.readQRCode();
+  }
+
+  // get QRCode from Java
+  function setQRCode(code){
+    $("#qr_code").text(code);
+    $("#search").val(code);
+  }
+
   $(document).on('click',".customer_tr",function(){
      // if(this.checked){
       $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
       var sale_id     = $("#sale_id").val() || 0;
       var customer_id = $(this).attr('data-ref');
       var customer_name = $(this).children("td:nth-child(3)").text();
-
+      console.log(sale_id);
       if(sale_id != 0){
               // var url = "/"+customer_id;
               update_sale(customer_id, customer_name,sale_id);
@@ -433,7 +459,7 @@
     }, function () {
       $.ajax({
         type: "POST",
-        url: "update_sale" ,
+        url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,
         data: {customer_id:customer_id,sale_id:sale_id},
         dataType: "json",
         success: function(data) {
@@ -442,12 +468,16 @@
             var id       = $("#table_id").val();
             var type     = $("#type").val();
             if (cashier_type == "quick_service") {
-               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
             }else{
-              if (type=="Table") {
-                window.location.href = '/origami/table/'+id
+              if(page == "payment"){
+                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
               }else{
-               window.location.href = '/origami/room/'+id
+                if (type=="Table") {
+                  window.location.href = '/origami/table/'+id
+                }else{
+                 window.location.href = '/origami/room/'+id
+                }
               }
             }
           }else{
@@ -460,17 +490,22 @@
   }
 
   $('#back').on('click',function(){
-    var id       = $("#table_id").val()
-    var type     = $("#type").val()
-    var sale_id  = $("#sale_id").val()
+    var id       = $("#table_id").val();
+    var type     = $("#type").val();
+    var sale_id  = $("#sale_id").val();
     if (cashier_type == "quick_service") {
       window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
     }else{
-      if (type=="Table") {
-          window.location.href = '/origami/table/'+id
+      if(page == "payment"){
+        window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+      }else{
+        if (type=="Table") {
+          window.location.href = '/origami/table/'+id;
         }else{
-         window.location.href = '/origami/room/'+id
-       }
+          window.location.href = '/origami/room/'+id;
+        }
+      }
+      
     }
     
  })
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 981ddb06..89884bee 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -544,7 +544,7 @@
   </div>
 </div>
 <script>
-  cashier_type = "cashier"
+  var cashier_type = "cashier";
     $(document).ready(function () {
       /* start check first bill or not*/
         var receipt_no = "";
@@ -627,7 +627,7 @@
             }
             var table_id = $('.tables').attr("data-id");
 
-            window.location.href = '/origami/' + sale_id+"/"+cashier_type + "/customers"
+            window.location.href = '/origami/' + sale_id+"/"+cashier_type + "/customers/normal";
 
         });
 
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 6c467d66..d212f46b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -33,7 +33,7 @@
             </div>
             
             <div class="row p-l-5 p-r-5">
-              <div class="col-lg-6 col-md-6 col-sm-6"><strong>Customer :</strong> <%= @sale_data.customer.name%> <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
+              <div class="col-lg-6 col-md-6 col-sm-6"><strong>Customer :</strong> <span id="customer_name"> <%= @sale_data.customer.name%></span>  <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
                 <span class="hidden" id="member_discount"><%= @member_discount%></span></div>
               <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Checkin Time : </strong> <%if !@checkin_time.nil?%><%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %>
               <%end%></div>
@@ -424,46 +424,50 @@
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <h4 class="modal-title" id="is_memberModalLabel">Is Member?</h4>
+      <h3 class="modal-title" id="is_memberModalLabel">Are you Member?</h3>
       </div>
       <div class="modal-body">
-
-      </div>
-      <div class="modal-footer ">
-        <div class="row p-r-20">
-          <div class="col-md-4">
-            <button type="button" class="btn btn-link bg-green waves-effect">Yes</button>
+        <div class="row text-center">
+          <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+          <input type="hidden" name="qr_code" id="qr_code" />
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-green waves-effect btn_customer_yes">Yes</button>
           </div>
 
-          <div class="col-md-4">
-            <button type="button" class="btn btn-link bg-red waves-effect" data-dismiss="modal">No</button>
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">No</button>
           </div>
 
-          <div class="col-md-4">
-            <button type="button" class="btn btn-link bg-primary waves-effect">Member</button>
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Member</button>
           </div>
 
-          <div class="col-md-4">
-            <button type="button" class="btn btn-link bg-primary waves-effect">QR</button>
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR</button>
           </div>
         </div>
-        
       </div>
+      <div class="modal-footer"></div>
     </div>
   </div>
-</div>    
+</div>   
+
+<div id="sxModal">
+  <div id="sxModal-Content"><h3>Card Tap</h3></div>
+</div> 
 
 <script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>"; 
 var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
-
   $(document).ready(function(){
-    console.log(customer_name);
-    console.log(customer_id);
-    // if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
-    //   $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
-    // }
+    //start customer modal popup
+    if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+      if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
+        $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
+      }
+    }
+
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
         var member_discount = $('#member_discount').text();
@@ -970,4 +974,112 @@ var customer_name = "<%= @customer.name %>";
       window.location.href = '/origami/quick_service';
     } 
   });
+
+  $(".btn_customer_yes").on('click',function(){
+    var sale_id = $('#sale_id').text();
+    window.location.href = "/origami/"+sale_id+"/"+cashier_type+"/customers/payment";
+  });
+
+  // Read Card Reader
+  $(".btn_member").on('click', function(){  
+    var cardNo = ""; 
+    var customer_id = '';
+    var customer_name = '';
+    var membership_id = '';
+    var membership_type = '';
+    var sale_id     = $("#sale_id").text() || 0;
+    var customer_mamber_card_no = 0;
+
+    $("#is_memberModal").hide();
+    $("#sxModal").show();   
+    setTimeout(function(){
+      getCardNo();
+      $("#sxModal").hide();        
+      customer_mamber_card_no = $("#paypar_account_no").val();
+      
+      if(sale_id != 0 && customer_mamber_card_no != 0){    
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/get_customer" ,
+          data: { filter : customer_mamber_card_no ,type :"card"},
+          dataType: "json",
+          success: function(data) {
+            if (data[0].customer_id == false) {
+              swal("Alert!", data[0].message, "error");
+            }else{
+              customer_id = data[0].customer_id;
+              customer_name = data[0].name;
+              membership_id = data[0].membership_id;
+              membership_type = data[0].membership_type;
+              update_sale(membership_id, customer_id, customer_name,sale_id);
+            }
+
+          }
+        });                
+      }
+    },100);
+  });
+
+  // Read NFC card no from java
+  function getCardNo(){
+    code2lab.readNFC();
+  }
+
+  // get CardNo from Java
+  function setCardNo(cardNo){
+    if(cardNo.length == 16){
+      $("#paypar_account_no").val(cardNo);
+    }
+  }
+
+  // QR Code Reader
+  $(".btn_qr_code").on('click', function(e){
+    $("#is_memberModal").hide();
+    var code = "";        
+    setTimeout(function(){
+       code=getQRCode(); 
+       $("#qr_code").val(code);          
+    },100);
+  });
+
+  // Read qrcode from java
+  function getQRCode(){
+    return code2lab.readQRCode();
+  }
+
+  function update_sale(membership_id, customer_id, customer_name, sale_id) {
+    var customer="";
+    if(customer_name != ""){
+      customer = '(' + customer_name + ')';
+    }
+
+    swal({
+      title: "Confirmation !",
+      text: 'Are You Sure to assign this customer' + customer + '!',
+      showCancelButton: true,
+      confirmButtonColor: "green",
+      confirmButtonText: "Yes!",
+      cancelButtonClass: 'btn btn-danger',
+      closeOnConfirm: false,
+    }, function () {
+      $.ajax({
+        type: "POST",
+        url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,
+        data: {customer_id:customer_id,sale_id:sale_id},
+        dataType: "json",
+        success: function(data) {
+          if(data.status == true)
+          {
+            //change customer detail
+            $("#customer_name").html(customer_name);
+            $("#membership_id").html(membership_id);
+            window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+          }else{
+            swal("Alert!", "Record not found!", "error");
+            location.reload();
+          }
+        }
+      });        
+    });
+  }
 </script>
\ No newline at end of file
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 7291581c..3826df57 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -486,6 +486,7 @@
 </div>
 </div>
 <script>
+var cashier_type = "cashier";
 $(document).ready(function(){
   // $(".tables").on('click', function(){
   //     var customer_id=$(".customer-id").text();
@@ -593,7 +594,7 @@ $(document).ready(function(){
     }
     var table_id = $('.tables').attr("data-id");
 
-    window.location.href = '/origami/'+ sale_id  + "/customers"
+    window.location.href = '/origami/' + sale_id+"/"+cashier_type + "/customers/normal";
 
   });
 
diff --git a/config/routes.rb b/config/routes.rb
index ee3a4c9e..a406fb0c 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -199,9 +199,9 @@ scope "(:locale)", locale: /en|mm/ do
 
     #---------Add Customer --------------#
     #resources :customers
-    get '/:sale_id/:type/customers', to: "customers#add_customer"
+    get '/:sale_id/:type/customers/:page', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
-    post '/:sale_id/:type/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
+    post '/:sale_id/:type/customers/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 

From fcc076a19eaec292d8bd24977cd735ff27a1a24b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Mar 2018 15:16:39 +0630
Subject: [PATCH 379/651] change route in other payment

---
 app/assets/javascripts/origami.js         | 18 +++++++++---------
 app/views/origami/jcb/index.html.erb      |  2 +-
 app/views/origami/master/index.html.erb   |  2 +-
 app/views/origami/mpu/index.html.erb      |  5 +++--
 app/views/origami/unionpay/index.html.erb |  2 +-
 app/views/origami/visa/index.html.erb     |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index d7afc4db..842b236b 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -230,14 +230,14 @@ function setCommPorts(comPortLists) {
 }
 
 /** pay with CB bank **/
-function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no) {
+function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no,cashier_type) {
 	$("#loading_wrapper").show();
     var com_port = $("#com_port_name").val();
-    reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port);
+    reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type);
 }
 
 //add req data to card_sale_trans table
-function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port) {
+function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type) {
   var jobj = {"cmd_type" : cmd_type, "payment_type" : "CARD", "amt" : bnk_bill_amount, "sale_id" : sale_id, "inv_no" : receipt_no, "com_port" : com_port};
   $.ajax({
       type: "POST",
@@ -247,14 +247,14 @@ function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, rece
       success: function(data) {
           if (data.status == "success"){
             card_sale_trans_id = data.card_sale_trans_id;
-            resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port);
+            resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port,cashier_type);
           }
        }
     });
 }
 
 //add res data to card_sale_trans table
-function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port) {
+function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port,cashier_type) {
 
   var resMsg = "";
   var card_payment_type="";
@@ -281,7 +281,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
           dataType: "json",
           success: function(data) {
             if(data.status == "success"){
-                resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port);
+                resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type);
             }
           }
         });
@@ -292,7 +292,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
 }
 
 
-function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port) {
+function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type) {
 	$("#loading_wrapper").hide();
     var jobj = $.parseJSON(resMsg);
     if(jobj.STATUS == "Approved"){
@@ -309,7 +309,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 						closeOnCancel: false,
 						allowOutsideClick: false
          			}, function () {
-         				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+         				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
          			});
          		}
          	}
@@ -327,7 +327,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 		  closeOnCancel: false,
 		  allowOutsideClick: false
 		}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/"+payment_type;
+				window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/"+payment_type;
 			});
     }
 }
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 837c9f43..b6512146 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -214,7 +214,7 @@ $('#jcb_pay').on('click',function(){
 			// }
 	    //end member discount
 	    if(bank_integration == '1'){
-		    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+		    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no,cashier_type);
 		}else{
 			$.ajax({type: "POST",
 	          url: "<%= origami_payment_jcb_path %>",
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index f5c8f06b..fa90de18 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -212,7 +212,7 @@
         // }
       //end member discount
       if(bank_integration == '1'){
-        pay_withBank("SALE", "master", amount, sale_id, receipt_no);
+        pay_withBank("SALE", "master", amount, sale_id, receipt_no,cashier_type);
       }else{
         $.ajax({type: "POST",
           url: "<%= origami_payment_master_path %>",
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index f40ce252..79e7bbe5 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -122,10 +122,11 @@
 	</div>
 </div>
 <script>
+	var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
-		var cashier_type = "<%= @cashier_type %>";
+		
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
@@ -217,7 +218,7 @@
 			// }
 	    //end member discount
 	    	if(bank_integration == '1'){
-	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no,cashier_type);
 	      	}else{
 	      		$.ajax({type: "POST",
 		          url: "<%= origami_payment_mpu_path %>",
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 5dee20f1..e407cc46 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -216,7 +216,7 @@
       //end member discount
       var bank_integration = "<%= @bank_integration %>";
       if(bank_integration == '1'){
-        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
+        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no, cashier_type);
       }
       else{
         $.ajax({type: "POST",
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 2970ba44..2824ef15 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -217,7 +217,7 @@
       //end member discount
       var bank_integration = "<%= @bank_integration %>";
       if(bank_integration == '1'){
-        pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
+        pay_withBank("SALE", "visa", amount, sale_id, receipt_no,cashier_type);
       }
       else{
         $.ajax({type: "POST",

From 3fcdbfb8df09ee664dd2d5d8f496fe593266f472 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Mar 2018 15:30:18 +0630
Subject: [PATCH 380/651] update receipt ranke file

---
 app/assets/javascripts/addorder.js            |   4 +-
 app/models/receipt.rb                         |   2 +
 app/models/receipt_detail.rb                  |   2 +
 app/models/sale.rb                            |  38 +++
 db/migrate/20180306044939_create_receipts.rb  |  42 ++++
 .../20180306045018_create_receipt_details.rb  |  43 ++++
 db/sym_master.sql                             |  14 ++
 lib/tasks/receipt.rake                        | 238 ++++++++++++++++++
 spec/models/receipt_detail_spec.rb            |   5 +
 spec/models/receipt_spec.rb                   |   5 +
 10 files changed, 391 insertions(+), 2 deletions(-)
 create mode 100644 app/models/receipt.rb
 create mode 100644 app/models/receipt_detail.rb
 create mode 100644 db/migrate/20180306044939_create_receipts.rb
 create mode 100644 db/migrate/20180306045018_create_receipt_details.rb
 create mode 100644 lib/tasks/receipt.rake
 create mode 100644 spec/models/receipt_detail_spec.rb
 create mode 100644 spec/models/receipt_spec.rb

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index de1024ea..3b4ad589 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -760,8 +760,8 @@ $(function() {
     $("#oqs_loading_wrapper").show();
     
     type = window.location.href.indexOf("quick_service");
-
-    if (type != 'true') {
+console.log(type)
+    if (type != -1) {
       type = 'quick_service'
       var table_type = $('#table_type').text();
       var table_id    = $('#table_id').val();
diff --git a/app/models/receipt.rb b/app/models/receipt.rb
new file mode 100644
index 00000000..40ad3176
--- /dev/null
+++ b/app/models/receipt.rb
@@ -0,0 +1,2 @@
+class Receipt < ApplicationRecord
+end
diff --git a/app/models/receipt_detail.rb b/app/models/receipt_detail.rb
new file mode 100644
index 00000000..c96e3d4e
--- /dev/null
+++ b/app/models/receipt_detail.rb
@@ -0,0 +1,2 @@
+class ReceiptDetail < ApplicationRecord
+end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 3fa19ef9..0784a43e 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2009,6 +2009,44 @@ end
                   .group("bookings.booking_id")
   end
 
+  def self.all_receipts
+    query = Sale.select("sales.*, sale_payments.created_at as receipt_close_time,
+                          case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark,
+                          case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges,
+                          SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
+                          SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount,
+                          SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
+                          SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,     
+                          SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,     
+                          SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
+                          SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount,
+                          SUM(case when (sale_items.status='foc') then sale_items.price else 0 end) as item_foc,
+                          SUM(case when (sale_items.status='Discount') then sale_items.price else 0 end) as item_discount,
+                          SUM(sale_items.qty) as qty,
+                          sales.cashier_name as cashier_name,
+                          surveys.child as child,
+                          surveys.adult as adult")
+            .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+            .joins("join sale_taxes on sale_taxes.sale_id = sales.sale_id")
+            .joins("join sale_items on sale_items.sale_id = sales.sale_id")
+            .joins("join sale_audits on sale_audits.sale_id = sales.sale_id")
+            .joins("left join surveys on surveys.receipt_no = sales.receipt_no")
+            
+    query = query.where("sale_status != 'new' && sale_payments.payment_amount > 0")
+            .group("sale_id")
+    return query
+end
+
+def self.all_receipt_details
+    query = SaleItem.select("sale_items.*, sale_payments.created_at as receipt_close_time,
+            sales.requested_at as requested_at, sales.receipt_no as receipt_no,sales.sale_id as s_id")
+            .joins("join sale_payments on sale_payments.sale_id = sale_items.sale_id")
+            .joins("join sales on sales.sale_id = sale_items.sale_id")
+            .group("sale_items.sale_item_id")
+   query = query.where("qty > 0 and sales.sale_status !='new'")
+    return query
+end
+
   private
 
   def generate_custom_id
diff --git a/db/migrate/20180306044939_create_receipts.rb b/db/migrate/20180306044939_create_receipts.rb
new file mode 100644
index 00000000..22f3b0fa
--- /dev/null
+++ b/db/migrate/20180306044939_create_receipts.rb
@@ -0,0 +1,42 @@
+class CreateReceipts < ActiveRecord::Migration[5.1]
+  def change
+    create_table :receipts do |t|
+      t.string  :client_code, :limit => 16, :null => false
+      t.string  :client_name, :null => false
+      t.string  :shop_code, :limit => 16, :null => false
+      t.string  :shop_name, :null => false
+      t.integer :receipt_no, :limit => 8, :null => false
+      t.datetime  :transaction_time, :null => false
+      t.datetime  :receipt_open_time, :null => false
+      t.datetime  :receipt_close_time, :null => false
+      t.decimal :gross_sales, :null => false, :default => 0
+      t.decimal :discount_amount, :null => false, :default => 0
+      t.decimal :sales, :null => false, :default => 0
+      t.decimal :tax_amount, :null => false, :default => 0
+      t.decimal :service_charges, :null => false, :default => 0
+      t.decimal :net_sales, :null => false, :default => 0
+      t.decimal :credit_card_sales, :null => false, :default => 0
+      t.decimal :voucher_sales, :null => false, :default => 0
+      t.decimal :foc_amount,  :null => false, :default => 0
+      t.decimal :staff_meal_amount, :null => false, :default => 0
+      t.decimal :rounding_amount, :null => false, :default => 0
+      t.decimal :raw_wastage_amount, :null => false, :default => 0
+      t.decimal :semi_wastage_amount, :null => false, :default => 0
+      t.decimal :wastage_amount, :null => false, :default => 0
+      t.decimal :spoilage_amount, :null => false, :default => 0
+      t.decimal :sampling_amount, :null => false, :default => 0
+      t.integer :qty, :null => false, :default => 0
+      t.integer :no_of_pax, :null => false, :default => 0
+      t.integer :no_of_adult, :null => false, :default => 0
+      t.integer :no_of_child, :null => false, :default => 0
+      t.string  :terminal_id, :null => false
+      t.string  :employee_code, :limit => 4, :null => false
+      t.string  :employee_name, :null => false
+      t.boolean :is_valid, :null => false, :default => false
+      t.boolean :overing, :null => false, :default => false
+      t.boolean :cancle, :null => false, :default => false
+      t.text    :remarks
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180306045018_create_receipt_details.rb b/db/migrate/20180306045018_create_receipt_details.rb
new file mode 100644
index 00000000..5fd38160
--- /dev/null
+++ b/db/migrate/20180306045018_create_receipt_details.rb
@@ -0,0 +1,43 @@
+class CreateReceiptDetails < ActiveRecord::Migration[5.1]
+  def change
+    create_table :receipt_details do |t|
+      t.string  :client_code, :null => false
+      t.string  :client_name, :null => false
+      t.string  :shop_code, :null => false
+      t.string  :shop_name, :null => false
+      t.string  :receipt_no, :null => false
+      t.datetime  :receipt_date, :null => false
+      t.datetime  :transaction_date, :null => false
+      t.integer :item_sequence, :null => false
+      t.string  :category_code, :null => false
+      t.string  :category_name, :null => false
+      t.string  :sub_category_code, :null => false
+      t.string  :sub_category_name, :null => false
+      t.string  :report_group_code, :null => false
+      t.string  :report_group_name, :null => false
+      t.string  :item_code, :null => false
+      t.string  :item_name, :null => false
+      t.integer :qty, :null => false, :default => 0
+      t.string  :transaction_type, :null => false
+      t.decimal :gross_sales, :null => false, :default => 0
+      t.string  :discount_code, :null => false
+      t.decimal :discount_amount, :null => false, :default => 0
+      t.decimal :sales, :null => false, :default => 0
+      t.decimal :tax_amount, :null => false, :default => 0
+      t.decimal :service_charges, :null => false, :default => 0
+      t.decimal :net_sales, :null => false, :default => 0
+      t.boolean :is_foc,  :null => false, :default => false
+      t.boolean :is_set_item, :null => false, :default => false
+      t.boolean :is_staff_meal, :null => false, :default => false
+      t.boolean :is_raw_wastage, :null => false, :default => false
+      t.boolean :is_semi_wastage, :null => false, :default => false
+      t.boolean :is_wastage, :null => false, :default => false
+      t.boolean :is_spoilage, :null => false, :default => false
+      t.boolean :is_sampling, :null => false, :default => false
+      t.boolean :tax_able, :null => false, :default => false
+      t.boolean :is_void, :null => false, :default => false
+      t.text    :remarks
+      t.timestamps
+    end
+  end
+end
\ No newline at end of file
diff --git a/db/sym_master.sql b/db/sym_master.sql
index 89abaf5b..cd0dac29 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -88,6 +88,10 @@ delete from sym_node;
 	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('cloud', 'sx', 'P');
 
 # Create Trigger for Setting Channel 
+	
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('seed_generators','seed_generators','setting',current_timestamp,current_timestamp);
 
 	insert into sym_trigger 
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
@@ -339,6 +343,11 @@ delete from sym_node;
 # Add triggers for tables with router
 
 # Setting Channel # From cloud to Master
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('seed_generators','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('lookups','cloud_2_sx', 100, current_timestamp, current_timestamp);
@@ -376,6 +385,11 @@ delete from sym_node;
 	values('display_images','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 # Setting Channel # From Master to cloud
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('seed_generators','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('lookups','sx_2_cloud', 100, current_timestamp, current_timestamp);
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
new file mode 100644
index 00000000..2d4e9dcc
--- /dev/null
+++ b/lib/tasks/receipt.rake
@@ -0,0 +1,238 @@
+namespace :consolidate do
+  desc "Receipt"
+  task :receipt => :environment do
+    Receipt.delete_all
+    sales = Sale.all_receipts
+   
+    shop  = Shop.find(1)
+    sales.each do |sale|
+      receipt = Receipt.new
+      receipt.client_code         = shop.id
+      receipt.client_name         = shop.id
+      receipt.shop_code           = shop.id
+      receipt.shop_name           = shop.id
+      receipt.receipt_no          = sale.receipt_no
+      receipt.transaction_time    = sale.requested_at #requet-at
+      receipt.receipt_open_time   = sale.requested_at #before disco/after tax /after/ser_char
+      receipt.receipt_close_time  = sale.receipt_close_time
+      receipt.gross_sales         = sale.total_amount + sale.total_tax #before disco/after tax /after/ser_char
+      receipt.discount_amount     = sale.total_discount + sale.item_discount
+      receipt.sales               = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn
+      receipt.tax_amount          = sale.total_tax
+      receipt.service_charges     = sale.service_charges
+      receipt.net_sales           = sale.total_amount + sale.total_discount #after disco/before tax / no rounding
+      receipt.credit_card_sales   = sale.mpu_amount + sale.master_amount + sale.visa_amount + sale.jcb_amount + sale.unionpay_amount + sale.credit_amount # 
+      receipt.voucher_sales       = 0
+      receipt.foc_amount          = sale.foc_amount + sale.item_foc
+      receipt.staff_meal_amount   = 0
+      receipt.rounding_amount     = sale.rounding_adjustment
+      receipt.raw_wastage_amount  = 0
+      receipt.semi_wastage_amount = 0
+      receipt.wastage_amount      = 0
+      receipt.spoilage_amount     = 0
+      receipt.sampling_amount     = 0
+      receipt.qty                 = sale.qty
+      receipt.no_of_pax           = 0
+      receipt.no_of_adult         = (sale.adult) ? sale.adult : 0
+      receipt.no_of_child         = (sale.child) ? sale.child : 0
+      receipt.terminal_id         = ShiftSale.find(sale.shift_sale_id).cashier_terminal_id
+      receipt.employee_code       = Employee.find(sale.cashier_id).emp_id
+      receipt.employee_name       = sale.cashier_name
+      receipt.is_valid            = (sale.payment_status=="void") ? false : true #void is false
+      receipt.overing             =false
+      receipt.cancle              = (sale.payment_status=="void") ? false : true # void is cancel
+      receipt.remarks             = sale.remark
+      receipt.save
+    end
+  end
+
+  desc "Receipt Detail"
+  task :receipt_detail => :environment do
+    ReceiptDetail.delete_all
+    sales = Sale.all_receipt_details
+
+    shop  = Shop.find(1)
+
+    sale_id = ''
+    count   = 0
+    @total_qty                 = 0
+    @total_gross_sales         = 0
+    @total_sales               = 0
+    @total_net_sales           = 0
+@z =1
+    @item_sequence = 1
+    sale_count = sales.to_a.count
+    sales.each do |sale|
+
+      if sale.qty > 0
+
+        if sale.item_instance_code !=nil
+          menu_category = MenuCategory.find(MenuItem.find_by_item_code(sale.product_code).menu_category_id)
+          name  = menu_category.name
+          code  = menu_category.code
+          menu_item = MenuItem.find_by_item_code(sale.product_code)
+          menu_name = menu_item.name
+          menu_code = menu_item.item_code
+          menu_type = menu_item.type
+        end
+        if sale.product_code == "Other Charges" && sale.status == "Other Charges"
+          code  = sale.product_code
+          name  = sale.product_code
+          menu_name = sale.product_code
+          menu_code = sale.product_code
+          menu_type = sale.product_code
+        end
+        
+        @receipt_no                = sale.receipt_no
+        @requested_at              = sale.requested_at
+
+        if sale_id == sale.sale_id || count == 0 || @z =0
+          @total_qty                 += sale.qty
+          @total_gross_sales         += sale.price
+          @total_sales               += sale.price
+          @total_net_sales           += sale.taxable_price
+        end
+
+        if sale_id != sale.sale_id && count !=0 
+
+          receipt = ReceiptDetail.new
+          receipt.client_code         = shop.id
+          receipt.client_name         = shop.id
+          receipt.shop_code           = shop.id
+          receipt.shop_name           = shop.id
+          receipt.receipt_no          = @receipt_no
+          receipt.receipt_date        = @requested_at #requet-at
+          receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
+          receipt.item_sequence       = @item_sequence
+          receipt.category_code       = ''
+          receipt.category_name       = ''
+          receipt.sub_category_code   = 0
+          receipt.sub_category_name   = 0
+          receipt.report_group_code   = 0
+          receipt.report_group_name   = 0
+          receipt.item_code           = ''
+          receipt.item_name           = ''
+          receipt.qty                 = @total_qty
+          receipt.transaction_type    = "Tender"
+          receipt.gross_sales         = @total_gross_sales
+          receipt.discount_code       = ''
+          receipt.discount_amount     = 0
+          receipt.sales               = @total_sales
+          receipt.tax_amount          = 0
+          receipt.service_charges     = 0
+          receipt.net_sales           = @total_net_sales
+          receipt.is_set_item         = false
+          receipt.is_foc              = false
+          receipt.is_staff_meal       = false
+          receipt.is_raw_wastage      = false
+          receipt.is_semi_wastage     = false
+          receipt.is_wastage          = false
+          receipt.is_spoilage         = false
+          receipt.is_sampling         = false
+          receipt.tax_able            = false
+          receipt.is_void             = false 
+          receipt.remarks             = ""
+          receipt.save
+          @type = "Tender"
+          @item_sequence             = 1
+          @total_qty                 = 0
+          @total_gross_sales         = 0
+          @total_sales               = 0
+          @total_net_sales           = 0
+  @z = 0
+        end
+
+        
+        discount_amount = (sale.status=="Discount") ? sale.price : 0
+          receipt = ReceiptDetail.new
+          receipt.client_code         = shop.id
+          receipt.client_name         = shop.id
+          receipt.shop_code           = shop.id
+          receipt.shop_name           = shop.id
+          receipt.receipt_no          = sale.receipt_no
+          receipt.receipt_date        = sale.requested_at #requet-at
+          receipt.transaction_date    = sale.requested_at #before disco/after tax /after/ser_char
+          receipt.item_sequence       = @item_sequence
+          receipt.category_code       = name
+          receipt.category_name       = code
+          receipt.sub_category_code   = 0
+          receipt.sub_category_name   = 0
+          receipt.report_group_code   = 0
+          receipt.report_group_name   = 0
+          receipt.item_code           = menu_name
+          receipt.item_name           = menu_code
+          receipt.qty                 = sale.qty
+          receipt.transaction_type    = (sale.status==nil) ? "Sales" : sale.status
+          receipt.gross_sales         = sale.price
+          receipt.discount_code       = sale.sale_item_id
+          receipt.discount_amount     = discount_amount
+          receipt.sales               = sale.price
+          receipt.tax_amount          = 0
+          receipt.service_charges     = 0
+          receipt.net_sales           = sale.taxable_price
+          receipt.is_set_item         = (menu_type=="SetMenuItem")? true : false 
+          receipt.is_foc              = (sale.status=="foc") ? true : false
+          receipt.is_staff_meal       = false
+          receipt.is_raw_wastage      = false
+          receipt.is_semi_wastage     = false
+          receipt.is_wastage          = false
+          receipt.is_spoilage         = false
+          receipt.is_sampling         = false
+          receipt.tax_able            = sale.is_taxable
+          receipt.is_void             = (sale.status=="void")? true : false 
+          receipt.remarks             = sale.remark
+          receipt.save
+      
+      end
+      
+        @z += 1
+     
+
+      count += 1
+      @item_sequence += 1
+      sale_id = sale.sale_id
+    end
+    
+    if count == sale_count
+      receipt = ReceiptDetail.new
+          receipt.client_code         = shop.id
+          receipt.client_name         = shop.id
+          receipt.shop_code           = shop.id
+          receipt.shop_name           = shop.id
+          receipt.receipt_no          = @receipt_no
+          receipt.receipt_date        = @requested_at #requet-at
+          receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
+          receipt.item_sequence       = @item_sequence
+          receipt.category_code       = ''
+          receipt.category_name       = ''
+          receipt.sub_category_code   = 0
+          receipt.sub_category_name   = 0
+          receipt.report_group_code   = 0
+          receipt.report_group_name   = 0
+          receipt.item_code           = ''
+          receipt.item_name           = ''
+          receipt.qty                 = @total_qty
+          receipt.transaction_type    = "Tender"
+          receipt.gross_sales         = @total_gross_sales
+          receipt.discount_code       = ''
+          receipt.discount_amount     = 0
+          receipt.sales               = @total_sales
+          receipt.tax_amount          = 0
+          receipt.service_charges     = 0
+          receipt.net_sales           = @total_net_sales
+          receipt.is_set_item         = false
+          receipt.is_foc              = false
+          receipt.is_staff_meal       = false
+          receipt.is_raw_wastage      = false
+          receipt.is_semi_wastage     = false
+          receipt.is_wastage          = false
+          receipt.is_spoilage         = false
+          receipt.is_sampling         = false
+          receipt.tax_able            = false
+          receipt.is_void             = false 
+          receipt.remarks             = ""
+          receipt.save
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/receipt_detail_spec.rb b/spec/models/receipt_detail_spec.rb
new file mode 100644
index 00000000..017ee888
--- /dev/null
+++ b/spec/models/receipt_detail_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ReceiptDetail, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/receipt_spec.rb b/spec/models/receipt_spec.rb
new file mode 100644
index 00000000..3b140805
--- /dev/null
+++ b/spec/models/receipt_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Receipt, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 1503462cea66e5913cc1dd552463191bc5f7b6b6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Mar 2018 16:26:50 +0630
Subject: [PATCH 381/651] update sym file for cusotmer and taxprofiles

---
 db/sym_master.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sym_master.sql b/db/sym_master.sql
index cd0dac29..3677fc2f 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -123,11 +123,11 @@ delete from sym_node;
 
 	insert into sym_trigger 
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
-	values('tax_profiles','customers','setting',current_timestamp,current_timestamp);
+	values('tax_profiles','tax_profiles','setting',current_timestamp,current_timestamp);
 
 	insert into sym_trigger 
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
-	values('display_images','customers','setting',current_timestamp,current_timestamp);
+	values('display_images','display_images','setting',current_timestamp,current_timestamp);
 
 # Create Trigger for Dining Channel 
 

From 3de5c173b52e39d55df574f2abde680eb25224c5 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 8 Mar 2018 18:08:36 +0630
Subject: [PATCH 382/651] update remove sidekiq

---
 app/models/order.rb    | 54 +++++++++++++++++++++++++++++++++++-------
 lib/tasks/receipt.rake |  2 +-
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index 15ce56c3..739de71a 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -286,23 +286,51 @@ class Order < ApplicationRecord
   #Process order items and send to order queue
   def process_order_queue
     #Send to background job for processing
-
-    cup_status = `#{"sudo service cups status"}`
+    order        = Order.find(self.id) 
+    cup_status   = `#{"sudo service cups status"}`
     print_status = check_cup_status(cup_status)
-     
+    sidekiq      = Lookup.find_by_lookup_type("sidekiq")
+
     if print_status
-      OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      if !sidekiq.nil?
+        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      else
+        if order
+          oqs = OrderQueueStation.new
+          oqs.process_order(order, self.table_id)
+        end
+        assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+        ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+      end
     else
       cup_start    = `#{"sudo service cups start"}`
       cup_status   = `#{"sudo service cups status"}`
       print_status = check_cup_status(cup_status)
 
       if print_status
-        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+        if !sidekiq.nil?
+          OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+        else
+          if order
+            oqs = OrderQueueStation.new
+            oqs.process_order(order, self.table_id)
+          end
+          assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+          ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+        end
       else
         msg = ' Print Error ! Please contact to service'
         ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
-        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+          if !sidekiq.nil?
+          OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+          else
+            if order
+              oqs = OrderQueueStation.new
+              oqs.process_order(order, self.table_id)
+            end
+            assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+            ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+          end
       end
     end
  
@@ -310,8 +338,18 @@ class Order < ApplicationRecord
 
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)
-    #Send to background job for processing
-      OrderQueueProcessorJob.perform_later(id, table_id)
+    sidekiq      = Lookup.find_by_lookup_type("sidekiq")
+   if !sidekiq.nil?
+          OrderQueueProcessorJob.perform_later(id, table_id)
+          else
+            order        = Order.find(id) 
+            if order
+              oqs = OrderQueueStation.new
+              oqs.process_order(order, table_id)
+            end
+            assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
+            ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+          end
   end
   
   def check_cup_status(status)
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index 2d4e9dcc..fa24f481 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -86,7 +86,7 @@ namespace :consolidate do
         @receipt_no                = sale.receipt_no
         @requested_at              = sale.requested_at
 
-        if sale_id == sale.sale_id || count == 0 || @z =0
+        if sale_id == sale.sale_id || count == 0 || @z ==0
           @total_qty                 += sale.qty
           @total_gross_sales         += sale.price
           @total_sales               += sale.price

From 7dd0f7189412defecf08c8f356c289c8fc5385c7 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 09:49:19 +0630
Subject: [PATCH 383/651] check and fixed SQA feedback

---
 app/assets/javascripts/addorder.js            | 10 +--
 app/controllers/home_controller.rb            | 26 ++++----
 .../origami/customers_controller.rb           |  6 +-
 app/models/ability.rb                         | 28 ++++++--
 app/views/home/dashboard.html.erb             |  6 +-
 app/views/layouts/_header.html.erb            |  2 +-
 app/views/origami/customers/index.html.erb    | 13 +++-
 app/views/origami/home/show.html.erb          |  8 +--
 .../origami/moveroom/move_dining.html.erb     | 14 ++--
 .../origami/movetable/move_dining.html.erb    | 22 ++++---
 app/views/origami/payments/show.html.erb      |  4 +-
 app/views/origami/pending_order/show.html.erb | 65 +++++++++++++++++++
 app/views/origami/rooms/show.html.erb         | 16 ++---
 13 files changed, 162 insertions(+), 58 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 69ac19d4..f6b702f7 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -985,19 +985,19 @@ $(function() {
   $("#back").on("click", function(){
     var table_id   = $('#table_id').text();
     var table_type = $('#table_type').text();
-    type = window.location.href.indexOf("quick_service");
-    if (type == 'true') {
+    type = window.location.href.includes("quick_service");
+    if (type == true) {
       var table_type = $('#table_id').find("option:selected").data('type');
       var table_id    = $('#table_id').val();
-      window.location.href = "/origami/dashboard"
+      window.location.href = "/origami/dashboard";
     }else{
       var table_type = $('#table_type').text();
       var table_id    = $('#table_id').text();
 
       if(table_type == "Table"){
-        window.location.href = "/origami/table/" + table_id
+        window.location.href = "/origami/table/" + table_id;
       }else {
-        window.location.href = "/origami/room/" + table_id
+        window.location.href = "/origami/room/" + table_id;
       }
     }
   }); 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 940f6103..3ebafa99 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -90,13 +90,15 @@ class HomeController < ApplicationController
     @sale_data = Array.new
     @total_payment_methods = Sale.total_payment_methods(today,current_user,@from,@to)
 
-    @total_payment_methods.each do |payment|
-      if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
-        pay = Sale.payment_sale('card', today, current_user,@from,@to)
-        @sale_data.push({'card' => pay.payment_amount})
-      else 
-        pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to)
-        @sale_data.push({payment.payment_method => pay.payment_amount})
+    if !@total_payment_methods.nil?
+      @total_payment_methods.each do |payment|
+        if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
+          pay = Sale.payment_sale('card', today, current_user,@from,@to)
+          @sale_data.push({'card' => pay.payment_amount})
+        else 
+          pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to)
+          @sale_data.push({payment.payment_method => pay.payment_amount})
+        end
       end
     end
     @summ_sale              = Sale.summary_sale_receipt(today,current_user,@from,@to)
@@ -109,10 +111,12 @@ class HomeController < ApplicationController
     @total_order            = Sale.total_order(today,current_user,@from,@to)
     @total_accounts         = Sale.total_account(today,current_user,@from,@to)
     @account_data = Array.new
-    @total_accounts.each do |account|
-      acc = Sale.account_data(account.account_id, today,current_user,@from,@to)
-      if !acc.nil?
-        @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
+    if !@total_accounts.nil?
+      @total_accounts.each do |account|
+        acc = Sale.account_data(account.account_id, today,current_user,@from,@to)
+        if !acc.nil?
+          @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
+        end
       end
     end
 
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index f8036a2a..25dc9748 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -63,7 +63,11 @@ class Origami::CustomersController < BaseOrigamiController
     else
        @booking_order    = BookingOrder.find_by_order_id(@sale_id)
        @booking          = Booking.find(@booking_order.booking_id)
-       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+       if @booking.dining_facility_id.to_i > 0
+         @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+       else
+        @dining_facility  = nil  
+       end
     end       
 
     filter = params[:filter]
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 29f66d34..95c6005f 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -112,10 +112,10 @@ class Ability
 
         can :index, :other_charge
         can :create, :other_charge
-        # can :index, :discount
-        # can :create, :discount
-        # can :remove_discount_items, :discount
-        # can :remove_all_discount, :discount
+        can :index, :discount
+        can :create, :discount
+        can :remove_discount_items, :discount
+        can :remove_all_discount, :discount
          can :member_discount, :discount
 
         can :first_bill, :payment
@@ -194,6 +194,26 @@ class Ability
      elsif user.role == "waiter"
         can :index, :home
         can :show, :home  
+
+        can :manage, Customer   
+        can :get_customer, Customer
+        can :add_customer, Customer
+        can :update_sale_by_customer, Customer
+
+        can :index, :other_charge
+        can :create, :other_charge
+        can :index, :discount
+        can :create, :discount
+        can :remove_discount_items, :discount
+        can :remove_all_discount, :discount
+        can :member_discount, :discount
+
+        #ability for  move table
+        can :move_dining, :movetable 
+        can :moving, :movetable
+
+        can :move_dining, :moveroom
+
         #ability for split_bill
         can :index, :split_bill
         can :create, :split_bill
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index a30cae23..5251b71f 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -218,7 +218,7 @@
       <% end %>
       <% end %>
 
-      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+      <% if current_user.role == 'administrator' %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <% else %>
@@ -262,11 +262,11 @@
             </div>
           </div>
         </div>
-        <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+        <% if current_user.role == 'administrator'  %>
       </div>
       <% end %>
 
-      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+      <% if current_user.role == 'administrator'  %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <% else %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 5f1fe42d..2207fef7 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -57,7 +57,7 @@
                         <i class="material-icons font-10 logout_icon">exit_to_app</i>
                         <span class="font-18">Logout</span>
                     </p> -->
-                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
+                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%= logout_path %>" data-method="delete">
                         <i class="material-icons font-7 logout_icon">exit_to_app</i>
                         <span class="font-15">Logout</span>
                     </p>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index e144d848..87ff1144 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -467,8 +467,16 @@
           {
             var id       = $("#table_id").val();
             var type     = $("#type").val();
+            var booking_id = "";
+            <% if !@booking_order.nil? %>
+              booking_id = "<%= @booking_order.booking_id %>";
+            <% end %>
             if (cashier_type == "quick_service") {
+              if(booking_id!= "" && page == "pending"){
+                window.location.href = '/origami/'+cashier_type+'/pending_order/'+booking_id;
+              }else{
                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
+              }
             }else{
               if(page == "payment"){
                 window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
@@ -496,7 +504,10 @@
     if (cashier_type == "quick_service") {
       window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
     }else{
-      if(page == "payment"){
+      if(page == "pending"){
+        window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/pending/';
+      }
+      else if(page == "payment"){
         window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
       }else{
         if (type=="Table") {
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 89884bee..d08d55f4 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -425,10 +425,7 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
-          <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
-          <% end %>
-          <% if current_login_employee.role != "waiter" %>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
@@ -455,10 +452,10 @@
                 <% if current_login_employee.role != "waiter" %>
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
-                  
+                <% end %>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
-                <% end %>
+                
                   <% if !@split_bill.nil? %>
                     <% if @split_bill == '1' %>
                       <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
@@ -515,7 +512,6 @@
                     </div>
                 </div>
             </div>
-          <% end %>
         </div>
     </div>
 </div>
diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb
index 9ff2f6e9..b46834ca 100755
--- a/app/views/origami/moveroom/move_dining.html.erb
+++ b/app/views/origami/moveroom/move_dining.html.erb
@@ -44,11 +44,15 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" >
          <% @rooms.each do |room| %>
          <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-           <div class="card-block">
-              <%= room.name %>
-           </div>
-         </div>
+          <% if room.get_booking.nil? %>
+            <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+          <% else %>
+            <div class="card rooms blue text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+          <% end %>
+              <div class="card-block">
+                  <%= room.name %>
+              </div>
+            </div>
          <% else %>
          <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
            <div class="card-block">
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 131407f0..4385cad7 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -59,18 +59,22 @@
            <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" >
              <% @rooms.each do |room| %>
              <% if room.status == 'occupied' %>
-             <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-               <div class="card-block">
+              <% if room.get_booking.nil? %>
+                 <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+              <% else %>
+                <div class="card rooms blue text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+              <% end %>
+                  <div class="card-block">
+                    <%= room.name %>
+                  </div>
+                </div>
+            <% else %>
+            <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+              <div class="card-block">
                 <%= room.name %>
               </div>
             </div>
-            <% else %>
-            <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-             <div class="card-block">
-              <%= room.name %>
-            </div>
-          </div>
-          <% end %>
+            <% end %>
           <% end %>
         </div>
       </div>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index d212f46b..c233a63c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -708,7 +708,7 @@ var customer_name = "<%= @customer.name %>";
       var sale_id = $('#dining').text();
     }
     //var table_id = $('.tables').attr("data-id");            
-     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
+     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys";
   });
 
   // bind customer to order or sale
@@ -720,7 +720,7 @@ var customer_name = "<%= @customer.name %>";
       var sale_id = $('#save_order_id').attr('data-order');
      }
     var table_id = $('.tables').attr("data-id");
-    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers"
+    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers/payment";
   });
 
   // Add Other Charges
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index d94a81d5..fade7ccb 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -153,6 +153,14 @@
    <% if current_user.role != "waiter" || @status != "sale"%>
    <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
    <%end%>
+   <!-- <% if @status != "order"%>
+   <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
+   <% end %>
+   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
+   <% if @status != "order"%>
+    <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
+    <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
+  <% end %> -->
    <% if current_user.role != "waiter" && @status != "order"%>
       <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
    <%end%>
@@ -163,6 +171,7 @@
 </div>
 </div>
 <script>
+var cashier_type = "quick_service";
 $(document).ready(function(){
   $(".sales").on('click',function(){
       var sale_id = $(this).attr("data-id");
@@ -203,5 +212,61 @@ $(document).ready(function(){
           }
       });   
     });
+
+    // bind survey to order or sale
+  $("#survey").on('click', function () {
+    var sale_id = $('#sale_id').val();        
+     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys";
+  });
+
+  // bind customer to order or sale
+  $("#customer").on('click', function () {
+    var sale = $('#sale_id').val();
+
+    if (sale.includes("SAL")) {
+      var sale_id = sale;
+    } else {
+      var sale_id = $('#save_order_id').val();
+    }
+    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers/pending";
+  });
+
+  // Add Other Charges
+  $('#other-charges').click(function () {
+    var sale = $('#sale_id').val();
+    if (sale != "") {
+      var sale_id = sale
+    } else {
+      var sale_id = $('#save_order_id').val();
+    }
+    if (sale_id != "") {
+      window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/other_charges';
+    }
+    else {
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+    }
+    return false;
+  });
+  // Discount for Payment
+  $('#discount').click(function () {
+    if ($(this).attr('active')=== "true") {
+      var sale = $('#sale_id').val();
+      if (sale != "") {
+        var sale_id = sale
+      } else {
+        var sale_id = $('#save_order_id').val();
+      }
+
+      if (sale_id != "") {
+        window.location.href = '/origami/' + sale_id + "/"+cashier_type+'/discount';
+      }
+      else {
+        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+      }
+    }else{
+      swal("Oops","You are not authorized for Discount","warning")
+    }
+    return false;
+  });
 });
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 3826df57..6ece5bda 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -392,10 +392,7 @@
    <!-- Waiter Buttons -->
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i> Back</button>
    <button type="button" id="add_order" class="btn btn-block btn- bg-blue waves-effect">Add Order</button>
-   <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
    <button type="button" id="survey" class="btn btn-block bg-blue waves-effect">Survey</button>
-   <% end %>
-   <% if current_login_employee.role != "waiter" %>
    <% if @room.bookings.length >= 1 %>
      <% if @status_order == 'order' && @status_sale != 'sale' %>
        <!-- <button type="button" class="btn bg-blue btn-block" >Add Order</button> -->
@@ -419,14 +416,14 @@
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
         <% if current_login_employee.role != "waiter" %>
+        <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
+        <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
         <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
         <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
+        <% end %>
         <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
-        <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
-        <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-        <% end %>
         <% if !@split_bill.nil? %>
           <% if @split_bill == '1' %>
             <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
@@ -481,7 +478,6 @@
      <% end %>
    <!-- <button type="button" id="re-print" class="btn bg-blue btn-block" >Re.Print</button> -->
    <% end %>
-   <% end %>
  </div>
 </div>
 </div>
@@ -582,7 +578,7 @@ $(document).ready(function(){
                 var sale_id = "<%= @room.id %>";
             }
             //var table_id = $('.tables').attr("data-id");            
-            window.location.href = '/origami/' + sale_id + "/surveys"
+            window.location.href = '/origami/' + sale_id +"/"+cashier_type+ "/surveys"
         });
   // bind customer to order or sale
   $("#customer").on('click', function(){
@@ -617,7 +613,7 @@ $(document).ready(function(){
       }
 
       if (sale_id != "") {
-        window.location.href = '/origami/' + sale_id + '/discount'
+        window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/discount'
       }
       else {
         swal ( "Oops" ,  "Please select an table!" ,  "warning" );
@@ -639,7 +635,7 @@ $(document).ready(function(){
     }
 
     if(sale_id!=""){
-      window.location.href = '/origami/' + sale_id + '/other_charges'
+      window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/other_charges'
     }
     else {
       swal ( "Oops" ,  "Please select an table!" ,  "warning" );

From df76988f016a4da22822ac31decaa7dfd8220d5c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 10:21:40 +0630
Subject: [PATCH 384/651] add seed_generator current and next data in
 clear:data

---
 lib/tasks/clear_data.rake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 17dcde74..651ff7cd 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -17,6 +17,7 @@ namespace :clear do
     Survey.delete_all
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
+    SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
     puts "Clear Data Done."
   end
 end

From d7d5f8afc7b16b16d813975db7a1c3b3be29dc24 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 10:55:28 +0630
Subject: [PATCH 385/651] check manager account login error in dashboard

---
 app/models/sale.rb                | 64 +++++++++++++++----------------
 app/views/home/dashboard.html.erb | 17 ++++----
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 829b81b2..29e32c14 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1181,7 +1181,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1195,7 +1195,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1213,7 +1213,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1226,7 +1226,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1245,7 +1245,7 @@ end
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
@@ -1264,7 +1264,7 @@ end
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
@@ -1287,7 +1287,7 @@ end
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
@@ -1306,7 +1306,7 @@ end
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
@@ -1329,7 +1329,7 @@ end
             .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
             .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
             .first()
@@ -1348,7 +1348,7 @@ end
             .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
             .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .first()
@@ -1371,7 +1371,7 @@ end
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct sp.payment_method")
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
               .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
@@ -1390,7 +1390,7 @@ end
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct sp.payment_method")
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
               .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
@@ -1417,7 +1417,7 @@ end
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
               query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
@@ -1448,7 +1448,7 @@ end
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
               query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
@@ -1493,7 +1493,7 @@ end
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
@@ -1515,7 +1515,7 @@ end
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
@@ -1541,7 +1541,7 @@ end
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
@@ -1563,7 +1563,7 @@ end
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
@@ -1589,7 +1589,7 @@ end
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
@@ -1611,7 +1611,7 @@ end
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
@@ -1637,7 +1637,7 @@ end
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
@@ -1659,7 +1659,7 @@ end
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
@@ -1686,7 +1686,7 @@ end
             .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct a.order_id) as total_order")
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
@@ -1711,7 +1711,7 @@ end
             .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct a.order_id) as total_order")
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
@@ -1739,7 +1739,7 @@ end
             .joins("JOIN accounts as b ON b.id = a.account_id")
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct b.id as account_id, b.title as title")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
@@ -1761,7 +1761,7 @@ end
             .joins("JOIN accounts as b ON b.id = a.account_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct b.id as account_id, b.title as title")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
@@ -1787,7 +1787,7 @@ end
             .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
@@ -1809,7 +1809,7 @@ end
             .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
@@ -1837,7 +1837,7 @@ end
             .order("SUM(a.qty) DESC")
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
@@ -1865,7 +1865,7 @@ end
             .order("SUM(a.qty) DESC")
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
@@ -1894,7 +1894,7 @@ end
             .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
             .sum("a.qty")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
               .sum("a.qty")
@@ -1913,7 +1913,7 @@ end
             .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             .sum("a.qty")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
               .sum("a.qty")
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 5251b71f..3dd73a3d 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -218,22 +218,21 @@
       <% end %>
       <% end %>
 
-      <% if current_user.role == 'administrator' %>
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <% else %>
         <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
       <% end %>
+        <% if !@total_customer.nil? && @total_customer.to_i > 0 %>
           <div class="card">
             <div class="body">
               <h6><%= t :customer %></h6>
               <table class="table">
-                <% if !@total_customer.nil? %>
                   <tr>
                     <td><%= t("views.right_panel.detail.total") %> <%= t :customer %> : </td>
                     <td align="right"><%= @total_customer %></td>
                   </tr>
-                <% end %>
                 <% if !@total_dinein.nil? %>
                   <tr>
                     <td><%= t("views.right_panel.detail.dine_in") %> : </td>
@@ -261,12 +260,13 @@
               </table>
             </div>
           </div>
+          <% end %>
         </div>
-        <% if current_user.role == 'administrator'  %>
+        <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       </div>
       <% end %>
 
-      <% if current_user.role == 'administrator'  %>
+      <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <% else %>
@@ -312,9 +312,10 @@
               </table>
             </div>
           </div>
-        </div>
-      </div>    
-    </div>
+        </div> 
+    <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+      </div>
+    <% end %>
     <% end %>
   </div>
 </div>

From 21d39349d3b359e40ad359989e7ccf8580603234 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 11:54:35 +0630
Subject: [PATCH 386/651] check shift update data

---
 app/assets/javascripts/addorder.js          |  6 +--
 app/controllers/origami/home_controller.rb  | 54 ++++++++++-----------
 app/controllers/origami/rooms_controller.rb | 54 ++++++++++-----------
 app/models/sale_payment.rb                  |  4 +-
 app/views/origami/home/show.html.erb        | 16 +++---
 app/views/origami/rooms/show.html.erb       | 16 +++---
 lib/tasks/clear_data.rake                   |  2 +-
 7 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 2694766f..b0c51031 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -46,8 +46,8 @@ $(function() {
                         + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
                         + JSON.stringify(item_attributes) +"' data-options = '"
                         + options +"' data-image='"+image_path+"'>"
-                      +"<i class='fa fa-plus material-icons'>"
-                      +'add</i>'
+                      +"<i class='fa fa-bars material-icons'>"
+                      +'view_list</i>'
                       +'</div>'
                      +'</div>'
 
@@ -146,7 +146,7 @@ $(function() {
                    promotion_price =  menu_items[field].promotion_price;
               }else{
                 fa_plus = 'material-icons';
-                add = 'add'
+                add = 'view_list'
                 menu_item_box = 'menu_item_box';
                 data_target = 'sx_item_detailModal';
                 data_modal  = ''
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 1a73ef8c..f552430a 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -30,33 +30,33 @@ class Origami::HomeController < BaseOrigamiController
     bookings = Booking.all
     if !bookings.today.nil?
       @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
+      # bookings.each do |booking|
+      #   if booking.sale_id.nil? && booking.booking_status != 'moved'
+      #     if !booking.booking_orders.empty?
+      #       booking.booking_orders.each do |booking_order|
+      #         order = Order.find(booking_order.order_id)
+      #         if !order.order_items.empty?
+      #           if !@order_items_count.key?(booking.dining_facility_id)
+      #             @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+      #           else
+      #             @order_items_count[booking.dining_facility_id] += order.order_items.count
+      #           end
+      #         end
+      #       end
+      #     end
+      #   else
+      #     if !booking.sale_id.nil?
+      #       sale = Sale.find(booking.sale_id)
+      #       if sale.sale_status !='completed'
+      #         if !@order_items_count.key?(booking.dining_facility_id)
+      #           @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+      #         else
+      #           @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+      #         end
+      #       end
+      #     end
+      #   end
+      # end
     end
 
     @dining.bookings.active.each do |booking|
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index e49c82e7..6117d01d 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -26,33 +26,33 @@ class Origami::RoomsController < BaseOrigamiController
     bookings = Booking.all
     if !bookings.today.nil?
       @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
+      # bookings.each do |booking|
+      #   if booking.sale_id.nil? && booking.booking_status != 'moved'
+      #     if !booking.booking_orders.empty?
+      #       booking.booking_orders.each do |booking_order|
+      #         order = Order.find(booking_order.order_id)
+      #         if !order.order_items.empty?
+      #           if !@order_items_count.key?(booking.dining_facility_id)
+      #             @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+      #           else
+      #             @order_items_count[booking.dining_facility_id] += order.order_items.count
+      #           end
+      #         end
+      #       end
+      #     end
+      #   else
+      #     if !booking.sale_id.nil?
+      #       sale = Sale.find(booking.sale_id)
+      #       if sale.sale_status !='completed'
+      #         if !@order_items_count.key?(booking.dining_facility_id)
+      #           @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+      #         else
+      #           @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+      #         end
+      #       end
+      #     end
+      #   end
+      # end
     end
     
     @room.bookings.active.each do |booking|
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index bb74c2f2..1866a630 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -356,10 +356,10 @@ class SalePayment < ApplicationRecord
 
       self.sale.save!
       table_update_status(sObj)
-
+      
       if check_foc
         update_shift
-      elsif paid_amount != "0.0"
+      elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
         update_shift
       end
     end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index d08d55f4..6f341572 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -50,11 +50,11 @@
                             <% end %>                         
                                 <div class="card-block">
                                   <%= table.name %>
-                                  <% if !@order_items_count.nil? %>
+                                  <!-- <% if !@order_items_count.nil? %>
                                     <% if @order_items_count.key?(table.id) %>
                                       (Orders : <%= @order_items_count[table.id] %>)
                                     <% end %>
-                                  <% end %>
+                                  <% end %> -->
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
@@ -67,11 +67,11 @@
                             <% end %>                   
                             <div class="card-block">
                                 <%= table.name %> 
-                                <% if !@order_items_count.nil? %>
+                                <!-- <% if !@order_items_count.nil? %>
                                   <% if @order_items_count.key?(table.id) %>
                                     (Orders : <%= @order_items_count[table.id] %>)
                                   <% end %>
-                                <% end %>
+                                <% end %> -->
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                               </div>
                             </div>
@@ -97,11 +97,11 @@
                           <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">
                               <%= room.name %>
-                              <% if !@order_items_count.nil? %>
+                              <!-- <% if !@order_items_count.nil? %>
                                 <% if @order_items_count.key?(room.id) %>
                                   (Orders : <%= @order_items_count[room.id] %>)
                                 <% end %>
-                              <% end %>
+                              <% end %> -->
                                   <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                             </div>
                           </div>
@@ -109,11 +109,11 @@
                             <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                               <div class="card-block">
                                 <%= room.name %>
-                                <% if !@order_items_count.nil? %>
+                                <!-- <% if !@order_items_count.nil? %>
                                   <% if @order_items_count.key?(room.id) %>
                                     (Orders : <%= @order_items_count[room.id] %>)
                                   <% end %>
-                                <% end %>
+                                <% end %> -->
                                     <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                               </div>
                             </div>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 6ece5bda..1edb07cf 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -50,11 +50,11 @@
                 <% end %>              
                     <div class="card-block">
                        <%= table.name %>
-                      <% if !@order_items_count.nil? %>
+                      <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(table.id) %>
                           (Orders : <%= @order_items_count[table.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
@@ -66,11 +66,11 @@
                   <% end %>           
                     <div class="card-block">
                        <%= table.name %>
-                       <% if !@order_items_count.nil? %>
+                       <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(table.id) %>
                           (Orders : <%= @order_items_count[table.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                     </div>
                   </div>
@@ -97,11 +97,11 @@
                  <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
-                      <% if !@order_items_count.nil? %>
+                      <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(room.id) %>
                           (Orders : <%= @order_items_count[room.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                       <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                       <div  style="font-size:12px;"></div>
                    </div>
@@ -110,11 +110,11 @@
                  <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
-                      <% if !@order_items_count.nil? %>
+                      <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(room.id) %>
                           (Orders : <%= @order_items_count[room.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                       <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                    </div>
                  </div>
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 651ff7cd..43ba291e 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -17,7 +17,7 @@ namespace :clear do
     Survey.delete_all
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
-    SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
+    SeedGenerator.where("id > 1").update(:current => 0, :next => 1)
     puts "Clear Data Done."
   end
 end

From 91e76c738132e02d25de01dbf0e961574fa7a8f0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 13:29:24 +0630
Subject: [PATCH 387/651] check click event for logout

---
 app/assets/javascripts/custom.js   | 54 +++++++++++++++---------------
 app/views/layouts/_header.html.erb | 37 +++++++++++++++++---
 2 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index f33f6d11..a2011022 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -20,33 +20,33 @@ $(document).ready(function() {
     borderRadius: '0',
     railBorderRadius: '0'
   });
-
-  $('.delete').click(function(){
-    var method    = $(this).attr('data-method');
-    var url       = $(this).attr('data-ref');
-    var html_text = $(this).siblings( "#delete_text" ).html();
-    //var page = url.substring(url.lastIndexOf('/') + 1);    
-    swal({
-        title: "Confirmation",
-        text: html_text,
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        html: true
-    }, function (isConfirm) {
-        if (isConfirm) {
-          $.ajax({
-            type: method,
-            url: url ,            
-            success: function(data) {              
-              location.href = data.url;
-            }
-         });          
-        } else {
-            swal("Cancelled", "Your imaginary file is safe :)", "error");
-        }
-    });
-  });
+  
+  // $('.delete').click(function(){
+  //   var method    = $(this).attr('data-method');
+  //   var url       = $(this).attr('data-ref');
+  //   var html_text = $(this).siblings( "#delete_text" ).html();
+  //   //var page = url.substring(url.lastIndexOf('/') + 1);    
+  //   swal({
+  //       title: "Confirmation",
+  //       text: html_text,
+  //       type: "warning",
+  //       showCancelButton: true,
+  //       confirmButtonColor: "#DD6B55",
+  //       html: true
+  //   }, function (isConfirm) {
+  //       if (isConfirm) {
+  //         $.ajax({
+  //           type: method,
+  //           url: url ,            
+  //           success: function(data) {              
+  //             location.href = data.url;
+  //           }
+  //        });          
+  //       } else {
+  //           swal("Cancelled", "Your imaginary file is safe :)", "error");
+  //       }
+  //   });
+  // });
 
   // for Notificaiotn message
   var placementFrom  = $("#notify_message").attr('data-placement-from');
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 2207fef7..d07da974 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -51,13 +51,11 @@
                 </li>
                 <% end %>
                 <li>
-                    <!-- <%if current_login_employee.role !="waiter" %> -->
-                    <!-- <%end%> -->  
                     <!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
                         <i class="material-icons font-10 logout_icon">exit_to_app</i>
                         <span class="font-18">Logout</span>
                     </p> -->
-                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%= logout_path %>" data-method="delete">
+                    <p class="delete waves-effect waves-block p-l-30 m-b-5 logout" data-ref="<%= logout_path %>" data-method="delete">
                         <i class="material-icons font-7 logout_icon">exit_to_app</i>
                         <span class="font-15">Logout</span>
                     </p>
@@ -73,4 +71,35 @@
             </a> -->
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
+
+<script type="text/javascript">
+    $(function(){
+        $('.delete').click(function(){
+            var method    = $(this).attr('data-method');
+            var url       = $(this).attr('data-ref');
+            var html_text = $(this).siblings( "#delete_text" ).html();
+            //var page = url.substring(url.lastIndexOf('/') + 1);    
+            swal({
+                title: "Confirmation",
+                text: html_text,
+                type: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#DD6B55",
+                html: true
+            }, function (isConfirm) {
+                if (isConfirm) {
+                  $.ajax({
+                    type: method,
+                    url: url ,            
+                    success: function(data) {              
+                      location.href = data.url;
+                    }
+                 });          
+                } else {
+                    swal("Cancelled", "Your imaginary file is safe :)", "error");
+                }
+            });
+        });
+    });
+</script>
\ No newline at end of file

From 8ce14f8c9963fb9826f90bd06d7ca2a0c0de9396 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 9 Mar 2018 14:04:26 +0630
Subject: [PATCH 388/651] update queui chang

---
 app/assets/javascripts/OQS.js                 |  76 +++++--
 .../channels/order_queue_station.js           |   3 +-
 app/controllers/oqs/home_controller.rb        |  20 +-
 app/views/oqs/home/index.html.erb             | 204 ++++++++----------
 .../oqs/home/index_quechange_backup.html.erb  | 196 +++++++++++++++++
 5 files changed, 364 insertions(+), 135 deletions(-)
 mode change 100755 => 100644 app/views/oqs/home/index.html.erb
 create mode 100755 app/views/oqs/home/index_quechange_backup.html.erb

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index ec3db11f..2bbf07bb 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -31,30 +31,75 @@ $(document).on('turbolinks:load', function() {
        $(".oqs_append").addClass('hide')
     });
 
+    $(".tables").on("click", function(){
+
+       var table_id = $(this).val();
+       $('#table_id').val(table_id);
+       oqs_id = $("#oqs_id").val();
+    	if (table_id){
+    		var table = table_id
+    	}else{
+    		var table = null
+    	}
+    	
+    	if (oqs_id > 0) {
+    	   $(".oqs_click").removeClass('oqs_active');
+	       $(".queue_station").removeClass('queue_station_box');
+	       $("#completed").addClass('hide');
+	       $(".oqs_append").removeClass('hide');
+	       $("#oqs_active").addClass('oqs_active');
+	       $(".queue_station").addClass('queue_station_box');
+	       // oqs_id = $(this).find(".oqs-id").text();
+	        $("#oqs_active").attr('data-id',oqs_id);
+	       var url    = 'oqs/get_items/'+oqs_id;
+	       
+	       show_details(url,table);
+    	}else{
+    		$("#completed").removeClass('hide')
+            $(".oqs_append").addClass('hide')
+    	}
+    });
+
     $(".oqs_click").on("click", function(){
-       $(".oqs_click").removeClass('oqs_active');
-       $(".queue_station").removeClass('queue_station_box');
-       $("#completed").addClass('hide');
-       $(".oqs_append").removeClass('hide');
-       $(this).addClass('oqs_active');
-       $(".queue_station").addClass('queue_station_box');
-       oqs_id = $(this).find(".oqs-id").text();
-       console.log(oqs_id);
-       var url    = 'oqs/get_items/'+oqs_id;
-      
-       show_details(url);
+    	oqs_id = $(this).val();
+    	var table_id = $('#table_id').val();
+    	if (table_id){
+    		var table = table_id
+    	}else{
+    		var table = null
+    	}
+    	
+    	if (oqs_id > 0) {
+    	   $(".oqs_click").removeClass('oqs_active');
+	       $(".queue_station").removeClass('queue_station_box');
+	       $("#completed").addClass('hide');
+	       $(".oqs_append").removeClass('hide');
+	       $("#oqs_active").addClass('oqs_active');
+	       $(".queue_station").addClass('queue_station_box');
+	       // oqs_id = $(this).find(".oqs-id").text();
+	        $("#oqs_active").attr('data-id',oqs_id);
+	       var url    = 'oqs/get_items/'+oqs_id;
+	       
+	       show_details(url,table);
+    	}else{
+    		$("#completed").removeClass('hide')
+            $(".oqs_append").addClass('hide')
+    	}
+       
 
     }); //End Click
  
-	function show_details(url){  
+	function show_details(url,table_id){  
 	     var oqs_append = $('.oqs_append');
 	     oqs_append.empty();
 	     var filter = $('.filter').text();
+
+	     console.log(table_id)
 	    //Start Ajax
 	    $.ajax({      
 	      type: "GET",         
 	      url: url, 
-	      data: {'filter':filter},
+	      data: {'filter':filter,'table_id':table_id},
 	      dataType: "json",
 	      success: function(data) {
 	          for(var field in data) {
@@ -67,7 +112,8 @@ $(document).on('turbolinks:load', function() {
 	            }
 
 	            var date = new Date(data[field]["created_at"]); 
-	            var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	            // var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	            var show_date =date.getHours()+ ':' +  date.getMinutes() +' '+(date.getHours() >= 12 ? 'PM' : 'AM');
 	            var set_menu_items = data[field]["set_menu_items"];
 	            var set_instance_items = "";
 	            if(set_menu_items!=null){
@@ -100,7 +146,7 @@ $(document).on('turbolinks:load', function() {
 	                          +set_instance_items
 	                         +'</p>'
 
-	                        +'<br/><p class="card-text item-options">'+ options +'</p>'
+	                        +'<p class="card-text item-options">'+ options +'</p>'
 
 	                        +'<span class="card-text">'
 	                          +'<span class="text-muted">Order at - '
diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js
index d2b502d4..c8b59231 100755
--- a/app/assets/javascripts/channels/order_queue_station.js
+++ b/app/assets/javascripts/channels/order_queue_station.js
@@ -5,8 +5,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
 
   disconnected: function() {},
 
-  received: function(data) {                 
-  	// console.log(data.order);
+  received: function(data) {
   	var oqs_id = $('.oqs_active').attr('data-id');
   	items = data.order;
   	for(var field in items) {
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 53a3e879..95c4d833 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -7,7 +7,8 @@ class Oqs::HomeController < BaseOqsController
   	# @queue_items_details = queue_items_query(false)
 
     # Query for OQS with delivery status true
-    
+    @tables   = DiningFacility.all.active.order('status desc')
+    @rooms    = Room.all.active.order('status desc')
 
     @filter = params[:filter]
 
@@ -113,7 +114,11 @@ class Oqs::HomeController < BaseOqsController
   def get_items_by_oqs
     oqs_id = params[:id]
     filter = params[:filter]
-    items  = queue_items_query(false,oqs_id,filter)
+    table_id = params[:table_id]
+    puts params
+    puts table_id
+    puts "sssssssssssss"
+    items  = queue_items_query(false,oqs_id,filter,table_id)
     if !items.empty?
       items.each do |item|
         if !item.set_menu_items.nil?
@@ -151,13 +156,20 @@ class Oqs::HomeController < BaseOqsController
 
 
   # Query for OQS with delivery status
-  def queue_items_query(status,oqs_id=nil,filter) 
+  def queue_items_query(status,oqs_id=nil,filter,table_id) 
     if oqs_id == nil
        oqs = ''
     else
       oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
     end
 
+    if table_id.to_i>0
+       table = "and df.id = '#{table_id}' "
+       
+    else
+     table = ''
+    end
+
     query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, 
                               oqs.id as station_id, oqs.station_name, 
                               oqs.is_active, oqpz.zone_id, 
@@ -173,7 +185,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
+    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} #{table}")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
     .order("assigned_order_items.assigned_order_item_id desc")
     .group("odt.order_items_id")
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
old mode 100755
new mode 100644
index 33ee74b7..585f9968
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,137 +1,115 @@
 <!-- Column One -->
-<div class="row clearfix">
-  <div class="col-lg-8 col-md-8 col-sm-8">  
+<div class="row clearfix" style="margin-top:-50px !important">
+  <div class="col-lg-11 col-md-11 col-sm-11">  
     <div class="body p-l-10">
-      <%= form_tag oqs_root_path, :method => :get do %>
       <div class="row clearfix">
         <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
-           <input type="text" name="filter" class="form-control" placeholder="Search">
-          
+          <span class="hidden" id="oqs_active"></span>
+          <select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
+            <option value="0"  data-id="0">Processed</option>
+            <% @queue_stations.each do |qsi|  %>
+              <% if qsi.is_active != false %>
+              <p class="hidden oqs-id"><%= qsi.id  %></p>
+              <option value="<%= qsi.id %>"  data-id="<%= qsi.id %>" style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
+              <% end %>
+            <% end %> 
+          </select>
         </div>
-        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-          <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
+        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
+        <span class="hidden" id="table_id"></span>
+          <select class="form-control select tables" name="table_id" id="tables">
+            <option value="">Select Table</option>
+            <% @tables.each do |table|  %>
+              
+              <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
+              
+            <% end %> 
+          </select>
         </div>
-
+<!-- 
+        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
+        <span class="hidden" id="room_id"></span>
+          <select class="form-control select rooms" name="table_id" id="rooms">
+            <option value="">Select Room</option>
+            <% @rooms.each do |table|  %>
+              
+              <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
+              
+            <% end %> 
+          </select>
+        </div> -->
       </div>
-      <% end %>
     </div>
-   
-    <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-      <!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
-        <a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
-      </li> -->
-      <li class="nav-item nav-completed">
-        <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed 
-        <span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
-      </li>
-      <% # For Tab Disable for Station is inactive
-      status=""
-      i=0
-      @queue_stations.each do |qsi|  
-        if qsi.is_active == false   
-          status="disabled"    
-          end %>
-          <li class="nav-item oqs_click" data-id="<%= qsi.id %>">
-            <p class="hidden oqs-id"><%= qsi.id  %></p>
-            <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
-              <%= qsi.station_name %>
-              <% if @filter.nil? %>
-              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
-              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
-              </span> 
-              <%else%>
-              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
-               <% @count.each do |c|%>    
-               <% if qsi.id == c.station_id %>
-               <%= c.total %>                
-               <%end %>  
-               <%end %>    
-             </span>
-             <%end%>
-             <% if qsi.auto_print %>
-             <span>(ap)</span>
-             <% end %>  
-           </a>
-         </li>
-         <% i+=1%>
-
-         <% end %>      
-      </ul>
-     <!-- Nav tabs - End -->
-     <p class="hidden filter"><%= @filter %></p>
-
-     <div class="tab-content" id="custom-slimscroll" style="">
-      <!--- Panel 0 - Completed -->
-
+    
+    <p class="hidden filter"><%= @filter %></p>
+    <div class="card">
+      <div class="card-block">
+        <div class="tab-content" id="custom-slimscroll" style="">
       <div class="tab-pane in active" id="completed" role="tabpanel">
-        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;column-count: ;">
           <%   
           @queue_completed_item.each do |qid|                               
             %>
             <div class="card queue_station" data-order-no="<%= qid.order_id %>">
               <div class="card-block">
-                <div class="row">
-                <%if qid.type.present?%>
-                 <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
-                <%else%>
-                 <span class="col-md-4 order-zone-type font-13"></span>
-                <%end%>
-                 
-                  <span class="order-zone hidden font-13"><%= qid.zone %></span>
-                  <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
-                </div> 
-               <p class="m-b--10">
-                  <span class="order-item font-16">
-                    <%= qid.item_name %>
-                  </span> [x
-                  <span class="order-qty">
-                    <%= qid.qty %>
-                  </span> ]  
-                  <% if !qid.set_menu_items.nil? %>
-                    <% qid.set_menu_items.each do |item_instance|%>
-                      <br><span class="font-12">
-                      <%= item_instance %>
-                      </span>
-                    <% end %>
-                  <% end %> 
-                </p>                  
-                
-                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+                  <div class="row">
+                    <%if qid.type.present?%>
+                    <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
+                    <%else%>
+                    <span class="col-md-4 order-zone-type font-13"></span>
+                    <%end%>
 
-                <span class="card-text">
-                  <span class="text-muted">Order at - 
-                    <span class="order-at font-13">
-                      <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
-                    </span> <br> 
-                     Order By - <span class="order-by font-13">
-                    <%= qid.item_order_by %>
-                    </span> 
+                    <span class="order-zone hidden font-13"><%= qid.zone %></span>
+                    <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
+                  </div> 
+                  <p class="m-b--10">
+                    <span class="order-item font-16">
+                      <%= qid.item_name %>
+                    </span> [x
+                    <span class="order-qty">
+                      <%= qid.qty %>
+                    </span> ]  
+                    <% if !qid.set_menu_items.nil? %>
+                      <% qid.set_menu_items.each do |item_instance|%>
+                       <br><span class="font-12">
+                       <%= item_instance %>
+                        </span>
+                      <% end %>
+                    <% end %> 
+                  </p>                  
+
+                  <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+
+                  <span class="card-text">
+                    <span class="text-muted">Order at - 
+                      <span class="order-at font-13">
+                        <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
+                      </span> <br> 
+                      Order By - <span class="order-by font-13">
+                      <%= qid.item_order_by %>
+                      </span> 
+                    </span>
                   </span>
-                </span>
-              
+
                 <p class="hidden order-status">completed</p>
                 <p class="hidden order-customer"><%= qid.customer_name %></p>
                 <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>                
               </div>
-            </div> 
-            <%                                      
-          end
-          %>    
+           </div> 
+          <% end %>    
         </div>
-      </div>
+       </div>
 
-
-      <!-- End Panel 0 - Completed -->
-      <!--- Order Items -->
       <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
       </div>
-      <!--- end of Items-->
     </div>
+      </div>
+    </div>
+
   </div>
 
   <!-- Column Two -->
-  <div class="col-lg-3 col-md-3 col-sm-3">
+  <!-- <div class="col-lg-3 col-md-3 col-sm-3">
     <div class="card"  >
       <div class="card-header">
         <div><strong id="order-title">ORDER DETAILS</strong></div>
@@ -143,20 +121,18 @@
               <tr>
               <th style="width:33%; text-align:">Order By</th>
                 <th style="width:33%; text-align:">Order At</th>
-                <!-- <th style="width:33%; text-align:">Customer</th> -->
               </tr>
             </thead>
             <tbody>
               <tr>
                 <td id="order-by" style="width:33%; text-align:"></td>
                 <td id="order-at" style="width:33%; text-align:"></td>
-                <!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
-                  </tr>
-                  <tr>
+                  </tr> -->
+                  <!-- <tr>
                     <td><strong class="hidden cus_name">Customer</strong></td>
                     <td id="order-customer" colspan="2"></td>
-                  </tr>
-                </tbody>
+                  </tr> -->
+              <!--   </tbody>
               </table>                  
         </div>
         <div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
@@ -168,17 +144,17 @@
               </tr>
             </thead>
             <tbody>              
-              <!-- Bind With JS -->
             </tbody>
           </table>
         </div>
       </div>
     </div>
   </div>
-
+ -->
   <!-- Column Three -->
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
+    <br>
     <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
     <% if ENV["SERVER_MODE"] != "cloud" %>
     <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
diff --git a/app/views/oqs/home/index_quechange_backup.html.erb b/app/views/oqs/home/index_quechange_backup.html.erb
new file mode 100755
index 00000000..33ee74b7
--- /dev/null
+++ b/app/views/oqs/home/index_quechange_backup.html.erb
@@ -0,0 +1,196 @@
+<!-- Column One -->
+<div class="row clearfix">
+  <div class="col-lg-8 col-md-8 col-sm-8">  
+    <div class="body p-l-10">
+      <%= form_tag oqs_root_path, :method => :get do %>
+      <div class="row clearfix">
+        <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
+           <input type="text" name="filter" class="form-control" placeholder="Search">
+          
+        </div>
+        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
+          <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
+        </div>
+
+      </div>
+      <% end %>
+    </div>
+   
+    <!-- Nav tabs -->
+    <ul class="nav nav-tabs" role="tablist">
+      <!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
+        <a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
+      </li> -->
+      <li class="nav-item nav-completed">
+        <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed 
+        <span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
+      </li>
+      <% # For Tab Disable for Station is inactive
+      status=""
+      i=0
+      @queue_stations.each do |qsi|  
+        if qsi.is_active == false   
+          status="disabled"    
+          end %>
+          <li class="nav-item oqs_click" data-id="<%= qsi.id %>">
+            <p class="hidden oqs-id"><%= qsi.id  %></p>
+            <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
+              <%= qsi.station_name %>
+              <% if @filter.nil? %>
+              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
+              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
+              </span> 
+              <%else%>
+              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
+               <% @count.each do |c|%>    
+               <% if qsi.id == c.station_id %>
+               <%= c.total %>                
+               <%end %>  
+               <%end %>    
+             </span>
+             <%end%>
+             <% if qsi.auto_print %>
+             <span>(ap)</span>
+             <% end %>  
+           </a>
+         </li>
+         <% i+=1%>
+
+         <% end %>      
+      </ul>
+     <!-- Nav tabs - End -->
+     <p class="hidden filter"><%= @filter %></p>
+
+     <div class="tab-content" id="custom-slimscroll" style="">
+      <!--- Panel 0 - Completed -->
+
+      <div class="tab-pane in active" id="completed" role="tabpanel">
+        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+          <%   
+          @queue_completed_item.each do |qid|                               
+            %>
+            <div class="card queue_station" data-order-no="<%= qid.order_id %>">
+              <div class="card-block">
+                <div class="row">
+                <%if qid.type.present?%>
+                 <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
+                <%else%>
+                 <span class="col-md-4 order-zone-type font-13"></span>
+                <%end%>
+                 
+                  <span class="order-zone hidden font-13"><%= qid.zone %></span>
+                  <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
+                </div> 
+               <p class="m-b--10">
+                  <span class="order-item font-16">
+                    <%= qid.item_name %>
+                  </span> [x
+                  <span class="order-qty">
+                    <%= qid.qty %>
+                  </span> ]  
+                  <% if !qid.set_menu_items.nil? %>
+                    <% qid.set_menu_items.each do |item_instance|%>
+                      <br><span class="font-12">
+                      <%= item_instance %>
+                      </span>
+                    <% end %>
+                  <% end %> 
+                </p>                  
+                
+                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+
+                <span class="card-text">
+                  <span class="text-muted">Order at - 
+                    <span class="order-at font-13">
+                      <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
+                    </span> <br> 
+                     Order By - <span class="order-by font-13">
+                    <%= qid.item_order_by %>
+                    </span> 
+                  </span>
+                </span>
+              
+                <p class="hidden order-status">completed</p>
+                <p class="hidden order-customer"><%= qid.customer_name %></p>
+                <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>                
+              </div>
+            </div> 
+            <%                                      
+          end
+          %>    
+        </div>
+      </div>
+
+
+      <!-- End Panel 0 - Completed -->
+      <!--- Order Items -->
+      <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
+      </div>
+      <!--- end of Items-->
+    </div>
+  </div>
+
+  <!-- Column Two -->
+  <div class="col-lg-3 col-md-3 col-sm-3">
+    <div class="card"  >
+      <div class="card-header">
+        <div><strong id="order-title">ORDER DETAILS</strong></div>
+      </div>
+      <div class="card-block">
+        <div class="card-title">
+          <table class="">
+            <thead>
+              <tr>
+              <th style="width:33%; text-align:">Order By</th>
+                <th style="width:33%; text-align:">Order At</th>
+                <!-- <th style="width:33%; text-align:">Customer</th> -->
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td id="order-by" style="width:33%; text-align:"></td>
+                <td id="order-at" style="width:33%; text-align:"></td>
+                <!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
+                  </tr>
+                  <tr>
+                    <td><strong class="hidden cus_name">Customer</strong></td>
+                    <td id="order-customer" colspan="2"></td>
+                  </tr>
+                </tbody>
+              </table>                  
+        </div>
+        <div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
+          <table class="table" id="oqs-order-details-table">
+            <thead>
+              <tr>
+                <th style="width:80%; text-align:left">Items</th>
+                <th style="width:20%; text-align:right">QTY</th>
+              </tr>
+            </thead>
+            <tbody>              
+              <!-- Bind With JS -->
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Column Three -->
+  <div class="col-lg-1 col-md-1 col-sm-1">
+    <!-- OQS Buttons -->
+    <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
+    <% if ENV["SERVER_MODE"] != "cloud" %>
+    <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
+      <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
+    <%end%>    
+  </div>
+</div>
+
+<script type="text/javascript">
+  $(document).on('turbolinks:load', function() {
+    $('#back').on('click', function () {
+        window.location.href = '/dashboard';
+    });
+  });
+</script>

From 9c89bce25d5d763d86d8c7e541f98c074bb64b23 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 14:05:18 +0630
Subject: [PATCH 389/651] change take away customer for quick service

---
 .../origami/addorders_controller.rb           |   7 +-
 app/models/printer/receipt_printer.rb         |   8 +-
 app/views/layouts/_header.html.erb            |   6 +-
 app/views/origami/payments/show.html.erb      | 100 +++++++++---------
 4 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index c9b1bc44..c71199e9 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -103,10 +103,15 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
      }
 
     # begin
+    if params[:order_source] == "quick_service"
+      customer_id = "CUS-000000000002" # for no customer id from mobile
+    else
+      customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    end
     @order = Order.new
     @order.source = params[:order_source]
     @order.order_type = params[:order_type]
-    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    @order.customer_id = customer_id
     @order.items = items_arr
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index d544c908..4b70f0b6 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -204,15 +204,15 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       if count == 1
         filename = "/receipts/receipt_bill_#{sale_data.receipt_no}.pdf"
         pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
-        if printed_status != 'Paid'
+        # if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
-        end
+        # end
       else
         filename = "/receipts/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
         pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
-        if printed_status != 'Paid'
+        # if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
-        end
+        # end
       end
 
       count -= 1
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d07da974..f3fe9e40 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -16,7 +16,11 @@
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
             <%if current_login_employee.role !="waiter" %>
                 <a href="javascript:void(0);" class="bars"></a>
-                <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+                <% if current_login_employee.role != "cashier" %>
+                    <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+                <% else %>
+                    <a class="navbar-brand" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
+                <% end %>
             <% else %>
                 <a class="navbar-brand m-0" href="<%= origami_dashboard_path%>">
             <%end%>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c233a63c..eade87e1 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -462,11 +462,11 @@ var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
     //start customer modal popup
-    if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
-      if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
-        $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
-      }
-    }
+    // if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+    //   if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
+    //     $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
+    //   }
+    // }
 
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
@@ -594,53 +594,53 @@ var customer_name = "<%= @customer.name %>";
                 $("#loading_wrapper" ).hide();
 
                 //PDF lightbox data
-                $("#sale_receipt_no").val(result.receipt_no);
-                $("#filename").val(result.filename);
-                $("#printer_name").val(result.printer_name);
-                $("#receipt_pdf").attr("src", result.filename);
-                $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
-                $("#pdfModalLabel").text("Payment Successful!");
-                $("#changed_amount").text("");
-                if($('#balance').text() < 0){
-                  <% if precision.to_i > 0 %>
-                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
-                  <% else %>
-                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
-                  <% end %>
-                }
-                //PDF lightbox data 
+                // $("#sale_receipt_no").val(result.receipt_no);
+                // $("#filename").val(result.filename);
+                // $("#printer_name").val(result.printer_name);
+                // $("#receipt_pdf").attr("src", result.filename);
+                // $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
+                // $("#pdfModalLabel").text("Payment Successful!");
+                // $("#changed_amount").text("");
                 // if($('#balance').text() < 0){
-                //   swal({
-                //     title: "Payment Successful!",
-                //     text: 'Changed amount  ' + $('#balance').text() * (-1),
-                //     html: true,
-                //     closeOnConfirm: false,
-                //     closeOnCancel: false,
-                //     allowOutsideClick: false
-                //   }, function () {
-                //     // if (cashier_type=="cashier") {
-                //     //   window.location.href = '/origami';
-                //     // }else{
-                //     //   window.location.href = '/origami/quick_service';
-                //     // }           
-                //   });
-                // }else{         
-                //   $('#pay').text("Pay");
-                //   swal({
-                //    title: "Payment Successful!",
-                //    text: 'Thank You !',
-                //    html: true,
-                //    closeOnConfirm: false, 
-                //    closeOnCancel: false,
-                //    allowOutsideClick: false
-                //  }, function () {
-                //   // if (cashier_type=="cashier") {
-                //   //   window.location.href = '/origami';
-                //   // }else{
-                //   //   window.location.href = '/origami/quick_service';
-                //   // }                
-                // });
+                //   <% if precision.to_i > 0 %>
+                //     $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
+                //   <% else %>
+                //     $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
+                //   <% end %>
                 // }
+                //PDF lightbox data 
+                if($('#balance').text() < 0){
+                  swal({
+                    title: "Payment Successful!",
+                    text: 'Changed amount  ' + $('#balance').text() * (-1),
+                    html: true,
+                    closeOnConfirm: false,
+                    closeOnCancel: false,
+                    allowOutsideClick: false
+                  }, function () {
+                    if (cashier_type=="cashier") {
+                      window.location.href = '/origami';
+                    }else{
+                      window.location.href = '/origami/quick_service';
+                    }           
+                  });
+                }else{         
+                  $('#pay').text("Pay");
+                  swal({
+                   title: "Payment Successful!",
+                   text: 'Thank You !',
+                   html: true,
+                   closeOnConfirm: false, 
+                   closeOnCancel: false,
+                   allowOutsideClick: false
+                 }, function () {
+                  if (cashier_type=="cashier") {
+                    window.location.href = '/origami';
+                  }else{
+                    window.location.href = '/origami/quick_service';
+                  }                
+                });
+                }
               }
             });
           }

From 9a96f066e9fddbe3f3f4433e2c488eff30ad82e0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 14:17:40 +0630
Subject: [PATCH 390/651] change print popup function

---
 app/models/printer/receipt_printer.rb    |   8 +-
 app/views/origami/payments/show.html.erb | 100 +++++++++++------------
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 4b70f0b6..d544c908 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -204,15 +204,15 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       if count == 1
         filename = "/receipts/receipt_bill_#{sale_data.receipt_no}.pdf"
         pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
-        # if printed_status != 'Paid'
+        if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
-        # end
+        end
       else
         filename = "/receipts/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
         pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
-        # if printed_status != 'Paid'
+        if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
-        # end
+        end
       end
 
       count -= 1
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index eade87e1..8dc9fe02 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -462,11 +462,11 @@ var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
     //start customer modal popup
-    // if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
-    //   if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
-    //     $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
-    //   }
-    // }
+    if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+      if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
+        $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
+      }
+    }
 
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
@@ -594,53 +594,53 @@ var customer_name = "<%= @customer.name %>";
                 $("#loading_wrapper" ).hide();
 
                 //PDF lightbox data
-                // $("#sale_receipt_no").val(result.receipt_no);
-                // $("#filename").val(result.filename);
-                // $("#printer_name").val(result.printer_name);
-                // $("#receipt_pdf").attr("src", result.filename);
-                // $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
-                // $("#pdfModalLabel").text("Payment Successful!");
-                // $("#changed_amount").text("");
-                // if($('#balance').text() < 0){
-                //   <% if precision.to_i > 0 %>
-                //     $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
-                //   <% else %>
-                //     $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
-                //   <% end %>
-                // }
-                //PDF lightbox data 
+                $("#sale_receipt_no").val(result.receipt_no);
+                $("#filename").val(result.filename);
+                $("#printer_name").val(result.printer_name);
+                $("#receipt_pdf").attr("src", result.filename);
+                $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
+                $("#pdfModalLabel").text("Payment Successful!");
+                $("#changed_amount").text("");
                 if($('#balance').text() < 0){
-                  swal({
-                    title: "Payment Successful!",
-                    text: 'Changed amount  ' + $('#balance').text() * (-1),
-                    html: true,
-                    closeOnConfirm: false,
-                    closeOnCancel: false,
-                    allowOutsideClick: false
-                  }, function () {
-                    if (cashier_type=="cashier") {
-                      window.location.href = '/origami';
-                    }else{
-                      window.location.href = '/origami/quick_service';
-                    }           
-                  });
-                }else{         
-                  $('#pay').text("Pay");
-                  swal({
-                   title: "Payment Successful!",
-                   text: 'Thank You !',
-                   html: true,
-                   closeOnConfirm: false, 
-                   closeOnCancel: false,
-                   allowOutsideClick: false
-                 }, function () {
-                  if (cashier_type=="cashier") {
-                    window.location.href = '/origami';
-                  }else{
-                    window.location.href = '/origami/quick_service';
-                  }                
-                });
+                  <% if precision.to_i > 0 %>
+                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
+                  <% else %>
+                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
+                  <% end %>
                 }
+                //PDF lightbox data 
+                // if($('#balance').text() < 0){
+                //   swal({
+                //     title: "Payment Successful!",
+                //     text: 'Changed amount  ' + $('#balance').text() * (-1),
+                //     html: true,
+                //     closeOnConfirm: false,
+                //     closeOnCancel: false,
+                //     allowOutsideClick: false
+                //   }, function () {
+                //     if (cashier_type=="cashier") {
+                //       window.location.href = '/origami';
+                //     }else{
+                //       window.location.href = '/origami/quick_service';
+                //     }           
+                //   });
+                // }else{         
+                //   $('#pay').text("Pay");
+                //   swal({
+                //    title: "Payment Successful!",
+                //    text: 'Thank You !',
+                //    html: true,
+                //    closeOnConfirm: false, 
+                //    closeOnCancel: false,
+                //    allowOutsideClick: false
+                //  }, function () {
+                //   if (cashier_type=="cashier") {
+                //     window.location.href = '/origami';
+                //   }else{
+                //     window.location.href = '/origami/quick_service';
+                //   }                
+                // });
+                // }
               }
             });
           }

From f7de959c78548a6ff61bee17f4b248629ad7306b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 9 Mar 2018 14:23:48 +0630
Subject: [PATCH 391/651] add receipt in .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8489e37c..b404db53 100755
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ capybara-*.html
 /public/assets/*
 /public/uploads/*
 /public/swf/*
+/public/receipts
 /coverage/
 /spec/tmp/*
 *.orig

From 4ea2337fae0f67d3b72370b4090c2825c2536476 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sun, 11 Mar 2018 16:14:44 +0630
Subject: [PATCH 392/651] update second display

---
 app/assets/images/second.jpg                  | Bin 0 -> 10769 bytes
 app/assets/images/slider/s1.jpg               | Bin 0 -> 203819 bytes
 app/assets/images/slider/s2.jpg               | Bin 0 -> 83094 bytes
 app/assets/images/slider/s3.jpg               | Bin 0 -> 122661 bytes
 app/assets/images/slider/s4.jpg               | Bin 0 -> 14500 bytes
 app/assets/javascripts/addorder.js            |  39 +-
 .../javascripts/channels/second_display.js    |  38 ++
 .../channels/second_display_view.js           | 112 ++++++
 app/assets/javascripts/wow_script.js          |   1 +
 app/assets/javascripts/wowslider.js           | 337 ++++++++++++++++++
 app/assets/stylesheets/wow_style.css          | 220 ++++++++++++
 app/channels/second_display_channel.rb        |  11 +
 app/channels/second_display_view_channel.rb   |  11 +
 .../origami/addorders_controller.rb           |   7 +-
 app/controllers/origami/home_controller.rb    |   3 -
 .../origami/second_display_controller.rb      |  23 ++
 app/models/order.rb                           |  36 ++
 app/views/origami/home/show.html.erb          |   9 +-
 app/views/origami/payments/show.html.erb      |  16 +-
 .../second_display/_second_display.html.erb   |  60 ++++
 .../origami/second_display/_slider.html.erb   |  18 +
 .../origami/second_display/index.html.erb     |  11 +
 config/initializers/assets.rb                 |   5 +
 config/routes.rb                              |   3 +
 24 files changed, 947 insertions(+), 13 deletions(-)
 create mode 100644 app/assets/images/second.jpg
 create mode 100644 app/assets/images/slider/s1.jpg
 create mode 100644 app/assets/images/slider/s2.jpg
 create mode 100644 app/assets/images/slider/s3.jpg
 create mode 100644 app/assets/images/slider/s4.jpg
 create mode 100644 app/assets/javascripts/channels/second_display.js
 create mode 100644 app/assets/javascripts/channels/second_display_view.js
 create mode 100644 app/assets/javascripts/wow_script.js
 create mode 100644 app/assets/javascripts/wowslider.js
 create mode 100644 app/assets/stylesheets/wow_style.css
 create mode 100644 app/channels/second_display_channel.rb
 create mode 100644 app/channels/second_display_view_channel.rb
 create mode 100644 app/controllers/origami/second_display_controller.rb
 create mode 100644 app/views/origami/second_display/_second_display.html.erb
 create mode 100644 app/views/origami/second_display/_slider.html.erb
 create mode 100644 app/views/origami/second_display/index.html.erb

diff --git a/app/assets/images/second.jpg b/app/assets/images/second.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b7063459263fd79ec6c1f5b9194607102461c737
GIT binary patch
literal 10769
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/slider/s1.jpg b/app/assets/images/slider/s1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cf5cfb0ba498461fa4d3082ac4a093b41a09cf01
GIT binary patch
literal 203819
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
a+RSPO8%<E<Qo)FxPv1i$gFF9k^#1|St4Qzw

literal 0
HcmV?d00001

diff --git a/app/assets/images/slider/s2.jpg b/app/assets/images/slider/s2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2e3e9332c9a245501f10c9d997ba056287bd50b2
GIT binary patch
literal 83094
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/slider/s3.jpg b/app/assets/images/slider/s3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e3b4de104a2300458452c2d214641367c77f3f50
GIT binary patch
literal 122661
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
RDqH;x4I%_f8=#Fp{|6<n)58D&

literal 0
HcmV?d00001

diff --git a/app/assets/images/slider/s4.jpg b/app/assets/images/slider/s4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..73decfb9be63625d9209d6b701eca702e9e7339d
GIT binary patch
literal 14500
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
AMgRZ+

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 9cc2f774..4378e517 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -684,6 +684,8 @@ $(function() {
     $('.add_to_order').attr('data-attributes',JSON.stringify(attribute_arr));
     $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
     var item_data = $(this);
+    item = get_item(item_data);
+    customer_display_view(item,"add");
     show_item_detail(item_data);
     calculate_sub_total();
       
@@ -692,6 +694,8 @@ $(function() {
   // click plus icon for add 
   $(document).on('click', '.add_icon', function(event){ 
     var item_data = $(this);
+    item = get_item(item_data);
+    customer_display_view(item,"add");
     show_item_detail(item_data);
     calculate_sub_total(); 
   }); //End Add Icon Click
@@ -795,7 +799,8 @@ $(function() {
           url: ajax_url,
           data: params,
           dataType: "json",
-           success:function(result){         
+           success:function(result){ 
+            customer_display_view(null,"reload");
               if (type == "quick_service") {
                   window.location.href = "/origami/quick_service"
               }else{
@@ -824,9 +829,7 @@ $(function() {
     type = "quick_service"
     modify_order = window.location.href.indexOf("modify_order");
     $("#oqs_loading_wrapper").show();
-    console.log(modify_order)
       if (modify_order !=-1) {
-        console.log($('#sale_id').text())
         var ajax_url   = '../../../quick_service/update_modify_order';
         var table_type = $('#table_type').text();
         var table_id    = $('#table_id').text();
@@ -861,7 +864,6 @@ $(function() {
       data: params,
       dataType: "json",
        success:function(result){
-        console.log(result)
           if (result.status) {
             if (result.data == null){
                window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
@@ -1152,6 +1154,35 @@ $(function() {
     });
     //end Ajax 
   }
+
+  /* Get  Item rows */
+ function get_item(data){
+  var sale_items = [];  
+  
+    var sale_item = {};
+    sale_item.qty = parseInt(data.attr('data-qty'))
+    sale_item.name =  data.attr('data-name');
+    sale_item.price = data.attr('data-price');
+    sale_item.item_code  = data.attr('data-item-code')
+    sale_item.instance_code  = data.attr('data-instance-code')
+    sale_item.attributes  = data.attr('data-attributes')
+    sale_item.options  = data.attr('data-options')
+    sale_item.instance  = data.attr('data-instance')
+    sale_items.push(sale_item);
+  
+  return sale_items;
+ }
+
+ function customer_display_view(data,status) {
+   $.ajax({
+          type: "POST",
+          url: '../../origami/customer_view',
+          data: {"data":data,"status":status},
+          dataType: "json",
+           success:function(result){         
+           }
+        });
+ }
  /*  $("input").keypress(function(){
     $("span").text(i += 1);
 });*/
diff --git a/app/assets/javascripts/channels/second_display.js b/app/assets/javascripts/channels/second_display.js
new file mode 100644
index 00000000..79b59cac
--- /dev/null
+++ b/app/assets/javascripts/channels/second_display.js
@@ -0,0 +1,38 @@
+App.checkin = App.cable.subscriptions.create('SecondDisplayChannel', {
+//  App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {    
+    var data_obj  = data.data;
+    var status    = data.status;
+    var count     = 0 
+    var sub_total = 0
+    if (data.status == "order") {
+      for(var i in data_obj) {
+
+        sub_total = sub_total + (data_obj[i].price * data_obj[i].qty)
+        count += 1
+        row ='<tr>'
+                +'<td>'+count+'</td>'
+                +'<td class="item-name">'+data_obj[i].item_name+'</td>'
+                +'<td class="item-attr">'+data_obj[i].qty +'</td>'
+                + '<td class="item-attr">'+data_obj[i].qty*data_obj[i].price +'</td>'
+              +'</tr>'
+          $(".second_display_items").append(row);
+      }//end looping
+    }else{
+       $('#s_sub_total').empty(); 
+       $('#s_sub_total').append(data_obj.total_amount);
+       $('#s_total_discount').empty(); 
+       $('#s_total_discount').append(data_obj.total_discount);
+       $('#s_tatal_tax').empty(); 
+       $('#s_tatal_tax').append(data_obj.total_tax);
+       $('#s_grand_total').empty(); 
+       $('#s_grand_total').append(data_obj.grand_total);
+    }
+  }
+});
+
diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js
new file mode 100644
index 00000000..1666c3c8
--- /dev/null
+++ b/app/assets/javascripts/channels/second_display_view.js
@@ -0,0 +1,112 @@
+App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
+//  App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {    
+    var items = data.data;
+    var tax   = data.tax_profiles;
+    var status= data.status
+    if (status == "reload") {
+      window.location.reload();
+    }
+    $('#second_display_slider').addClass("hidden")
+    $('#second_display_items').removeClass("hidden")
+    // append items
+    for(var i in items) {
+      qty           = parseInt(items[i].qty);
+      append        = 0;
+      price         = items[i].price;
+
+      instance_name = items[i].instance;
+      if (instance_name == "undefined"){
+        instance = '';
+      }else{
+        instance = "("+items[i].instance+")";
+      }
+
+      var rowCount = $('.second_display_items tbody tr').length+1;
+      var item_row = $('.second_display_items tbody tr');
+
+      $(item_row).each(function(j){
+        var item_code = $(item_row[j]).attr('data-code');
+        var instance_code = $(item_row[j]).attr('data-instance-code');
+
+        if (item_code == items[i].item_code && instance_code == items[i].instance_code) {
+          if (qty > 1) {            
+            qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
+          }else{            
+            qty = parseInt($(item_row[j]).children('#item_qty').text()) + 1;
+          }
+          
+          $(item_row[j]).children('#item_qty').text(qty);
+          parseFloat($(item_row[j]).children('#item_price').text(parseFloat(price*qty).toFixed(2)));
+          append =1;
+        }else{
+          if (qty > 1) {            
+            qty = qty;
+          }else{            
+            qty = 1;
+          }
+        }  
+      }); 
+      if (append===0) {
+        row ="<tr class='item_box' data-price ='"
+            +price+ "' 'data-instance ='"
+            +instance+ "' data-code='"+items[i].item_code+"' data-instance-code='"
+            +items[i].instance_code+"' data-attributes='"
+            +items[i].attributes+"' data-options ='"
+            +items[i].options+"' data-row ='"+rowCount+ "'>"
+        +'<td class="item-cell-no">'+rowCount+'</td>'
+        +'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance +'</td>'
+        +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+        +'<td class="item-cell-price" id="item_price">' 
+        + parseFloat(price).toFixed(2)
+        +'</td>' 
+        +'</tr>';
+        $(".second_display_items tbody").append(row);
+       
+      }
+    }
+    //end apend items
+      var total_price    = 0;
+      var taxable_amount = 0;
+      var total_discount = 0
+      var total_tax_amount = 0
+      var item_row       = $('.second_display_items tbody tr');
+      //calculate Sub Total
+      $(item_row).each(function(i){
+        var unit_price = parseFloat($(item_row[i]).attr('data-price'));
+        var qty        = parseFloat($(item_row[i]).children('#item_qty').text());
+        total_price += qty*unit_price;    
+      }); 
+      //calculate Tax Amount
+      for(var i in tax) {
+        // substract , to give after discount
+        var total_tax = total_price - total_discount
+        // include or execulive
+        if (tax[i].inclusive){
+          rate = tax[i].rate
+          divided_value = (100 + rate)/rate
+          total_tax_amount = total_tax_amount + (total_tax / divided_value)
+        }else{
+           total_tax_amount = total_tax_amount + (total_tax  * tax[i].rate / 100)
+        }
+      }
+      //end calculate Tax amount
+      var fixed_total_price    = parseFloat(total_price).toFixed(2);
+      var fixed_taxable_amount = parseFloat(total_tax_amount).toFixed(2);
+      var fixed_grand_total    = parseFloat(total_price + total_tax_amount).toFixed(2);
+
+      $('#s_sub_total').empty(); 
+      $('#s_sub_total').append(fixed_total_price);
+      $('#s_tatal_tax').empty(); 
+      $('#s_tatal_tax').append(fixed_taxable_amount);
+      $('#s_grand_total').empty(); 
+      $('#s_grand_total').append(fixed_grand_total);
+  }
+  
+});
+
diff --git a/app/assets/javascripts/wow_script.js b/app/assets/javascripts/wow_script.js
new file mode 100644
index 00000000..d15d5798
--- /dev/null
+++ b/app/assets/javascripts/wow_script.js
@@ -0,0 +1 @@
+jQuery("#wowslider-container").wowSlider({effect:"rotate",prev:"",next:"",duration:20*100,delay:20*100,width:580,height:212,autoPlay:true,stopOnHover:false,loop:false,bullets:true,caption:true,captionEffect:"slide",controls:true,logo:"",images:0});
\ No newline at end of file
diff --git a/app/assets/javascripts/wowslider.js b/app/assets/javascripts/wowslider.js
new file mode 100644
index 00000000..5179927a
--- /dev/null
+++ b/app/assets/javascripts/wowslider.js
@@ -0,0 +1,337 @@
+// -----------------------------------------------------------------------------------
+// http://wowslider.com/
+// JavaScript Wow Slider is a free software that helps you easily generate delicious 
+// slideshows with gorgeous transition effects, in a few clicks without writing a single line of code.
+// Generated by WOW Slider 2.7
+jQuery.fn.wowSlider = function (d) {
+    var e = jQuery;
+    var h = this;
+    var t = h.get(0);
+    d = e.extend({
+        prev: "",
+        next: "",
+        duration: 1000,
+        delay: 20 * 100,
+        width: 960,
+        height: 360,
+        controls: true,
+        autoPlay: true,
+        bullets: true,
+    }, d);
+    var a = e(".ws_images", h);
+    var l = a.find("ul");
+
+    function u(D) {
+        l.css({
+            left: -D + "00%"
+        })
+    }
+    e("<div>")
+        .css({
+        width: "100%",
+        visibility: "hidden",
+        "font-size": 0,
+        "line-height": 0
+    })
+        .append(a.find("li:first img:first")
+        .clone()
+        .css({
+        width: "100%"
+    }))
+        .prependTo(a);
+    l.css({
+        position: "absolute",
+        top: 0,
+        animation: "none",
+        "-moz-animation": "none",
+        "-webkit-animation": "none"
+    });
+    var m = a.find("li");
+    var v = m.length;
+
+    function i(D) {
+        return ((D || 0) + v) % v
+    }
+    var C = navigator.userAgent;
+    if ((e.browser.msie && parseInt(e.browser.version, 10) < 8) || (/Safari/.test(C))) {
+        var b = Math.pow(10, Math.ceil(Math.LOG10E * Math.log(v)));
+        l.css({
+            width: b + "00%"
+        });
+        m.css({
+            width: 100 / b + "%"
+        })
+    } else {
+        l.css({
+            width: v + "00%",
+            display: "table"
+        });
+        m.css({
+            display: "table-cell",
+            "float": "none",
+            width: "auto"
+        })
+    }
+    u(0);
+    var k = [];
+    m.each(function (D) {
+        var F = e(">img:first,>a:first,>div:first", this)
+            .get(0);
+        var G = e("<div></div>");
+        for (var E = 0; E < this.childNodes.length;) {
+            if (this.childNodes[E] != F) {
+                G.append(this.childNodes[E])
+            } else {
+                E++
+            }
+        }
+        if (!e(this)
+            .data("descr")) {
+            e(this)
+                .data("descr", G.html()
+                .replace(/^\s+|\s+$/g, ""))
+        }
+        e(this)
+            .css({
+            "font-size": 0
+        });
+        k[k.length] = e(">a>img", this)
+            .get(0) || e(">*", this)
+            .get(0)
+    });
+    k = e(k);
+    k.css("visibility", "visible");
+
+    function f(F, D, E) {
+        this.go = function (G) {
+            E.find("ul")
+                .stop(true)
+                .animate({
+                left: (G ? -G + "00%" : (/Safari/.test(navigator.userAgent) ? "0%" : 0))
+            }, F.duration, "easeInOutExpo");
+            return G
+        }
+    }
+    var o = new f(d, k, a);
+    var c = 0;
+
+    function r(F, E, D) {
+        if (isNaN(F)) {
+            F = c + 1
+        }
+        F = i(F);
+        if (c == F) {
+            return
+        }
+        s(F, E, D)
+    }
+    function s(F, E, D) {
+        var F = o.go(F, c, E, D);
+        if (F < 0) {
+            return
+        }
+        q(F);
+        j(m[F]);
+        c = F;
+        z()
+    }
+    var B = h.find(".ws_bullets");
+
+    function q(D) {
+        if (B.length) {
+            n(D)
+        }
+    }
+    var p;
+
+    function z(D) {
+        w();
+        if (d.autoPlay) {
+            p = setTimeout(function () {
+                r()
+            }, d.delay + (D ? 0 : d.duration))
+        }
+    }
+    function w() {
+        if (p) {
+            clearTimeout(p)
+        }
+        p = null
+    }
+    function y(G, F, E, D) {
+        w();
+        G.preventDefault();
+        r(F, E, D);
+        z()
+    }
+    if (d.controls) {
+        var x = e('<a href="#" class="ws_next">' + d.next + "</a>");
+        var g = e('<a href="#" class="ws_prev">' + d.prev + "</a>");
+        h.append(x);
+        h.append(g);
+        x.bind("click", function (D) {
+            y(D, c + 1)
+        });
+        g.bind("click", function (D) {
+            y(D, c - 1)
+        })
+    }
+    function A() {
+        h.find(".ws_bullets a")
+            .click(function (L) {
+            y(L, e(this)
+                .index())
+        });
+        if (B.length) {
+            var F = B.find(">div");
+            var K = e("a", B);
+            var I = K.find("IMG");
+            if (I.length) {
+                var H = e('<div class="ws_bulframe"/>')
+                    .appendTo(F);
+                var E = e("<div/>")
+                    .css({
+                    width: I.length + 1 + "00%"
+                })
+                    .appendTo(e("<div/>")
+                    .appendTo(H));
+                I.appendTo(E);
+                e("<span/>")
+                    .appendTo(H);
+                var G = -1;
+
+                function J(N) {
+                    if (N < 0) {
+                        N = 0
+                    }
+                    e(K.get(G))
+                        .removeClass("ws_overbull");
+                    e(K.get(N))
+                        .addClass("ws_overbull");
+                    H.show();
+                    var O = {
+                        left: K.get(N)
+                            .offsetLeft - H.width() / 2,
+                        "margin-top": K.get(N)
+                            .offsetTop - K.get(0)
+                            .offsetTop + "px",
+                        "margin-bottom": -K.get(N)
+                            .offsetTop + K.get(K.length - 1)
+                            .offsetTop + "px"
+                    };
+                    var M = I.get(N);
+                    var L = {
+                        left: -M.offsetLeft + (e(M)
+                            .outerWidth(true) - e(M)
+                            .outerWidth()) / 2
+                    };
+                    if (G < 0) {
+                        H.css(O);
+                        E.css(L)
+                    } else {
+                        if (!document.all) {
+                            O.opacity = 1
+                        }
+                        H.stop()
+                            .animate(O, "fast");
+                        E.stop()
+                            .animate(L, "fast")
+                    }
+                    G = N
+                }
+                K.hover(function () {
+                    J(e(this)
+                        .index())
+                });
+                var D;
+                F.hover(function () {
+                    if (D) {
+                        clearTimeout(D);
+                        D = 0
+                    }
+                    J(G)
+                }, function () {
+                    K.removeClass("ws_overbull");
+                    if (document.all) {
+                        if (!D) {
+                            D = setTimeout(function () {
+                                H.hide();
+                                D = 0
+                            }, 400)
+                        }
+                    } else {
+                        H.stop()
+                            .animate({
+                            opacity: 0
+                        }, {
+                            duration: "fast",
+                            complete: function () {
+                                H.hide()
+                            }
+                        })
+                    }
+                });
+                F.click(function (L) {
+                    y(L, e(L.target)
+                        .index())
+                })
+            }
+        }
+    }
+    function n(D) {
+        e("A", B)
+            .each(function (E) {
+            if (E == D) {
+                e(this)
+                    .addClass("ws_selbull")
+            } else {
+                e(this)
+                    .removeClass("ws_selbull")
+            }
+        })
+    }
+    h.append("<div class='ws-title' style='display:none'></div>");
+
+    function j(E) {
+        var G = e("img", E)
+            .attr("title");
+        var F = e(E)
+            .data("descr");
+        var D = e(".ws-title", h);
+        D.stop(1, 1)
+            .stop(1, 1)
+            .fadeOut(1000 / 3, function () {
+            if (G || F) {
+                D.html((G ? "<span>" + G + "</span>" : "") + (F ? "<div>" + F + "</div>" : ""));
+                D.fadeIn(400, function () {
+                    if (e.browser.msie) {
+                        e(this)
+                            .get(0)
+                            .style.removeAttribute("filter")
+                    }
+                })
+            }
+        })
+    }
+    if (B.length) {
+        A()
+    }
+    q(c);
+    j(m[c]);
+    z(1);
+    return this
+};
+jQuery.extend(jQuery.easing, {
+    easeInOutExpo: function (e, f, a, h, g) {
+        if (f == 0) {
+            return a
+        }
+        if (f == g) {
+            return a + h
+        }
+        if ((f /= g / 2) < 1) {
+            return h / 2 * Math.pow(2, 10 * (f - 1)) + a
+        }
+        return h / 2 * (-Math.pow(2, - 10 * --f) + 2) + a
+    }
+});
diff --git a/app/assets/stylesheets/wow_style.css b/app/assets/stylesheets/wow_style.css
new file mode 100644
index 00000000..4080a69d
--- /dev/null
+++ b/app/assets/stylesheets/wow_style.css
@@ -0,0 +1,220 @@
+/*
+ *	generated by WOW Slider 2.5
+ *	template Quiet
+ */
+@import url("http://fonts.googleapis.com/css?family=Oswald");
+#wowslider-container { 
+	zoom: 1; 
+	position: relative; 
+	max-width:580px;
+	margin:0 auto;
+	z-index:100;
+	border:none;
+	text-align:left; /* reset align=center */
+}
+* html #wowslider-container{ width:580px }
+#wowslider-container ul{
+	position:relative;
+	width: 10000%; 
+	height:auto;
+	left:0;
+	list-style:none;
+	margin:0;
+	padding:0;
+	border-spacing:0;
+	overflow: visible;
+	/*table-layout:fixed;*/
+}
+#wowslider-container .ws_images ul li{
+	width:1%;
+	line-height:0; /*opera*/
+	float:left;
+	font-size:0;
+	padding:0 0 0 0;
+	margin:0 0 0 0;
+}
+
+#wowslider-container .ws_images{
+	position: relative;
+	left:0;
+	top:0;
+	width:100%;
+	height:100%;
+	overflow:hidden;
+}
+#wowslider-container .ws_images a{
+	width:100%;
+	display:block;
+	color:transparent;
+}
+
+#wowslider-container .ws_images img{
+	width:100%;
+	border:none 0;
+	max-width: none;
+}
+#wowslider-container a{ 
+	text-decoration: none; 
+	outline: none; 
+	border: none; 
+}
+
+#wowslider-container  .ws_bullets { 
+	font-size: 0px; 
+	float: left;
+	position:absolute;
+	z-index:70;
+}
+#wowslider-container  .ws_bullets div{
+	position:relative;
+	float:left;
+}
+#wowslider-container  a.wsl{
+	display:none;
+}
+#wowslider-container  .ws_bullets { 
+	padding: 10px; 
+}
+#wowslider-container .ws_bullets a { 
+	width:15px;
+	height:15px;
+	background: url(./bullet.png) left top;
+	float: left; 
+	text-indent: -4000px; 
+	position:relative;
+	margin-left:3px;
+	color:transparent;
+}
+#wowslider-container .ws_bullets a:hover{
+	background-position: 0 50%;
+}
+#wowslider-container .ws_bullets a.ws_selbull{
+	background-position: 0 100%;
+}
+#wowslider-container a.ws_next, #wowslider-container a.ws_prev {
+	position:absolute;
+	display:none;
+	top:50%;
+	margin-top:-50px;
+	z-index:60;
+	height: 100px;
+	width: 60px;
+	background-image: url(./arrows.png);
+}
+#wowslider-container a.ws_next{
+	background-position: 100% 0;
+	right:0;
+}
+#wowslider-container a.ws_prev {
+	left:0;
+	background-position: 0 0; 
+}
+* html #wowslider-container a.ws_next,* html #wowslider-container a.ws_prev{display:block}
+#wowslider-container:hover a.ws_next, #wowslider-container:hover a.ws_prev {display:block}
+/* bottom center */
+#wowslider-container  .ws_bullets {
+    top: 5px;
+    right: 10px;
+}
+#wowslider-container .ws_bullets .ws_bulframe {
+	top: 20px;
+}
+#wowslider-container .ws_bullets .ws_bulframe {
+	top: 20px;
+}
+#wowslider-container .ws-title{
+	position: absolute;
+	bottom: 10%;
+	left: 7%;
+	z-index: 50;
+	padding:12px;
+	color: #000000;
+	background:#fff;
+    font-family:Oswald,Impact,Charcoal,sans-serif;
+	font-size: 30px;
+	text-shadow: 1px 1px 1px #BBBBBB;
+	line-height: 30px;
+	border-radius:5px;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	opacity:0.5;
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);	
+}
+#wowslider-container .ws-title div{
+	font-size: 25px;
+	text-shadow: 1px 1px 1px #000000;
+}#wowslider-container ul{
+	animation: wsBasic 12s infinite;
+	-moz-animation: wsBasic 12s infinite;
+	-webkit-animation: wsBasic 12s infinite;
+}
+@keyframes wsBasic{0%{left:-0%} 16.67%{left:-0%} 33.33%{left:-100%} 50%{left:-100%} 66.67%{left:-200%} 83.33%{left:-200%} }
+@-moz-keyframes wsBasic{0%{left:-0%} 16.67%{left:-0%} 33.33%{left:-100%} 50%{left:-100%} 66.67%{left:-200%} 83.33%{left:-200%} }
+@-webkit-keyframes wsBasic{0%{left:-0%} 16.67%{left:-0%} 33.33%{left:-100%} 50%{left:-100%} 66.67%{left:-200%} 83.33%{left:-200%} }
+
+#wowslider-container .ws_shadow{
+	background: url(./shadow.png) left 100%;
+	background-repeat: no-repeat;
+	background-size:100%;
+	width:100%;
+	height:20%;
+	position: absolute;
+	left:0;
+	bottom:-20%;
+	z-index:-1;
+}
+* html #wowslider-container .ws_shadow{/*ie6*/
+	background:none;
+	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader( src='wowslider/install/shadow.png', sizingMethod='scale');
+}
+*+html #wowslider-container .ws_shadow{/*ie7*/
+	background:none;
+	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader( src='wowslider/install/shadow.png', sizingMethod='scale');
+}
+#wowslider-container .ws_bullets  a img{
+	text-indent:0;
+	display:block;
+	top:15px;
+	left:-123px;
+	visibility:hidden;
+	position:absolute;
+    -moz-box-shadow: 0 0 5px #999999;
+    box-shadow: 0 0 5px #999999;
+    border: 5px solid #FFFFFF;
+	max-width:none;
+}
+#wowslider-container .ws_bullets a:hover img{
+	visibility:visible;
+}
+
+#wowslider-container .ws_bulframe div div{
+	height:90px;
+	overflow:visible;
+	position:relative;
+}
+#wowslider-container .ws_bulframe div {
+	left:0;
+	overflow:hidden;
+	position:relative;
+	width:246px;
+	background-color:#FFFFFF;
+}
+#wowslider-container  .ws_bullets .ws_bulframe{
+	display:none;
+	overflow:visible;
+	position:absolute;
+	cursor:pointer;
+    -moz-box-shadow: 0 0 5px #999999;
+    box-shadow: 0 0 5px #999999;
+    border: 5px solid #FFFFFF;
+}
+#wowslider-container .ws_bulframe span{
+	display:block;
+	position:absolute;
+	top:-11px;
+	margin-left:-5px;
+	left:123px;
+	background:url(./triangle.png);
+	width:15px;
+	height:6px;
+}
\ No newline at end of file
diff --git a/app/channels/second_display_channel.rb b/app/channels/second_display_channel.rb
new file mode 100644
index 00000000..90f53508
--- /dev/null
+++ b/app/channels/second_display_channel.rb
@@ -0,0 +1,11 @@
+class SecondDisplayChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "second_display_channel"
+  end
+
+  def unsubscribed
+    stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+
+end
\ No newline at end of file
diff --git a/app/channels/second_display_view_channel.rb b/app/channels/second_display_view_channel.rb
new file mode 100644
index 00000000..e0b6322e
--- /dev/null
+++ b/app/channels/second_display_view_channel.rb
@@ -0,0 +1,11 @@
+class SecondDisplayViewChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "second_display_view_channel"
+  end
+
+  def unsubscribed
+    stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index c9b1bc44..a247aa04 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -1,4 +1,4 @@
-class Origami::AddordersController < ApplicationController#BaseOrigamiController
+class Origami::AddordersController < BaseOrigamiController
   # before_action :set_dining, only: [:detail]
 
   def index
@@ -156,10 +156,15 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       end
 
       @status, @booking = @order.generate
+
+      # Order.send_customer_view(@booking)
+    
       if current_user.role != "waiter" && params[:create_type] == "create_pay"
         if @status && @booking && @order.source == 'quick_service'
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+          # for second display 
+          ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
           result = {:status=> @status, :data => @sale }
           render :json => result.to_json
         end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 1a73ef8c..07288ca1 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -93,9 +93,6 @@ class Origami::HomeController < BaseOrigamiController
                 @account_arr = Array.new
                 if @customer.tax_profiles
                   accounts = @customer.tax_profiles
-                  puts accounts.to_json
-                  puts "sssssssssss"
-                  puts @customer.tax_profiles
                   @account_arr =[]
                   accounts.each do |acc|
                     account = TaxProfile.find(acc)
diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb
new file mode 100644
index 00000000..8d2efd6f
--- /dev/null
+++ b/app/controllers/origami/second_display_controller.rb
@@ -0,0 +1,23 @@
+class Origami::SecondDisplayController < BaseOrigamiController
+
+  def index
+   
+  end
+
+  def customer_view
+   if params[:status]!= "billed"
+     tax_profiles = TaxProfile.all.order("order_by asc")
+   else
+     tax_profiles = nil
+   end
+   
+   ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
+  end
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+
+
+end
diff --git a/app/models/order.rb b/app/models/order.rb
index 739de71a..3f8ce21a 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -487,6 +487,42 @@ class Order < ApplicationRecord
     end
   end
 
+  def self.send_customer_view(booking)
+    @status = ""
+    @data_array = Array.new
+    if(!booking.sale_id.nil?) 
+      sale = Sale.find(booking.sale_id)
+         if sale.sale_status != "completed" && sale.sale_status != 'void'
+           @data_array.push(sale)
+           @status = "sale"
+           @data_obj = sale  
+         end
+    else
+
+      @status = "order"
+      booking.booking_orders.each do |booking_order|
+        @data_obj = Order.find(booking_order.order_id)
+        if (@data_obj.status == "new")
+          @data_obj.order_items.each do |item|
+            if !item.set_menu_items.nil?
+              instance_item_sets = JSON.parse(item.set_menu_items)
+               arr_instance_item_sets = Array.new
+              instance_item_sets.each do |instance_item|
+                item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+                 arr_instance_item_sets.push(item_instance_name)
+                item.price = item.price.to_f + instance_item["price"].to_f
+              end
+              item.set_menu_items = arr_instance_item_sets
+            end
+           @data_array.push(item)
+
+          end
+        end
+      end
+    end
+     ActionCable.server.broadcast "second_display_channel",data: @data_array,status:@status
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index bd682b96..7e4d714b 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -332,10 +332,10 @@
                         <td class="charges-name"><strong>Tax:
                         (<% @i = 0
                          @account_arr.each do |ct| %>
-                        <%=ct.name%>
-                       <% if @account_arr.count != @i+1%>
-                        +       <% @i =+1 %>
-                       <%end%>
+                            <%=ct.name%>
+                           <% if @account_arr.count != @i+1%>
+                            +       <% @i =+1 %>
+                           <%end%>
                         <%end %>)
               </strong></td>
                         <td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0 %></strong></td>
@@ -424,6 +424,7 @@
             <i class="material-icons">reply</i>
              <%= t("views.btn.back") %>
           </button>
+          <a href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect" style="height: 45px">Customer View</a>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
           <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index cb213a38..af414f4c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -422,6 +422,7 @@ console.log("fffffffffffff")
 
     $("#back").on('click', function() {
       localStorage.removeItem('cash');
+      customer_display_view(null,"reload");
       if (cashier_type=="cashier") {
         window.location.href = '/origami/table/'+ dining_id;
       }else{
@@ -680,6 +681,7 @@ console.log("fffffffffffff")
                    closeOnCancel: false,
                    allowOutsideClick: false
                  }, function () {
+                  customer_display_view(null,"reload");
                   if (cashier_type=="cashier") {
                     window.location.href = '/origami';
                   }else{
@@ -730,6 +732,7 @@ console.log("fffffffffffff")
               url: ajax_url,
               data: "remark="+ remark + "&sale_id=" + sale_id,
               success: function () {
+                customer_display_view(null,"reload");
                if (cashier_type=="cashier") {
                  window.location.href = '/origami';
                }else{
@@ -788,7 +791,8 @@ console.log("fffffffffffff")
                 type: "POST",
                 url: "<%= origami_payment_foc_path %>",
                 data: params,
-                success:function(result){          
+                success:function(result){  
+                  customer_display_view(null,"reload");        
                   if (cash >= 0) {
                     swal({
                        title: "Information!",
@@ -811,6 +815,16 @@ console.log("fffffffffffff")
         }
       });
 
+  function customer_display_view(data,status) {
+     $.ajax({
+            type: "POST",
+            url: '../../../customer_view',
+            data: {"data":data,"status":status},
+            dataType: "json",
+             success:function(result){         
+             }
+          });
+   }
   function calculate_member_discount(sale_id) {
    var sub_total = $('#sub-total').text();
    var member_id = $('#membership_id').text();
diff --git a/app/views/origami/second_display/_second_display.html.erb b/app/views/origami/second_display/_second_display.html.erb
new file mode 100644
index 00000000..a5ac8872
--- /dev/null
+++ b/app/views/origami/second_display/_second_display.html.erb
@@ -0,0 +1,60 @@
+<div class="row clearfix">
+  <div class="col-lg-6 col-md-6 col-sm-6">
+    
+      <div class="card">
+        <div class="card-block">
+          <div class="card-text" >
+          <div id="order-detail-slimscroll" data-height="150">
+            <table class="table table-striped second_display_items" id="order-items-table">
+              <thead>
+                <tr>
+
+                  <th>#</th>
+                  <th class="item-name">Items</th>
+                  <th class="item-">QTY</th>
+                  <th class="item-">Price</th>
+                </tr>
+              </thead>
+              <tbody>
+
+              </tbody>
+            </table>
+            </div>
+          </div>
+        </div>
+          <div class="card-footer">
+                <table class="table" border="0">
+                  <tr>
+                    <td class="charges-name"><strong>Sub Total:</strong></td>
+                    <td></td>
+                    <td></td>
+                    <td class="item-attr"><strong id="s_sub_total">0.00</strong></td>
+                  </tr>
+                  <tr>
+                    <td class="charges-name"><strong>Discount Amount:</strong></td>
+                    <td></td>
+                    <td></td>
+                    <td class="item-attr"><strong id="s_total_discount">0.00</strong></td>
+                  </tr>
+                  <tr>
+                    <td class="charges-name"><strong>Tax Amount:</strong></td>
+                    <td></td>
+                    <td></td>
+                    <td class="item-attr"><strong id="s_tatal_tax">0.00</strong></td>
+                  </tr>
+                  <tr>
+                    <td class="charges-name"><strong>Grand:</strong></td>
+                    <td></td>
+                    <td></td>
+                    <td class="item-attr"><strong id="s_grand_total">0.00</strong></td>
+                  </tr>
+                </table>
+        </div>
+      </div>  
+    
+  </div>
+  <div class="col-lg-6 col-md-6 col-sm-6">
+    <%= image_tag("slider/s2.jpg", :alt => "rss feed") %>
+  </div>
+</div>
+
diff --git a/app/views/origami/second_display/_slider.html.erb b/app/views/origami/second_display/_slider.html.erb
new file mode 100644
index 00000000..9d01a463
--- /dev/null
+++ b/app/views/origami/second_display/_slider.html.erb
@@ -0,0 +1,18 @@
+<%= stylesheet_link_tag    'wow_style', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'wowslider', 'data-turbolinks-track': 'reload' %> 
+<%= javascript_include_tag 'wow_script', 'data-turbolinks-track': 'reload' %>
+<div class="row">
+	 <div class="col-lg-12 col-md-12 col-sm-12">
+	 <div id="wowslider-container" style="max-width: 100%;height: 530px ;">
+				<div class="ws_images full_screen">
+					<ul>
+					<li><%= image_tag("slider/s1.jpg", :alt => "rss feed") %></li>
+					<li><%= image_tag("slider/s2.jpg", :alt => "rss feed") %></li>
+					<li><%= image_tag("slider/s4.jpg", :alt => "rss feed") %></li>
+					</ul>
+				</div>
+				<div class="ws_bullets"></div>
+			</div>
+	</div> 
+</div>	
+
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
new file mode 100644
index 00000000..ea97b891
--- /dev/null
+++ b/app/views/origami/second_display/index.html.erb
@@ -0,0 +1,11 @@
+<div class="container-fluid">
+    <div class="slider" id="second_display_slider">
+    	<%= render 'slider' %>
+    </div>
+    
+    <div class="item hidden" id="second_display_items">
+    	<%= render 'second_display' %>
+    </div>
+</div>
+
+
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 13b3db4d..7aa7b6ba 100755
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -41,6 +41,11 @@ Rails.application.config.assets.precompile += %w( fileinput.min.js )
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
 
+# --- Customer/ Customer - Crm ----
+Rails.application.config.assets.precompile += %w( wow_style.css )
+Rails.application.config.assets.precompile += %w( wowslider.js )
+Rails.application.config.assets.precompile += %w( wow_script.js )
+
 # --- Custom SX Themem ----
 Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 
diff --git a/config/routes.rb b/config/routes.rb
index 340dc914..a96281b4 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -95,6 +95,9 @@ scope "(:locale)", locale: /en|mm/ do
     get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
     post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
     
+    resources :second_display
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]

From 6e9ecd342bec964e10eada221930702671e31dbb Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 12 Mar 2018 10:42:29 +0630
Subject: [PATCH 393/651] update second display

---
 app/assets/images/second.jpg                  | Bin 10769 -> 0 bytes
 app/assets/javascripts/addorder.js            |  32 ++++++++++++++++++
 .../origami/second_display/_slider.html.erb   |   2 +-
 config/initializers/action_controller.rb      |  10 +++---
 config/license.yml                            |  15 --------
 5 files changed, 38 insertions(+), 21 deletions(-)
 delete mode 100644 app/assets/images/second.jpg
 delete mode 100644 config/license.yml

diff --git a/app/assets/images/second.jpg b/app/assets/images/second.jpg
deleted file mode 100644
index b7063459263fd79ec6c1f5b9194607102461c737..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10769
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

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index bef42a03..bab72a06 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -366,6 +366,11 @@ $(function() {
     var items  = $('.selected-instance');
 
     if (items.length >= min_qty) {
+
+      item = get_set_item(items);
+      console.log(item)
+      // customer_display_view(item,"add");
+
       attribute_arr = []
       option_arr = []
 
@@ -685,6 +690,7 @@ $(function() {
     $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
     var item_data = $(this);
     item = get_item(item_data);
+    console.log(item)
     customer_display_view(item,"add");
     show_item_detail(item_data);
     calculate_sub_total();
@@ -1173,6 +1179,32 @@ $(function() {
   return sale_items;
  }
 
+ /* Get  Item rows */
+ function get_set_item(items){
+  var sale_items = [];  
+
+    var sale_item = {};
+        sale_item.code          = $('.set-item').attr('data-code');
+        sale_item.name          = $('.set-item').attr('data-name');
+        sale_item.price         = $('.set-item').attr('data-price');
+        sale_item.option        = $('.set-item').attr('data-options');
+        sale_item.parent        = $('.set-item').attr('data-parent');
+
+    sale_items.push(sale_item);
+
+    $(items).each(function(i){
+        sale_item,code          = $(items[i]).attr('data-code');
+        sale_item,name          = $(items[i]).attr('data-name');
+        sale_item,price         = $(items[i]).attr('data-price');
+        sale_item,option        = $(items[i]).attr('data-options');
+        sale_item,sub_item      = $(items[i]).attr('data-sub-item');
+        sale_items.push(sale_item);
+    });
+
+  
+  return sale_items;
+ }
+
  function customer_display_view(data,status) {
    $.ajax({
           type: "POST",
diff --git a/app/views/origami/second_display/_slider.html.erb b/app/views/origami/second_display/_slider.html.erb
index 9d01a463..61c71203 100644
--- a/app/views/origami/second_display/_slider.html.erb
+++ b/app/views/origami/second_display/_slider.html.erb
@@ -3,7 +3,7 @@
 <%= javascript_include_tag 'wow_script', 'data-turbolinks-track': 'reload' %>
 <div class="row">
 	 <div class="col-lg-12 col-md-12 col-sm-12">
-	 <div id="wowslider-container" style="max-width: 100%;height: 530px ;">
+	 <div id="wowslider-container" style="max-width: 100%;">
 				<div class="ws_images full_screen">
 					<ul>
 					<li><%= image_tag("slider/s1.jpg", :alt => "rss feed") %></li>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8f310dab..02e35bb8 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/config/license.yml b/config/license.yml
deleted file mode 100644
index fefa7d40..00000000
--- a/config/license.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-iv_key: f3ICP0M2HJLIeXURn3yv5A==
-shop_name: sx_license_test3
-email: aungmyo.zaw@code2lab.com
-telephone: 0099404923
-fax: 49494949432
-address: Yangon
-dbhost: m4ZCds3ANyqjqCgZVSTfRQ==
-dbschema: +mvY73HAjWqMrby9Zu+tBg==
-dbusername: UO2rBxhoSfDEKutK2OEL4A==
-dbpassword: sVpy+Lj6i3MpT+CjoJrDOw==
-api_token: srTutEOCzphDFOXQqVWnZwQDTXiHdzwzY
-app_token: pSzbojYfXLNpSLmhdNTfLCtxfzeUahO
-plan_sku: +53eC6oiOsBRxtBgVjyULw==
-renewable_date: hon6p5jvfirTFniaFrH0qw==
-plan_name: eaMIWzHlTnljCEkE2oxoHg==

From 92401ab4f9c932a77c736262ee42d2b4022e2b24 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 12 Mar 2018 12:10:52 +0630
Subject: [PATCH 394/651] merge with old_town_aston req

---
 .../origami/payments_controller.rb            | 18 +++++
 .../origami/table_invoices_controller.rb      |  1 +
 app/models/sale.rb                            | 18 ++---
 app/views/origami/split_bill/index.html.erb   |  3 +-
 .../origami/table_invoices/show.html.erb      | 76 ++++++++++++++++---
 config/initializers/action_controller.rb      | 10 +--
 6 files changed, 99 insertions(+), 27 deletions(-)
 mode change 100755 => 100644 app/views/origami/split_bill/index.html.erb
 mode change 100755 => 100644 app/views/origami/table_invoices/show.html.erb

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 06167bb5..563decfe 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -228,6 +228,23 @@ class Origami::PaymentsController < BaseOrigamiController
           @individual_total.push({'total_customer' => saleObj.equal_persons.to_i, 'per_person_amount' => per_person_amount.to_f })
       end
 
+      # rounding adjustment
+      # if @shop.is_rounding_adj
+      #   a = saleObj.grand_total % 25 # Modulus
+      #   b = saleObj.grand_total / 25 # Division
+      #   #not calculate rounding if modulus is 0 and division is even
+      #   #calculate rounding if modulus is zero or not zero and division are not even
+      #   if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+      #     new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #     @rounding_adj = new_total-saleObj.grand_total
+      #   else
+      #     @rounding_adj = @sale_data.rounding_adjustment
+      #   end
+      # else
+      #   @rounding_adj = @sale_data.rounding_adjustment
+      # end
+      #end rounding adjustment
+
       # rounding adjustment
       if @shop.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
@@ -237,6 +254,7 @@ class Origami::PaymentsController < BaseOrigamiController
         if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
           new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
           @rounding_adj = new_total-saleObj.grand_total
+          saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj)        
         else
           @rounding_adj = @sale_data.rounding_adjustment
         end
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index 09535f4a..9aff7202 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -46,6 +46,7 @@ class Origami::TableInvoicesController < BaseOrigamiController
               if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
                 new_total    = Sale.get_rounding_adjustment(sale.grand_total)
                 sale.rounding_adjustment = new_total-sale.grand_total
+                sale.update_attributes(grand_total: new_total,old_grand_total: sale.grand_total,rounding_adjustment:sale.rounding_adjustment)        
               end
             end
             #end rounding adjustment
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 29e32c14..f0b5aeed 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -913,15 +913,15 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
 
     query = Sale.all
     if shift.present?
-      query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a)
+      query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
     elsif shift_sale_range.present?
-      query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a)
+      query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
     else
-      query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to)
+      query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
     end
@@ -1112,7 +1112,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) DESC").limit(20)
     else
@@ -1120,7 +1120,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) DESC").limit(20)
     end
@@ -1132,7 +1132,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) ASC").limit(20)
     else
@@ -1140,7 +1140,7 @@ end
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
-                      "and payment_status='paid' and sale_status= 'completed'")
+                      "and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) ASC").limit(20)
     end
@@ -1149,12 +1149,12 @@ end
   def self.hourly_sales(today,from,to)
     if !from.nil? && !to.nil?
       query= Sale.select("grand_total")
-            .where('payment_status="paid" and sale_status = "completed" and receipt_date between ? and ?',from,to)
+            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
             .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
             .order('receipt_date')
     else
       query= Sale.select("grand_total")
-            .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
             .order('receipt_date')
     end
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
old mode 100755
new mode 100644
index 1db44d41..517195d0
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -387,7 +387,8 @@
 	$('#order_item_split').on('click',function () {
 		var cnt_order_item = "<%= @order_items.count %>";
 		var order_items = get_selected_order_items();// Selected Order Items
-		var cnt_items = parseInt(cnt_order_item) - parseInt(order_items.length);
+		
+		var cnt_items = parseInt(cnt_order_item - 1) - parseInt(order_items.length);
 		if (order_items.length > 0){
 			// if(cnt_items > 0){
 				swal({
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
old mode 100755
new mode 100644
index 3336ffe2..515973f1
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -157,11 +157,59 @@
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
-   <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
-   <button type="button" id="void" class="btn bg-danger btn-block" active="<%= can? :overall_void, :void %>" > Void </button>
+   <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
+   <button type="button" data-toggle="modal" data-target="#voidModal" class="btn bg-danger btn-block" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
  </div>
 </div>
 </div>
+
+<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="voidModalLabel">Please Enter Reason for Void</h4>
+      </div>
+      <div class="modal-body">
+         <input type="textarea" name="remark" class="form-control col-md-12 remark" id="remark">
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-red waves-effect " id="void" active="true">VOID</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="focModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="focModalLabel">Please Enter Reason for FOC</h4>
+      </div>
+      <div class="modal-body">
+         <input type="textarea" name="remark" class="form-control col-md-12 remark" id="foc_remark">
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-red waves-effect " id="foc" active="true">FOC</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>
 <script>
 $(document).ready(function(){
   $(".tables").on('click', function(){
@@ -177,17 +225,18 @@ $(document).ready(function(){
 $('#pay').on('click',function() {
    var sale_id = '<%= @sale.id %>';
 
-   var url = '<%= @calculate_rouding_adj_path %>';
+   // var url = '<%= @calculate_rouding_adj_path %>';
 
-   $.ajax({
-      type: "GET",
-        url: url,
-        success:function(result){          
-          // location.reload();
-        }
-    });
+   // $.ajax({
+   //    type: "GET",
+   //      url: url,
+   //      success:function(result){          
+   //          // console.log(result);
+   //      }
+   //  });
    window.location.href = '/origami/sale/'+ sale_id + "/cashier/payment";
 });
+
 $('#back').on('click',function(){
   var lookup_split_bill = '<%= @split_bill %>';
   if(lookup_split_bill == '1'){
@@ -211,10 +260,12 @@ $('#void').on('click',function () {
       }, function (isConfirm) {
         if (isConfirm) {
           var sale_id = $('#sale_id').val();
+          var remark  = $("#remark").val();
           var ajax_url = "/origami/sale/" + sale_id + '/void';
           $.ajax({
               type: 'POST',
               url: ajax_url,
+              data: "remark="+ remark + "&sale_id=" + sale_id,
               success: function () {
                   window.location.href = '/origami';
               }
@@ -227,13 +278,14 @@ $('#void').on('click',function () {
 });
 
 $('#foc').click(function() {
+  var remark  = $("#foc_remark").val();
   var cash = $('#grand_total').text();
   var sub_total = $('#sub_total').text();
   var sale_id = '';
   if($('.receipt_block > div').hasClass('selected-item')){
     sale_id = $('.receipt_block > div.selected-item').parent().attr('data-id');
   }
-  var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total };
+  var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark,'type':'cashier' };
   // console.log(sale_id);
   if(sale_id != ''){
     if ($(this).attr('active')=== "true") {  
@@ -247,7 +299,7 @@ $('#foc').click(function() {
                title: "Information!",
                text: 'Thank You !',
               }, function () {
-                window.location.href = '/origami';
+                   window.location.href = '/origami';
               });
             }
           }
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 02e35bb8..8f310dab 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From 68f20a55353ee4933e504070d032267d4d2b4a80 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 12 Mar 2018 16:03:44 +0630
Subject: [PATCH 395/651] update options for addorder

---
 app/assets/javascripts/addorder.js                  | 12 ++++++++++--
 .../javascripts/channels/second_display_view.js     | 13 ++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index bab72a06..c4a81194 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -719,14 +719,22 @@ $(function() {
       instance = "("+data.attr('data-instance')+")";
     }
 
+    d_option = data.attr('data-options');
+    if (d_option){
+      option_name = "-"+data.attr('data-options');      
+    }else{
+      option_name = '';
+    }
+
     var rowCount = $('.summary-items tbody tr').length+1;
     var item_row = $('.summary-items tbody tr');
     
     $(item_row).each(function(i){
       item_code = $(item_row[i]).attr('data-code');
       instance_code = $(item_row[i]).attr('data-instance-code');
+      r_option = $(item_row[i]).attr('data-options');
 
-      if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')) {
+      if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option==d_option) {
         if (qty > 1) {            
           qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty;
         }else{            
@@ -752,7 +760,7 @@ $(function() {
           +data.attr('data-attributes')+"' data-options ='"
           +data.attr('data-options')+"' data-row ='"+rowCount+ "'>"
       +'<td class="item-cell-no">'+rowCount+'</td>'
-      +'<td class="item-cell-name" id="item_name" >' + data.attr('data-name')+ ' ' + instance +'</td>'
+      +'<td class="item-cell-name" id="item_name" >' + data.attr('data-name')+ ' ' + instance +' ' + option_name +'</td>'
       +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
       +'<td class="item-cell-price" id="item_price">' 
       + parseFloat(price).toFixed(2)
diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js
index 1666c3c8..5a5c8c8e 100644
--- a/app/assets/javascripts/channels/second_display_view.js
+++ b/app/assets/javascripts/channels/second_display_view.js
@@ -27,14 +27,21 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
         instance = "("+items[i].instance+")";
       }
 
+      d_option = items[i].options;
+      if (d_option){
+        option_name = "-"+items[i].options;      
+      }else{
+        option_name = '';
+      }
+
       var rowCount = $('.second_display_items tbody tr').length+1;
       var item_row = $('.second_display_items tbody tr');
 
       $(item_row).each(function(j){
         var item_code = $(item_row[j]).attr('data-code');
         var instance_code = $(item_row[j]).attr('data-instance-code');
-
-        if (item_code == items[i].item_code && instance_code == items[i].instance_code) {
+        var r_option = $(item_row[j]).attr('data-options');
+        if (item_code == items[i].item_code && instance_code == items[i].instance_code && r_option==d_option) {
           if (qty > 1) {            
             qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
           }else{            
@@ -60,7 +67,7 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
             +items[i].attributes+"' data-options ='"
             +items[i].options+"' data-row ='"+rowCount+ "'>"
         +'<td class="item-cell-no">'+rowCount+'</td>'
-        +'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance +'</td>'
+        +'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance + ' ' + option_name +'</td>'
         +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
         +'<td class="item-cell-price" id="item_price">' 
         + parseFloat(price).toFixed(2)

From 428b9a4b64bffcc787952ce22e0ff01c26f21487 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 12 Mar 2018 17:25:01 +0630
Subject: [PATCH 396/651] update option add set and second display

---
 app/assets/javascripts/addorder.js            |  37 +++--
 .../channels/second_display_view.js           | 153 +++++++++++-------
 2 files changed, 116 insertions(+), 74 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index c4a81194..1ddde0e4 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -368,8 +368,7 @@ $(function() {
     if (items.length >= min_qty) {
 
       item = get_set_item(items);
-      console.log(item)
-      // customer_display_view(item,"add");
+      customer_display_view(item,"set_add");
 
       attribute_arr = []
       option_arr = []
@@ -405,6 +404,7 @@ $(function() {
         price         = $(items[i]).attr('data-price');
         option        = $(items[i]).attr('data-options');
         sub_item      = $(items[i]).attr('data-sub-item');
+        option          = $(items[i]).attr('data-options');
         total         = qty * price ;
         option_arr.push(option);
         row ="<tr class='item_box' data-price ='"
@@ -690,7 +690,6 @@ $(function() {
     $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
     var item_data = $(this);
     item = get_item(item_data);
-    console.log(item)
     customer_display_view(item,"add");
     show_item_detail(item_data);
     calculate_sub_total();
@@ -1190,22 +1189,28 @@ $(function() {
  /* Get  Item rows */
  function get_set_item(items){
   var sale_items = [];  
+     var item = {};
+        item.code          = $('.set-item').attr('data-code');
+        item.name          = $('.set-item').attr('data-name');
+        item.item_name     = $('#set_name').text();
+        item.qty           = parseInt($('#set_count').val());
+        item.item_code     = $('#set_item_code').text();
+        item.price         = $('.set-item').attr('data-price');
+        item.option        = $('.set-item').attr('data-options');
+        item.parent        = $('.set-item').attr('data-parent');
 
-    var sale_item = {};
-        sale_item.code          = $('.set-item').attr('data-code');
-        sale_item.name          = $('.set-item').attr('data-name');
-        sale_item.price         = $('.set-item').attr('data-price');
-        sale_item.option        = $('.set-item').attr('data-options');
-        sale_item.parent        = $('.set-item').attr('data-parent');
-
-    sale_items.push(sale_item);
+    sale_items.push(item);
 
     $(items).each(function(i){
-        sale_item,code          = $(items[i]).attr('data-code');
-        sale_item,name          = $(items[i]).attr('data-name');
-        sale_item,price         = $(items[i]).attr('data-price');
-        sale_item,option        = $(items[i]).attr('data-options');
-        sale_item,sub_item      = $(items[i]).attr('data-sub-item');
+      var sale_item = {};      
+        sale_item.code          = $(items[i]).attr('data-code');
+        sale_item.name          = $(items[i]).attr('data-name');
+        sale_item.item_name     = $('#set_name').text();
+        sale_item.qty           = parseInt($('#set_count').val());
+        sale_item.item_code     = $('#set_item_code').text();
+        sale_item.price         = $(items[i]).attr('data-price');
+        sale_item.option        = $(items[i]).attr('data-options');
+        sale_item.sub_item      = $(items[i]).attr('data-sub-item');
         sale_items.push(sale_item);
     });
 
diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js
index 5a5c8c8e..00d4904c 100644
--- a/app/assets/javascripts/channels/second_display_view.js
+++ b/app/assets/javascripts/channels/second_display_view.js
@@ -15,66 +15,103 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
     $('#second_display_slider').addClass("hidden")
     $('#second_display_items').removeClass("hidden")
     // append items
-    for(var i in items) {
-      qty           = parseInt(items[i].qty);
-      append        = 0;
-      price         = items[i].price;
+    if (status == "add") {
+      for(var i in items) {
+        qty           = parseInt(items[i].qty);
+        append        = 0;
+        price         = items[i].price;
 
-      instance_name = items[i].instance;
-      if (instance_name == "undefined"){
-        instance = '';
-      }else{
-        instance = "("+items[i].instance+")";
-      }
-
-      d_option = items[i].options;
-      if (d_option){
-        option_name = "-"+items[i].options;      
-      }else{
-        option_name = '';
-      }
-
-      var rowCount = $('.second_display_items tbody tr').length+1;
-      var item_row = $('.second_display_items tbody tr');
-
-      $(item_row).each(function(j){
-        var item_code = $(item_row[j]).attr('data-code');
-        var instance_code = $(item_row[j]).attr('data-instance-code');
-        var r_option = $(item_row[j]).attr('data-options');
-        if (item_code == items[i].item_code && instance_code == items[i].instance_code && r_option==d_option) {
-          if (qty > 1) {            
-            qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
-          }else{            
-            qty = parseInt($(item_row[j]).children('#item_qty').text()) + 1;
-          }
-          
-          $(item_row[j]).children('#item_qty').text(qty);
-          parseFloat($(item_row[j]).children('#item_price').text(parseFloat(price*qty).toFixed(2)));
-          append =1;
+        instance_name = items[i].instance;
+        if (instance_name == "undefined"){
+          instance = '';
         }else{
-          if (qty > 1) {            
-            qty = qty;
-          }else{            
-            qty = 1;
-          }
-        }  
-      }); 
-      if (append===0) {
-        row ="<tr class='item_box' data-price ='"
-            +price+ "' 'data-instance ='"
-            +instance+ "' data-code='"+items[i].item_code+"' data-instance-code='"
-            +items[i].instance_code+"' data-attributes='"
-            +items[i].attributes+"' data-options ='"
-            +items[i].options+"' data-row ='"+rowCount+ "'>"
-        +'<td class="item-cell-no">'+rowCount+'</td>'
-        +'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance + ' ' + option_name +'</td>'
-        +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
-        +'<td class="item-cell-price" id="item_price">' 
-        + parseFloat(price).toFixed(2)
-        +'</td>' 
-        +'</tr>';
-        $(".second_display_items tbody").append(row);
-       
+          instance = "("+items[i].instance+")";
+        }
+
+        d_option = items[i].options;
+        if (d_option){
+          option_name = "-"+items[i].options;      
+        }else{
+          option_name = '';
+        }
+
+        var rowCount = $('.second_display_items tbody tr').length+1;
+        var item_row = $('.second_display_items tbody tr');
+
+        $(item_row).each(function(j){
+          var item_code = $(item_row[j]).attr('data-code');
+          var instance_code = $(item_row[j]).attr('data-instance-code');
+          var r_option = $(item_row[j]).attr('data-options');
+          if (item_code == items[i].item_code && instance_code == items[i].instance_code && r_option==d_option) {
+            if (qty > 1) {            
+              qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
+            }else{            
+              qty = parseInt($(item_row[j]).children('#item_qty').text()) + 1;
+            }
+            
+            $(item_row[j]).children('#item_qty').text(qty);
+            parseFloat($(item_row[j]).children('#item_price').text(parseFloat(price*qty).toFixed(2)));
+            append =1;
+          }else{
+            if (qty > 1) {            
+              qty = qty;
+            }else{            
+              qty = 1;
+            }
+          }  
+        }); 
+        if (append===0) {
+          row ="<tr class='item_box' data-price ='"
+              +price+ "' 'data-instance ='"
+              +instance+ "' data-code='"+items[i].item_code+"' data-instance-code='"
+              +items[i].instance_code+"' data-attributes='"
+              +items[i].attributes+"' data-options ='"
+              +items[i].options+"' data-row ='"+rowCount+ "'>"
+          +'<td class="item-cell-no">'+rowCount+'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance + ' ' + option_name +'</td>'
+          +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+          +'<td class="item-cell-price" id="item_price">' 
+          + parseFloat(price).toFixed(2)
+          +'</td>' 
+          +'</tr>';
+          $(".second_display_items tbody").append(row);
+         
+        }
+      }
+    }
+    if (status == "set_add") {
+      // var option_arr = [];
+       var attribute_arr = [];
+      var rowCount = $('.second_display_items tbody tr').length+1;
+      for(var i in items) {
+
+        
+          code          = items[i].code;
+          item_code     = items[i].item_code;
+          name          = items[i].name;
+          item_name     = items[i].item_name;
+          qty           = items[i].qty;
+          price         = items[i].price;
+          option        = items[i].option;
+          sub_item      = items[i].sub_item;
+          total         = qty * price ;
+          // option_arr.push(option);
+          row ="<tr class='item_box' data-price ='"
+                +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+                +name+ "' data-code='"+item_code+"' data-instance-code='"
+                +code+"' data-attributes='"
+                +attribute_arr+"' data-options ='"
+                +option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
+            +'<td class="item-cell-no">'+rowCount+'</td>'
+            +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name + ''+option+'</td>'
+            +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+            +'<td class="item-cell-price" id="item_price">' 
+            + parseFloat(total).toFixed(2)
+            +'</td>' 
+            +'</tr>';
+            $(".second_display_items tbody").append(row);
+          rowCount = rowCount + 1;
+        
       }
     }
     //end apend items

From f051022ab444554be431fd3e056f53ea5df88a05 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 12 Mar 2018 17:50:51 +0630
Subject: [PATCH 397/651] check reload issue

---
 app/views/origami/payments/show.html.erb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 8c7ac778..26bd24af 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -609,7 +609,7 @@ var customer_name = "<%= @customer.name %>";
                     $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
                   <% end %>
                 }
-                customer_display_view(null,"reload");
+                
                 //PDF lightbox data 
                 // if($('#balance').text() < 0){
                 //   swal({
@@ -969,11 +969,12 @@ var customer_name = "<%= @customer.name %>";
             data: params,
             success:function(result){
               console.log(result);
-              if (cashier_type=="cashier") {
-                window.location.href = '/origami';
-              }else{
-                window.location.href = '/origami/quick_service';
-              } 
+              customer_display_view(null,"reload");
+              // if (cashier_type=="cashier") {
+              //   window.location.href = '/origami';
+              // }else{
+              //   window.location.href = '/origami/quick_service';
+              // } 
             }
           });
     //   }

From 5b99a8cf650959911cb867fec82061e16ab80ca3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 10:26:18 +0630
Subject: [PATCH 398/651] update reload second display

---
 app/assets/javascripts/addorder.js             | 18 ++++++++++--------
 .../channels/second_display_view.js            | 10 +++++-----
 .../origami/second_display/index.html.erb      |  8 ++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 1ddde0e4..32054b53 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -776,17 +776,17 @@ $(function() {
     e.preventDefault();
     $("#oqs_loading_wrapper").show();
     
-    type = window.location.href.indexOf("quick_service");
-    if (type != -1) {
+    quick_service = window.location.href.indexOf("quick_service");
+    if (quick_service != -1) {
       type = 'quick_service'
-      var table_type = $('#table_type').text();
+      var table_type  = $('#table_type').text();
       var table_id    = $('#table_id').val();
       var customer_id = $('#customer_id').val();
       var booking_id  = $('#booking_id').text();
       var ajax_url = 'addorders/create';
     }else{
       type = 'cashier'
-      var table_type = $('#table_type').text();
+      var table_type  = $('#table_type').text();
       var table_id    = $('#table_id').text();
       var customer_id = $('#customer_id').text();
       var booking_id  = $('#booking_id').text();
@@ -813,17 +813,19 @@ $(function() {
           data: params,
           dataType: "json",
            success:function(result){ 
-            customer_display_view(null,"reload");
+            console.log(type)
+            console.log(table_type)
               if (type == "quick_service") {
-                  window.location.href = "/origami/quick_service"
+                   window.location.href = "/origami/quick_service"
               }else{
                 if(table_type == "Table"){
-                  window.location.href = "/origami/table/" + table_id
+                   window.location.href = "/origami/table/" + table_id
                 }
                 else {
-                  window.location.href = "/origami/room/" + table_id
+                   window.location.href = "/origami/room/" + table_id
                 } 
               }
+              customer_display_view(null,"reload");
            }
         });
       // }else{
diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js
index 00d4904c..c6ac124c 100644
--- a/app/assets/javascripts/channels/second_display_view.js
+++ b/app/assets/javascripts/channels/second_display_view.js
@@ -10,10 +10,12 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
     var tax   = data.tax_profiles;
     var status= data.status
     if (status == "reload") {
-      window.location.reload();
+      jQuery('#s_reload').click();
     }
-    $('#second_display_slider').addClass("hidden")
-    $('#second_display_items').removeClass("hidden")
+      $('#second_display_slider').addClass("hidden")
+      $('#second_display_items').removeClass("hidden")
+    
+    
     // append items
     if (status == "add") {
       for(var i in items) {
@@ -84,8 +86,6 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
        var attribute_arr = [];
       var rowCount = $('.second_display_items tbody tr').length+1;
       for(var i in items) {
-
-        
           code          = items[i].code;
           item_code     = items[i].item_code;
           name          = items[i].name;
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
index ea97b891..1973363c 100644
--- a/app/views/origami/second_display/index.html.erb
+++ b/app/views/origami/second_display/index.html.erb
@@ -1,4 +1,5 @@
 <div class="container-fluid">
+    <button type="button" class="hidden" id="s_reload">Reload</button>
     <div class="slider" id="second_display_slider">
     	<%= render 'slider' %>
     </div>
@@ -7,5 +8,12 @@
     	<%= render 'second_display' %>
     </div>
 </div>
+<script type="text/javascript">
+	$(document).ready(function () {
+      $('#s_reload').on('click', function () {
+      window.location.href = '/origami/second_display';
+      });
+    });
+</script>
 
 

From 30bfb060df261f96a05e10edc53cefb759538f2f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 13 Mar 2018 10:58:06 +0630
Subject: [PATCH 399/651] check payment and ability for split bill

---
 app/models/ability.rb                    | 10 ++++++++
 app/views/origami/payments/show.html.erb | 29 ++++++++++++------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 95c6005f..de43d71f 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -93,6 +93,11 @@ class Ability
         can :index, :home
         can :show, :home
 
+        #ability for split_bill
+        can :index, :split_bill
+        can :create, :split_bill
+        can :update_sale, :split_bill
+
     elsif user.role == "cashier"
         
         # can :overall_void, :void
@@ -191,6 +196,11 @@ class Ability
 
         can :index, :home
         can :show, :home
+
+        #ability for split_bill
+        can :index, :split_bill
+        can :create, :split_bill
+        can :update_sale, :split_bill
      elsif user.role == "waiter"
         can :index, :home
         can :show, :home  
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 26bd24af..ee006c3a 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -914,14 +914,15 @@ var customer_name = "<%= @customer.name %>";
 
   function customer_display_view(data,status) {
      $.ajax({
-            type: "POST",
-            url: '../../../customer_view',
-            data: {"data":data,"status":status},
-            dataType: "json",
-             success:function(result){         
-             }
-          });
-   }
+        type: "POST",
+        url: '../../../customer_view',
+        data: {"data":data,"status":status},
+        dataType: "json",
+        success:function(result){         
+        }
+      });
+  }
+
   function calculate_member_discount(sale_id) {
    var sub_total = $('#sub-total').text();
    var member_id = $('#membership_id').text();
@@ -969,12 +970,12 @@ var customer_name = "<%= @customer.name %>";
             data: params,
             success:function(result){
               console.log(result);
-              customer_display_view(null,"reload");
-              // if (cashier_type=="cashier") {
-              //   window.location.href = '/origami';
-              // }else{
-              //   window.location.href = '/origami/quick_service';
-              // } 
+              if (cashier_type=="cashier") {
+                window.location.href = '/origami';
+              }else{
+                window.location.href = '/origami/quick_service';
+                customer_display_view(null,"reload");
+              } 
             }
           });
     //   }

From df781395c8780bcf9489e1a62b65ac94e1d3b380 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 11:40:05 +0630
Subject: [PATCH 400/651] update oqs and read me

---
 README.md                                | 38 +++++++++++-------------
 app/models/order.rb                      |  2 +-
 app/views/oqs/home/index.html.erb        |  3 +-
 config/initializers/action_controller.rb | 10 +++----
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index ee8846a0..b5d2c62b 100755
--- a/README.md
+++ b/README.md
@@ -8,28 +8,21 @@ Things you may want to cover:
 ruby 2.4.1p111
 
 * Membership Details
+Osaka =>
+	Auth Token       => wu8YvlLmah0CL => New => v3
+			         => rj0MJ0XI5GsKZehE => Old => v
+			         => code2lab => Old
 
-	Osaka
+	Merchant account => RxzaYyAGzm7VqAZ4hKnv
+	Campaign Id      => {"campaign_type_id": 5}
 
-		Auth Token        => wu8YvlLmah0CL => New 	##note : Old => rj0MJ0XI5GsKZehE
+BITP
+	Auth Token       => pZBHXEFbGNj/G => New  => V3 
+					 => rj0MJ0XI5GsKZehE => Old  => V2
+					 => code2lab => Old
 
-						  => code2lab => Old
-
-		Merchant account  => RxzaYyAGzm7VqAZ4hKnv
-
-	    Campaign Id       => {"campaign_type_id": 5}
-
-
-
-    BITP
-
-		Auth Token        => pZBHXEFbGNj/G => New   ##note : Old => rj0MJ0XI5GsKZehE
-
-						  => code2lab => Old
-
-		Merchant account  => vWSsseoZCzxd6xcNf_uS
-		
-	    Campaign Id       => {"campaign_type_id": 1}
+	Merchant account => vWSsseoZCzxd6xcNf_uS
+    Campaign Id      => {"campaign_type_id": 1}
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
@@ -105,7 +98,12 @@ Change type in mysql
 
 For split bill
 	1) settings/lookups => { type:split_bill, name:SplitBill, value:1 }
-	
+
+For Sidekiq
+    1) If you want to use  sidekiq
+       => Create New Lookups => lookup_type = sidekiq, Name = sidekiq , Value = 1 or 0
+
+For Check CUp status	
 ###please open 	
 sudo cat /etc/sudoers
 ### cope and parse
diff --git a/app/models/order.rb b/app/models/order.rb
index 3f8ce21a..1508c960 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -290,7 +290,7 @@ class Order < ApplicationRecord
     cup_status   = `#{"sudo service cups status"}`
     print_status = check_cup_status(cup_status)
     sidekiq      = Lookup.find_by_lookup_type("sidekiq")
-
+ 
     if print_status
       if !sidekiq.nil?
         OrderQueueProcessorJob.perform_later(self.id, self.table_id)
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 585f9968..ee73d560 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,5 +1,5 @@
 <!-- Column One -->
-<div class="row clearfix" style="margin-top:-50px !important">
+<div class="row clearfix" style="">
   <div class="col-lg-11 col-md-11 col-sm-11">  
     <div class="body p-l-10">
       <div class="row clearfix">
@@ -20,7 +20,6 @@
           <select class="form-control select tables" name="table_id" id="tables">
             <option value="">Select Table</option>
             <% @tables.each do |table|  %>
-              
               <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
               
             <% end %> 
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8f310dab..02e35bb8 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

From 371a736eaf59480c70deb5a8c7421768e79af88d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 13 Mar 2018 11:47:42 +0630
Subject: [PATCH 401/651] add shop detail in product sale

---
 app/controllers/reports/product_sale_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/controllers/reports/product_sale_controller.rb b/app/controllers/reports/product_sale_controller.rb
index 38a77115..9791545e 100644
--- a/app/controllers/reports/product_sale_controller.rb
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -18,4 +18,10 @@ class Reports::ProductSaleController < BaseReportController
 			format.xls
 		end
   	end
+
+  	#Shop Name in Navbor
+	helper_method :shop_detail
+	def shop_detail
+		@shop = Shop.first
+	end
 end

From a9afa4e3177fd9b5c72440e4b14937356650c06a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 13 Mar 2018 11:48:55 +0630
Subject: [PATCH 402/651] action controller

---
 config/initializers/action_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 02e35bb8..8f310dab 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From 9f0bef732eb530afa2a3912a1f14b6947fb4b1db Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 14:23:23 +0630
Subject: [PATCH 403/651] update change version v3 for api paymal

---
 app/controllers/crm/customers_controller.rb     |  6 +++---
 app/controllers/origami/discounts_controller.rb |  2 +-
 app/controllers/origami/payments_controller.rb  |  6 +++---
 app/controllers/origami/voucher_controller.rb   |  2 +-
 app/models/customer.rb                          | 12 ++++++------
 app/models/sale_payment.rb                      | 11 ++++++-----
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 83a437a2..55eed487 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -143,7 +143,7 @@ class Crm::CustomersController < BaseCrmController
                                         :body => member_params,
                                         :headers => {
                                               'Content-Type' => 'application/json',
-                                              'Accept'       => 'application/json; version=2'
+                                              'Accept'       => 'application/json; version=3'
                                                     },
                                         :timeout => 10
                                )
@@ -269,7 +269,7 @@ end
                                       :body => member_params,
                                       :headers => {
                                                'Content-Type' => 'application/json',
-                                               'Accept'       => 'application/json; version=2'
+                                               'Accept'       => 'application/json; version=3'
                                                   },
                                       :timeout => 10
                               )
@@ -328,7 +328,7 @@ end
                                       :body => member_params,
                                       :headers => {
                                                'Content-Type' => 'application/json',
-                                               'Accept'       => 'application/json; version=2'
+                                               'Accept'       => 'application/json; version=3'
                                                   },
                                       :timeout => 10
                                             )
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 24b2c83f..0c2fbef5 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -273,7 +273,7 @@ class Origami::DiscountsController < BaseOrigamiController
                                              auth_token:auth_token}.to_json,
                                   :headers => {
                                       'Content-Type' => 'application/json',
-                                      'Accept'       => 'application/json; version=2'
+                                      'Accept'       => 'application/json; version=3'
                            }, :timeout => 10)
           rescue HTTParty::Error
             response = {"status": false, "message": "Can't open membership server " }
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 563decfe..a5a96e43 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -63,9 +63,9 @@ class Origami::PaymentsController < BaseOrigamiController
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
-        member_info = Customer.get_member_account(customer)
-        current_balance = SaleAudit.paymal_search(sale_id)
-        # current_balance = 0
+        # member_info = Customer.get_member_account(customer)
+        # current_balance = SaleAudit.paymal_search(sale_id)
+         current_balance = 0
       end
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 750189df..c0a9e96d 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -54,7 +54,7 @@ class Origami::VoucherController < BaseOrigamiController
                                   }.to_json,
                         :headers => {
                                   'Content-Type' => 'application/json',
-                                  'Accept' => 'application/json; version=2'
+                                  'Accept' => 'application/json; version=3'
                         }, :timeout => 10
                   )
               rescue Net::OpenTimeout
diff --git a/app/models/customer.rb b/app/models/customer.rb
index fcdd7f31..59ab8841 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -31,7 +31,7 @@ class Customer < ApplicationRecord
                         }.to_json,
                             :headers => {
                               'Content-Type' => 'application/json',
-                              'Accept'       => 'application/json; version=2'
+                              'Accept'       => 'application/json; version=3'
                             },
                           :timeout => 10)
     rescue HTTParty::Error
@@ -68,7 +68,7 @@ class Customer < ApplicationRecord
                                             }.to_json,
                                     :headers => {
                                             'Content-Type' => 'application/json',
-                                            'Accept'       => 'application/json; version=2'
+                                            'Accept'       => 'application/json; version=3'
                                     },
                                     :timeout => 10
                                )
@@ -121,7 +121,7 @@ class Customer < ApplicationRecord
                      :body => member_params,
                      :headers => {
                               'Content-Type' => 'application/json',
-                              'Accept'       => 'application/json; version=2'
+                              'Accept'       => 'application/json; version=3'
                       })
       rescue Net::OpenTimeout
       response = { status: false, message: "Server Time out" }
@@ -198,7 +198,7 @@ class Customer < ApplicationRecord
                                 }.to_json,
                                 :headers => {
                                   'Content-Type' => 'application/json',
-                                  'Accept'       => 'application/json; version=2'
+                                  'Accept'       => 'application/json; version=3'
                                 }, :timeout => 10)
         rescue Net::OpenTimeout
            response = { "status": false , "message": "Connect To" }
@@ -274,7 +274,7 @@ class Customer < ApplicationRecord
                                   }.to_json,
                                   :headers => {
                                     'Content-Type' => 'application/json',
-                                    'Accept'       => 'application/json; version=2'
+                                    'Accept'       => 'application/json; version=3'
                                   }, :timeout => 10)
           rescue Net::OpenTimeout
              response = { "status": false , "message": "Connect To" }
@@ -309,7 +309,7 @@ class Customer < ApplicationRecord
                                       }.to_json,
        :headers => {
         'Content-Type' => 'application/json',
-        'Accept'       => 'application/json; version=2'
+        'Accept'       => 'application/json; version=3'
         },
         :timeout => 10
         )
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 1866a630..5809dc0f 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -85,7 +85,7 @@ class SalePayment < ApplicationRecord
                         }.to_json,
               :headers => {
                         'Content-Type' => 'application/json',
-                        'Accept' => 'application/json; version=2'
+                        'Accept' => 'application/json; version=3'
               }, :timeout => 10
         )
     rescue Net::OpenTimeout
@@ -133,7 +133,7 @@ class SalePayment < ApplicationRecord
                             auth_token:auth_token}.to_json,
                   :headers => {
                             'Content-Type' => 'application/json',
-                            'Accept' => 'application/json; version=2'
+                            'Accept' => 'application/json; version=3'
                   },
                   :timeout => 10
             )
@@ -455,7 +455,7 @@ class SalePayment < ApplicationRecord
                                 }.to_json,
                                 :headers => {
                                   'Content-Type' => 'application/json',
-                                  'Accept'       => 'application/json; version=2'
+                                  'Accept'       => 'application/json; version=3'
                                 }, :timeout => 10)
         rescue Net::OpenTimeout
            response = { "status": false , "message": " Connection timeout" }
@@ -500,7 +500,8 @@ class SalePayment < ApplicationRecord
           end
           rebate_arr.push(data)
         end
-
+        Rails.logger.debug "Rebage Response"
+          Rails.logger.debug rebate_arr.to_json
      		total_amount = rebate_prices - payparcost - overall_dis
 
         if credit == 1
@@ -531,7 +532,7 @@ class SalePayment < ApplicationRecord
                                   }.to_json,
                                   :headers => {
                                     'Content-Type' => 'application/json',
-                                    'Accept'       => 'application/json; version=2'
+                                    'Accept'       => 'application/json; version=3'
                                   }, :timeout => 10)
           rescue Net::OpenTimeout
              response = { "status": false , "message": "Connect To" }

From a95fc4d07a30da09dad8c80131471f080103b922 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 14:43:58 +0630
Subject: [PATCH 404/651] update payment controller if member

---
 app/controllers/origami/payments_controller.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index a5a96e43..79c084a6 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -152,8 +152,17 @@ class Origami::PaymentsController < BaseOrigamiController
         
         if customer.membership_id != nil && rebate && credit_data.nil?
           member_info    = Customer.get_member_account(customer)
-          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-          current_balance = SaleAudit.paymal_search(sale_id)
+          puts member_info["status"]
+          if member_info["status"] == true
+            rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+            current_balance = SaleAudit.paymal_search(sale_id)
+          else
+            rebate_amount  = 0
+            current_balance = 0
+            member_info =nil
+          end
+          # rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          # current_balance = SaleAudit.paymal_search(sale_id)
         end
         
         #for card sale data

From 694feb9c06420107806cc6d7c8b042fc3f7d8604 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 13 Mar 2018 14:46:07 +0630
Subject: [PATCH 405/651] For pull

---
 app/assets/javascripts/application.js         | 20 +++++++
 .../settings/display_images_controller.rb     | 11 ++++
 app/controllers/settings/shops_controller.rb  | 16 ++++-
 app/models/display_image.rb                   |  5 ++
 app/models/shop.rb                            |  3 +
 app/uploaders/display_image_uploader.rb       | 59 +++++++++++++++++++
 app/views/settings/shops/_form.html.erb       | 29 ++++++++-
 app/views/settings/shops/show.html.erb        |  8 +++
 config/routes.rb                              |  5 +-
 9 files changed, 151 insertions(+), 5 deletions(-)
 create mode 100644 app/controllers/settings/display_images_controller.rb
 create mode 100644 app/models/display_image.rb
 create mode 100644 app/uploaders/display_image_uploader.rb

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 590657ef..e486c152 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -164,6 +164,26 @@ $(document).ready(function() {
     }
   });  
 
+  $("#shop_image").fileinput({
+      previewFileType: "image",
+      allowedFileExtensions: ["jpg", "gif", "png"],
+      browseClass: "btn btn-success",
+      browseLabel: "Pick Image",
+      browseIcon: "<i class=\"fa fa-image\"></i> ",
+      removeClass: "btn btn-danger",
+      removeLabel: "Delete",
+      removeIcon: "<i class=\"fa fa-trash\"></i> ",
+      showUpload: false,
+      // uploadClass: "btn btn-info",
+      // uploadLabel: "Upload",
+      // uploadIcon: "<i class=\"fa fa-upload\"></i> ",
+      previewTemplates: {
+        image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
+                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
+                '</div>\n',
+    }
+  });  
+
   // first input focus for all form
   $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus();
 
diff --git a/app/controllers/settings/display_images_controller.rb b/app/controllers/settings/display_images_controller.rb
new file mode 100644
index 00000000..48406f48
--- /dev/null
+++ b/app/controllers/settings/display_images_controller.rb
@@ -0,0 +1,11 @@
+class Settings::DisplayImagesController < ApplicationController
+  def destroy
+    #byebug
+    @item_photo = DisplayImage.find(params[:shop_id])
+    item = @item_photo.id
+    @item_photo.destroy
+    respond_to do |format|
+      format.html {redirect_to settings_shops_url+'/1/edit', notice: 'Image was successfully destroyed.'}
+    end
+  end
+end
diff --git a/app/controllers/settings/shops_controller.rb b/app/controllers/settings/shops_controller.rb
index f69aaac6..365be7e2 100644
--- a/app/controllers/settings/shops_controller.rb
+++ b/app/controllers/settings/shops_controller.rb
@@ -1,6 +1,6 @@
 class Settings::ShopsController < ApplicationController
   load_and_authorize_resource except: [:create]
-  before_action :set_shop, only: [:show, :edit, :update]
+  before_action :set_shop, only: [:show, :edit, :update, :destroy]
 
   # GET /settings/shops
   # GET /settings/shops.json
@@ -11,11 +11,13 @@ class Settings::ShopsController < ApplicationController
   # GET /settings/shops/1
   # GET /settings/shops/1.json
   def show
+    @display_images = @settings_shop.display_images.all
   end
 
   # GET /settings/shops/new
   def new
     @settings_shop = Shop.new
+    @display_image = @settings_shop.display_images.build
   end
 
   # GET /settings/shops/1/edit
@@ -28,6 +30,11 @@ class Settings::ShopsController < ApplicationController
     @settings_shop = Shop.new(shop_params)
     respond_to do |format|
       if @settings_shop.save
+        if params[:display_images].present?
+          params[:display_images]['image'].each do |a|
+            @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => a)
+          end
+        end
         format.html { redirect_to settings_shops_url, notice: 'Shop was successfully created.' }
         format.json { render :index, status: :created, location: @settings_shop }
       else
@@ -42,6 +49,11 @@ class Settings::ShopsController < ApplicationController
   def update
     respond_to do |format|
       if @settings_shop.update(shop_params)
+        if params[:display_images].present?
+          params[:display_images]['image'].each do |a|
+            @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => a)
+          end
+        end
         format.html { redirect_to settings_shops_url, notice: 'Shop was successfully updated.' }
         format.json { render :index, status: :ok, location: @settings_shop }
       else
@@ -71,6 +83,6 @@ class Settings::ShopsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def shop_params
-      params.require(:shop).permit(:logo, :name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info)
+      params.require(:shop).permit(:logo, :name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info, display_images_attributes: [:id, :shop_id, :image])
     end
 end
diff --git a/app/models/display_image.rb b/app/models/display_image.rb
new file mode 100644
index 00000000..63405b26
--- /dev/null
+++ b/app/models/display_image.rb
@@ -0,0 +1,5 @@
+class DisplayImage < ApplicationRecord
+	mount_uploader :image, DisplayImageUploader
+    belongs_to :shop
+
+end
diff --git a/app/models/shop.rb b/app/models/shop.rb
index 0fd9ed0e..b0e84912 100755
--- a/app/models/shop.rb
+++ b/app/models/shop.rb
@@ -3,4 +3,7 @@ class Shop < ApplicationRecord
 
 	# Shop Image Uploader
   	mount_uploader :logo, ShopImageUploader
+
+  	has_many :display_images
+ 	accepts_nested_attributes_for :display_images
 end
diff --git a/app/uploaders/display_image_uploader.rb b/app/uploaders/display_image_uploader.rb
new file mode 100644
index 00000000..33e28997
--- /dev/null
+++ b/app/uploaders/display_image_uploader.rb
@@ -0,0 +1,59 @@
+class DisplayImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # def root
+  #   Rails.root.join 'public/'
+  # end
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    #"image/image"
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # def cache_dir
+  #   '/tmp/images'
+  # end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url(*args)
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process scale: [200, 300]
+  process :resize_to_fit => [200, 150]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process resize_to_fit: [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_whitelist
+    %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end	
+
+end
\ No newline at end of file
diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb
index b615d189..0be7b052 100755
--- a/app/views/settings/shops/_form.html.erb
+++ b/app/views/settings/shops/_form.html.erb
@@ -2,7 +2,7 @@
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <div class="card">
       <div class="body">
-        <%= simple_form_for([:settings,@settings_shop]) do |f| %>
+        <%= simple_form_for([:settings,@settings_shop], :html => { :multipart => true }) do |f| %>
         <%= f.error_notification %>
         <div class="form-group p-l-15">
           <%= f.input :name ,:input_html=>{:class=>"col-md-10"},:required=>true%>
@@ -25,7 +25,7 @@
           <%= f.input :show_account_info %>
         </div>
 
-        <label>Shop Image</label>
+        <label>Shop Logo</label>
           <div class="panel padding-10">
             <div class="form-group">
               <div class="menu-item-img">
@@ -40,6 +40,31 @@
             </div>
           </div> 
 
+        <label>Shop Images</label>
+          <div class="panel padding-10">
+            <div class="form-group">
+              <div class="menu-item-img">
+  
+                <%= f.fields_for :display_images do |p| %>
+                 <div class="field">
+                   <%= p.label :image %><br>
+                   <%= image_tag p.object.image, :class => "img-thumbnail" %>
+                   <%= p.file_field :image, :multiple => true, name:     "display_images[image][]" %>
+                   <%= link_to "Destroy", settings_shop_display_image_path(p.object), method: :delete %>
+                 </div>
+               <% end %>   
+                     
+              </div>
+            </div>
+          </div> 
+
+   <!--        <%= f.fields_for :display_images do |p| %>
+           <div class="field">
+             <%= p.label :image %><br>
+             <%= p.file_field :image, :multiple => true, name:     "display_images[image][]" %>
+           </div>
+         <% end %> -->
+
         <div class="form-actions p-l-15">
           <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
         </div>
diff --git a/app/views/settings/shops/show.html.erb b/app/views/settings/shops/show.html.erb
index bea0ab38..d30ca274 100755
--- a/app/views/settings/shops/show.html.erb
+++ b/app/views/settings/shops/show.html.erb
@@ -99,6 +99,14 @@
               <td style="width:20%">Shop Image</td>
               <td><%= image_tag @settings_shop.logo, :size => '200x200'%></td>
             </tr>
+            <tr>
+              <td style="width:20%">Shop Images</td>
+              <td>
+                <% @display_images.each do |p| %>
+                     <%= image_tag p.image , :size => '200x200'%><br>
+                <% end %>
+              </td>
+            </tr>
             <tr>
               <td><%= link_to t("views.btn.edit"), edit_settings_shop_path(@settings_shop),:class => 'btn btn-primary btn-sm waves-effect' %>
               </td>
diff --git a/config/routes.rb b/config/routes.rb
index 340dc914..6a4c403d 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -285,7 +285,10 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- System Settings ------------#
   namespace :settings do
-    resources :shops
+    resources :shops do
+      resources :display_images
+    end
+
     #employees
     resources :employees
     #menu

From 9228168ebcdba53813c712b354839c2e725a1d5b Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 13 Mar 2018 14:51:07 +0630
Subject: [PATCH 406/651] route changes

---
 .gitignore                                    |   1 +
 app/assets/javascripts/OQS.js                 |  76 ++-
 app/assets/javascripts/addorder.js            |  17 +-
 .../channels/order_queue_station.js           |   3 +-
 app/assets/javascripts/custom.js              |  54 +-
 app/assets/javascripts/origami.js             |  18 +-
 app/controllers/crm/customers_controller.rb   |  10 +-
 app/controllers/home_controller.rb            |  26 +-
 app/controllers/oqs/home_controller.rb        |  20 +-
 .../origami/addorders_controller.rb           |   7 +-
 .../origami/customers_controller.rb           |   7 +-
 app/controllers/origami/home_controller.rb    |  54 +-
 .../origami/payments_controller.rb            |  59 +-
 app/controllers/origami/rooms_controller.rb   |  54 +-
 app/models/ability.rb                         |  33 +-
 app/models/order.rb                           |  54 +-
 app/models/printer/receipt_printer.rb         |  38 +-
 app/models/receipt.rb                         |   2 +
 app/models/receipt_detail.rb                  |   2 +
 app/models/sale.rb                            | 115 +++-
 app/models/sale_payment.rb                    |   4 +-
 app/pdf/receipt_bill_a5_pdf.rb                |  11 +-
 app/pdf/receipt_bill_pdf.rb                   |  11 +-
 app/views/crm/customers/index.html.erb        |   9 +-
 app/views/home/dashboard.html.erb             |  11 +-
 app/views/layouts/_header.html.erb            |  40 +-
 app/views/oqs/home/index.html.erb             | 204 +++---
 .../oqs/home/index_quechange_backup.html.erb  | 196 ++++++
 app/views/origami/customers/index.html.erb    | 100 ++-
 app/views/origami/home/show.html.erb          |  32 +-
 app/views/origami/master/index.html.erb       |  38 +-
 .../origami/moveroom/move_dining.html.erb     |  14 +-
 .../origami/movetable/move_dining.html.erb    |  22 +-
 app/views/origami/mpu/index.html.erb          |  55 +-
 app/views/origami/payments/show.html.erb      | 613 ++++++++++++------
 app/views/origami/pending_order/show.html.erb |  65 ++
 app/views/origami/rooms/show.html.erb         |  49 +-
 app/views/origami/unionpay/index.html.erb     |  42 +-
 app/views/origami/visa/index.html.erb         |  83 ++-
 config/routes.rb                              |   5 +-
 db/migrate/20170530072247_create_shops.rb     |   3 +
 .../20170628103624_create_print_settings.rb   |   4 +-
 db/migrate/20180306044939_create_receipts.rb  |  42 ++
 .../20180306045018_create_receipt_details.rb  |  43 ++
 db/sym_master.sql                             |  18 +-
 lib/tasks/clear_data.rake                     |   1 +
 lib/tasks/receipt.rake                        | 238 +++++++
 spec/models/receipt_detail_spec.rb            |   5 +
 spec/models/receipt_spec.rb                   |   5 +
 49 files changed, 1906 insertions(+), 707 deletions(-)
 create mode 100644 app/models/receipt.rb
 create mode 100644 app/models/receipt_detail.rb
 mode change 100755 => 100644 app/views/oqs/home/index.html.erb
 create mode 100755 app/views/oqs/home/index_quechange_backup.html.erb
 create mode 100644 db/migrate/20180306044939_create_receipts.rb
 create mode 100644 db/migrate/20180306045018_create_receipt_details.rb
 create mode 100644 lib/tasks/receipt.rake
 create mode 100644 spec/models/receipt_detail_spec.rb
 create mode 100644 spec/models/receipt_spec.rb

diff --git a/.gitignore b/.gitignore
index 8489e37c..b404db53 100755
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ capybara-*.html
 /public/assets/*
 /public/uploads/*
 /public/swf/*
+/public/receipts
 /coverage/
 /spec/tmp/*
 *.orig
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index ec3db11f..2bbf07bb 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -31,30 +31,75 @@ $(document).on('turbolinks:load', function() {
        $(".oqs_append").addClass('hide')
     });
 
+    $(".tables").on("click", function(){
+
+       var table_id = $(this).val();
+       $('#table_id').val(table_id);
+       oqs_id = $("#oqs_id").val();
+    	if (table_id){
+    		var table = table_id
+    	}else{
+    		var table = null
+    	}
+    	
+    	if (oqs_id > 0) {
+    	   $(".oqs_click").removeClass('oqs_active');
+	       $(".queue_station").removeClass('queue_station_box');
+	       $("#completed").addClass('hide');
+	       $(".oqs_append").removeClass('hide');
+	       $("#oqs_active").addClass('oqs_active');
+	       $(".queue_station").addClass('queue_station_box');
+	       // oqs_id = $(this).find(".oqs-id").text();
+	        $("#oqs_active").attr('data-id',oqs_id);
+	       var url    = 'oqs/get_items/'+oqs_id;
+	       
+	       show_details(url,table);
+    	}else{
+    		$("#completed").removeClass('hide')
+            $(".oqs_append").addClass('hide')
+    	}
+    });
+
     $(".oqs_click").on("click", function(){
-       $(".oqs_click").removeClass('oqs_active');
-       $(".queue_station").removeClass('queue_station_box');
-       $("#completed").addClass('hide');
-       $(".oqs_append").removeClass('hide');
-       $(this).addClass('oqs_active');
-       $(".queue_station").addClass('queue_station_box');
-       oqs_id = $(this).find(".oqs-id").text();
-       console.log(oqs_id);
-       var url    = 'oqs/get_items/'+oqs_id;
-      
-       show_details(url);
+    	oqs_id = $(this).val();
+    	var table_id = $('#table_id').val();
+    	if (table_id){
+    		var table = table_id
+    	}else{
+    		var table = null
+    	}
+    	
+    	if (oqs_id > 0) {
+    	   $(".oqs_click").removeClass('oqs_active');
+	       $(".queue_station").removeClass('queue_station_box');
+	       $("#completed").addClass('hide');
+	       $(".oqs_append").removeClass('hide');
+	       $("#oqs_active").addClass('oqs_active');
+	       $(".queue_station").addClass('queue_station_box');
+	       // oqs_id = $(this).find(".oqs-id").text();
+	        $("#oqs_active").attr('data-id',oqs_id);
+	       var url    = 'oqs/get_items/'+oqs_id;
+	       
+	       show_details(url,table);
+    	}else{
+    		$("#completed").removeClass('hide')
+            $(".oqs_append").addClass('hide')
+    	}
+       
 
     }); //End Click
  
-	function show_details(url){  
+	function show_details(url,table_id){  
 	     var oqs_append = $('.oqs_append');
 	     oqs_append.empty();
 	     var filter = $('.filter').text();
+
+	     console.log(table_id)
 	    //Start Ajax
 	    $.ajax({      
 	      type: "GET",         
 	      url: url, 
-	      data: {'filter':filter},
+	      data: {'filter':filter,'table_id':table_id},
 	      dataType: "json",
 	      success: function(data) {
 	          for(var field in data) {
@@ -67,7 +112,8 @@ $(document).on('turbolinks:load', function() {
 	            }
 
 	            var date = new Date(data[field]["created_at"]); 
-	            var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	            // var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	            var show_date =date.getHours()+ ':' +  date.getMinutes() +' '+(date.getHours() >= 12 ? 'PM' : 'AM');
 	            var set_menu_items = data[field]["set_menu_items"];
 	            var set_instance_items = "";
 	            if(set_menu_items!=null){
@@ -100,7 +146,7 @@ $(document).on('turbolinks:load', function() {
 	                          +set_instance_items
 	                         +'</p>'
 
-	                        +'<br/><p class="card-text item-options">'+ options +'</p>'
+	                        +'<p class="card-text item-options">'+ options +'</p>'
 
 	                        +'<span class="card-text">'
 	                          +'<span class="text-muted">Order at - '
diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 69ac19d4..b0c51031 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -46,8 +46,8 @@ $(function() {
                         + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
                         + JSON.stringify(item_attributes) +"' data-options = '"
                         + options +"' data-image='"+image_path+"'>"
-                      +"<i class='fa fa-plus material-icons'>"
-                      +'add</i>'
+                      +"<i class='fa fa-bars material-icons'>"
+                      +'view_list</i>'
                       +'</div>'
                      +'</div>'
 
@@ -146,7 +146,7 @@ $(function() {
                    promotion_price =  menu_items[field].promotion_price;
               }else{
                 fa_plus = 'material-icons';
-                add = 'add'
+                add = 'view_list'
                 menu_item_box = 'menu_item_box';
                 data_target = 'sx_item_detailModal';
                 data_modal  = ''
@@ -760,7 +760,6 @@ $(function() {
     $("#oqs_loading_wrapper").show();
     
     type = window.location.href.indexOf("quick_service");
-
     if (type != -1) {
       type = 'quick_service'
       var table_type = $('#table_type').text();
@@ -985,19 +984,19 @@ $(function() {
   $("#back").on("click", function(){
     var table_id   = $('#table_id').text();
     var table_type = $('#table_type').text();
-    type = window.location.href.indexOf("quick_service");
-    if (type == 'true') {
+    type = window.location.href.includes("quick_service");
+    if (type == true) {
       var table_type = $('#table_id').find("option:selected").data('type');
       var table_id    = $('#table_id').val();
-      window.location.href = "/origami/dashboard"
+      window.location.href = "/origami/dashboard";
     }else{
       var table_type = $('#table_type').text();
       var table_id    = $('#table_id').text();
 
       if(table_type == "Table"){
-        window.location.href = "/origami/table/" + table_id
+        window.location.href = "/origami/table/" + table_id;
       }else {
-        window.location.href = "/origami/room/" + table_id
+        window.location.href = "/origami/room/" + table_id;
       }
     }
   }); 
diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js
index d2b502d4..c8b59231 100755
--- a/app/assets/javascripts/channels/order_queue_station.js
+++ b/app/assets/javascripts/channels/order_queue_station.js
@@ -5,8 +5,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
 
   disconnected: function() {},
 
-  received: function(data) {                 
-  	// console.log(data.order);
+  received: function(data) {
   	var oqs_id = $('.oqs_active').attr('data-id');
   	items = data.order;
   	for(var field in items) {
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index f33f6d11..a2011022 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -20,33 +20,33 @@ $(document).ready(function() {
     borderRadius: '0',
     railBorderRadius: '0'
   });
-
-  $('.delete').click(function(){
-    var method    = $(this).attr('data-method');
-    var url       = $(this).attr('data-ref');
-    var html_text = $(this).siblings( "#delete_text" ).html();
-    //var page = url.substring(url.lastIndexOf('/') + 1);    
-    swal({
-        title: "Confirmation",
-        text: html_text,
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        html: true
-    }, function (isConfirm) {
-        if (isConfirm) {
-          $.ajax({
-            type: method,
-            url: url ,            
-            success: function(data) {              
-              location.href = data.url;
-            }
-         });          
-        } else {
-            swal("Cancelled", "Your imaginary file is safe :)", "error");
-        }
-    });
-  });
+  
+  // $('.delete').click(function(){
+  //   var method    = $(this).attr('data-method');
+  //   var url       = $(this).attr('data-ref');
+  //   var html_text = $(this).siblings( "#delete_text" ).html();
+  //   //var page = url.substring(url.lastIndexOf('/') + 1);    
+  //   swal({
+  //       title: "Confirmation",
+  //       text: html_text,
+  //       type: "warning",
+  //       showCancelButton: true,
+  //       confirmButtonColor: "#DD6B55",
+  //       html: true
+  //   }, function (isConfirm) {
+  //       if (isConfirm) {
+  //         $.ajax({
+  //           type: method,
+  //           url: url ,            
+  //           success: function(data) {              
+  //             location.href = data.url;
+  //           }
+  //        });          
+  //       } else {
+  //           swal("Cancelled", "Your imaginary file is safe :)", "error");
+  //       }
+  //   });
+  // });
 
   // for Notificaiotn message
   var placementFrom  = $("#notify_message").attr('data-placement-from');
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 0f5380a7..418b6ebe 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -255,14 +255,14 @@ function setCommPorts(comPortLists) {
 }
 
 /** pay with CB bank **/
-function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no) {
+function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no,cashier_type) {
 	$("#loading_wrapper").show();
     var com_port = $("#com_port_name").val();
-    reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port);
+    reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type);
 }
 
 //add req data to card_sale_trans table
-function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port) {
+function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type) {
   var jobj = {"cmd_type" : cmd_type, "payment_type" : "CARD", "amt" : bnk_bill_amount, "sale_id" : sale_id, "inv_no" : receipt_no, "com_port" : com_port};
   $.ajax({
       type: "POST",
@@ -272,14 +272,14 @@ function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, rece
       success: function(data) {
           if (data.status == "success"){
             card_sale_trans_id = data.card_sale_trans_id;
-            resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port);
+            resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port,cashier_type);
           }
        }
     });
 }
 
 //add res data to card_sale_trans table
-function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port) {
+function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port,cashier_type) {
 
   var resMsg = "";
   var card_payment_type="";
@@ -306,7 +306,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
           dataType: "json",
           success: function(data) {
             if(data.status == "success"){
-                resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port);
+                resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type);
             }
           }
         });
@@ -317,7 +317,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
 }
 
 
-function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port) {
+function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type) {
 	$("#loading_wrapper").hide();
     var jobj = $.parseJSON(resMsg);
     if(jobj.STATUS == "Approved"){
@@ -334,7 +334,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 						closeOnCancel: false,
 						allowOutsideClick: false
          			}, function () {
-         				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+         				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
          			});
          		}
          	}
@@ -352,7 +352,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 		  closeOnCancel: false,
 		  allowOutsideClick: false
 		}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/"+payment_type;
+				window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/"+payment_type;
 			});
     }
 }
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 42ea4b2f..eb9dc653 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -167,7 +167,7 @@ class Crm::CustomersController < BaseCrmController
                   status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
 
                   if params[:sale_id]
-                      format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' }
+                      format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created.' }
                   else
                       format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'}
                   end
@@ -186,21 +186,21 @@ class Crm::CustomersController < BaseCrmController
                   if response["message"] == "Account has not exist."
                     customer.destroy
                     if params[:sale_id]
-                      format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]}
+                      format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer cannot created.' + response["message"]}
                     else
                       format.html { redirect_to crm_customers_path, notice: 'Customer cannot created.' + response["message"] }
                     end
                   end
 
                   if params[:sale_id]
-                      format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response["message"]}
+                      format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created.' + response["message"]}
                   else
                       format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response["message"] }
                   end
               end
           else
               if params[:sale_id]
-                  format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. noted'}
+                  format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created. noted'}
                 else
                   format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' }
               end
@@ -209,7 +209,7 @@ class Crm::CustomersController < BaseCrmController
 
           if params[:sale_id]
             flash[:errors] = @crm_customers.errors
-            format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'}
+            format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page]}
             format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
           else
             flash[:errors] = @crm_customers.errors
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d59a5af3..147b2ee4 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -92,13 +92,15 @@ class HomeController < ApplicationController
     @sale_data = Array.new
     @total_payment_methods = Sale.total_payment_methods(today,current_user,@from,@to)
 
-    @total_payment_methods.each do |payment|
-      if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
-        pay = Sale.payment_sale('card', today, current_user,@from,@to)
-        @sale_data.push({'card' => pay.payment_amount})
-      else 
-        pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to)
-        @sale_data.push({payment.payment_method => pay.payment_amount})
+    if !@total_payment_methods.nil?
+      @total_payment_methods.each do |payment|
+        if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
+          pay = Sale.payment_sale('card', today, current_user,@from,@to)
+          @sale_data.push({'card' => pay.payment_amount})
+        else 
+          pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to)
+          @sale_data.push({payment.payment_method => pay.payment_amount})
+        end
       end
     end
     @summ_sale              = Sale.summary_sale_receipt(today,current_user,@from,@to)
@@ -111,10 +113,12 @@ class HomeController < ApplicationController
     @total_order            = Sale.total_order(today,current_user,@from,@to)
     @total_accounts         = Sale.total_account(today,current_user,@from,@to)
     @account_data = Array.new
-    @total_accounts.each do |account|
-      acc = Sale.account_data(account.account_id, today,current_user,@from,@to)
-      if !acc.nil?
-        @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
+    if !@total_accounts.nil?
+      @total_accounts.each do |account|
+        acc = Sale.account_data(account.account_id, today,current_user,@from,@to)
+        if !acc.nil?
+          @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
+        end
       end
     end
 
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 58b2910b..19d4c17f 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -7,7 +7,8 @@ class Oqs::HomeController < BaseOqsController
   	# @queue_items_details = queue_items_query(false)
 
     # Query for OQS with delivery status true
-    
+    @tables   = DiningFacility.all.active.order('status desc')
+    @rooms    = Room.all.active.order('status desc')
 
     @filter = params[:filter]
 
@@ -113,7 +114,11 @@ class Oqs::HomeController < BaseOqsController
   def get_items_by_oqs
     oqs_id = params[:id]
     filter = params[:filter]
-    items  = queue_items_query(false,oqs_id,filter)
+    table_id = params[:table_id]
+    puts params
+    puts table_id
+    puts "sssssssssssss"
+    items  = queue_items_query(false,oqs_id,filter,table_id)
     if !items.empty?
       items.each do |item|
         if !item.set_menu_items.nil?
@@ -151,13 +156,20 @@ class Oqs::HomeController < BaseOqsController
 
 
   # Query for OQS with delivery status
-  def queue_items_query(status,oqs_id=nil,filter) 
+  def queue_items_query(status,oqs_id=nil,filter,table_id) 
     if oqs_id == nil
        oqs = ''
     else
       oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
     end
 
+    if table_id.to_i>0
+       table = "and df.id = '#{table_id}' "
+       
+    else
+     table = ''
+    end
+
     query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, 
                               oqs.id as station_id, oqs.station_name, 
                               oqs.is_active, oqpz.zone_id, 
@@ -173,7 +185,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
+    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} #{table}")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
     .order("assigned_order_items.assigned_order_item_id desc")
     .group("odt.order_items_id")
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index c3e6766e..3b05856f 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -103,10 +103,15 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
      }
 
     # begin
+    if params[:order_source] == "quick_service"
+      customer_id = "CUS-000000000002" # for no customer id from mobile
+    else
+      customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    end
     @order = Order.new
     @order.source = params[:order_source]
     @order.order_type = params[:order_type]
-    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    @order.customer_id = customer_id
     @order.items = items_arr
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index d93e5040..234a1dc5 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -50,6 +50,7 @@ class Origami::CustomersController < BaseOrigamiController
 
     @sale_id             = params[:sale_id]
     @cashier_type        = params[:type]
+    @page                = params[:page]
     
      if(@sale_id[0,3] == "SAL")
        @booking          = Booking.find_by_sale_id(@sale_id)
@@ -62,7 +63,11 @@ class Origami::CustomersController < BaseOrigamiController
     else
        @booking_order    = BookingOrder.find_by_order_id(@sale_id)
        @booking          = Booking.find(@booking_order.booking_id)
-       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+       if @booking.dining_facility_id.to_i > 0
+         @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+       else
+        @dining_facility  = nil  
+       end
     end       
 
     filter = params[:filter]
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 14a2a93b..184daca4 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -30,33 +30,33 @@ class Origami::HomeController < BaseOrigamiController
     bookings = Booking.all
     if !bookings.today.nil?
       @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
+      # bookings.each do |booking|
+      #   if booking.sale_id.nil? && booking.booking_status != 'moved'
+      #     if !booking.booking_orders.empty?
+      #       booking.booking_orders.each do |booking_order|
+      #         order = Order.find(booking_order.order_id)
+      #         if !order.order_items.empty?
+      #           if !@order_items_count.key?(booking.dining_facility_id)
+      #             @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+      #           else
+      #             @order_items_count[booking.dining_facility_id] += order.order_items.count
+      #           end
+      #         end
+      #       end
+      #     end
+      #   else
+      #     if !booking.sale_id.nil?
+      #       sale = Sale.find(booking.sale_id)
+      #       if sale.sale_status !='completed'
+      #         if !@order_items_count.key?(booking.dining_facility_id)
+      #           @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+      #         else
+      #           @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+      #         end
+      #       end
+      #     end
+      #   end
+      # end
     end
 
     @dining.bookings.active.each do |booking|
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 64b0bde5..6a726199 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -28,8 +28,21 @@ class Origami::PaymentsController < BaseOrigamiController
       end
 
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
       # Print for First Bill to Customer
       unique_code = "ReceiptBillPdf"
+      if !receipt_bill_a5_pdf.empty?
+        receipt_bill_a5_pdf.each do |receipt_bilA5|
+          if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+            if receipt_bilA5[1] == '1'
+              unique_code = "ReceiptBillA5Pdf"
+            else
+              unique_code = "ReceiptBillPdf"
+            end
+          end
+        end
+      end
+
        #shop detail
       shop_details =  Shop::ShopDetail 
       # customer= Customer.where('customer_id=' +.customer_id)
@@ -95,7 +108,6 @@ class Origami::PaymentsController < BaseOrigamiController
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
-      render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil
 
       # For Cashier by Zone
@@ -118,7 +130,20 @@ class Origami::PaymentsController < BaseOrigamiController
 
       # For Print
       if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
         unique_code = "ReceiptBillPdf"
+        if !receipt_bill_a5_pdf.empty?
+          receipt_bill_a5_pdf.each do |receipt_bilA5|
+            if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+              if receipt_bilA5[1] == '1'
+                unique_code = "ReceiptBillA5Pdf"
+              else
+                unique_code = "ReceiptBillPdf"
+              end
+            end
+          end
+        end
+
         customer= Customer.find(saleObj.customer_id)
 
         # get member information
@@ -151,7 +176,9 @@ class Origami::PaymentsController < BaseOrigamiController
         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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+
+        render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
 
         if params[:type] == "quick_service"
           booking = Booking.find_by_sale_id(sale_id)
@@ -437,5 +464,31 @@ class Origami::PaymentsController < BaseOrigamiController
         end
       end
   end
- 
+
+  #print function for receipt
+  def print 
+    filename      = params[:filename]
+    receipt_no    = params[:receipt_no]
+    printer_name  = params[:printer_name]
+    
+    receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
+    unique_code = "ReceiptBillPdf"
+    if !receipt_bill_a5_pdf.empty?
+      receipt_bill_a5_pdf.each do |receipt_bilA5|
+        if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+          if receipt_bilA5[1] == '1'
+            unique_code = "ReceiptBillA5Pdf"
+          else
+            unique_code = "ReceiptBillPdf"
+          end
+        end
+      end
+    end
+    # get printer info
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    printer = Printer::ReceiptPrinter.new(print_settings)
+    printer.print_receipt_pdf(filename,receipt_no,print_settings.print_copies,printer_name)
+    
+    render :json => {status: true}
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index f3b11556..3aa98282 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -26,33 +26,33 @@ class Origami::RoomsController < BaseOrigamiController
     bookings = Booking.all
     if !bookings.today.nil?
       @order_items_count = Hash.new
-      bookings.each do |booking|
-        if booking.sale_id.nil? && booking.booking_status != 'moved'
-          if !booking.booking_orders.empty?
-            booking.booking_orders.each do |booking_order|
-              order = Order.find(booking_order.order_id)
-              if !order.order_items.empty?
-                if !@order_items_count.key?(booking.dining_facility_id)
-                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-                else
-                  @order_items_count[booking.dining_facility_id] += order.order_items.count
-                end
-              end
-            end
-          end
-        else
-          if !booking.sale_id.nil?
-            sale = Sale.find(booking.sale_id)
-            if sale.sale_status !='completed'
-              if !@order_items_count.key?(booking.dining_facility_id)
-                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-              else
-                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-              end
-            end
-          end
-        end
-      end
+      # bookings.each do |booking|
+      #   if booking.sale_id.nil? && booking.booking_status != 'moved'
+      #     if !booking.booking_orders.empty?
+      #       booking.booking_orders.each do |booking_order|
+      #         order = Order.find(booking_order.order_id)
+      #         if !order.order_items.empty?
+      #           if !@order_items_count.key?(booking.dining_facility_id)
+      #             @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+      #           else
+      #             @order_items_count[booking.dining_facility_id] += order.order_items.count
+      #           end
+      #         end
+      #       end
+      #     end
+      #   else
+      #     if !booking.sale_id.nil?
+      #       sale = Sale.find(booking.sale_id)
+      #       if sale.sale_status !='completed'
+      #         if !@order_items_count.key?(booking.dining_facility_id)
+      #           @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+      #         else
+      #           @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+      #         end
+      #       end
+      #     end
+      #   end
+      # end
     end
     
     @room.bookings.active.each do |booking|
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 33372ac9..95c6005f 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -65,7 +65,8 @@ class Ability
         can :create, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
-        can :foc, :payment        
+        can :foc, :payment  
+        can :print, :payment      
 
         can :move_dining, :movetable 
         can :moving, :movetable
@@ -111,10 +112,10 @@ class Ability
 
         can :index, :other_charge
         can :create, :other_charge
-        # can :index, :discount
-        # can :create, :discount
-        # can :remove_discount_items, :discount
-        # can :remove_all_discount, :discount
+        can :index, :discount
+        can :create, :discount
+        can :remove_discount_items, :discount
+        can :remove_all_discount, :discount
          can :member_discount, :discount
 
         can :first_bill, :payment
@@ -122,6 +123,7 @@ class Ability
         can :create, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
+        can :print, :payment
 
         can :move_dining, :movetable 
         can :moving, :movetable
@@ -180,6 +182,7 @@ class Ability
         can :show, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
+        can :print, :payment
 
         can :manage, Commission
         can :manage, Commissioner
@@ -191,6 +194,26 @@ class Ability
      elsif user.role == "waiter"
         can :index, :home
         can :show, :home  
+
+        can :manage, Customer   
+        can :get_customer, Customer
+        can :add_customer, Customer
+        can :update_sale_by_customer, Customer
+
+        can :index, :other_charge
+        can :create, :other_charge
+        can :index, :discount
+        can :create, :discount
+        can :remove_discount_items, :discount
+        can :remove_all_discount, :discount
+        can :member_discount, :discount
+
+        #ability for  move table
+        can :move_dining, :movetable 
+        can :moving, :movetable
+
+        can :move_dining, :moveroom
+
         #ability for split_bill
         can :index, :split_bill
         can :create, :split_bill
diff --git a/app/models/order.rb b/app/models/order.rb
index 15ce56c3..739de71a 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -286,23 +286,51 @@ class Order < ApplicationRecord
   #Process order items and send to order queue
   def process_order_queue
     #Send to background job for processing
-
-    cup_status = `#{"sudo service cups status"}`
+    order        = Order.find(self.id) 
+    cup_status   = `#{"sudo service cups status"}`
     print_status = check_cup_status(cup_status)
-     
+    sidekiq      = Lookup.find_by_lookup_type("sidekiq")
+
     if print_status
-      OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      if !sidekiq.nil?
+        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+      else
+        if order
+          oqs = OrderQueueStation.new
+          oqs.process_order(order, self.table_id)
+        end
+        assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+        ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+      end
     else
       cup_start    = `#{"sudo service cups start"}`
       cup_status   = `#{"sudo service cups status"}`
       print_status = check_cup_status(cup_status)
 
       if print_status
-        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+        if !sidekiq.nil?
+          OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+        else
+          if order
+            oqs = OrderQueueStation.new
+            oqs.process_order(order, self.table_id)
+          end
+          assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+          ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+        end
       else
         msg = ' Print Error ! Please contact to service'
         ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
-        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+          if !sidekiq.nil?
+          OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+          else
+            if order
+              oqs = OrderQueueStation.new
+              oqs.process_order(order, self.table_id)
+            end
+            assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+            ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+          end
       end
     end
  
@@ -310,8 +338,18 @@ class Order < ApplicationRecord
 
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)
-    #Send to background job for processing
-      OrderQueueProcessorJob.perform_later(id, table_id)
+    sidekiq      = Lookup.find_by_lookup_type("sidekiq")
+   if !sidekiq.nil?
+          OrderQueueProcessorJob.perform_later(id, table_id)
+          else
+            order        = Order.find(id) 
+            if order
+              oqs = OrderQueueStation.new
+              oqs.process_order(order, table_id)
+            end
+            assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
+            ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+          end
   end
   
   def check_cup_status(status)
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 0cf6526f..d544c908 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -197,17 +197,28 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     print_settings.print_copies = 1
     print_settings.save!
 
+    directory_name = 'public/receipts'
+    Dir.mkdir(directory_name) unless File.exists?(directory_name)
+
     begin
       if count == 1
-        pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf"
-        self.print("tmp/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+        filename = "/receipts/receipt_bill_#{sale_data.receipt_no}.pdf"
+        pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
+        if printed_status != 'Paid'
+          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+        end
       else
-        pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
-        self.print("tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+        filename = "/receipts/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
+        pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
+        if printed_status != 'Paid'
+          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+        end
       end
 
       count -= 1
     end until count == 0
+
+    return filename, sale_data.receipt_no, cashier_terminal.printer_name
   end
 
    # stock check
@@ -247,4 +258,23 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     self.print("tmp/print_call_waiter.pdf")
   end
 
+  #print receipt pdf from js
+  def print_receipt_pdf(filename,receipt_no,print_copies,printer_name)
+    count = print_copies.to_i
+    # if count == 0
+    #   self.print("public"+filename, printer_name)
+    # else
+      begin
+        if count == 1
+          self.print("public"+filename, printer_name)
+        else
+          filename = "public/receipts/receipt_bill_#{receipt_no}_#{count}.pdf"
+          self.print(filename, printer_name)
+        end
+
+        count -= 1
+      end until count == 0
+    # end
+  end
+
 end
diff --git a/app/models/receipt.rb b/app/models/receipt.rb
new file mode 100644
index 00000000..40ad3176
--- /dev/null
+++ b/app/models/receipt.rb
@@ -0,0 +1,2 @@
+class Receipt < ApplicationRecord
+end
diff --git a/app/models/receipt_detail.rb b/app/models/receipt_detail.rb
new file mode 100644
index 00000000..c96e3d4e
--- /dev/null
+++ b/app/models/receipt_detail.rb
@@ -0,0 +1,2 @@
+class ReceiptDetail < ApplicationRecord
+end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 54c60eb3..29e32c14 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -548,11 +548,22 @@ class Sale < ApplicationRecord
 
   #Generate new Receipt No when it is not assigned
   def generate_receipt_no
+    #shop_code and client_code
+    shop_details =  Shop::ShopDetail
+
     #Date-Shift-
     if self.receipt_no.nil?
       prefix = DateTime.now().utc
       #self.receipt_no = prefix.to_s + "/" + self.shit_id.to_s + "/" + SeedGenerator.new_receipt_no().to_s
-      self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+      if !shop_details.nil?
+        if !shop_details.shop_code.nil?
+          self.receipt_no = shop_details.shop_code + "-" + prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+        else
+          self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+        end
+      else
+        self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
+      end
 
       self.receipt_date = prefix
       Rails.logger.debug "Receipt No #{self.receipt_no} | Date #{ self.receipt_date.to_s}"
@@ -1170,7 +1181,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1184,7 +1195,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1202,7 +1213,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1215,7 +1226,7 @@ end
       if current_user.nil?
         total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1234,7 +1245,7 @@ end
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
@@ -1253,7 +1264,7 @@ end
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
@@ -1276,7 +1287,7 @@ end
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
@@ -1295,7 +1306,7 @@ end
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
@@ -1318,7 +1329,7 @@ end
             .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
             .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
             .first()
@@ -1337,7 +1348,7 @@ end
             .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
             .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .first()
@@ -1360,7 +1371,7 @@ end
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct sp.payment_method")
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
               .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
@@ -1379,7 +1390,7 @@ end
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct sp.payment_method")
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
               .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
@@ -1406,7 +1417,7 @@ end
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
               query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
@@ -1437,7 +1448,7 @@ end
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
               query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
@@ -1482,7 +1493,7 @@ end
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
@@ -1504,7 +1515,7 @@ end
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
@@ -1530,7 +1541,7 @@ end
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
@@ -1552,7 +1563,7 @@ end
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
@@ -1578,7 +1589,7 @@ end
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
@@ -1600,7 +1611,7 @@ end
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
@@ -1626,7 +1637,7 @@ end
               .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
@@ -1648,7 +1659,7 @@ end
               .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
               .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
@@ -1675,7 +1686,7 @@ end
             .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct a.order_id) as total_order")
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
@@ -1700,7 +1711,7 @@ end
             .where('b.status = "billed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct a.order_id) as total_order")
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
@@ -1728,7 +1739,7 @@ end
             .joins("JOIN accounts as b ON b.id = a.account_id")
             .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct b.id as account_id, b.title as title")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
@@ -1750,7 +1761,7 @@ end
             .joins("JOIN accounts as b ON b.id = a.account_id")
             .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct b.id as account_id, b.title as title")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
@@ -1776,7 +1787,7 @@ end
             .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
@@ -1798,7 +1809,7 @@ end
             .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
@@ -1826,7 +1837,7 @@ end
             .order("SUM(a.qty) DESC")
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
@@ -1854,7 +1865,7 @@ end
             .order("SUM(a.qty) DESC")
             .first()
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
@@ -1883,7 +1894,7 @@ end
             .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
             .sum("a.qty")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
               .sum("a.qty")
@@ -1902,7 +1913,7 @@ end
             .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             .sum("a.qty")
       else
-        if current_user.role == 'administrator'
+        if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
               .sum("a.qty")
@@ -2011,6 +2022,44 @@ end
                   .group("bookings.booking_id")
   end
 
+  def self.all_receipts
+    query = Sale.select("sales.*, sale_payments.created_at as receipt_close_time,
+                          case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark,
+                          case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges,
+                          SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
+                          SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount,
+                          SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
+                          SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,     
+                          SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,     
+                          SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
+                          SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount,
+                          SUM(case when (sale_items.status='foc') then sale_items.price else 0 end) as item_foc,
+                          SUM(case when (sale_items.status='Discount') then sale_items.price else 0 end) as item_discount,
+                          SUM(sale_items.qty) as qty,
+                          sales.cashier_name as cashier_name,
+                          surveys.child as child,
+                          surveys.adult as adult")
+            .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+            .joins("join sale_taxes on sale_taxes.sale_id = sales.sale_id")
+            .joins("join sale_items on sale_items.sale_id = sales.sale_id")
+            .joins("join sale_audits on sale_audits.sale_id = sales.sale_id")
+            .joins("left join surveys on surveys.receipt_no = sales.receipt_no")
+            
+    query = query.where("sale_status != 'new' && sale_payments.payment_amount > 0")
+            .group("sale_id")
+    return query
+end
+
+def self.all_receipt_details
+    query = SaleItem.select("sale_items.*, sale_payments.created_at as receipt_close_time,
+            sales.requested_at as requested_at, sales.receipt_no as receipt_no,sales.sale_id as s_id")
+            .joins("join sale_payments on sale_payments.sale_id = sale_items.sale_id")
+            .joins("join sales on sales.sale_id = sale_items.sale_id")
+            .group("sale_items.sale_item_id")
+   query = query.where("qty > 0 and sales.sale_status !='new'")
+    return query
+end
+
   private
 
   def generate_custom_id
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index bb74c2f2..1866a630 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -356,10 +356,10 @@ class SalePayment < ApplicationRecord
 
       self.sale.save!
       table_update_status(sObj)
-
+      
       if check_foc
         update_shift
-      elsif paid_amount != "0.0"
+      elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
         update_shift
       end
     end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index ee9a1bda..206c7a0a 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -112,6 +112,7 @@ class ReceiptBillA5Pdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
             text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
         end
+
         if sale_data.bookings[0].dining_facility_id.to_i > 0
             bounding_box([self.item_description_width, y_position], :width => self.item_description_width, :height => self.item_height) do
                 text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
@@ -121,10 +122,16 @@ class ReceiptBillA5Pdf < Prawn::Document
         move_down line_move
 
         y_position = cursor
-        bounding_box([0, y_position], :width =>self.item_description_width, :height => self.item_height) do
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+            bounding_box([0, y_position], :width => self.item_description_width, :height => self.item_height) do
+                text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :left
+            end
+        end
+
+        bounding_box([self.item_description_width, y_position], :width =>self.item_description_width, :height => self.item_height) do
             text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
         end    
-        bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
+        bounding_box([self.item_description_width - 2,y_position], :width =>self.item_description_width, :height => self.item_height) do
               text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right
         end
         move_down line_move
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 0f02d506..efc85c7f 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -108,9 +108,10 @@ class ReceiptBillPdf < Prawn::Document
         move_down line_move
         # move_down 2
         y_position = cursor
-        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+        bounding_box([0,y_position], :width =>self.description_width + self.price_num_width, :height => self.item_height) do
             text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
         end
+
         if sale_data.bookings[0].dining_facility_id.to_i > 0
           bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do
             text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
@@ -120,7 +121,13 @@ class ReceiptBillPdf < Prawn::Document
         move_down line_move
 
         y_position = cursor
-        bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do
+        if sale_data.bookings[0].dining_facility_id.to_i > 0
+          bounding_box([0,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :left
+          end
+        end
+
+        bounding_box([self.label_width, y_position], :width =>self.label_width, :height => self.item_height) do
             text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
         end    
         bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index d05af387..372c05e9 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -23,10 +23,10 @@
                         <input type="hidden" name="type" id="type" value="">
                   </div>
                   <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
-                    <button type="submit" class="btn btn-sm bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
+                    <button type="submit" class="btn btn-sm bg-blue waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.search") %></button>
                   <!-- </div> -->
-                    <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
-                    <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
+                    <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
+                    <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
                 </div>
                 <% end %>
             </div>
@@ -145,7 +145,8 @@ $(function() {
     $("#qr_code").on('click', function(e){
         var code = "";        
         setTimeout(function(){
-           var hi=getQRCode();           
+           code=getQRCode();
+           setQRCode(code);           
         },100);
     });
 
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 50673b5f..aee947c7 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -228,16 +228,15 @@
       <% else %>
         <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
       <% end %>
+        <% if !@total_customer.nil? && @total_customer.to_i > 0 %>
           <div class="card">
             <div class="body">
               <h6><%= t :customer %></h6>
               <table class="table">
-                <% if !@total_customer.nil? %>
                   <tr>
                     <td><%= t("views.right_panel.detail.total") %> <%= t :customer %> : </td>
                     <td align="right"><%= @total_customer %></td>
                   </tr>
-                <% end %>
                 <% if !@total_dinein.nil? %>
                   <tr>
                     <td><%= t("views.right_panel.detail.dine_in") %> : </td>
@@ -265,6 +264,7 @@
               </table>
             </div>
           </div>
+          <% end %>
         </div>
         <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
       </div>
@@ -316,9 +316,10 @@
               </table>
             </div>
           </div>
-        </div>
-      </div>    
-    </div>
+        </div> 
+    <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
+      </div>
+    <% end %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 15dfdfbe..e3e7adda 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -16,7 +16,11 @@
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
             <%if current_login_employee.role !="waiter" %>
                 <a href="javascript:void(0);" class="bars"></a>
-                <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+                <% if current_login_employee.role != "cashier" %>
+                    <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+                <% else %>
+                    <a class="navbar-brand" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
+                <% end %>
             <% else %>
                 <a class="navbar-brand m-0" href="<%= origami_dashboard_path%>">
             <%end%>
@@ -56,13 +60,11 @@
                 </li>
                 <% end %>
                 <li>
-                    <!-- <%if current_login_employee.role !="waiter" %> -->
-                    <!-- <%end%> -->  
                     <!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
                         <i class="material-icons font-10 logout_icon">exit_to_app</i>
                         <span class="font-18">Logout</span>
                     </p> -->
-                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
+                    <p class="delete waves-effect waves-block p-l-30 m-b-5 logout" data-ref="<%= logout_path %>" data-method="delete">
                         <i class="material-icons font-7 logout_icon">exit_to_app</i>
                         <span class="font-15">Logout</span>
                     </p>
@@ -79,9 +81,39 @@
         </div>
     </div>
 </nav>
+
 <script type="text/javascript">
     if((document.getElementById("otherPayment")!=undefined) && (document.getElementById("otherPayment")!=null) && (document.getElementById("otherPayment")!="")){
         var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
         document.getElementById("otherPayment").innerHTML = otherPayment;
     }
+
+    $(function(){
+        $('.delete').click(function(){
+            var method    = $(this).attr('data-method');
+            var url       = $(this).attr('data-ref');
+            var html_text = $(this).siblings( "#delete_text" ).html();
+            //var page = url.substring(url.lastIndexOf('/') + 1);    
+            swal({
+                title: "Confirmation",
+                text: html_text,
+                type: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#DD6B55",
+                html: true
+            }, function (isConfirm) {
+                if (isConfirm) {
+                  $.ajax({
+                    type: method,
+                    url: url ,            
+                    success: function(data) {              
+                      location.href = data.url;
+                    }
+                 });          
+                } else {
+                    swal("Cancelled", "Your imaginary file is safe :)", "error");
+                }
+            });
+        });
+    });
 </script>
\ No newline at end of file
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
old mode 100755
new mode 100644
index 33ee74b7..585f9968
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,137 +1,115 @@
 <!-- Column One -->
-<div class="row clearfix">
-  <div class="col-lg-8 col-md-8 col-sm-8">  
+<div class="row clearfix" style="margin-top:-50px !important">
+  <div class="col-lg-11 col-md-11 col-sm-11">  
     <div class="body p-l-10">
-      <%= form_tag oqs_root_path, :method => :get do %>
       <div class="row clearfix">
         <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
-           <input type="text" name="filter" class="form-control" placeholder="Search">
-          
+          <span class="hidden" id="oqs_active"></span>
+          <select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
+            <option value="0"  data-id="0">Processed</option>
+            <% @queue_stations.each do |qsi|  %>
+              <% if qsi.is_active != false %>
+              <p class="hidden oqs-id"><%= qsi.id  %></p>
+              <option value="<%= qsi.id %>"  data-id="<%= qsi.id %>" style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
+              <% end %>
+            <% end %> 
+          </select>
         </div>
-        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-          <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
+        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
+        <span class="hidden" id="table_id"></span>
+          <select class="form-control select tables" name="table_id" id="tables">
+            <option value="">Select Table</option>
+            <% @tables.each do |table|  %>
+              
+              <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
+              
+            <% end %> 
+          </select>
         </div>
-
+<!-- 
+        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
+        <span class="hidden" id="room_id"></span>
+          <select class="form-control select rooms" name="table_id" id="rooms">
+            <option value="">Select Room</option>
+            <% @rooms.each do |table|  %>
+              
+              <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
+              
+            <% end %> 
+          </select>
+        </div> -->
       </div>
-      <% end %>
     </div>
-   
-    <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-      <!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
-        <a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
-      </li> -->
-      <li class="nav-item nav-completed">
-        <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed 
-        <span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
-      </li>
-      <% # For Tab Disable for Station is inactive
-      status=""
-      i=0
-      @queue_stations.each do |qsi|  
-        if qsi.is_active == false   
-          status="disabled"    
-          end %>
-          <li class="nav-item oqs_click" data-id="<%= qsi.id %>">
-            <p class="hidden oqs-id"><%= qsi.id  %></p>
-            <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
-              <%= qsi.station_name %>
-              <% if @filter.nil? %>
-              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
-              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
-              </span> 
-              <%else%>
-              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
-               <% @count.each do |c|%>    
-               <% if qsi.id == c.station_id %>
-               <%= c.total %>                
-               <%end %>  
-               <%end %>    
-             </span>
-             <%end%>
-             <% if qsi.auto_print %>
-             <span>(ap)</span>
-             <% end %>  
-           </a>
-         </li>
-         <% i+=1%>
-
-         <% end %>      
-      </ul>
-     <!-- Nav tabs - End -->
-     <p class="hidden filter"><%= @filter %></p>
-
-     <div class="tab-content" id="custom-slimscroll" style="">
-      <!--- Panel 0 - Completed -->
-
+    
+    <p class="hidden filter"><%= @filter %></p>
+    <div class="card">
+      <div class="card-block">
+        <div class="tab-content" id="custom-slimscroll" style="">
       <div class="tab-pane in active" id="completed" role="tabpanel">
-        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;column-count: ;">
           <%   
           @queue_completed_item.each do |qid|                               
             %>
             <div class="card queue_station" data-order-no="<%= qid.order_id %>">
               <div class="card-block">
-                <div class="row">
-                <%if qid.type.present?%>
-                 <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
-                <%else%>
-                 <span class="col-md-4 order-zone-type font-13"></span>
-                <%end%>
-                 
-                  <span class="order-zone hidden font-13"><%= qid.zone %></span>
-                  <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
-                </div> 
-               <p class="m-b--10">
-                  <span class="order-item font-16">
-                    <%= qid.item_name %>
-                  </span> [x
-                  <span class="order-qty">
-                    <%= qid.qty %>
-                  </span> ]  
-                  <% if !qid.set_menu_items.nil? %>
-                    <% qid.set_menu_items.each do |item_instance|%>
-                      <br><span class="font-12">
-                      <%= item_instance %>
-                      </span>
-                    <% end %>
-                  <% end %> 
-                </p>                  
-                
-                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+                  <div class="row">
+                    <%if qid.type.present?%>
+                    <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
+                    <%else%>
+                    <span class="col-md-4 order-zone-type font-13"></span>
+                    <%end%>
 
-                <span class="card-text">
-                  <span class="text-muted">Order at - 
-                    <span class="order-at font-13">
-                      <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
-                    </span> <br> 
-                     Order By - <span class="order-by font-13">
-                    <%= qid.item_order_by %>
-                    </span> 
+                    <span class="order-zone hidden font-13"><%= qid.zone %></span>
+                    <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
+                  </div> 
+                  <p class="m-b--10">
+                    <span class="order-item font-16">
+                      <%= qid.item_name %>
+                    </span> [x
+                    <span class="order-qty">
+                      <%= qid.qty %>
+                    </span> ]  
+                    <% if !qid.set_menu_items.nil? %>
+                      <% qid.set_menu_items.each do |item_instance|%>
+                       <br><span class="font-12">
+                       <%= item_instance %>
+                        </span>
+                      <% end %>
+                    <% end %> 
+                  </p>                  
+
+                  <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+
+                  <span class="card-text">
+                    <span class="text-muted">Order at - 
+                      <span class="order-at font-13">
+                        <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
+                      </span> <br> 
+                      Order By - <span class="order-by font-13">
+                      <%= qid.item_order_by %>
+                      </span> 
+                    </span>
                   </span>
-                </span>
-              
+
                 <p class="hidden order-status">completed</p>
                 <p class="hidden order-customer"><%= qid.customer_name %></p>
                 <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>                
               </div>
-            </div> 
-            <%                                      
-          end
-          %>    
+           </div> 
+          <% end %>    
         </div>
-      </div>
+       </div>
 
-
-      <!-- End Panel 0 - Completed -->
-      <!--- Order Items -->
       <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
       </div>
-      <!--- end of Items-->
     </div>
+      </div>
+    </div>
+
   </div>
 
   <!-- Column Two -->
-  <div class="col-lg-3 col-md-3 col-sm-3">
+  <!-- <div class="col-lg-3 col-md-3 col-sm-3">
     <div class="card"  >
       <div class="card-header">
         <div><strong id="order-title">ORDER DETAILS</strong></div>
@@ -143,20 +121,18 @@
               <tr>
               <th style="width:33%; text-align:">Order By</th>
                 <th style="width:33%; text-align:">Order At</th>
-                <!-- <th style="width:33%; text-align:">Customer</th> -->
               </tr>
             </thead>
             <tbody>
               <tr>
                 <td id="order-by" style="width:33%; text-align:"></td>
                 <td id="order-at" style="width:33%; text-align:"></td>
-                <!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
-                  </tr>
-                  <tr>
+                  </tr> -->
+                  <!-- <tr>
                     <td><strong class="hidden cus_name">Customer</strong></td>
                     <td id="order-customer" colspan="2"></td>
-                  </tr>
-                </tbody>
+                  </tr> -->
+              <!--   </tbody>
               </table>                  
         </div>
         <div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
@@ -168,17 +144,17 @@
               </tr>
             </thead>
             <tbody>              
-              <!-- Bind With JS -->
             </tbody>
           </table>
         </div>
       </div>
     </div>
   </div>
-
+ -->
   <!-- Column Three -->
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
+    <br>
     <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
     <% if ENV["SERVER_MODE"] != "cloud" %>
     <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
diff --git a/app/views/oqs/home/index_quechange_backup.html.erb b/app/views/oqs/home/index_quechange_backup.html.erb
new file mode 100755
index 00000000..33ee74b7
--- /dev/null
+++ b/app/views/oqs/home/index_quechange_backup.html.erb
@@ -0,0 +1,196 @@
+<!-- Column One -->
+<div class="row clearfix">
+  <div class="col-lg-8 col-md-8 col-sm-8">  
+    <div class="body p-l-10">
+      <%= form_tag oqs_root_path, :method => :get do %>
+      <div class="row clearfix">
+        <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
+           <input type="text" name="filter" class="form-control" placeholder="Search">
+          
+        </div>
+        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
+          <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
+        </div>
+
+      </div>
+      <% end %>
+    </div>
+   
+    <!-- Nav tabs -->
+    <ul class="nav nav-tabs" role="tablist">
+      <!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
+        <a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
+      </li> -->
+      <li class="nav-item nav-completed">
+        <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed 
+        <span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
+      </li>
+      <% # For Tab Disable for Station is inactive
+      status=""
+      i=0
+      @queue_stations.each do |qsi|  
+        if qsi.is_active == false   
+          status="disabled"    
+          end %>
+          <li class="nav-item oqs_click" data-id="<%= qsi.id %>">
+            <p class="hidden oqs-id"><%= qsi.id  %></p>
+            <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
+              <%= qsi.station_name %>
+              <% if @filter.nil? %>
+              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
+              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
+              </span> 
+              <%else%>
+              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
+               <% @count.each do |c|%>    
+               <% if qsi.id == c.station_id %>
+               <%= c.total %>                
+               <%end %>  
+               <%end %>    
+             </span>
+             <%end%>
+             <% if qsi.auto_print %>
+             <span>(ap)</span>
+             <% end %>  
+           </a>
+         </li>
+         <% i+=1%>
+
+         <% end %>      
+      </ul>
+     <!-- Nav tabs - End -->
+     <p class="hidden filter"><%= @filter %></p>
+
+     <div class="tab-content" id="custom-slimscroll" style="">
+      <!--- Panel 0 - Completed -->
+
+      <div class="tab-pane in active" id="completed" role="tabpanel">
+        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+          <%   
+          @queue_completed_item.each do |qid|                               
+            %>
+            <div class="card queue_station" data-order-no="<%= qid.order_id %>">
+              <div class="card-block">
+                <div class="row">
+                <%if qid.type.present?%>
+                 <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
+                <%else%>
+                 <span class="col-md-4 order-zone-type font-13"></span>
+                <%end%>
+                 
+                  <span class="order-zone hidden font-13"><%= qid.zone %></span>
+                  <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
+                </div> 
+               <p class="m-b--10">
+                  <span class="order-item font-16">
+                    <%= qid.item_name %>
+                  </span> [x
+                  <span class="order-qty">
+                    <%= qid.qty %>
+                  </span> ]  
+                  <% if !qid.set_menu_items.nil? %>
+                    <% qid.set_menu_items.each do |item_instance|%>
+                      <br><span class="font-12">
+                      <%= item_instance %>
+                      </span>
+                    <% end %>
+                  <% end %> 
+                </p>                  
+                
+                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+
+                <span class="card-text">
+                  <span class="text-muted">Order at - 
+                    <span class="order-at font-13">
+                      <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
+                    </span> <br> 
+                     Order By - <span class="order-by font-13">
+                    <%= qid.item_order_by %>
+                    </span> 
+                  </span>
+                </span>
+              
+                <p class="hidden order-status">completed</p>
+                <p class="hidden order-customer"><%= qid.customer_name %></p>
+                <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>                
+              </div>
+            </div> 
+            <%                                      
+          end
+          %>    
+        </div>
+      </div>
+
+
+      <!-- End Panel 0 - Completed -->
+      <!--- Order Items -->
+      <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
+      </div>
+      <!--- end of Items-->
+    </div>
+  </div>
+
+  <!-- Column Two -->
+  <div class="col-lg-3 col-md-3 col-sm-3">
+    <div class="card"  >
+      <div class="card-header">
+        <div><strong id="order-title">ORDER DETAILS</strong></div>
+      </div>
+      <div class="card-block">
+        <div class="card-title">
+          <table class="">
+            <thead>
+              <tr>
+              <th style="width:33%; text-align:">Order By</th>
+                <th style="width:33%; text-align:">Order At</th>
+                <!-- <th style="width:33%; text-align:">Customer</th> -->
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td id="order-by" style="width:33%; text-align:"></td>
+                <td id="order-at" style="width:33%; text-align:"></td>
+                <!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
+                  </tr>
+                  <tr>
+                    <td><strong class="hidden cus_name">Customer</strong></td>
+                    <td id="order-customer" colspan="2"></td>
+                  </tr>
+                </tbody>
+              </table>                  
+        </div>
+        <div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
+          <table class="table" id="oqs-order-details-table">
+            <thead>
+              <tr>
+                <th style="width:80%; text-align:left">Items</th>
+                <th style="width:20%; text-align:right">QTY</th>
+              </tr>
+            </thead>
+            <tbody>              
+              <!-- Bind With JS -->
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Column Three -->
+  <div class="col-lg-1 col-md-1 col-sm-1">
+    <!-- OQS Buttons -->
+    <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
+    <% if ENV["SERVER_MODE"] != "cloud" %>
+    <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
+      <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
+    <%end%>    
+  </div>
+</div>
+
+<script type="text/javascript">
+  $(document).on('turbolinks:load', function() {
+    $('#back').on('click', function () {
+        window.location.href = '/dashboard';
+    });
+  });
+</script>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index eebaabbf..87ff1144 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -34,12 +34,14 @@
                  <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
 
                </div>
-               <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-                <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
-              </div>
+               <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
+                <button type="submit" class="btn bg-blue waves-effect waves-effect" style="height: 30%;margin-right: 10px;">Search</button>
+              <!-- </div> -->
 
               <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>
 
+              <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
+
             </div>
             <% end %>
           </div>
@@ -114,6 +116,8 @@
 
           <span class="patch_method"></span>
           <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
+          <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
+          <input type="hidden" id="page" name="page" value="<%= @page %>" />
           <%if !@dining_facility.nil?%>
           <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
           <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
@@ -262,7 +266,8 @@
   </div>
 </div>
 <script type="text/javascript">
-  var cashier_type = "<%= @cashier_type %>"; 
+  var cashier_type = "<%= @cashier_type %>";
+  var page     = "<%= @page %>"; 
   $(function() {
       /*$('.datepicker').datepicker({
        setDate: '12-12-1999',
@@ -295,22 +300,23 @@
         getCardNo();
         $("#sxModal").hide();        
         customer_mamber_card_no = $("#search").val();
-
+        
         if(sale_id != 0 && customer_mamber_card_no != 0){    
           $.ajax({
             type: "POST",
-            url: "get_customer" ,
+            url: "/origami/"+sale_id+"/get_customer" ,
             data: { filter : customer_mamber_card_no ,type :"card"},
             dataType: "json",
             success: function(data) {
               if (data[0].customer_id == false) {
-                $.alert({
-                 title: 'Alert!',
-                 content: data[0].message,
-                 type: 'red',
-                 typeAnimated: true,
-                 btnClass: 'btn-danger',
-               });
+                swal("Alert!", data[0].message, "error");
+               //  $.alert({
+               //   title: 'Alert!',
+               //   content: data[0].message,
+               //   type: 'red',
+               //   typeAnimated: true,
+               //   btnClass: 'btn-danger',
+               // });
               }else{
                 customer_id = data[0].customer_id;
                 customer_name = data[0].name;
@@ -339,13 +345,33 @@
     }
   }
 
+  // QR Code Reader
+  $("#qr_code").on('click', function(e){
+      var code = "";        
+      setTimeout(function(){
+         code=getQRCode();  
+         setQRCode(code);         
+      },100);
+  });
+
+  // Read qrcode from java
+  function getQRCode(){
+    return code2lab.readQRCode();
+  }
+
+  // get QRCode from Java
+  function setQRCode(code){
+    $("#qr_code").text(code);
+    $("#search").val(code);
+  }
+
   $(document).on('click',".customer_tr",function(){
      // if(this.checked){
       $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
       var sale_id     = $("#sale_id").val() || 0;
       var customer_id = $(this).attr('data-ref');
       var customer_name = $(this).children("td:nth-child(3)").text();
-
+      console.log(sale_id);
       if(sale_id != 0){
               // var url = "/"+customer_id;
               update_sale(customer_id, customer_name,sale_id);
@@ -433,7 +459,7 @@
     }, function () {
       $.ajax({
         type: "POST",
-        url: "update_sale" ,
+        url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,
         data: {customer_id:customer_id,sale_id:sale_id},
         dataType: "json",
         success: function(data) {
@@ -441,13 +467,25 @@
           {
             var id       = $("#table_id").val();
             var type     = $("#type").val();
+            var booking_id = "";
+            <% if !@booking_order.nil? %>
+              booking_id = "<%= @booking_order.booking_id %>";
+            <% end %>
             if (cashier_type == "quick_service") {
-               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
-            }else{
-              if (type=="Table") {
-                window.location.href = '/origami/table/'+id
+              if(booking_id!= "" && page == "pending"){
+                window.location.href = '/origami/'+cashier_type+'/pending_order/'+booking_id;
               }else{
-               window.location.href = '/origami/room/'+id
+               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
+              }
+            }else{
+              if(page == "payment"){
+                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
+              }else{
+                if (type=="Table") {
+                  window.location.href = '/origami/table/'+id
+                }else{
+                 window.location.href = '/origami/room/'+id
+                }
               }
             }
           }else{
@@ -460,17 +498,25 @@
   }
 
   $('#back').on('click',function(){
-    var id       = $("#table_id").val()
-    var type     = $("#type").val()
-    var sale_id  = $("#sale_id").val()
+    var id       = $("#table_id").val();
+    var type     = $("#type").val();
+    var sale_id  = $("#sale_id").val();
     if (cashier_type == "quick_service") {
       window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
     }else{
-      if (type=="Table") {
-          window.location.href = '/origami/table/'+id
+      if(page == "pending"){
+        window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/pending/';
+      }
+      else if(page == "payment"){
+        window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+      }else{
+        if (type=="Table") {
+          window.location.href = '/origami/table/'+id;
         }else{
-         window.location.href = '/origami/room/'+id
-       }
+          window.location.href = '/origami/room/'+id;
+        }
+      }
+      
     }
     
  })
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index bd682b96..6f341572 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -50,11 +50,11 @@
                             <% end %>                         
                                 <div class="card-block">
                                   <%= table.name %>
-                                  <% if !@order_items_count.nil? %>
+                                  <!-- <% if !@order_items_count.nil? %>
                                     <% if @order_items_count.key?(table.id) %>
                                       (Orders : <%= @order_items_count[table.id] %>)
                                     <% end %>
-                                  <% end %>
+                                  <% end %> -->
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
@@ -67,11 +67,11 @@
                             <% end %>                   
                             <div class="card-block">
                                 <%= table.name %> 
-                                <% if !@order_items_count.nil? %>
+                                <!-- <% if !@order_items_count.nil? %>
                                   <% if @order_items_count.key?(table.id) %>
                                     (Orders : <%= @order_items_count[table.id] %>)
                                   <% end %>
-                                <% end %>
+                                <% end %> -->
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                               </div>
                             </div>
@@ -97,11 +97,11 @@
                           <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">
                               <%= room.name %>
-                              <% if !@order_items_count.nil? %>
+                              <!-- <% if !@order_items_count.nil? %>
                                 <% if @order_items_count.key?(room.id) %>
                                   (Orders : <%= @order_items_count[room.id] %>)
                                 <% end %>
-                              <% end %>
+                              <% end %> -->
                                   <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                             </div>
                           </div>
@@ -109,11 +109,11 @@
                             <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                               <div class="card-block">
                                 <%= room.name %>
-                                <% if !@order_items_count.nil? %>
+                                <!-- <% if !@order_items_count.nil? %>
                                   <% if @order_items_count.key?(room.id) %>
                                     (Orders : <%= @order_items_count[room.id] %>)
                                   <% end %>
-                                <% end %>
+                                <% end %> -->
                                     <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                               </div>
                             </div>
@@ -196,7 +196,7 @@
               <div class="card-title">
                 <div class="row p-l-5 p-r-5">
                   <% if (!@sale_array.empty?) && (!@date.nil?) %>
-                    <div class="col-lg-6 col-md-6 col-sm-6">
+                    <div class="col-lg-8 col-md-8 col-sm-8">
                       &nbsp; Receipt No: <span id="receipt_no">
                          <% if @status_sale == 'sale' %>
                           <%= @sale_array[0].receipt_no rescue '' %>
@@ -204,7 +204,7 @@
                        </span>
                        <br>
                     </div>
-                    <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+                    <div class="col-lg-4 col-md-4 col-sm-4 text-right">
                       Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %></span>
                       <br>
                     </div>
@@ -425,10 +425,7 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
-          <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
-          <% end %>
-          <% if current_login_employee.role != "waiter" %>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
@@ -455,10 +452,10 @@
                 <% if current_login_employee.role != "waiter" %>
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
-                  
+                <% end %>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
-                <% end %>
+                
                   <% if !@split_bill.nil? %>
                     <% if @split_bill == '1' %>
                       <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
@@ -515,7 +512,6 @@
                     </div>
                 </div>
             </div>
-          <% end %>
         </div>
     </div>
 </div>
@@ -544,7 +540,7 @@
   </div>
 </div>
 <script>
-  cashier_type = "cashier"
+  var cashier_type = "cashier";
     $(document).ready(function () {
       /* start check first bill or not*/
         var receipt_no = "";
@@ -627,7 +623,7 @@
             }
             var table_id = $('.tables').attr("data-id");
 
-            window.location.href = '/origami/' + sale_id+"/"+cashier_type + "/customers"
+            window.location.href = '/origami/' + sale_id+"/"+cashier_type + "/customers/normal";
 
         });
 
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 03d90a07..49d95e80 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -199,25 +199,25 @@
     $("#reference_no_Err").html("");
     if(reference_no.length > 0){
       if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-        $(this).off("click");
-        //start member discount 5% by pay card  
-          // var sub_total = $('#sub-total').text();
-          // var member_id = $('#membership_id').text();
-          // var member_discount = $('#member_discount').text();
-          // if (member_id && member_discount) {
-          //   $.ajax({
-          //     type: "POST",
-          //     url: "/origami/" + sale_id + "/member_discount",
-          //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-          //           // success:function(result){           
-          //           // }
-          //         });
-          // }
-        //end member discount
-        if(bank_integration == '1'){
-          $("#reference_no").val("");
-          pay_withBank("SALE", "master", amount, sale_id, receipt_no);
-        }else{
+        
+      $(this).off("click");
+      //start member discount 5% by pay card  
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //           // success:function(result){           
+        //           // }
+        //         });
+        // }
+      //end member discount
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "master", amount, sale_id, receipt_no,cashier_type);
+      }else{
           $.ajax({type: "POST",
             url: "<%= origami_payment_master_path %>",
             data: "amount="+ amount + "&sale_id="+ sale_id,
diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb
index 9ff2f6e9..b46834ca 100755
--- a/app/views/origami/moveroom/move_dining.html.erb
+++ b/app/views/origami/moveroom/move_dining.html.erb
@@ -44,11 +44,15 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" >
          <% @rooms.each do |room| %>
          <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-           <div class="card-block">
-              <%= room.name %>
-           </div>
-         </div>
+          <% if room.get_booking.nil? %>
+            <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+          <% else %>
+            <div class="card rooms blue text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+          <% end %>
+              <div class="card-block">
+                  <%= room.name %>
+              </div>
+            </div>
          <% else %>
          <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
            <div class="card-block">
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 131407f0..4385cad7 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -59,18 +59,22 @@
            <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" >
              <% @rooms.each do |room| %>
              <% if room.status == 'occupied' %>
-             <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-               <div class="card-block">
+              <% if room.get_booking.nil? %>
+                 <div class="card rooms red text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+              <% else %>
+                <div class="card rooms blue text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+              <% end %>
+                  <div class="card-block">
+                    <%= room.name %>
+                  </div>
+                </div>
+            <% else %>
+            <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
+              <div class="card-block">
                 <%= room.name %>
               </div>
             </div>
-            <% else %>
-            <div class="card rooms green text-white" data-id="<%= room.id %>" data-name="<%= room.name %>">
-             <div class="card-block">
-              <%= room.name %>
-            </div>
-          </div>
-          <% end %>
+            <% end %>
           <% end %>
         </div>
       </div>
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index caa0c9e9..51a6bdc4 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -122,10 +122,11 @@
 	</div>
 </div>
 <script>
+	var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
-		var cashier_type = "<%= @cashier_type %>";
+		
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
@@ -219,36 +220,36 @@
 			    //          });
 				// }
 		    //end member discount
-		    	if(bank_integration == '1'){
-		    		$("#reference_no").val("");
-		      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
-		      	}else{
-		      		$.ajax({type: "POST",
-			          url: "<%= origami_payment_mpu_path %>",
-			          data: "amount="+ amount + "&sale_id="+ sale_id,
-			          success:function(result){
-			            if(result){
-			              swal({
-			                title: "Information!",
-			                text: "Payment Successfully",
-			                html: true,
-			            closeOnConfirm: false,
-			            closeOnCancel: false,
-			            allowOutsideClick: false
-			              }, function () {
-			                window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment";
-			              });
-			            }
-			          }
-			        });
-		      	}
-		    }else{
+	    	if(bank_integration == '1'){
+	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no,cashier_type);
+	      	}else{
+	      		$.ajax({type: "POST",
+		          url: "<%= origami_payment_mpu_path %>",
+		          data: "amount="+ amount + "&sale_id="+ sale_id,
+		          success:function(result){
+		            if(result){
+		              swal({
+		                title: "Information!",
+		                text: "Payment Successfully",
+		                html: true,
+		            closeOnConfirm: false,
+		            closeOnCancel: false,
+		            allowOutsideClick: false
+		              }, function () {
+		                window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment";
+		              });
+		            }
+		          }
+		        });
+	      	}
+
+	     }else{
 		     	if (amount>0) {
-			        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+		        	swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
 			    }else{
 			        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
 			    }
-		    }
+		 	}
 		}else{
 		 	$("#reference_no_Err").html("can't be blank");
 		}
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index cb213a38..8dc9fe02 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -33,7 +33,7 @@
             </div>
             
             <div class="row p-l-5 p-r-5">
-              <div class="col-lg-6 col-md-6 col-sm-6"><strong>Customer :</strong> <%= @sale_data.customer.name%> <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
+              <div class="col-lg-6 col-md-6 col-sm-6"><strong>Customer :</strong> <span id="customer_name"> <%= @sale_data.customer.name%></span>  <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
                 <span class="hidden" id="member_discount"><%= @member_discount%></span></div>
               <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Checkin Time : </strong> <%if !@checkin_time.nil?%><%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %>
               <%end%></div>
@@ -384,10 +384,90 @@
       </div>
     </div>
   </div>
-</div>       
-<script>
+</div>  
+
+<!-- pdf light box -->
+<div class="modal fade" id="pdfModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-md" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="pdfModalLabel"></h4>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" name="sale_receipt_no" id="sale_receipt_no">
+        <input type="hidden" name="filename" id="filename">
+        <input type="hidden" name="printer_name" id="printer_name">
+        <p id="changed_amount"></p>
+        <div class="text-center">
+          <iframe id="receipt_pdf" src="" style="width: 400px; height: 600px;"></iframe>
+        </div>
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <% if ENV["SERVER_MODE"] != 'cloud' %>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
+          </div>
+          <% end %>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>   
+
+<!-- customer light box -->
+<div class="modal fade" id="is_memberModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-md" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h3 class="modal-title" id="is_memberModalLabel">Are you Member?</h3>
+      </div>
+      <div class="modal-body">
+        <div class="row text-center">
+          <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+          <input type="hidden" name="qr_code" id="qr_code" />
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-green waves-effect btn_customer_yes">Yes</button>
+          </div>
+
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">No</button>
+          </div>
+
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Member</button>
+          </div>
+
+          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR</button>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer"></div>
+    </div>
+  </div>
+</div>   
+
+<div id="sxModal">
+  <div id="sxModal-Content"><h3>Card Tap</h3></div>
+</div> 
+
+<script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>"; 
+var customer_id = "<%= @customer.id %>";
+var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
+    //start customer modal popup
+    if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+      if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
+        $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
+      }
+    }
+
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
         var member_discount = $('#member_discount').text();
@@ -402,7 +482,6 @@ var cashier_type = "<%= @cashier_type %>";
           console.log("ssssssssssss")
           payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
           if (member_id && member_discount) {
-console.log("fffffffffffff")
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
             } else{
@@ -436,6 +515,188 @@ console.log("fffffffffffff")
       $('#cash').text(localStorage.getItem("cash"));
     }
     update_balance();
+
+    // Disable click event cash to prevent
+    $(".payment .cash-color").off('click');
+
+    $('#credit_payment').click(function() {
+      var sale_id = $('#sale_id').text();
+      window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment/credit_payment"
+      return false;
+    });
+
+    $('#card_payment').click(function() {
+      localStorage.setItem("cash",$('#cash').text() );
+      var sale_id = $('#sale_id').text();
+      window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment"
+      return false;
+    });
+
+    $('#pay').click(function() {
+      sub_total = $('#sub-total').text();
+      if (payment_type == 'MPU' && $('.mpu').text() == 0 && sub_total != 0.0) {
+          swal("Oops","Please Pay with MPU Payment","warning");
+      }else if(payment_type == "Redeem" && $('#ppamount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with Redeem Payment","warning");
+      }else if(payment_type == "VISA" && $('#visacount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with Visa Payment","warning");
+        
+      }else if(payment_type == "JCB" && $('#jcbcount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with jcb Payment","warning");
+      }
+      else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with Master Payment","warning");
+      }
+      else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with UNIONPAY Payment","warning");
+      }
+      else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with Credit Payment","warning");
+      }else{
+
+        $( "#loading_wrapper").show();
+        if($('#balance').text() > 0){
+          swal ( "Oops", "Insufficient Amount!" ,  "error" );
+          $("#loading_wrapper").hide();
+        }else{
+          $(this).off("click");
+          var sale_id   = $('#sale_id').text();
+          // var item_row  = $('.is_card');
+
+          //  payment
+            var cash   = $('#cash').text();
+            var credit = $('#credit').text();
+            var card   = $('#card').text();
+
+            if (credit <= 0) {
+              calculate_member_discount(sale_id);
+            }
+            
+            $.ajax({type: "POST",
+              url: "<%= origami_payment_cash_path %>",
+              data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type,
+              success:function(result){
+                /* start delete receipt no in first bill*/
+                if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+                  var receipt_no = ($("#receipt_no").html()).trim();
+                  deleteReceiptNoInFirstBillData(receipt_no);
+                }
+                /* end delete receipt no in first bill*/
+
+                localStorage.removeItem("cash");             
+                if (result.status) {
+                  var msg = result.message;
+                }
+                else{
+                  var msg = '';
+                }
+
+                $("#loading_wrapper" ).hide();
+
+                //PDF lightbox data
+                $("#sale_receipt_no").val(result.receipt_no);
+                $("#filename").val(result.filename);
+                $("#printer_name").val(result.printer_name);
+                $("#receipt_pdf").attr("src", result.filename);
+                $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
+                $("#pdfModalLabel").text("Payment Successful!");
+                $("#changed_amount").text("");
+                if($('#balance').text() < 0){
+                  <% if precision.to_i > 0 %>
+                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
+                  <% else %>
+                    $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
+                  <% end %>
+                }
+                //PDF lightbox data 
+                // if($('#balance').text() < 0){
+                //   swal({
+                //     title: "Payment Successful!",
+                //     text: 'Changed amount  ' + $('#balance').text() * (-1),
+                //     html: true,
+                //     closeOnConfirm: false,
+                //     closeOnCancel: false,
+                //     allowOutsideClick: false
+                //   }, function () {
+                //     if (cashier_type=="cashier") {
+                //       window.location.href = '/origami';
+                //     }else{
+                //       window.location.href = '/origami/quick_service';
+                //     }           
+                //   });
+                // }else{         
+                //   $('#pay').text("Pay");
+                //   swal({
+                //    title: "Payment Successful!",
+                //    text: 'Thank You !',
+                //    html: true,
+                //    closeOnConfirm: false, 
+                //    closeOnCancel: false,
+                //    allowOutsideClick: false
+                //  }, function () {
+                //   if (cashier_type=="cashier") {
+                //     window.location.href = '/origami';
+                //   }else{
+                //     window.location.href = '/origami/quick_service';
+                //   }                
+                // });
+                // }
+              }
+            });
+          }
+        }
+    });
+  
+    // $('#void').on('click',function () {
+    //   if ($(this).attr('active') === "true") { 
+    //         var sale_id = $('#sale_id').text();
+    //         var remark  = $("#remark").val();
+    //         var ajax_url = "/origami/sale/" + sale_id + '/void';
+    //         $.ajax({
+    //           type: 'POST',
+    //           url: ajax_url,
+    //           data: "remark="+ remark + "&sale_id=" + sale_id,
+    //           success: function () {
+    //              window.location.href = '/origami/';
+    //           }
+    //         })
+    //   }else{
+    //     swal("Opps","You are not authorized for void","warning")
+    //   }
+    // });
+    $('#void').on('click', function () {
+      if ($(this).attr('active')=== "true") {
+        swal({
+            title: "Alert",
+            text: "Are you sure want to Void?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, void it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+            var sale_id = $('#sale_id').text();
+            var remark  = $("#remark").val();
+            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            $.ajax({
+              type: 'POST',
+              url: ajax_url,
+              data: "remark="+ remark + "&sale_id=" + sale_id,
+              success: function () {
+               if (cashier_type=="cashier") {
+                 window.location.href = '/origami';
+               }else{
+                 window.location.href = '/origami/quick_service';
+               } 
+              }
+            })
+          }
+        }); 
+      }else{
+        swal("Oops","You are not authorized for void","warning")
+      }
+    });
   });
 
   // bind survey to order or sale
@@ -447,7 +708,7 @@ console.log("fffffffffffff")
       var sale_id = $('#dining').text();
     }
     //var table_id = $('.tables').attr("data-id");            
-     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
+     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys";
   });
 
   // bind customer to order or sale
@@ -459,7 +720,7 @@ console.log("fffffffffffff")
       var sale_id = $('#save_order_id').attr('data-order');
      }
     var table_id = $('.tables').attr("data-id");
-    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers"
+    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers/payment";
   });
 
   // Add Other Charges
@@ -529,6 +790,9 @@ console.log("fffffffffffff")
           $('#cash').text(input_value);
           update_balance();
         }else{
+          if($('#cash').text() == '0'){
+            $('#cash').text("");
+          }
           $('#cash').append(input_value);
           update_balance();
         }
@@ -577,174 +841,6 @@ console.log("fffffffffffff")
     }
   });
 
-  $( document ).ready(function() {
-     
-    // Disable click event cash to prevent
-    $(".payment .cash-color").off('click');
-
-    $('#credit_payment').click(function() {
-      var sale_id = $('#sale_id').text();
-      window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment/credit_payment"
-      return false;
-    });
-
-    $('#card_payment').click(function() {
-      localStorage.setItem("cash",$('#cash').text() );
-      var sale_id = $('#sale_id').text();
-      window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment"
-      return false;
-    });
-
-    $('#pay').click(function() {
-      sub_total = $('#sub-total').text();
-      if (payment_type == 'MPU' && $('.mpu').text() == 0 && sub_total != 0.0) {
-          swal("Oops","Please Pay with MPU Payment","warning");
-      }else if(payment_type == "Redeem" && $('#ppamount').text()==0 && sub_total != 0.0){
-          swal("Oops","Please Pay with Redeem Payment","warning");
-      }else if(payment_type == "VISA" && $('#visacount').text()==0 && sub_total != 0.0){
-          swal("Oops","Please Pay with Visa Payment","warning");
-        
-      }else if(payment_type == "JCB" && $('#jcbcount').text()==0 && sub_total != 0.0){
-          swal("Oops","Please Pay with jcb Payment","warning");
-      }
-      else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
-          swal("Oops","Please Pay with Master Payment","warning");
-      }
-      else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){
-          swal("Oops","Please Pay with UNIONPAY Payment","warning");
-      }
-      else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
-          swal("Oops","Please Pay with Credit Payment","warning");
-      }else{
-
-        $( "#loading_wrapper").show();
-        if($('#balance').text() > 0){
-          swal ( "Oops", "Insufficient Amount!" ,  "error" );
-          $("#loading_wrapper").hide();
-        }else{
-          $(this).off("click");
-          var sale_id   = $('#sale_id').text();
-          // var item_row  = $('.is_card');
-
-          //  payment
-            var cash   = $('#cash').text();
-            var credit = $('#credit').text();
-            var card   = $('#card').text();
-
-            if (credit <= 0) {
-              calculate_member_discount(sale_id);
-            }
-            
-            $.ajax({type: "POST",
-              url: "<%= origami_payment_cash_path %>",
-              data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type,
-              async: false,
-              success:function(result){
-                /* start delete receipt no in first bill*/
-                if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
-                  var receipt_no = ($("#receipt_no").html()).trim();
-                  deleteReceiptNoInFirstBillData(receipt_no);
-                }
-                /* end delete receipt no in first bill*/
-
-                localStorage.removeItem("cash");             
-                if (result.status) {
-                  var msg = result.message;
-                }
-                else{
-                  var msg = '';
-                }
-                $( "#loading_wrapper" ).hide();
-                if($('#balance').text() < 0){
-                  swal({
-                    title: "Payment Successful!",
-                    text: 'Changed amount  ' + $('#balance').text() * (-1),
-                    html: true,
-                    closeOnConfirm: false,
-                    closeOnCancel: false,
-                    allowOutsideClick: false
-                  }, function () {
-                    if (cashier_type=="cashier") {
-                      window.location.href = '/origami';
-                    }else{
-                      window.location.href = '/origami/quick_service';
-                    }                    
-                  });
-                }else{         
-                  $('#pay').text("Pay");
-                  swal({
-                   title: "Payment Successful!",
-                   text: 'Thank You !',
-                   html: true,
-                   closeOnConfirm: false, 
-                   closeOnCancel: false,
-                   allowOutsideClick: false
-                 }, function () {
-                  if (cashier_type=="cashier") {
-                    window.location.href = '/origami';
-                  }else{
-                    window.location.href = '/origami/quick_service';
-                  }                  
-                });
-                }
-              }
-            });
-          }
-        }
-    });
-
-    // $('#void').on('click',function () {
-    //   if ($(this).attr('active') === "true") { 
-    //         var sale_id = $('#sale_id').text();
-    //         var remark  = $("#remark").val();
-    //         var ajax_url = "/origami/sale/" + sale_id + '/void';
-    //         $.ajax({
-    //           type: 'POST',
-    //           url: ajax_url,
-    //           data: "remark="+ remark + "&sale_id=" + sale_id,
-    //           success: function () {
-    //              window.location.href = '/origami/';
-    //           }
-    //         })
-    //   }else{
-    //     swal("Opps","You are not authorized for void","warning")
-    //   }
-    // });
-    $('#void').on('click', function () {
-      if ($(this).attr('active')=== "true") {
-        swal({
-            title: "Alert",
-            text: "Are you sure want to Void?",
-            type: "warning",
-            showCancelButton: true,
-            confirmButtonColor: "#DD6B55",
-            confirmButtonText: "Yes, void it!",
-            closeOnConfirm: false
-        }, function (isConfirm) {
-          if (isConfirm) {
-            var sale_id = $('#sale_id').text();
-            var remark  = $("#remark").val();
-            var ajax_url = "/origami/sale/" + sale_id + '/void';
-            $.ajax({
-              type: 'POST',
-              url: ajax_url,
-              data: "remark="+ remark + "&sale_id=" + sale_id,
-              success: function () {
-               if (cashier_type=="cashier") {
-                 window.location.href = '/origami';
-               }else{
-                 window.location.href = '/origami/quick_service';
-               } 
-              }
-            })
-          }
-        }); 
-      }else{
-        swal("Oops","You are not authorized for void","warning")
-      }
-    });
-  });
-
   function update_balance(){
     var cash = $('#cash').text();
     var credit = $('#credit').text();
@@ -809,7 +905,7 @@ console.log("fffffffffffff")
         }else{
           swal("Oops","You are not authorized for foc","warning")
         }
-      });
+  });
 
   function calculate_member_discount(sale_id) {
    var sub_total = $('#sub-total').text();
@@ -823,14 +919,167 @@ console.log("fffffffffffff")
      }else{
       is_card = true
      }
-    $.ajax({
-      type: "POST",
-      url: "/origami/" + sale_id + "/member_discount",
-      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
-      async: false,
-      success:function(result){ 
+      $.ajax({
+        type: "POST",
+        url: "/origami/" + sale_id + "/member_discount",
+        data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+        async: false,
+        success:function(result){ 
+        }
+      });
+    }
+  }
+
+  //print pdf function
+  $(".print_receipt").on('click',function(){
+    var sale_id   = $('#sale_id').text();
+    var filename = $("#filename").val();
+    var printer_name = $("#printer_name").val();
+    var receipt_no = $("#sale_receipt_no").val();
+    var params = { 'filename':filename, 'receipt_no':receipt_no, 'printer_name':printer_name };
+    
+    // swal({
+    //     title: "Alert",
+    //     text: "Are you sure want to print?",
+    //     type: "warning",
+    //     showCancelButton: true,
+    //     confirmButtonColor: "#DD6B55",
+    //     confirmButtonText: "Print",
+    //     closeOnConfirm: false
+    // }, function (isConfirm) {
+    //   if (isConfirm) {
+          $.ajax({
+            type: "POST",            
+            url: "/origami/sale/"+sale_id+"/"+cashier_type+"/payment/print",
+            data: params,
+            success:function(result){
+              console.log(result);
+              if (cashier_type=="cashier") {
+                window.location.href = '/origami';
+              }else{
+                window.location.href = '/origami/quick_service';
+              } 
+            }
+          });
+    //   }
+    // }); 
+    
+  });
+  
+
+  $(".btn_pdf_close").on('click',function(){
+    if (cashier_type=="cashier") {
+      window.location.href = '/origami';
+    }else{
+      window.location.href = '/origami/quick_service';
+    } 
+  });
+
+  $(".btn_customer_yes").on('click',function(){
+    var sale_id = $('#sale_id').text();
+    window.location.href = "/origami/"+sale_id+"/"+cashier_type+"/customers/payment";
+  });
+
+  // Read Card Reader
+  $(".btn_member").on('click', function(){  
+    var cardNo = ""; 
+    var customer_id = '';
+    var customer_name = '';
+    var membership_id = '';
+    var membership_type = '';
+    var sale_id     = $("#sale_id").text() || 0;
+    var customer_mamber_card_no = 0;
+
+    $("#is_memberModal").hide();
+    $("#sxModal").show();   
+    setTimeout(function(){
+      getCardNo();
+      $("#sxModal").hide();        
+      customer_mamber_card_no = $("#paypar_account_no").val();
+      
+      if(sale_id != 0 && customer_mamber_card_no != 0){    
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/get_customer" ,
+          data: { filter : customer_mamber_card_no ,type :"card"},
+          dataType: "json",
+          success: function(data) {
+            if (data[0].customer_id == false) {
+              swal("Alert!", data[0].message, "error");
+            }else{
+              customer_id = data[0].customer_id;
+              customer_name = data[0].name;
+              membership_id = data[0].membership_id;
+              membership_type = data[0].membership_type;
+              update_sale(membership_id, customer_id, customer_name,sale_id);
+            }
+
+          }
+        });                
       }
+    },100);
+  });
+
+  // Read NFC card no from java
+  function getCardNo(){
+    code2lab.readNFC();
+  }
+
+  // get CardNo from Java
+  function setCardNo(cardNo){
+    if(cardNo.length == 16){
+      $("#paypar_account_no").val(cardNo);
+    }
+  }
+
+  // QR Code Reader
+  $(".btn_qr_code").on('click', function(e){
+    $("#is_memberModal").hide();
+    var code = "";        
+    setTimeout(function(){
+       code=getQRCode(); 
+       $("#qr_code").val(code);          
+    },100);
+  });
+
+  // Read qrcode from java
+  function getQRCode(){
+    return code2lab.readQRCode();
+  }
+
+  function update_sale(membership_id, customer_id, customer_name, sale_id) {
+    var customer="";
+    if(customer_name != ""){
+      customer = '(' + customer_name + ')';
+    }
+
+    swal({
+      title: "Confirmation !",
+      text: 'Are You Sure to assign this customer' + customer + '!',
+      showCancelButton: true,
+      confirmButtonColor: "green",
+      confirmButtonText: "Yes!",
+      cancelButtonClass: 'btn btn-danger',
+      closeOnConfirm: false,
+    }, function () {
+      $.ajax({
+        type: "POST",
+        url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,
+        data: {customer_id:customer_id,sale_id:sale_id},
+        dataType: "json",
+        success: function(data) {
+          if(data.status == true)
+          {
+            //change customer detail
+            $("#customer_name").html(customer_name);
+            $("#membership_id").html(membership_id);
+            window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+          }else{
+            swal("Alert!", "Record not found!", "error");
+            location.reload();
+          }
+        }
+      });        
     });
   }
-}
 </script>
\ No newline at end of file
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index d94a81d5..fade7ccb 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -153,6 +153,14 @@
    <% if current_user.role != "waiter" || @status != "sale"%>
    <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
    <%end%>
+   <!-- <% if @status != "order"%>
+   <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
+   <% end %>
+   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
+   <% if @status != "order"%>
+    <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
+    <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
+  <% end %> -->
    <% if current_user.role != "waiter" && @status != "order"%>
       <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
    <%end%>
@@ -163,6 +171,7 @@
 </div>
 </div>
 <script>
+var cashier_type = "quick_service";
 $(document).ready(function(){
   $(".sales").on('click',function(){
       var sale_id = $(this).attr("data-id");
@@ -203,5 +212,61 @@ $(document).ready(function(){
           }
       });   
     });
+
+    // bind survey to order or sale
+  $("#survey").on('click', function () {
+    var sale_id = $('#sale_id').val();        
+     window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys";
+  });
+
+  // bind customer to order or sale
+  $("#customer").on('click', function () {
+    var sale = $('#sale_id').val();
+
+    if (sale.includes("SAL")) {
+      var sale_id = sale;
+    } else {
+      var sale_id = $('#save_order_id').val();
+    }
+    window.location.href = '/origami/' + sale_id + "/"+cashier_type+"/customers/pending";
+  });
+
+  // Add Other Charges
+  $('#other-charges').click(function () {
+    var sale = $('#sale_id').val();
+    if (sale != "") {
+      var sale_id = sale
+    } else {
+      var sale_id = $('#save_order_id').val();
+    }
+    if (sale_id != "") {
+      window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/other_charges';
+    }
+    else {
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+    }
+    return false;
+  });
+  // Discount for Payment
+  $('#discount').click(function () {
+    if ($(this).attr('active')=== "true") {
+      var sale = $('#sale_id').val();
+      if (sale != "") {
+        var sale_id = sale
+      } else {
+        var sale_id = $('#save_order_id').val();
+      }
+
+      if (sale_id != "") {
+        window.location.href = '/origami/' + sale_id + "/"+cashier_type+'/discount';
+      }
+      else {
+        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+      }
+    }else{
+      swal("Oops","You are not authorized for Discount","warning")
+    }
+    return false;
+  });
 });
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4cd6a846..1edb07cf 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -50,11 +50,11 @@
                 <% end %>              
                     <div class="card-block">
                        <%= table.name %>
-                      <% if !@order_items_count.nil? %>
+                      <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(table.id) %>
                           (Orders : <%= @order_items_count[table.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
@@ -66,11 +66,11 @@
                   <% end %>           
                     <div class="card-block">
                        <%= table.name %>
-                       <% if !@order_items_count.nil? %>
+                       <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(table.id) %>
                           (Orders : <%= @order_items_count[table.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                     </div>
                   </div>
@@ -97,11 +97,11 @@
                  <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
-                      <% if !@order_items_count.nil? %>
+                      <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(room.id) %>
                           (Orders : <%= @order_items_count[room.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                       <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                       <div  style="font-size:12px;"></div>
                    </div>
@@ -110,11 +110,11 @@
                  <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
-                      <% if !@order_items_count.nil? %>
+                      <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(room.id) %>
                           (Orders : <%= @order_items_count[room.id] %>)
                         <% end %>
-                      <% end %>
+                      <% end %> -->
                       <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                    </div>
                  </div>
@@ -193,12 +193,15 @@
          <div class="card-title row p-l-5 p-r-5">
            
             <% if @status_sale == 'sale' %>
-            <div class="col-lg-6 col-md-6 col-sm-6">
+            <div class="col-lg-8 col-md-8 col-sm-8">
             &nbsp;  Receipt No: 
               <span id="receipt_no">
                  <%= @obj_sale.receipt_no rescue '' %>
               </span>
               </div>
+              <div class="col-lg-4 col-md-4 col-sm-4 text-right">
+                Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
+               </div>
              <% else %>
              <div class="col-lg-7 col-md-7 col-sm-7">
              &nbsp; Order No: 
@@ -206,17 +209,10 @@
                  <%= @obj_order.order_id rescue '' %>
               </span>
               </div>
-            <% end %>
-           <% if @status_sale == 'sale' %>
-            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-            Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
-           </div>
-             <% else %>
-               <div class="col-lg-5 col-md-5 col-sm-5 text-right">
+              <div class="col-lg-5 col-md-5 col-sm-5 text-right">
                 Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-'%></span>
                </div>
             <% end %>
-           
          </div>
          <div class="card-title row customer_detail p-l-5 p-r-5" >
            <div class="col-lg-6 col-md-6 col-sm-6">
@@ -396,10 +392,7 @@
    <!-- Waiter Buttons -->
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i> Back</button>
    <button type="button" id="add_order" class="btn btn-block btn- bg-blue waves-effect">Add Order</button>
-   <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
    <button type="button" id="survey" class="btn btn-block bg-blue waves-effect">Survey</button>
-   <% end %>
-   <% if current_login_employee.role != "waiter" %>
    <% if @room.bookings.length >= 1 %>
      <% if @status_order == 'order' && @status_sale != 'sale' %>
        <!-- <button type="button" class="btn bg-blue btn-block" >Add Order</button> -->
@@ -423,14 +416,14 @@
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
         <% if current_login_employee.role != "waiter" %>
+        <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
+        <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
         <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
         <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
+        <% end %>
         <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
-        <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
-        <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-        <% end %>
         <% if !@split_bill.nil? %>
           <% if @split_bill == '1' %>
             <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
@@ -485,11 +478,11 @@
      <% end %>
    <!-- <button type="button" id="re-print" class="btn bg-blue btn-block" >Re.Print</button> -->
    <% end %>
-   <% end %>
  </div>
 </div>
 </div>
 <script>
+var cashier_type = "cashier";
 $(document).ready(function(){
   // $(".tables").on('click', function(){
   //     var customer_id=$(".customer-id").text();
@@ -585,7 +578,7 @@ $(document).ready(function(){
                 var sale_id = "<%= @room.id %>";
             }
             //var table_id = $('.tables').attr("data-id");            
-            window.location.href = '/origami/' + sale_id + "/surveys"
+            window.location.href = '/origami/' + sale_id +"/"+cashier_type+ "/surveys"
         });
   // bind customer to order or sale
   $("#customer").on('click', function(){
@@ -597,7 +590,7 @@ $(document).ready(function(){
     }
     var table_id = $('.tables').attr("data-id");
 
-    window.location.href = '/origami/'+ sale_id  + "/customers"
+    window.location.href = '/origami/' + sale_id+"/"+cashier_type + "/customers/normal";
 
   });
 
@@ -620,7 +613,7 @@ $(document).ready(function(){
       }
 
       if (sale_id != "") {
-        window.location.href = '/origami/' + sale_id + '/discount'
+        window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/discount'
       }
       else {
         swal ( "Oops" ,  "Please select an table!" ,  "warning" );
@@ -642,7 +635,7 @@ $(document).ready(function(){
     }
 
     if(sale_id!=""){
-      window.location.href = '/origami/' + sale_id + '/other_charges'
+      window.location.href = '/origami/' + sale_id +"/"+cashier_type+ '/other_charges'
     }
     else {
       swal ( "Oops" ,  "Please select an table!" ,  "warning" );
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 8658f23c..2ecdcda4 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -200,30 +200,30 @@
     var reference_no = $('#reference_no').val();
     var sale_id = "<%= @sale_id %>";
     var receipt_no = "<%= @receipt_no %>";
+
     $("#reference_no_Err").html("");
     if(reference_no.length > 0){
       if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
         $(this).off("click");
-        //start member discount 5% by pay card  
-          // var sub_total = $('#sub-total').text();
-          // var member_id = $('#membership_id').text();
-          // var member_discount = $('#member_discount').text();
-          // if (member_id && member_discount) {
-          //   $.ajax({
-          //     type: "POST",
-          //     url: "/origami/" + sale_id + "/member_discount",
-          //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-          //            success:function(result){           
-          //            }
-          //         });
-          // }
-        //end member discount
-        var bank_integration = "<%= @bank_integration %>";
-        if(bank_integration == '1'){
-          $("#reference_no").val("");
-          pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
-        }
-        else{
+      //start member discount 5% by pay card  
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //            success:function(result){           
+        //            }
+        //         });
+        // }
+      //end member discount
+      var bank_integration = "<%= @bank_integration %>";
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no, cashier_type);
+      }
+      else{
           $.ajax({type: "POST",
             url: "<%= origami_payment_unionpay_path %>",
             data: "amount="+ amount + "&sale_id="+ sale_id,
@@ -241,7 +241,7 @@
                 });
               }
             }
-           });
+          });
         }
       }else{
         if (amount>0) {
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 3cdca7df..2b81db65 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -201,49 +201,48 @@
     console.log(amount);
     console.log($("#validamount").attr("value"));
     $("#reference_no_Err").html("");
-    if(reference_no.length > 0){    
+    if(reference_no.length > 0){ 
       if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-        $(this).off("click");
-        //start member discount 5% by pay card  
-          // var sub_total = $('#sub-total').text();
-          // var member_id = $('#membership_id').text();
-          // var member_discount = $('#member_discount').text();
-          // if (member_id && member_discount) {
-          //   $.ajax({
-          //     type: "POST",
-          //     url: "/origami/" + sale_id + "/member_discount",
-          //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-          //            success:function(result){           
-          //            }
-          //         });
-          // }
-        //end member discount
-        var bank_integration = "<%= @bank_integration %>";
-        if(bank_integration == '1'){
-          $("#reference_no").val("");
-          pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
-        }
-        else{
-          $.ajax({type: "POST",
-            url: "<%= origami_payment_visa_path %>",
-            data: "amount="+ amount + "&sale_id="+ sale_id,
-            success:function(result){
-              if(result){
-                swal({
-                  title: "Information!",
-                  text: "Payment Successfully",
-                  html: true,
-              closeOnConfirm: false,
-              closeOnCancel: false,
-              allowOutsideClick: false
-                }, function () {
-                  window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
-                });
-              }
+      $(this).off("click");
+      //start member discount 5% by pay card  
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //            success:function(result){           
+        //            }
+        //         });
+        // }
+      //end member discount
+      var bank_integration = "<%= @bank_integration %>";
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "visa", amount, sale_id, receipt_no,cashier_type);
+      }
+      else{
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_visa_path %>",
+          data: "amount="+ amount + "&sale_id="+ sale_id,
+          success:function(result){
+            if(result){
+              swal({
+                title: "Information!",
+                text: "Payment Successfully",
+                html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+              });
             }
-           });
-        }
-      }else{
+           }
+        });
+      }
+    }else{
         if (amount>0) {
           swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
         }else{
@@ -253,5 +252,5 @@
     }else{
       $("#reference_no_Err").html("can't be blank");
     }
-  })
+  });
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 6a4c403d..17b3bb0c 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -165,6 +165,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj', :as => "calculate_rouding_adjs"
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => {:format => 'json'}
     get 'sale/:sale_id/:type/payment' => 'payments#show'
+    post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
 
     post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
@@ -198,9 +199,9 @@ scope "(:locale)", locale: /en|mm/ do
 
     #---------Add Customer --------------#
     #resources :customers
-    get '/:sale_id/:type/customers', to: "customers#add_customer"
+    get '/:sale_id/:type/customers/:page', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
-    post '/:sale_id/:type/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
+    post '/:sale_id/:type/customers/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 
diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb
index bd25c970..1c87b505 100755
--- a/db/migrate/20170530072247_create_shops.rb
+++ b/db/migrate/20170530072247_create_shops.rb
@@ -3,6 +3,9 @@ class CreateShops < ActiveRecord::Migration[5.1]
     create_table :shops do |t|
       t.string :logo
       t.string :name, :null => false
+      t.string :shop_code, :null => false
+      t.string :client_name, :null => false
+      t.string :client_code, :null => false
       t.string :address, :null => false
       t.string :township, :null => false
       t.string :city, :null => false
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index 329d3a7c..672953fc 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -6,7 +6,9 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :template  
       t.string  :font, :default => ""    
       t.string  :printer_name, :null => false
-      t.string  :api_settings
+      t.string  :api_settings,
+      t.string  :brand_name
+      t.string  :type
       t.decimal :page_width, :null => false, :default => 210
       t.decimal :page_height, :null => false, :default => 1450
       t.integer :print_copies, :null => false, :default => 1
diff --git a/db/migrate/20180306044939_create_receipts.rb b/db/migrate/20180306044939_create_receipts.rb
new file mode 100644
index 00000000..22f3b0fa
--- /dev/null
+++ b/db/migrate/20180306044939_create_receipts.rb
@@ -0,0 +1,42 @@
+class CreateReceipts < ActiveRecord::Migration[5.1]
+  def change
+    create_table :receipts do |t|
+      t.string  :client_code, :limit => 16, :null => false
+      t.string  :client_name, :null => false
+      t.string  :shop_code, :limit => 16, :null => false
+      t.string  :shop_name, :null => false
+      t.integer :receipt_no, :limit => 8, :null => false
+      t.datetime  :transaction_time, :null => false
+      t.datetime  :receipt_open_time, :null => false
+      t.datetime  :receipt_close_time, :null => false
+      t.decimal :gross_sales, :null => false, :default => 0
+      t.decimal :discount_amount, :null => false, :default => 0
+      t.decimal :sales, :null => false, :default => 0
+      t.decimal :tax_amount, :null => false, :default => 0
+      t.decimal :service_charges, :null => false, :default => 0
+      t.decimal :net_sales, :null => false, :default => 0
+      t.decimal :credit_card_sales, :null => false, :default => 0
+      t.decimal :voucher_sales, :null => false, :default => 0
+      t.decimal :foc_amount,  :null => false, :default => 0
+      t.decimal :staff_meal_amount, :null => false, :default => 0
+      t.decimal :rounding_amount, :null => false, :default => 0
+      t.decimal :raw_wastage_amount, :null => false, :default => 0
+      t.decimal :semi_wastage_amount, :null => false, :default => 0
+      t.decimal :wastage_amount, :null => false, :default => 0
+      t.decimal :spoilage_amount, :null => false, :default => 0
+      t.decimal :sampling_amount, :null => false, :default => 0
+      t.integer :qty, :null => false, :default => 0
+      t.integer :no_of_pax, :null => false, :default => 0
+      t.integer :no_of_adult, :null => false, :default => 0
+      t.integer :no_of_child, :null => false, :default => 0
+      t.string  :terminal_id, :null => false
+      t.string  :employee_code, :limit => 4, :null => false
+      t.string  :employee_name, :null => false
+      t.boolean :is_valid, :null => false, :default => false
+      t.boolean :overing, :null => false, :default => false
+      t.boolean :cancle, :null => false, :default => false
+      t.text    :remarks
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180306045018_create_receipt_details.rb b/db/migrate/20180306045018_create_receipt_details.rb
new file mode 100644
index 00000000..5fd38160
--- /dev/null
+++ b/db/migrate/20180306045018_create_receipt_details.rb
@@ -0,0 +1,43 @@
+class CreateReceiptDetails < ActiveRecord::Migration[5.1]
+  def change
+    create_table :receipt_details do |t|
+      t.string  :client_code, :null => false
+      t.string  :client_name, :null => false
+      t.string  :shop_code, :null => false
+      t.string  :shop_name, :null => false
+      t.string  :receipt_no, :null => false
+      t.datetime  :receipt_date, :null => false
+      t.datetime  :transaction_date, :null => false
+      t.integer :item_sequence, :null => false
+      t.string  :category_code, :null => false
+      t.string  :category_name, :null => false
+      t.string  :sub_category_code, :null => false
+      t.string  :sub_category_name, :null => false
+      t.string  :report_group_code, :null => false
+      t.string  :report_group_name, :null => false
+      t.string  :item_code, :null => false
+      t.string  :item_name, :null => false
+      t.integer :qty, :null => false, :default => 0
+      t.string  :transaction_type, :null => false
+      t.decimal :gross_sales, :null => false, :default => 0
+      t.string  :discount_code, :null => false
+      t.decimal :discount_amount, :null => false, :default => 0
+      t.decimal :sales, :null => false, :default => 0
+      t.decimal :tax_amount, :null => false, :default => 0
+      t.decimal :service_charges, :null => false, :default => 0
+      t.decimal :net_sales, :null => false, :default => 0
+      t.boolean :is_foc,  :null => false, :default => false
+      t.boolean :is_set_item, :null => false, :default => false
+      t.boolean :is_staff_meal, :null => false, :default => false
+      t.boolean :is_raw_wastage, :null => false, :default => false
+      t.boolean :is_semi_wastage, :null => false, :default => false
+      t.boolean :is_wastage, :null => false, :default => false
+      t.boolean :is_spoilage, :null => false, :default => false
+      t.boolean :is_sampling, :null => false, :default => false
+      t.boolean :tax_able, :null => false, :default => false
+      t.boolean :is_void, :null => false, :default => false
+      t.text    :remarks
+      t.timestamps
+    end
+  end
+end
\ No newline at end of file
diff --git a/db/sym_master.sql b/db/sym_master.sql
index 89abaf5b..3677fc2f 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -88,6 +88,10 @@ delete from sym_node;
 	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('cloud', 'sx', 'P');
 
 # Create Trigger for Setting Channel 
+	
+	insert into sym_trigger 
+	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
+	values('seed_generators','seed_generators','setting',current_timestamp,current_timestamp);
 
 	insert into sym_trigger 
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
@@ -119,11 +123,11 @@ delete from sym_node;
 
 	insert into sym_trigger 
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
-	values('tax_profiles','customers','setting',current_timestamp,current_timestamp);
+	values('tax_profiles','tax_profiles','setting',current_timestamp,current_timestamp);
 
 	insert into sym_trigger 
 	(trigger_id,source_table_name,channel_id,last_update_time,create_time)
-	values('display_images','customers','setting',current_timestamp,current_timestamp);
+	values('display_images','display_images','setting',current_timestamp,current_timestamp);
 
 # Create Trigger for Dining Channel 
 
@@ -339,6 +343,11 @@ delete from sym_node;
 # Add triggers for tables with router
 
 # Setting Channel # From cloud to Master
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('seed_generators','cloud_2_sx', 100, current_timestamp, current_timestamp);
+
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('lookups','cloud_2_sx', 100, current_timestamp, current_timestamp);
@@ -376,6 +385,11 @@ delete from sym_node;
 	values('display_images','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 # Setting Channel # From Master to cloud
+
+	insert into sym_trigger_router 
+	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
+	values('seed_generators','sx_2_cloud', 100, current_timestamp, current_timestamp);
+
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
 	values('lookups','sx_2_cloud', 100, current_timestamp, current_timestamp);
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 17dcde74..43ba291e 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -17,6 +17,7 @@ namespace :clear do
     Survey.delete_all
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
+    SeedGenerator.where("id > 1").update(:current => 0, :next => 1)
     puts "Clear Data Done."
   end
 end
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
new file mode 100644
index 00000000..fa24f481
--- /dev/null
+++ b/lib/tasks/receipt.rake
@@ -0,0 +1,238 @@
+namespace :consolidate do
+  desc "Receipt"
+  task :receipt => :environment do
+    Receipt.delete_all
+    sales = Sale.all_receipts
+   
+    shop  = Shop.find(1)
+    sales.each do |sale|
+      receipt = Receipt.new
+      receipt.client_code         = shop.id
+      receipt.client_name         = shop.id
+      receipt.shop_code           = shop.id
+      receipt.shop_name           = shop.id
+      receipt.receipt_no          = sale.receipt_no
+      receipt.transaction_time    = sale.requested_at #requet-at
+      receipt.receipt_open_time   = sale.requested_at #before disco/after tax /after/ser_char
+      receipt.receipt_close_time  = sale.receipt_close_time
+      receipt.gross_sales         = sale.total_amount + sale.total_tax #before disco/after tax /after/ser_char
+      receipt.discount_amount     = sale.total_discount + sale.item_discount
+      receipt.sales               = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn
+      receipt.tax_amount          = sale.total_tax
+      receipt.service_charges     = sale.service_charges
+      receipt.net_sales           = sale.total_amount + sale.total_discount #after disco/before tax / no rounding
+      receipt.credit_card_sales   = sale.mpu_amount + sale.master_amount + sale.visa_amount + sale.jcb_amount + sale.unionpay_amount + sale.credit_amount # 
+      receipt.voucher_sales       = 0
+      receipt.foc_amount          = sale.foc_amount + sale.item_foc
+      receipt.staff_meal_amount   = 0
+      receipt.rounding_amount     = sale.rounding_adjustment
+      receipt.raw_wastage_amount  = 0
+      receipt.semi_wastage_amount = 0
+      receipt.wastage_amount      = 0
+      receipt.spoilage_amount     = 0
+      receipt.sampling_amount     = 0
+      receipt.qty                 = sale.qty
+      receipt.no_of_pax           = 0
+      receipt.no_of_adult         = (sale.adult) ? sale.adult : 0
+      receipt.no_of_child         = (sale.child) ? sale.child : 0
+      receipt.terminal_id         = ShiftSale.find(sale.shift_sale_id).cashier_terminal_id
+      receipt.employee_code       = Employee.find(sale.cashier_id).emp_id
+      receipt.employee_name       = sale.cashier_name
+      receipt.is_valid            = (sale.payment_status=="void") ? false : true #void is false
+      receipt.overing             =false
+      receipt.cancle              = (sale.payment_status=="void") ? false : true # void is cancel
+      receipt.remarks             = sale.remark
+      receipt.save
+    end
+  end
+
+  desc "Receipt Detail"
+  task :receipt_detail => :environment do
+    ReceiptDetail.delete_all
+    sales = Sale.all_receipt_details
+
+    shop  = Shop.find(1)
+
+    sale_id = ''
+    count   = 0
+    @total_qty                 = 0
+    @total_gross_sales         = 0
+    @total_sales               = 0
+    @total_net_sales           = 0
+@z =1
+    @item_sequence = 1
+    sale_count = sales.to_a.count
+    sales.each do |sale|
+
+      if sale.qty > 0
+
+        if sale.item_instance_code !=nil
+          menu_category = MenuCategory.find(MenuItem.find_by_item_code(sale.product_code).menu_category_id)
+          name  = menu_category.name
+          code  = menu_category.code
+          menu_item = MenuItem.find_by_item_code(sale.product_code)
+          menu_name = menu_item.name
+          menu_code = menu_item.item_code
+          menu_type = menu_item.type
+        end
+        if sale.product_code == "Other Charges" && sale.status == "Other Charges"
+          code  = sale.product_code
+          name  = sale.product_code
+          menu_name = sale.product_code
+          menu_code = sale.product_code
+          menu_type = sale.product_code
+        end
+        
+        @receipt_no                = sale.receipt_no
+        @requested_at              = sale.requested_at
+
+        if sale_id == sale.sale_id || count == 0 || @z ==0
+          @total_qty                 += sale.qty
+          @total_gross_sales         += sale.price
+          @total_sales               += sale.price
+          @total_net_sales           += sale.taxable_price
+        end
+
+        if sale_id != sale.sale_id && count !=0 
+
+          receipt = ReceiptDetail.new
+          receipt.client_code         = shop.id
+          receipt.client_name         = shop.id
+          receipt.shop_code           = shop.id
+          receipt.shop_name           = shop.id
+          receipt.receipt_no          = @receipt_no
+          receipt.receipt_date        = @requested_at #requet-at
+          receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
+          receipt.item_sequence       = @item_sequence
+          receipt.category_code       = ''
+          receipt.category_name       = ''
+          receipt.sub_category_code   = 0
+          receipt.sub_category_name   = 0
+          receipt.report_group_code   = 0
+          receipt.report_group_name   = 0
+          receipt.item_code           = ''
+          receipt.item_name           = ''
+          receipt.qty                 = @total_qty
+          receipt.transaction_type    = "Tender"
+          receipt.gross_sales         = @total_gross_sales
+          receipt.discount_code       = ''
+          receipt.discount_amount     = 0
+          receipt.sales               = @total_sales
+          receipt.tax_amount          = 0
+          receipt.service_charges     = 0
+          receipt.net_sales           = @total_net_sales
+          receipt.is_set_item         = false
+          receipt.is_foc              = false
+          receipt.is_staff_meal       = false
+          receipt.is_raw_wastage      = false
+          receipt.is_semi_wastage     = false
+          receipt.is_wastage          = false
+          receipt.is_spoilage         = false
+          receipt.is_sampling         = false
+          receipt.tax_able            = false
+          receipt.is_void             = false 
+          receipt.remarks             = ""
+          receipt.save
+          @type = "Tender"
+          @item_sequence             = 1
+          @total_qty                 = 0
+          @total_gross_sales         = 0
+          @total_sales               = 0
+          @total_net_sales           = 0
+  @z = 0
+        end
+
+        
+        discount_amount = (sale.status=="Discount") ? sale.price : 0
+          receipt = ReceiptDetail.new
+          receipt.client_code         = shop.id
+          receipt.client_name         = shop.id
+          receipt.shop_code           = shop.id
+          receipt.shop_name           = shop.id
+          receipt.receipt_no          = sale.receipt_no
+          receipt.receipt_date        = sale.requested_at #requet-at
+          receipt.transaction_date    = sale.requested_at #before disco/after tax /after/ser_char
+          receipt.item_sequence       = @item_sequence
+          receipt.category_code       = name
+          receipt.category_name       = code
+          receipt.sub_category_code   = 0
+          receipt.sub_category_name   = 0
+          receipt.report_group_code   = 0
+          receipt.report_group_name   = 0
+          receipt.item_code           = menu_name
+          receipt.item_name           = menu_code
+          receipt.qty                 = sale.qty
+          receipt.transaction_type    = (sale.status==nil) ? "Sales" : sale.status
+          receipt.gross_sales         = sale.price
+          receipt.discount_code       = sale.sale_item_id
+          receipt.discount_amount     = discount_amount
+          receipt.sales               = sale.price
+          receipt.tax_amount          = 0
+          receipt.service_charges     = 0
+          receipt.net_sales           = sale.taxable_price
+          receipt.is_set_item         = (menu_type=="SetMenuItem")? true : false 
+          receipt.is_foc              = (sale.status=="foc") ? true : false
+          receipt.is_staff_meal       = false
+          receipt.is_raw_wastage      = false
+          receipt.is_semi_wastage     = false
+          receipt.is_wastage          = false
+          receipt.is_spoilage         = false
+          receipt.is_sampling         = false
+          receipt.tax_able            = sale.is_taxable
+          receipt.is_void             = (sale.status=="void")? true : false 
+          receipt.remarks             = sale.remark
+          receipt.save
+      
+      end
+      
+        @z += 1
+     
+
+      count += 1
+      @item_sequence += 1
+      sale_id = sale.sale_id
+    end
+    
+    if count == sale_count
+      receipt = ReceiptDetail.new
+          receipt.client_code         = shop.id
+          receipt.client_name         = shop.id
+          receipt.shop_code           = shop.id
+          receipt.shop_name           = shop.id
+          receipt.receipt_no          = @receipt_no
+          receipt.receipt_date        = @requested_at #requet-at
+          receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
+          receipt.item_sequence       = @item_sequence
+          receipt.category_code       = ''
+          receipt.category_name       = ''
+          receipt.sub_category_code   = 0
+          receipt.sub_category_name   = 0
+          receipt.report_group_code   = 0
+          receipt.report_group_name   = 0
+          receipt.item_code           = ''
+          receipt.item_name           = ''
+          receipt.qty                 = @total_qty
+          receipt.transaction_type    = "Tender"
+          receipt.gross_sales         = @total_gross_sales
+          receipt.discount_code       = ''
+          receipt.discount_amount     = 0
+          receipt.sales               = @total_sales
+          receipt.tax_amount          = 0
+          receipt.service_charges     = 0
+          receipt.net_sales           = @total_net_sales
+          receipt.is_set_item         = false
+          receipt.is_foc              = false
+          receipt.is_staff_meal       = false
+          receipt.is_raw_wastage      = false
+          receipt.is_semi_wastage     = false
+          receipt.is_wastage          = false
+          receipt.is_spoilage         = false
+          receipt.is_sampling         = false
+          receipt.tax_able            = false
+          receipt.is_void             = false 
+          receipt.remarks             = ""
+          receipt.save
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/receipt_detail_spec.rb b/spec/models/receipt_detail_spec.rb
new file mode 100644
index 00000000..017ee888
--- /dev/null
+++ b/spec/models/receipt_detail_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ReceiptDetail, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/receipt_spec.rb b/spec/models/receipt_spec.rb
new file mode 100644
index 00000000..3b140805
--- /dev/null
+++ b/spec/models/receipt_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Receipt, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From bf1b7ecb561334405c8601bdeb9206965604ea8b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 14:59:23 +0630
Subject: [PATCH 407/651] update payment controller if member

---
 app/controllers/origami/payments_controller.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 79c084a6..4508c582 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -152,17 +152,10 @@ class Origami::PaymentsController < BaseOrigamiController
         
         if customer.membership_id != nil && rebate && credit_data.nil?
           member_info    = Customer.get_member_account(customer)
-          puts member_info["status"]
           if member_info["status"] == true
             rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
             current_balance = SaleAudit.paymal_search(sale_id)
-          else
-            rebate_amount  = 0
-            current_balance = 0
-            member_info =nil
           end
-          # rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-          # current_balance = SaleAudit.paymal_search(sale_id)
         end
         
         #for card sale data

From 44389d485a4ac3ec4866e7546f523ed51b129eea Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 17:38:25 +0630
Subject: [PATCH 408/651] update request bill reload in quick service

---
 app/controllers/origami/request_bills_controller.rb | 8 +++++---
 app/views/origami/pending_order/show.html.erb       | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 409177fe..f6dd4e14 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -8,9 +8,7 @@ class Origami::RequestBillsController < ApplicationController
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
-      puts params[:id]
-      puts bk_order
-      puts bk_order.booking_id
+      order = Order.find(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
       
       if check_booking.sale_id.nil?
@@ -29,6 +27,10 @@ class Origami::RequestBillsController < ApplicationController
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
+      if order.source == "quick_service"
+        result = {:status=> @status, :data => @sale.sale_id }
+          render :json => result.to_json
+      end
     else
       @status = false
       @error_message = "No Current Open Shift for This Employee"
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index fade7ccb..d7c929f7 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -203,11 +203,12 @@ $(document).ready(function(){
           url: ajax_url,
           // data: 'order_id='+ order_id,
           success: function (result) {
+            console.log(result)
               if (!result.status) {
                 swal("Information!", result.error_message);
               }
               else {              
-                location.reload();
+                window.location.href = '../pending_order/'+ result.data;
               }
           }
       });   

From 84fe089568ad6e81b94af143fdfce3845fe070d6 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 13 Mar 2018 17:53:04 +0630
Subject: [PATCH 409/651] Active tab in dashboard, Manager Tab, Union Payment

---
 app/assets/stylesheets/login.scss             |  5 ++++
 .../origami/unionpay_controller.rb            |  1 +
 app/views/layouts/login_dashboard.html.erb    | 29 +++++++++++++++++--
 app/views/origami/unionpay/index.html.erb     |  1 -
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 66252d60..b5f29da6 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -8,6 +8,11 @@
   background-color: #2790a5;
 }
 
+.active_tab{
+  border-style: solid;
+  border-color: #2790a5;
+}
+
 .login-page {
   margin: 0% auto;
   background-color: #2790a5;
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index 905a1ffb..707a1022 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -8,6 +8,7 @@ class Origami::UnionpayController < BaseOrigamiController
     @unionpaycount = 0
     others = 0
 
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 54bc8b95..f2f6f958 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -105,6 +105,14 @@
             </div>      
             <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
                 <ul class="nav nav-tabs" role="tablist">
+                    <% @employees.each do |employee| %>
+                        <%if employee.role == "manager" %>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#manager" role="tab"><b>Manager</b></a>
+                                <% break %>
+                            </li>
+                        <% end %>
+                    <% end %>
                     <% @employees.each do |employee| %>
                         <%if employee.role == "supervisor" %>
                             <li class="nav-item">
@@ -144,6 +152,21 @@
 
                 <div class="tab-content" style="max-height:650px; overflow:auto">
 
+                    <div class="tab-pane"  id="manager" role="tabpanel" style="max-height:; overflow:auto">
+                        <% @employees.each do |employee| %>
+                            <%if employee.role == "manager" %>
+                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                    <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                    </form>
+                                    <div class="login_dashboard p-card">
+                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                        <div class="p-name"><b><%=  employee.name%></b>
+                                        </div>
+                                    </div>
+                                </div>
+                            <% end %>
+                        <% end %>
+                    </div>  
                     <div class="tab-pane"  id="supervisor" role="tabpanel" style="max-height:; overflow:auto">
                         <% @employees.each do |employee| %>
                             <%if employee.role == "supervisor" %>
@@ -239,8 +262,8 @@
 
         $('ul.nav.nav-tabs li a').click(function() {  
             var bb = $('.nav-item').children()[0]; 
-            $(bb).removeClass('login_dashboard');
-            $(this).parent().addClass('login_dashboard').siblings().removeClass('login_dashboard');
+            $(bb).removeClass('active_tab');
+            $(this).parent().addClass('active_tab').siblings().removeClass('active_tab');
         });
 
         $("#emp_id").focus();
@@ -285,7 +308,7 @@
         var aa = $('.nav-item').children().attr('href').replace('#','');
         $('#'+aa).addClass('active');
         var bb = $('.nav-item').children()[0]; 
-        $(bb).addClass('login_dashboard').siblings().removeClass('login_dashboard');
+        $(bb).parent().addClass('active_tab').siblings().removeClass('active_tab');
 
     });     
 
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 2ecdcda4..c48e4a80 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -12,7 +12,6 @@
       </span>
     </ol>
   </div> -->
-  <h5>UNIONPAY Payment</h5>
   <div class="row">
    <div class="col-lg-5 col-md-5 col-sm-5">
     <span class="hidden" id="membership_id"><%= @membership_id%></span>

From 20333f6a2e08d66e581527b11a479b6bc66488bd Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 14 Mar 2018 09:57:08 +0630
Subject: [PATCH 410/651] Add image in login page

---
 app/assets/stylesheets/login.scss          |  4 ++
 app/views/layouts/login_dashboard.html.erb | 80 ++++++++++++++++------
 2 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index b5f29da6..56566121 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -90,3 +90,7 @@
   padding-bottom: 20px;
   font-size: 14px;
 }
+
+.style_image{
+  height : 107px;
+}
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index f2f6f958..064dd572 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -158,11 +158,19 @@
                                 <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                     <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                     </form>
-                                    <div class="login_dashboard p-card">
-                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
-                                        <div class="p-name"><b><%=  employee.name%></b>
+                                    <%if employee.image_path.present? %>
+                                        <div class="login_dashboard p-card">
+                                            <%= image_tag employee.image_path, :class => "style_image" %>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
                                         </div>
-                                    </div>
+                                    <% else %>                                     
+                                        <div class="login_dashboard p-card">
+                                            <i class="material-icons" style="font-size: 100px;">person</i>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
+                                        </div>
+                                    <% end %>    
                                 </div>
                             <% end %>
                         <% end %>
@@ -173,11 +181,19 @@
                                 <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                     <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                     </form>
-                                    <div class="login_dashboard p-card">
-                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
-                                        <div class="p-name"><b><%=  employee.name%></b>
+                                    <%if employee.image_path.present? %>
+                                        <div class="login_dashboard p-card">
+                                            <%= image_tag employee.image_path, :class => "style_image" %>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
                                         </div>
-                                    </div>
+                                    <% else %> 
+                                        <div class="login_dashboard p-card">
+                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
+                                        </div>
+                                    <% end %>    
                                 </div>
                             <% end %>
                         <% end %>
@@ -189,11 +205,19 @@
                                 <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                     <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                     </form>
-                                    <div class="login_dashboard p-card">
-                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
-                                        <div class="p-name"><b><%=  employee.name%></b>
+                                    <%if employee.image_path.present? %>
+                                        <div class="login_dashboard p-card">
+                                            <%= image_tag employee.image_path, :class => "style_image" %>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
                                         </div>
-                                    </div>
+                                    <% else %> 
+                                        <div class="login_dashboard p-card">
+                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
+                                        </div>
+                                    <% end %>    
                                 </div>
                             <% end %>
                         <% end %>
@@ -205,11 +229,19 @@
                                 <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                     <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                     </form>
-                                     <div class="login_dashboard p-card">
-                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
-                                        <div class="p-name"><b><%=  employee.name%></b>
+                                    <%if employee.image_path.present? %>
+                                        <div class="login_dashboard p-card">
+                                            <%= image_tag employee.image_path, :class => "style_image" %>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
                                         </div>
-                                    </div>
+                                    <% else %> 
+                                        <div class="login_dashboard p-card">
+                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
+                                        </div>
+                                    <% end %>    
                                 </div>
                             <% end %>
                         <% end %>
@@ -221,11 +253,19 @@
                                 <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                     <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                     </form>
-                                    <div class="login_dashboard p-card">
-                                        <i class="material-icons md-48" style="font-size: 100px;">person</i>
-                                        <div class="p-name"><b><%=  employee.name%></b>
+                                    <%if employee.image_path.present? %>
+                                        <div class="login_dashboard p-card">
+                                            <%= image_tag employee.image_path, :class => "style_image" %>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
                                         </div>
-                                    </div>
+                                    <% else %> 
+                                        <div class="login_dashboard p-card">
+                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <div class="p-name"><b><%=  employee.name%></b>
+                                            </div>
+                                        </div>
+                                    <% end %>    
                                 </div>
                             <% end %>
                         <% end %>

From b836bffb90b6d0d9cf00e6957a31d3961d12268e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Mar 2018 12:15:56 +0630
Subject: [PATCH 411/651] change payment member UI

---
 app/views/origami/payments/show.html.erb      | 23 +++++--------------
 .../20170628103624_create_print_settings.rb   |  4 ++--
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index ee006c3a..46c7b2ba 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -424,27 +424,16 @@
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <h3 class="modal-title" id="is_memberModalLabel">Are you Member?</h3>
+      <h1 class="modal-title" id="is_memberModalLabel">Are you Member?</h1>
       </div>
       <div class="modal-body">
-        <div class="row text-center">
+        <div class="btn-group">
           <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
           <input type="hidden" name="qr_code" id="qr_code" />
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-            <button type="button" class="btn btn-lg btn-link bg-green waves-effect btn_customer_yes">Yes</button>
-          </div>
-
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-            <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">No</button>
-          </div>
-
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Member</button>
-          </div>
-
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR</button>
-          </div>
+          <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">No</button>
+          <button type="button" class="btn btn-lg btn-link bg-green waves-effect btn_customer_yes">Yes</button>
+          <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Card Member</button>
+          <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR Code</button>
         </div>
       </div>
       <div class="modal-footer"></div>
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index 672953fc..4f27bd0c 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -6,13 +6,13 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :template  
       t.string  :font, :default => ""    
       t.string  :printer_name, :null => false
-      t.string  :api_settings,
+      t.string  :api_settings
       t.string  :brand_name
       t.string  :type
       t.decimal :page_width, :null => false, :default => 210
       t.decimal :page_height, :null => false, :default => 1450
       t.integer :print_copies, :null => false, :default => 1
-      t.string :precision
+      t.string  :precision
       t.boolean :delimiter
       t.integer :heading_space
 

From cf5a85fa5c330cb57e46c27312838e39afdc8ad0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Mar 2018 13:51:31 +0630
Subject: [PATCH 412/651] update migrate for sale audit remark

---
 config/initializers/action_controller.rb        | 10 +++++-----
 db/migrate/20170403174111_create_sale_audits.rb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8f310dab..02e35bb8 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/db/migrate/20170403174111_create_sale_audits.rb b/db/migrate/20170403174111_create_sale_audits.rb
index e1dcfffd..1cf609df 100755
--- a/db/migrate/20170403174111_create_sale_audits.rb
+++ b/db/migrate/20170403174111_create_sale_audits.rb
@@ -9,7 +9,7 @@ class CreateSaleAudits < ActiveRecord::Migration[5.1]
       t.string :action_by, :null => false
       t.string :approved_by, :null => true
       t.datetime :approved_at, :null => true
-      t.string :remark
+      t.text :remark
       t.timestamps
     end
   end

From 70e400c3b97b54ff3b96d2dbf9d7e7319fcb00f9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Mar 2018 15:08:26 +0630
Subject: [PATCH 413/651] change UI in payment page

---
 app/assets/stylesheets/origami.scss      | 10 +++++++
 app/views/origami/payments/show.html.erb | 36 ++++++++++++++++++------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 623a4618..0ec6fc4c 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -396,3 +396,13 @@ i.logout_icon{
 	color: #fff !important;
 	background-color: #5DADE2 !important;
 }
+
+/* Start Is Member Modal */
+#is_memberModal .modal-body {
+	height: 200px !important;
+}
+
+#is_memberModal .btn {
+	width: 80%;
+}
+/* End Is Member Modal */
\ No newline at end of file
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 46c7b2ba..55d0b19b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -424,16 +424,29 @@
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <h1 class="modal-title" id="is_memberModalLabel">Are you Member?</h1>
+        <h1 class="modal-title" id="is_memberModalLabel">Are you Member?</h1>
       </div>
       <div class="modal-body">
-        <div class="btn-group">
-          <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
-          <input type="hidden" name="qr_code" id="qr_code" />
-          <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">No</button>
-          <button type="button" class="btn btn-lg btn-link bg-green waves-effect btn_customer_yes">Yes</button>
-          <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Card Member</button>
-          <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR Code</button>
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+        <input type="hidden" name="qr_code" id="qr_code" />
+        <div class="row text-center m-t-20">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Card Member</button>
+          </div>
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR Code</button>
+          </div>
+        </div>
+        <div class="row clearfix"></div>
+        <div class="row text-center m-t-20">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-green waves-effect btn_customer_yes">Yes</button>
+          </div>
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">No</button>
+          </div>
         </div>
       </div>
       <div class="modal-footer"></div>
@@ -442,7 +455,12 @@
 </div>   
 
 <div id="sxModal">
-  <div id="sxModal-Content"><h3>Card Tap</h3></div>
+  <div id="sxModal-Content">
+    <h3>Card Tap</h3>
+  </div>
+  <div>
+    <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">Cancel</button>
+  </div>
 </div> 
 
 <script type="text/javascript">

From 68a27ffcc7ea63cc16a1df1a7831582ab34bbaa3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 14 Mar 2018 17:42:24 +0630
Subject: [PATCH 414/651] check customer lightbox

---
 app/assets/stylesheets/origami.scss        | 18 ++++++++++++--
 app/models/sale.rb                         |  2 +-
 app/views/crm/customers/_new_form.html.erb |  7 ++++++
 app/views/origami/customers/index.html.erb | 13 +++++++---
 app/views/origami/payments/show.html.erb   | 28 ++++++++++++++--------
 5 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 0ec6fc4c..07c7428f 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -314,7 +314,7 @@ tr.discount-item-row:hover {
 	position: relative;
 	left: 42%;
 	top: 30%;
-	background-color: #d9534f;	
+	background-color: #32ad1a;	
 	color: #fff;
 	text-align: center;
     width: 200px;
@@ -405,4 +405,18 @@ i.logout_icon{
 #is_memberModal .btn {
 	width: 80%;
 }
-/* End Is Member Modal */
\ No newline at end of file
+/* End Is Member Modal */
+
+/* Start iframe */
+iframe {
+	border: none;
+	overflow: hidden !important;
+	width: 400px;
+	height: 550px;
+}
+
+#pdfModal .btn {
+	width: 150%;
+	height: 100%;
+}
+/* End iframe */
\ No newline at end of file
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f0b5aeed..5d46aafc 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -884,7 +884,7 @@ def self.get_menu_item_query(order_by)
                      "(CASE WHEN si.qty IS NOT NULL THEN SUM(si.qty) ELSE 0 END) as total_item," +
                      "(CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END) as unit_price," +
                      "(CASE WHEN si.qty IS NOT NULL THEN (SUM(si.qty) * si.unit_price) ELSE 0 END) as grand_total," +
-                     "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE mii.item_instance_name END) as product_name, 
+                     "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE CONCAT(menu_items.name,' - ',mii.item_instance_name) END) as product_name, 
                      mc.name as" +
                      " menu_category_name,mc.id as menu_category_id, si.remark as status_type, 
                      si.price as price ")
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 3a953e81..5dcb86b0 100755
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -162,6 +162,9 @@
 
 <div id="sxModal">
   <div id="sxModal-Content"><h3><%= t :card_tap %></h3></div>
+  <div class="m-r-20" align="right">
+      <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
+  </div>
 </div>
 <!-- The modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="modalLabelLarge" aria-hidden="true">
@@ -212,4 +215,8 @@
       $("#type").val("card");
     }
   }
+
+  $("#sxModal .btn_cancel").on('click',function(){
+    $("#sxModal").hide();
+  });
 </script>
\ No newline at end of file
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 87ff1144..2600f3fe 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -263,6 +263,9 @@
 
    <div id="sxModal">
     <div id="sxModal-Content"><h3>Card Tap</h3></div>
+    <div class="m-r-20" align="right">
+        <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
+    </div>
   </div>
 </div>
 <script type="text/javascript">
@@ -475,11 +478,11 @@
               if(booking_id!= "" && page == "pending"){
                 window.location.href = '/origami/'+cashier_type+'/pending_order/'+booking_id;
               }else{
-               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
+               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
               }
             }else{
               if(page == "payment"){
-                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
+                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
               }else{
                 if (type=="Table") {
                   window.location.href = '/origami/table/'+id
@@ -519,7 +522,11 @@
       
     }
     
- })
+ });
+
+  $("#sxModal .btn_cancel").on('click',function(){
+    $("#sxModal").hide();
+  });
 
 </script>
 
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 55d0b19b..2deb9c0c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -391,21 +391,23 @@
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <h4 class="modal-title" id="pdfModalLabel"></h4>
+      <h4 class="modal-title">
+        <span id="pdfModalLabel"></span>
+        <span id="changed_amount" class="p-l-120"></span>
+      </h4>
       </div>
       <div class="modal-body">
         <input type="hidden" name="sale_receipt_no" id="sale_receipt_no">
         <input type="hidden" name="filename" id="filename">
         <input type="hidden" name="printer_name" id="printer_name">
-        <p id="changed_amount"></p>
         <div class="text-center">
-          <iframe id="receipt_pdf" src="" style="width: 400px; height: 600px;"></iframe>
+          <iframe id="receipt_pdf" src="" class="pdf-iframe" scrolling="no"></iframe>
         </div>
       </div>
       <div class="modal-footer ">
-        <div class="row p-r-20">
+        <div class="row m-b-10 m-r-30">
           <% if ENV["SERVER_MODE"] != 'cloud' %>
-          <div class="col-md-5">
+          <div class="col-md-5 m-r-20">
             <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
           </div>
           <% end %>
@@ -458,8 +460,8 @@
   <div id="sxModal-Content">
     <h3>Card Tap</h3>
   </div>
-  <div>
-    <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">Cancel</button>
+  <div class="m-r-20" align="right">
+      <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
   </div>
 </div> 
 
@@ -469,7 +471,7 @@ var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
     //start customer modal popup
-    if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+    if((cashier_type=='quick_service') && (customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
       if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
         $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
       }
@@ -487,7 +489,9 @@ var customer_name = "<%= @customer.name %>";
         
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           console.log("ssssssssssss")
-          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
+          console.log(member_id);
+          console.log(member_discount);
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
@@ -607,7 +611,7 @@ var customer_name = "<%= @customer.name %>";
                 $("#printer_name").val(result.printer_name);
                 $("#receipt_pdf").attr("src", result.filename);
                 $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
-                $("#pdfModalLabel").text("Payment Successful!");
+                $("#pdfModalLabel").text("Sale Completed");
                 $("#changed_amount").text("");
                 if($('#balance').text() < 0){
                   <% if precision.to_i > 0 %>
@@ -1106,4 +1110,8 @@ var customer_name = "<%= @customer.name %>";
       });        
     });
   }
+
+  $("#sxModal .btn_cancel").on('click',function(){
+    $("#sxModal").hide();
+  });
 </script>
\ No newline at end of file

From 6ec03e3454746a0f6f017d430c59d84699a4c8c9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Mar 2018 17:52:23 +0630
Subject: [PATCH 415/651] update today issue

---
 app/assets/javascripts/addorder.js                | 15 +++++++++++++--
 app/views/layouts/_header.html.erb                |  3 ++-
 app/views/origami/addorders/detail.html.erb       |  5 +++++
 app/views/origami/dashboard/index.html.erb        | 13 +++++++++++--
 app/views/origami/home/show.html.erb              |  8 ++++----
 app/views/origami/orders/show.html.erb            |  2 +-
 .../second_display/_second_display.html.erb       |  2 +-
 app/views/origami/second_display/index.html.erb   |  2 +-
 8 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 32054b53..1df7a16e 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -880,13 +880,24 @@ $(function() {
       dataType: "json",
        success:function(result){
           if (result.status) {
+            console.log(result)
             if (result.data == null){
-               window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+               swal({
+                  title: "Please Open Shift !",
+                  text: result.status,
+                  type: "warning",
+                  confirmButtonColor: "#DD6B55",
+                  confirmButtonText: "Ok",
+                  closeOnConfirm: false
+              }, function () {
+                  window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+              });
+
             }else{
             window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
             }
           }
-          } 
+       } 
     });
   });
 
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index e3e7adda..11d62573 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -10,6 +10,7 @@
 </div> -->
 <!-- #END# Search Bar -->
 <!-- Top Bar -->
+<%if !request.path_info.include?('second_display') %>
 <nav class="navbar">
     <div class="container-fluid">
         <div class="navbar-header">
@@ -81,7 +82,7 @@
         </div>
     </div>
 </nav>
-
+<%end%>
 <script type="text/javascript">
     if((document.getElementById("otherPayment")!=undefined) && (document.getElementById("otherPayment")!=null) && (document.getElementById("otherPayment")!="")){
         var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 9190ccf7..6c580f40 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -482,6 +482,11 @@
     </div>
     </div>
     <% end %>
+    <style type="text/css">
+      .fadeInRight{
+        -webkit-animation-duration: 350ms !important;
+      }
+    </style>
 <script>
     jQuery(function(){
         id = "<%=@menu[0].id%>";
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 08376432..5361ac27 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -189,15 +189,24 @@
       </div>
       <% end %>
     </div>
-
+ <button type="button" data-href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect second_view hidden" style="height: 45px">Customer View</button>
 <script>
 
+
+
   $(".cashier_view").on('click', function() {
     window.location.href = '/origami';
   });
 
   $(".qs_view").on('click', function() {
-    window.location.href = '/origami/quick_service';
+     document.getElementById('second_view').click();
+     window.location.href = '/origami/quick_service';
+    
+  });
+  
+ $("#second_view").on('click', function () {
+    var url = $(this).attr("data-href");
+    window.open(url,'_blank');
   });
 
 </script>
\ No newline at end of file
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 194ac82e..8c2e58bc 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -134,7 +134,7 @@
               <div class="tab-pane dining" id="orders" role="tabpanel">
                 <div class="card-columns">
                   <% @orders.each do |order| %>
-                      <div class="card orders red text-white" data-id="<%= order.order_id %>">
+                      <div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
                         <div class="card-block">
                           <%
                             order_status = ""
@@ -424,7 +424,7 @@
             <i class="material-icons">reply</i>
              <%= t("views.btn.back") %>
           </button>
-          <a href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect" style="height: 45px">Customer View</a>
+        <!--   <a href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect" style="height: 45px">Customer View</a> -->
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
           <% if @dining.status != "available" %> 
@@ -491,11 +491,11 @@
                 <div class="modal-dialog" role="document">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment Method</h4>
                         </div>
                         <div class="modal-body">
                            <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
-                             <option value="Cash">Cash</option>
+                             <!-- <option value="Cash">Cash</option> -->
                              <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 57a55597..fe3a62ef 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -131,7 +131,7 @@
   <div class="tab-pane active" id="orders" role="tabpanel" style="">
    <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
      <% @orders.each do |order| %>
-     <div class="card orders red text-white" data-id = "<%= order.order_id %>">
+     <div class="card orders  <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id = "<%= order.order_id %>">
        <div class="card-block">
         <%
         order_status = ""
diff --git a/app/views/origami/second_display/_second_display.html.erb b/app/views/origami/second_display/_second_display.html.erb
index a5ac8872..267be25a 100644
--- a/app/views/origami/second_display/_second_display.html.erb
+++ b/app/views/origami/second_display/_second_display.html.erb
@@ -4,7 +4,7 @@
       <div class="card">
         <div class="card-block">
           <div class="card-text" >
-          <div id="order-detail-slimscroll" data-height="150">
+          <div id="order-detail-slimscroll" data-height="160">
             <table class="table table-striped second_display_items" id="order-items-table">
               <thead>
                 <tr>
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
index 1973363c..dbcd1f73 100644
--- a/app/views/origami/second_display/index.html.erb
+++ b/app/views/origami/second_display/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid" style="margin-top:-65px;">
     <button type="button" class="hidden" id="s_reload">Reload</button>
     <div class="slider" id="second_display_slider">
     	<%= render 'slider' %>

From 864b90e6295d58b5135a9857749c5ad61ccabd8f Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 15 Mar 2018 10:28:22 +0630
Subject: [PATCH 416/651] found receipts in public

---
 public/receipts/receipt_bill_20180219-75.pdf  | 483 ++++++++++++++++++
 .../receipt_bill_qwer-20180307-77.pdf         | 455 +++++++++++++++++
 .../receipt_bill_qwer-20180307-78.pdf         | 455 +++++++++++++++++
 .../receipt_bill_qwer-20180307-79.pdf         | 455 +++++++++++++++++
 .../receipt_bill_qwer-20180307-80.pdf         | 455 +++++++++++++++++
 .../receipt_bill_qwer-20180307-81.pdf         | 455 +++++++++++++++++
 .../receipt_bill_qwer-20180307-82.pdf         | 455 +++++++++++++++++
 .../receipt_bill_qwer-20180307-83.pdf         | 455 +++++++++++++++++
 8 files changed, 3668 insertions(+)
 create mode 100644 public/receipts/receipt_bill_20180219-75.pdf
 create mode 100644 public/receipts/receipt_bill_qwer-20180307-77.pdf
 create mode 100644 public/receipts/receipt_bill_qwer-20180307-78.pdf
 create mode 100644 public/receipts/receipt_bill_qwer-20180307-79.pdf
 create mode 100644 public/receipts/receipt_bill_qwer-20180307-80.pdf
 create mode 100644 public/receipts/receipt_bill_qwer-20180307-81.pdf
 create mode 100644 public/receipts/receipt_bill_qwer-20180307-82.pdf
 create mode 100644 public/receipts/receipt_bill_qwer-20180307-83.pdf

diff --git a/public/receipts/receipt_bill_20180219-75.pdf b/public/receipts/receipt_bill_20180219-75.pdf
new file mode 100644
index 00000000..95238846
--- /dev/null
+++ b/public/receipts/receipt_bill_20180219-75.pdf
@@ -0,0 +1,483 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4242
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a2032303138303231392d3735>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207432>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2031392d30322d323031382831303a323920414d2d31303a333620414d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<56> 80 <6f646b61202d>] TJ
+ET
+
+
+BT
+93.864 1282.2 Td
+/F1.0 8 Tf
+[<31302c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+172.864 1282.2 Td
+/F1.0 8 Tf
+[<31302c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1267.952 Td
+/F1.0 8 Tf
+[<746573745f6974656d31202d>] TJ
+ET
+
+
+BT
+0.0 1258.704 Td
+/F1.0 8 Tf
+[<74657374315f736d616c6c>] TJ
+ET
+
+
+BT
+98.312 1267.952 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1267.952 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1267.952 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+0.0 1250.2 m
+210.0 1250.2 l
+S
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+170.864 1239.456 Td
+/F1.0 8 Tf
+[<31312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1225.208 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+175.312 1210.96 Td
+/F1.0 8 Tf
+[<312c3130302e30>] TJ
+ET
+
+
+BT
+0.0 1196.712 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+181.984 1196.712 Td
+/F1.0 8 Tf
+[<3535302e30>] TJ
+ET
+
+
+BT
+0.0 1181.028 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+163.08 1181.028 Td
+/F2.0 10 Tf
+[<31322c3635302e30>] TJ
+ET
+
+0.0 1171.308 m
+210.0 1171.308 l
+S
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+170.864 1160.564 Td
+/F1.0 8 Tf
+[<31322c3635302e30>] TJ
+ET
+
+
+BT
+0.0 1146.316 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+190.88 1146.316 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1127.068 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1127.068 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1118.564 m
+210.0 1118.564 l
+S
+
+BT
+0.0 1107.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1107.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1098.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1098.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1089.324 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1089.324 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1080.82 m
+210.0 1080.82 l
+S
+
+BT
+0.0 1070.076 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1070.076 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1060.828 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+170.864 1060.828 Td
+/F1.0 8 Tf
+[<31302c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1051.58 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1051.58 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1043.076 m
+210.0 1043.076 l
+S
+
+BT
+0.0 1031.614 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1017.332 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1017.332 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1008.828 m
+210.0 1008.828 l
+S
+
+BT
+0.0 996.648 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 998.084 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004509 00000 n 
+0000004792 00000 n 
+0000004889 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4991
+%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-77.pdf b/public/receipts/receipt_bill_qwer-20180307-77.pdf
new file mode 100644
index 00000000..13df612b
--- /dev/null
+++ b/public/receipts/receipt_bill_qwer-20180307-77.pdf
@@ -0,0 +1,455 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4003
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3737>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207431>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2030372d30332d323031382830353a333320504d2d30353a353020504d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<746573745f6974656d31202d>] TJ
+ET
+
+
+BT
+0.0 1272.952 Td
+/F1.0 8 Tf
+[<74657374315f736d616c6c>] TJ
+ET
+
+
+BT
+98.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+0.0 1264.448 m
+210.0 1264.448 l
+S
+
+BT
+0.0 1253.704 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+175.312 1253.704 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1239.456 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+181.984 1225.208 Td
+/F1.0 8 Tf
+[<3130302e30>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+186.432 1210.96 Td
+/F1.0 8 Tf
+[<35302e30>] TJ
+ET
+
+
+BT
+0.0 1195.276 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+168.64 1195.276 Td
+/F2.0 10 Tf
+[<312c3135302e30>] TJ
+ET
+
+0.0 1185.556 m
+210.0 1185.556 l
+S
+
+BT
+0.0 1174.812 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+175.312 1174.812 Td
+/F1.0 8 Tf
+[<312c3135302e30>] TJ
+ET
+
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+190.88 1160.564 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1141.316 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1141.316 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1132.812 m
+210.0 1132.812 l
+S
+
+BT
+0.0 1122.068 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1122.068 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1112.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1112.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1103.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1103.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1095.068 m
+210.0 1095.068 l
+S
+
+BT
+0.0 1084.324 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1084.324 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1075.076 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+190.88 1075.076 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1065.828 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1065.828 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1057.324 m
+210.0 1057.324 l
+S
+
+BT
+0.0 1045.862 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1031.58 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1031.58 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1023.076 m
+210.0 1023.076 l
+S
+
+BT
+0.0 1010.896 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 1012.332 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004270 00000 n 
+0000004553 00000 n 
+0000004650 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4752
+%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-78.pdf b/public/receipts/receipt_bill_qwer-20180307-78.pdf
new file mode 100644
index 00000000..0167d798
--- /dev/null
+++ b/public/receipts/receipt_bill_qwer-20180307-78.pdf
@@ -0,0 +1,455 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4003
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3738>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207431>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2030372d30332d323031382830363a303320504d2d30363a303420504d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<746573745f6974656d31202d>] TJ
+ET
+
+
+BT
+0.0 1272.952 Td
+/F1.0 8 Tf
+[<74657374315f736d616c6c>] TJ
+ET
+
+
+BT
+98.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+0.0 1264.448 m
+210.0 1264.448 l
+S
+
+BT
+0.0 1253.704 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+175.312 1253.704 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1239.456 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+181.984 1225.208 Td
+/F1.0 8 Tf
+[<3130302e30>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+186.432 1210.96 Td
+/F1.0 8 Tf
+[<35302e30>] TJ
+ET
+
+
+BT
+0.0 1195.276 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+168.64 1195.276 Td
+/F2.0 10 Tf
+[<312c3135302e30>] TJ
+ET
+
+0.0 1185.556 m
+210.0 1185.556 l
+S
+
+BT
+0.0 1174.812 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+175.312 1174.812 Td
+/F1.0 8 Tf
+[<312c3135302e30>] TJ
+ET
+
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+190.88 1160.564 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1141.316 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1141.316 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1132.812 m
+210.0 1132.812 l
+S
+
+BT
+0.0 1122.068 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1122.068 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1112.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1112.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1103.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1103.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1095.068 m
+210.0 1095.068 l
+S
+
+BT
+0.0 1084.324 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1084.324 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1075.076 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+190.88 1075.076 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1065.828 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1065.828 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1057.324 m
+210.0 1057.324 l
+S
+
+BT
+0.0 1045.862 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1031.58 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1031.58 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1023.076 m
+210.0 1023.076 l
+S
+
+BT
+0.0 1010.896 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 1012.332 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004270 00000 n 
+0000004553 00000 n 
+0000004650 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4752
+%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-79.pdf b/public/receipts/receipt_bill_qwer-20180307-79.pdf
new file mode 100644
index 00000000..8720c5b6
--- /dev/null
+++ b/public/receipts/receipt_bill_qwer-20180307-79.pdf
@@ -0,0 +1,455 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4003
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3739>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207432>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2030372d30332d323031382830363a303620504d2d30363a303620504d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<746573745f6974656d31202d>] TJ
+ET
+
+
+BT
+0.0 1272.952 Td
+/F1.0 8 Tf
+[<74657374315f736d616c6c>] TJ
+ET
+
+
+BT
+98.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+0.0 1264.448 m
+210.0 1264.448 l
+S
+
+BT
+0.0 1253.704 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+175.312 1253.704 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1239.456 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+181.984 1225.208 Td
+/F1.0 8 Tf
+[<3130302e30>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+186.432 1210.96 Td
+/F1.0 8 Tf
+[<35302e30>] TJ
+ET
+
+
+BT
+0.0 1195.276 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+168.64 1195.276 Td
+/F2.0 10 Tf
+[<312c3135302e30>] TJ
+ET
+
+0.0 1185.556 m
+210.0 1185.556 l
+S
+
+BT
+0.0 1174.812 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+175.312 1174.812 Td
+/F1.0 8 Tf
+[<312c3135302e30>] TJ
+ET
+
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+190.88 1160.564 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1141.316 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1141.316 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1132.812 m
+210.0 1132.812 l
+S
+
+BT
+0.0 1122.068 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1122.068 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1112.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1112.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1103.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1103.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1095.068 m
+210.0 1095.068 l
+S
+
+BT
+0.0 1084.324 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1084.324 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1075.076 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+190.88 1075.076 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1065.828 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1065.828 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1057.324 m
+210.0 1057.324 l
+S
+
+BT
+0.0 1045.862 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1031.58 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1031.58 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1023.076 m
+210.0 1023.076 l
+S
+
+BT
+0.0 1010.896 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 1012.332 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004270 00000 n 
+0000004553 00000 n 
+0000004650 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4752
+%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-80.pdf b/public/receipts/receipt_bill_qwer-20180307-80.pdf
new file mode 100644
index 00000000..e1ecd3dd
--- /dev/null
+++ b/public/receipts/receipt_bill_qwer-20180307-80.pdf
@@ -0,0 +1,455 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4003
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3830>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207432>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2030372d30332d323031382830363a303720504d2d30363a303720504d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<746573745f6974656d31202d>] TJ
+ET
+
+
+BT
+0.0 1272.952 Td
+/F1.0 8 Tf
+[<74657374315f736d616c6c>] TJ
+ET
+
+
+BT
+98.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+0.0 1264.448 m
+210.0 1264.448 l
+S
+
+BT
+0.0 1253.704 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+175.312 1253.704 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1239.456 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+181.984 1225.208 Td
+/F1.0 8 Tf
+[<3130302e30>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+186.432 1210.96 Td
+/F1.0 8 Tf
+[<35302e30>] TJ
+ET
+
+
+BT
+0.0 1195.276 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+168.64 1195.276 Td
+/F2.0 10 Tf
+[<312c3135302e30>] TJ
+ET
+
+0.0 1185.556 m
+210.0 1185.556 l
+S
+
+BT
+0.0 1174.812 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+175.312 1174.812 Td
+/F1.0 8 Tf
+[<312c3135302e30>] TJ
+ET
+
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+190.88 1160.564 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1141.316 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1141.316 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1132.812 m
+210.0 1132.812 l
+S
+
+BT
+0.0 1122.068 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1122.068 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1112.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1112.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1103.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1103.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1095.068 m
+210.0 1095.068 l
+S
+
+BT
+0.0 1084.324 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1084.324 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1075.076 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+190.88 1075.076 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1065.828 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1065.828 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1057.324 m
+210.0 1057.324 l
+S
+
+BT
+0.0 1045.862 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1031.58 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1031.58 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1023.076 m
+210.0 1023.076 l
+S
+
+BT
+0.0 1010.896 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 1012.332 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004270 00000 n 
+0000004553 00000 n 
+0000004650 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4752
+%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-81.pdf b/public/receipts/receipt_bill_qwer-20180307-81.pdf
new file mode 100644
index 00000000..c2c35188
--- /dev/null
+++ b/public/receipts/receipt_bill_qwer-20180307-81.pdf
@@ -0,0 +1,455 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4005
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3831>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207432>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2030372d30332d323031382830363a303920504d2d30363a303920504d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<746573745f6974656d32202d>] TJ
+ET
+
+
+BT
+0.0 1272.952 Td
+/F1.0 8 Tf
+[<74657374315f736d616c32>] TJ
+ET
+
+
+BT
+98.312 1282.2 Td
+/F1.0 8 Tf
+[<322c3032302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1282.2 Td
+/F1.0 8 Tf
+[<322c3032302e30>] TJ
+ET
+
+0.0 1264.448 m
+210.0 1264.448 l
+S
+
+BT
+0.0 1253.704 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+175.312 1253.704 Td
+/F1.0 8 Tf
+[<322c3032302e30>] TJ
+ET
+
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1239.456 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+181.984 1225.208 Td
+/F1.0 8 Tf
+[<3230322e30>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+181.984 1210.96 Td
+/F1.0 8 Tf
+[<3130312e30>] TJ
+ET
+
+
+BT
+0.0 1195.276 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+168.64 1195.276 Td
+/F2.0 10 Tf
+[<322c3332332e30>] TJ
+ET
+
+0.0 1185.556 m
+210.0 1185.556 l
+S
+
+BT
+0.0 1174.812 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+175.312 1174.812 Td
+/F1.0 8 Tf
+[<322c3332332e30>] TJ
+ET
+
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+190.88 1160.564 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1141.316 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1141.316 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1132.812 m
+210.0 1132.812 l
+S
+
+BT
+0.0 1122.068 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1122.068 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1112.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1112.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1103.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1103.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1095.068 m
+210.0 1095.068 l
+S
+
+BT
+0.0 1084.324 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1084.324 Td
+/F1.0 8 Tf
+[<322c3032302e30>] TJ
+ET
+
+
+BT
+0.0 1075.076 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+190.88 1075.076 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1065.828 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1065.828 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1057.324 m
+210.0 1057.324 l
+S
+
+BT
+0.0 1045.862 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1031.58 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1031.58 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1023.076 m
+210.0 1023.076 l
+S
+
+BT
+0.0 1010.896 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 1012.332 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004272 00000 n 
+0000004555 00000 n 
+0000004652 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4754
+%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-82.pdf b/public/receipts/receipt_bill_qwer-20180307-82.pdf
new file mode 100644
index 00000000..088b1130
--- /dev/null
+++ b/public/receipts/receipt_bill_qwer-20180307-82.pdf
@@ -0,0 +1,455 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4012
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3832>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207431>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2030372d30332d323031382830363a313320504d2d30363a313320504d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<746573745f6974656d31202d>] TJ
+ET
+
+
+BT
+0.0 1272.952 Td
+/F1.0 8 Tf
+[<74657374315f736d616c6c>] TJ
+ET
+
+
+BT
+98.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+0.0 1264.448 m
+210.0 1264.448 l
+S
+
+BT
+0.0 1253.704 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+175.312 1253.704 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1239.456 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+181.984 1225.208 Td
+/F1.0 8 Tf
+[<3130302e30>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+186.432 1210.96 Td
+/F1.0 8 Tf
+[<35302e30>] TJ
+ET
+
+
+BT
+0.0 1195.276 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+168.64 1195.276 Td
+/F2.0 10 Tf
+[<312c3135302e30>] TJ
+ET
+
+0.0 1185.556 m
+210.0 1185.556 l
+S
+
+BT
+0.0 1174.812 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+175.312 1174.812 Td
+/F1.0 8 Tf
+[<322c3330302e30>] TJ
+ET
+
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+175.312 1160.564 Td
+/F1.0 8 Tf
+[<312c3135302e30>] TJ
+ET
+
+
+BT
+0.0 1141.316 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1141.316 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1132.812 m
+210.0 1132.812 l
+S
+
+BT
+0.0 1122.068 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1122.068 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1112.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1112.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1103.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1103.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1095.068 m
+210.0 1095.068 l
+S
+
+BT
+0.0 1084.324 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1084.324 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1075.076 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+190.88 1075.076 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1065.828 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1065.828 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1057.324 m
+210.0 1057.324 l
+S
+
+BT
+0.0 1045.862 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1031.58 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1031.58 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1023.076 m
+210.0 1023.076 l
+S
+
+BT
+0.0 1010.896 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 1012.332 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004279 00000 n 
+0000004562 00000 n 
+0000004659 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4761
+%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-83.pdf b/public/receipts/receipt_bill_qwer-20180307-83.pdf
new file mode 100644
index 00000000..ebac5da2
--- /dev/null
+++ b/public/receipts/receipt_bill_qwer-20180307-83.pdf
@@ -0,0 +1,455 @@
+%PDF-1.3
+%ÿÿÿÿ
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4003
+>>
+stream
+q
+
+BT
+48.975 1417.82 Td
+/F1.0 10 Tf
+[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
+ET
+
+
+BT
+10.268 1402.696 Td
+/F1.0 8 Tf
+[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
+ET
+
+
+BT
+71.904 1388.448 Td
+/F1.0 8 Tf
+[<54> 120 <656c3a2030392d323538363736363131>] TJ
+ET
+
+0.0 1379.944 m
+210.0 1379.944 l
+S
+0.0 1379.944 m
+210.0 1379.944 l
+S
+
+BT
+0.0 1367.2 Td
+/F1.0 8 Tf
+[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3833>] TJ
+ET
+
+
+BT
+0.0 1347.2 Td
+/F1.0 8 Tf
+[<54> 120 <6162> 20 <6c65202d207431>] TJ
+ET
+
+
+BT
+100.0 1347.2 Td
+/F1.0 8 Tf
+[<573a2043617368696572>] TJ
+ET
+
+
+BT
+160.216 1347.2 Td
+/F1.0 8 Tf
+[<433a2043617368696572>] TJ
+ET
+
+
+BT
+0.0 1327.2 Td
+/F1.0 8 Tf
+[<44617465203a2030372d30332d323031382830363a313720504d2d30363a313720504d29>] TJ
+ET
+
+0.0 1312.944 m
+210.0 1312.944 l
+S
+
+BT
+0.0 1302.2 Td
+/F1.0 8 Tf
+[<4974656d73>] TJ
+ET
+
+
+BT
+106.656 1302.2 Td
+/F1.0 8 Tf
+[<5072> -15 <696365>] TJ
+ET
+
+
+BT
+138.276 1302.2 Td
+/F1.0 8 Tf
+[<517479>] TJ
+ET
+
+
+BT
+187.176 1302.2 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c>] TJ
+ET
+
+0.0 1292.944 m
+210.0 1292.944 l
+S
+
+BT
+0.0 1282.2 Td
+/F1.0 8 Tf
+[<746573745f6974656d31202d>] TJ
+ET
+
+
+BT
+0.0 1272.952 Td
+/F1.0 8 Tf
+[<74657374315f736d616c6c>] TJ
+ET
+
+
+BT
+98.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+138.94 1282.2 Td
+/F1.0 8 Tf
+[<312e30>] TJ
+ET
+
+
+BT
+177.312 1282.2 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+0.0 1264.448 m
+210.0 1264.448 l
+S
+
+BT
+0.0 1253.704 Td
+/F1.0 8 Tf
+[<5375622054> 120 <6f74616c>] TJ
+ET
+
+
+BT
+175.312 1253.704 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1239.456 Td
+/F1.0 8 Tf
+[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
+ET
+
+
+BT
+181.104 1239.456 Td
+/F1.0 8 Tf
+[<2820302e302029>] TJ
+ET
+
+
+BT
+0.0 1225.208 Td
+/F1.0 8 Tf
+[<536572> -30 <76696365204368617267657320282031302529>] TJ
+ET
+
+
+BT
+181.984 1225.208 Td
+/F1.0 8 Tf
+[<3130302e30>] TJ
+ET
+
+
+BT
+0.0 1210.96 Td
+/F1.0 8 Tf
+[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
+ET
+
+
+BT
+186.432 1210.96 Td
+/F1.0 8 Tf
+[<35302e30>] TJ
+ET
+
+
+BT
+0.0 1195.276 Td
+/F2.0 10 Tf
+[<4772616e642054> 80 <6f74616c>] TJ
+ET
+
+
+BT
+168.64 1195.276 Td
+/F2.0 10 Tf
+[<312c3135302e30>] TJ
+ET
+
+0.0 1185.556 m
+210.0 1185.556 l
+S
+
+BT
+0.0 1174.812 Td
+/F1.0 8 Tf
+[<436173682050> 40 <61> 30 <796d656e74>] TJ
+ET
+
+
+BT
+175.312 1174.812 Td
+/F1.0 8 Tf
+[<312c3135302e30>] TJ
+ET
+
+
+BT
+0.0 1160.564 Td
+/F1.0 8 Tf
+[<4368616e676520416d6f756e74>] TJ
+ET
+
+
+BT
+190.88 1160.564 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1141.316 Td
+/F1.0 8 Tf
+[<437573746f6d6572204e616d65>] TJ
+ET
+
+
+BT
+169.064 1141.316 Td
+/F1.0 8 Tf
+[<57> 50 <414c4b2d494e>] TJ
+ET
+
+0.0 1132.812 m
+210.0 1132.812 l
+S
+
+BT
+0.0 1122.068 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1122.068 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1112.82 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1112.82 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+
+BT
+0.0 1103.572 Td
+/F1.0 8 Tf
+[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
+ET
+
+
+BT
+185.552 1103.572 Td
+/F1.0 8 Tf
+[<28302e3029>] TJ
+ET
+
+0.0 1095.068 m
+210.0 1095.068 l
+S
+
+BT
+0.0 1084.324 Td
+/F1.0 8 Tf
+[<46> 30 <6f6f64>] TJ
+ET
+
+
+BT
+175.312 1084.324 Td
+/F1.0 8 Tf
+[<312c3030302e30>] TJ
+ET
+
+
+BT
+0.0 1075.076 Td
+/F1.0 8 Tf
+[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
+ET
+
+
+BT
+190.88 1075.076 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+
+BT
+0.0 1065.828 Td
+/F1.0 8 Tf
+[<50726f64756374>] TJ
+ET
+
+
+BT
+190.88 1065.828 Td
+/F1.0 8 Tf
+[<302e30>] TJ
+ET
+
+0.0 1057.324 m
+210.0 1057.324 l
+S
+
+BT
+0.0 1045.862 Td
+/F1.0 9 Tf
+[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
+ET
+
+
+BT
+0.0 1031.58 Td
+/F1.0 8 Tf
+[<416d6f756e7420447565202870657220706572736f6e29>] TJ
+ET
+
+
+BT
+193.104 1031.58 Td
+/F1.0 8 Tf
+[<496e66>] TJ
+ET
+
+0.0 1023.076 m
+210.0 1023.076 l
+S
+
+BT
+0.0 1010.896 Td
+/F2.0 10 Tf
+[<50> 30 <616964>] TJ
+ET
+
+
+BT
+102.0 1012.332 Td
+/F1.0 8 Tf
+[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 210 1450]
+/CropBox [0 0 210 1450]
+/BleedBox [0 0 210 1450]
+/TrimBox [0 0 210 1450]
+/ArtBox [0 0 210 1450]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+/F2.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000004270 00000 n 
+0000004553 00000 n 
+0000004650 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+4752
+%%EOF

From e2ad5920079d782ef9dd4cd947ecf71eb0056658 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Mar 2018 10:53:17 +0630
Subject: [PATCH 417/651] update start import and export menu

---
 data/recent_users.json | 128 +++++++++++++++++++++++++++++++++++++++++
 lib/tasks/receipt.rake |  40 +++++++++++++
 2 files changed, 168 insertions(+)
 create mode 100644 data/recent_users.json

diff --git a/data/recent_users.json b/data/recent_users.json
new file mode 100644
index 00000000..4d2e6825
--- /dev/null
+++ b/data/recent_users.json
@@ -0,0 +1,128 @@
+[
+  {
+    "id": 1,
+    "name": "Administrator",
+    "role": "administrator",
+    "emp_id": "999",
+    "password_digest": "$2a$10$mfWmxBvOHt3NbWrLGOF/POTpnxF7QEtnW99qW818dkrQqVLtjQdrS",
+    "token_session": null,
+    "session_expiry": null,
+    "session_last_login": "2018-03-14 09:41:25 +0630",
+    "created_by": "SYSTEM DEFAULT",
+    "created_at": "2017-11-08 09:44:30 +0630",
+    "updated_at": "2018-03-14 16:02:09 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 2,
+    "name": "Waiter",
+    "role": "waiter",
+    "emp_id": "111",
+    "password_digest": "$2a$10$PjBemEA2yKOcoGAyXjz81OqglrASIF8RTYHVe0vqp3FQ0T4/PzJJG",
+    "token_session": "662e797ad508ab6c43b1",
+    "session_expiry": "2018-02-21 01:45:11 +0630",
+    "session_last_login": "2018-02-20 13:45:11 +0630",
+    "created_by": "SYSTEM DEFAULT",
+    "created_at": "2017-11-08 09:44:30 +0630",
+    "updated_at": "2018-02-20 13:59:17 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 3,
+    "name": "Waiter 2",
+    "role": "waiter",
+    "emp_id": "222",
+    "password_digest": "$2a$10$gXh/Tpbr8EyJSaxsbJYVh.K7Fr4bT0A1i2mWuuZm/FHQ4D/wV1E8e",
+    "token_session": "61868be9530b753ada84",
+    "session_expiry": "2018-03-14 05:41:12 +0630",
+    "session_last_login": "2018-03-13 17:11:12 +0630",
+    "created_by": "SYSTEM DEFAULT",
+    "created_at": "2017-11-08 09:44:30 +0630",
+    "updated_at": "2018-03-13 17:32:47 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 4,
+    "name": "Cashier",
+    "role": "cashier",
+    "emp_id": "333",
+    "password_digest": "$2a$10$fHo.9wOn.yr.2Ke6iuCfou6DjpyHXwQSmZQ.43O7W4SnlmzuoIEF2",
+    "token_session": "693f6e98bb90b6af9978",
+    "session_expiry": "2018-03-15 12:36:28 +0630",
+    "session_last_login": "2018-03-14 16:36:28 +0630",
+    "created_by": "SYSTEM DEFAULT",
+    "created_at": "2017-11-08 09:44:30 +0630",
+    "updated_at": "2018-03-14 17:05:14 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 5,
+    "name": "manager",
+    "role": "manager",
+    "emp_id": "888",
+    "password_digest": "$2a$10$EaU/Sxfsb8Q3kBIAyxSEJ.ZpRC9vxSdVAFvF0WXUvWiAqHyqGggoe",
+    "token_session": null,
+    "session_expiry": null,
+    "session_last_login": "2018-01-16 13:37:05 +0630",
+    "created_by": null,
+    "created_at": "2017-11-30 10:03:11 +0630",
+    "updated_at": "2018-01-16 13:48:02 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 6,
+    "name": "Account",
+    "role": "account",
+    "emp_id": "777",
+    "password_digest": "$2a$10$bJmgIxHefkvxpxJQLQPcpurTJrp8.BwP/kirJRYb1v1thrU3TDzkC",
+    "token_session": null,
+    "session_expiry": null,
+    "session_last_login": "2018-01-16 10:37:22 +0630",
+    "created_by": null,
+    "created_at": "2018-01-16 10:23:09 +0630",
+    "updated_at": "2018-01-16 10:49:24 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 7,
+    "name": "Supervisor",
+    "role": "supervisor",
+    "emp_id": "666",
+    "password_digest": "$2a$10$/WQirOw5nu6kKDiITTVa7.IGeVyxH5JmLp3/Astu/5DlOAoMLn4Ne",
+    "token_session": null,
+    "session_expiry": null,
+    "session_last_login": "2018-01-16 14:28:40 +0630",
+    "created_by": null,
+    "created_at": "2018-01-16 10:23:32 +0630",
+    "updated_at": "2018-01-16 15:32:33 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 8,
+    "name": "123",
+    "role": "waiter",
+    "emp_id": "123",
+    "password_digest": "$2a$10$v8JBsc31XkLRNZ/QhfYBg.wbVT7CyVvk83U..0PsGiz61w0Atl/WW",
+    "token_session": "4fc9a18a5df511e507fc",
+    "session_expiry": "2018-02-01 20:08:35 +0630",
+    "session_last_login": "2018-02-01 14:08:35 +0630",
+    "created_by": null,
+    "created_at": "2018-02-01 14:07:16 +0630",
+    "updated_at": "2018-02-01 17:45:10 +0630",
+    "image_path": {"url":null}
+  },
+  {
+    "id": 9,
+    "name": "Cashier 2",
+    "role": "cashier",
+    "emp_id": "444",
+    "password_digest": "$2a$10$5n34O09xmrIHbgvX.uhr9uAaUR8etjaqiicaXr017VWm/qDkjKVue",
+    "token_session": "0477edce9cf259f280c1",
+    "session_expiry": "2018-02-20 19:07:50 +0630",
+    "session_last_login": "2018-02-20 11:37:50 +0630",
+    "created_by": null,
+    "created_at": "2018-02-14 17:10:12 +0630",
+    "updated_at": "2018-02-20 13:37:46 +0630",
+    "image_path": {"url":null}
+  }
+]
\ No newline at end of file
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index fa24f481..ee884fb2 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -1,4 +1,44 @@
 namespace :consolidate do
+
+  
+  desc 'export sers who have logged in since 2017-06-30'
+  task :export => :environment do
+    puts "Export users who have logged in since 2017-06-30"
+
+    # get a file ready, the 'data' directory has already been added in Rails.root
+    filepath = File.join(Rails.root, 'data', 'recent_users.json')
+    puts "- exporting users into #{filepath}"
+
+    # the key here is to use 'as_json', otherwise you get an ActiveRecord_Relation object, which extends
+    # array, and works like in an array, but not for exporting
+    users = Employee.all.as_json
+puts users
+    # The pretty is nice so I can diff exports easily, if that's not important, JSON(users) will do
+    File.open(filepath, 'w') do |f|
+      f.write(JSON.pretty_generate(users))
+    end
+
+    puts "- dumped #{users.size} users"
+  end
+
+  desc 'import users from recent users dump'
+  task :import => :environment do
+    puts "Importing current users"
+
+    filepath = File.join(Rails.root, 'data', 'recent_users.json')
+    abort "Input file not found: #{filepath}" unless File.exist?(filepath)
+
+    current_users = JSON.parse(File.read(filepath))
+
+    current_users.each do |cu|
+      puts cu.to_json
+      Employee.create(cu)
+    end
+
+    puts "- imported #{current_users.size} users"
+  end
+
+
   desc "Receipt"
   task :receipt => :environment do
     Receipt.delete_all

From c7f11c2a330704c2248a98e6b4ad63e7ec114265 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 15 Mar 2018 11:15:43 +0630
Subject: [PATCH 418/651] fixed set menu item update and individual payment

---
 app/controllers/oqs/edit_controller.rb        |  7 ++
 .../origami/split_bill_controller.rb          | 70 ++++++++++++++-----
 app/pdf/receipt_bill_a5_pdf.rb                |  4 +-
 app/pdf/receipt_bill_pdf.rb                   |  4 +-
 app/views/origami/split_bill/index.html.erb   | 23 +++++-
 5 files changed, 84 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 app/controllers/origami/split_bill_controller.rb
 mode change 100644 => 100755 app/views/origami/split_bill/index.html.erb

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index e8d9615d..b123ac73 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -25,6 +25,13 @@ class Oqs::EditController < BaseOqsController
     order_item.item_order_by = current_user.name
     order_item.qty = qty_weight
     order_item.remark = remarks
+    if !order_item.set_menu_items.nil?
+      instance_item_sets = JSON.parse(order_item.set_menu_items)
+      instance_item_sets.each_with_index do |instance_item, instance_index|
+        instance_item_sets[instance_index]["quantity"] = qty_weight
+      end
+      order_item.set_menu_items = instance_item_sets.to_json
+    end
     order_item.save
 
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
old mode 100644
new mode 100755
index 1790624a..16239750
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -77,6 +77,10 @@ class Origami::SplitBillController < BaseOrigamiController
 
 	def create
 		order_ids = params[:order_ids]
+		arr_order_ids = nil
+		if !params[:arr_order_ids].nil?
+			arr_order_ids = JSON.parse(params[:arr_order_ids])
+		end
 		orders = nil
 		if !params[:orders].empty? 
 			orders = JSON.parse(params[:orders])
@@ -136,14 +140,15 @@ class Origami::SplitBillController < BaseOrigamiController
 					order_id_count = 0
 					order_id = nil
 
-					order_items.each do |order_item|
-						order_item_count = 0
-						order = Order.find(order_item["order_id"])
-						if order.order_items.count == 1
-							order_id = order.id
-							order_id_count += 1
-						else
-							order_item_count += 1
+					arr_order_ids.each do |order|
+						order.each do |odr|
+							data = Order.find(odr[0])
+							if data.order_items.count == odr[1]
+								order_id = odr[0]
+								order_id_count += 1
+							else
+								order_item_count += 1
+							end
 						end
 					end
 
@@ -158,10 +163,12 @@ class Origami::SplitBillController < BaseOrigamiController
 							puts "order_id_count > 1"
 
 							updated_order_id = Array.new
-							order_ids.each do |odr_id|
-								odr = Order.find(odr_id)
-								if odr.order_items.count > 1
-									updated_order_id.push(odr_id)
+							arr_order_ids.each do |order|
+								order.each do |odr|
+									data = Order.find(odr[0])
+									if data.order_items.count != odr[1]
+										updated_order_id.push(odr[0])
+									end
 								end
 							end
 
@@ -266,12 +273,32 @@ class Origami::SplitBillController < BaseOrigamiController
 						    end
 						end
 					else
-						# puts order_ids
-						if order_ids.count == 1 && order_id_count == 0 && order_item_count == 1
-							BookingOrder.find_by_order_id(order_ids[0]).delete
-							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
-							order_items.each do |order_item|
-								update_order_item(order_ids[0], order_item)
+						if order_ids.count == 1 && order_item_count == 1
+							if order_id_count == 0 
+								customer = Customer.find(params[:customer_id])
+								order_type = "dine_in"
+								if !customer.nil?
+									if customer.customer_type == "Takeaway"
+										order_type = "takeaway"
+									elsif customer.customer_type == "Delivery"
+										order_type = "delivery"
+									end
+								end
+
+								# begin
+								order = create_order(params,order_type,order_items.count,current_user)
+
+							    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+
+							    order_items.each do |order_item|
+							    	update_order_item(order.order_id, order_item)
+							    end
+							else
+								BookingOrder.find_by_order_id(order_ids[0]).delete
+								BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
+								order_items.each do |order_item|
+									update_order_item(order_ids[0], order_item)
+							    end
 						    end
 						else
 							customer = Customer.find(params[:customer_id])
@@ -366,4 +393,11 @@ class Origami::SplitBillController < BaseOrigamiController
 
 		render :json => { status: true }
 	end
+
+	#Shop Name in Navbor
+	helper_method :shop_detail
+	def shop_detail
+		@shop = Shop.first
+	end
+
 end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 206c7a0a..604d99dd 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -491,8 +491,8 @@ class ReceiptBillA5Pdf < Prawn::Document
     end
 
     #individual payment per person
-    def individual_payment(sale_data, survey, precision, delimiter)
-        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+    def individual_payment(sale_data, precision, delimiter)
+        per_person = sale_data.grand_total.to_i / sale_data.equal_persons.to_i
         stroke_horizontal_rule
         move_down line_move
         y_position = cursor
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index efc85c7f..fe1ee628 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -494,8 +494,8 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     #individual payment per person
-    def individual_payment(sale_data, survey, precision, delimiter)
-        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+    def individual_payment(sale_data, precision, delimiter)
+        per_person = sale_data.grand_total.to_i / sale_data.equal_persons.to_i
         stroke_horizontal_rule
         move_down line_move
         y_position = cursor
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
old mode 100644
new mode 100755
index 517195d0..fb97b51d
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -623,20 +623,39 @@ function orderItemSplitBillProcess(cnt_items){
 	}
 
 	var order_ids = [];
+	var arr_order_ids = [];
 	if(order_items!=undefined && order_items!=null){
 		$.each(order_items,function(key,value){
+			var orderIds = {};
 			if($.inArray(value.order_id,order_ids) == -1){
 				order_ids.push(value.order_id);
+				orderIds[value.order_id] = 1;
+				arr_order_ids.push(orderIds);
+			}else{
+				if(arr_order_ids != null & arr_order_ids!=""){
+					if(arr_order_ids.length > 0){
+						$.each(arr_order_ids, function(k,val){
+							$.each(val,function(kk,vval){
+								if((val[kk]!= undefined) && (kk == value.order_id)){
+									val[kk] += 1;
+								}
+							});
+							arr_order_ids[k] = val;
+						});
+					}
+				}
 			}
 		});
 	}
 
+	// console.log(JSON.stringify(arr_order_ids));
+
 	var ajax_url = "/origami/split_bills";
 	$.ajax({
 		type: "POST",
 		url: ajax_url,
 		dataType: 'JSON',
-		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items), 'orders' : ''},
+		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'arr_order_ids': JSON.stringify(arr_order_ids), 'order_items' : JSON.stringify(order_items), 'orders' : ''},
 		success: function (result) {
 			if (!result.status) {
 				swal("Information!", result.error_message);
@@ -669,7 +688,7 @@ function orderSplitBillProcess(cnt_orders){
 		type: "POST",
 		url: ajax_url,
 		dataType: 'JSON',
-		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders)},
+		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders), 'arr_order_ids': []},
 		success: function (result) {
 			if (!result.status) {
 				swal("Information!", result.error_message);

From 28c23bb50d06cb0f86dc444cc214545aba98712b Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 15 Mar 2018 11:16:31 +0630
Subject: [PATCH 419/651] check bill

---
 app/pdf/receipt_bill_pdf.rb | 218 ++++++++++++++++++------------------
 1 file changed, 108 insertions(+), 110 deletions(-)

diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index efc85c7f..6b8b33af 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -1,111 +1,113 @@
 class ReceiptBillPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+    include ActionView::Helpers::NumberHelper
 
-  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
-    self.page_width = printer_settings.page_width
-    self.page_height = printer_settings.page_height
-    self.margin = 0
-    self.price_width = 60
-    self.qty_width = 25
-    self.total_width = 60
-    self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
-    self.item_height = 15
-    self.item_description_width = (self.page_width-5) / 2
-    self.label_width = 100
+    attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
+  
+    def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
+        self.page_width = printer_settings.page_width
+        self.page_height = printer_settings.page_height
+        self.margin = 0
+        self.price_width = 60
+        self.qty_width = 25
+        self.total_width = 60
+        self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
+        self.item_height = 15
+        self.item_description_width = (self.page_width-5) / 2
+        self.label_width = 100
 
-    self.description_width = 150
-    self.price_num_width = 50
-    self.line_move = 2
-    # @item_width = self.page_width.to_i / 2
-    # @qty_width = @item_width.to_i / 3
-    # @double = @qty_width * 1.3
-    # @half_qty = @qty_width / 2
-    #setting page margin and width
-    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+        self.description_width = 150
+        self.price_num_width = 50
+        self.line_move = 2
+        # @item_width = self.page_width.to_i / 2
+        # @qty_width = @item_width.to_i / 3
+        # @double = @qty_width * 1.3
+        # @half_qty = @qty_width / 2
+        #setting page margin and width
+        super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin])
 
-    #precision checked
-    if printer_settings.precision.to_i > 2
-        printer_settings.precision = 2
+        #precision checked
+        if printer_settings.precision.to_i > 2
+            printer_settings.precision = 2
+        end
+
+        # db font setup
+        if printer_settings.font != ""
+            font_families.update("#{printer_settings.font}" => {
+                :normal => "public/fonts/#{printer_settings.font}.ttf",
+                :italic => "public/fonts/#{printer_settings.font}.ttf",
+                :bold => "public/fonts/#{printer_settings.font}.ttf",
+                :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+            })
+
+            font "#{printer_settings.font}"
+            fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+        end
+        # font "public/fonts/Zawgyi-One.ttf"
+        # font "public/fonts/padauk.ttf"
+        self.header_font_size = 10
+        self.item_font_size = 8
+
+        if printer_settings.delimiter
+            delimiter = ","
+        else
+            delimiter = ""
+        end
+
+        header(shop_details)
+
+        stroke_horizontal_rule
+
+        cashier_info(sale_data, customer_name)
+        line_items(sale_items,printer_settings.precision,delimiter)
+        all_total(sale_data,printer_settings.precision,delimiter)
+
+
+        if member_info != nil
+            member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
+        end
+
+        customer(customer_name)
+
+        #start card sale trans data
+        if card_data != nil
+            card_sale_data(card_data)
+        end
+        #end card sale trans data
+
+        if discount_price_by_accounts.length > 0 && shop_details.show_account_info
+            discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
+        end
+
+        if shop_details.show_account_info
+           items_account(item_price_by_accounts,printer_settings.precision,delimiter)
+        end
+
+        #start for individual payment
+        if !sale_data.equal_persons.nil?
+            individual_payment(sale_data, printer_settings.precision, delimiter)
+        end
+        #end for individual payment
+
+        sign(sale_data)
+
+        footer(printed_status)
     end
 
-    # db font setup
-    if printer_settings.font != ""
-        font_families.update("#{printer_settings.font}" => {
-            :normal => "public/fonts/#{printer_settings.font}.ttf",
-            :italic => "public/fonts/#{printer_settings.font}.ttf",
-            :bold => "public/fonts/#{printer_settings.font}.ttf",
-            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
-        })
-
-        font "#{printer_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
-    end
-    # font "public/fonts/Zawgyi-One.ttf"
-    # font "public/fonts/padauk.ttf"
-    self.header_font_size = 10
-    self.item_font_size = 8
-
-    if printer_settings.delimiter
-        delimiter = ","
-    else
-        delimiter = ""
-    end
-
-    header(shop_details)
-
-    stroke_horizontal_rule
-
-    cashier_info(sale_data, customer_name)
-    line_items(sale_items,printer_settings.precision,delimiter)
-    all_total(sale_data,printer_settings.precision,delimiter)
-
-
-    if member_info != nil
-        member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
-    end
-
-    customer(customer_name)
-
-    #start card sale trans data
-    if card_data != nil
-        card_sale_data(card_data)
-    end
-    #end card sale trans data
-
-    if discount_price_by_accounts.length > 0 && shop_details.show_account_info
-        discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
-    end
-
-    if shop_details.show_account_info
-       items_account(item_price_by_accounts,printer_settings.precision,delimiter)
-    end
-
-    #start for individual payment
-    if !sale_data.equal_persons.nil?
-        individual_payment(sale_data, printer_settings.precision, delimiter)
-    end
-    #end for individual payment
-
-    sign(sale_data)
-
-    footer(printed_status)
-  end
-
-  def header (shop_details)
-    text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
-    move_down line_move
-    text "#{shop_details.address}", :size => self.item_font_size,:align => :center
-    # move_down self.item_height
-    move_down line_move
-    text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
-    move_down line_move
-
-    stroke_horizontal_rule
-  end
-
-  def cashier_info(sale_data, customer_name)
+    def header (shop_details)
+        text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
         move_down line_move
+        text "#{shop_details.address}", :size => self.item_font_size,:align => :center
+        # move_down self.item_height
+        move_down line_move
+        text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
+        move_down line_move
+
+        stroke_horizontal_rule
+    end
+
+    def cashier_info(sale_data, customer_name)
+        move_down line_move
+
         # move_down 2
         y_position = cursor
         bounding_box([0,y_position], :width =>self.description_width + self.price_num_width, :height => self.item_height) do
@@ -117,7 +119,7 @@ class ReceiptBillPdf < Prawn::Document
             text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
          end
         end
-        
+
         move_down line_move
 
         y_position = cursor
@@ -141,12 +143,11 @@ class ReceiptBillPdf < Prawn::Document
         else
             time = sale_data.receipt_date.strftime('%d-%m-%Y %H:%M %p')
         end
-        
+
         bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do
                 text "Date : #{ time }",:size => self.item_font_size,:align => :left
         end
 
-
         # bounding_box([self.item_description_width,y_position], :width =>self.label_width+5) do
         #      text "(#{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } 
         #         - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" ,
@@ -155,7 +156,7 @@ class ReceiptBillPdf < Prawn::Document
 
         move_down line_move
         stroke_horizontal_rule
-  end
+    end
 
     def line_items(sale_items,precision,delimiter)
         if precision.to_i > 0
@@ -250,7 +251,6 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     def all_total(sale_data,precision,delimiter)
-
         move_down line_move
         item_name_width = self.item_width
         y_position = cursor
@@ -316,8 +316,7 @@ class ReceiptBillPdf < Prawn::Document
         end
         move_down line_move
         
-        sale_payment(sale_data,precision,delimiter)
-       
+        sale_payment(sale_data,precision,delimiter)     
     end
 
     def sale_payment(sale_data,precision,delimiter)        
@@ -548,8 +547,7 @@ class ReceiptBillPdf < Prawn::Document
                  text "Acknowledged By" , :size => self.item_font_size,:align => :center
              end
         end
-        
-        
+              
     end
 
     def footer(printed_status)

From 96f8640df798c86b220beb69bdee4391f2e5b180 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Mar 2018 13:46:40 +0630
Subject: [PATCH 420/651] Edit Dashboard's photo and Add Bread Crumb Name

---
 app/assets/javascripts/origami.js             | 43 ++++++++++++++++++-
 app/assets/stylesheets/login.scss             |  9 +++-
 app/controllers/origami/jcb_controller.rb     |  1 -
 app/controllers/origami/master_controller.rb  |  1 -
 app/controllers/origami/mpu_controller.rb     |  1 -
 .../origami/redeem_payments_controller.rb     |  1 -
 app/controllers/origami/surveys_controller.rb |  1 -
 .../origami/unionpay_controller.rb            |  1 -
 app/controllers/origami/visa_controller.rb    |  1 -
 app/views/layouts/_header.html.erb            | 15 ++-----
 app/views/layouts/login_dashboard.html.erb    | 10 ++---
 app/views/origami/addorders/detail.html.erb   |  1 +
 app/views/origami/cash_ins/new.html.erb       |  3 ++
 app/views/origami/cash_mgmt/index.html.erb    |  2 +-
 app/views/origami/cash_mgmt/new.html.erb      |  3 ++
 app/views/origami/cash_outs/new.html.erb      |  4 +-
 .../origami/credit_payments/index.html.erb    |  1 +
 app/views/origami/customers/index.html.erb    |  4 ++
 app/views/origami/dashboard/index.html.erb    |  3 ++
 app/views/origami/discounts/index.html.erb    |  1 +
 app/views/origami/home/index.html.erb         |  1 +
 app/views/origami/home/show.html.erb          |  1 +
 app/views/origami/in_duties/_form.html.erb    |  1 +
 app/views/origami/in_duties/index.html.erb    |  1 +
 app/views/origami/jcb/index.html.erb          |  1 +
 app/views/origami/master/index.html.erb       |  1 +
 .../origami/moveroom/move_dining.html.erb     |  1 +
 .../origami/movetable/move_dining.html.erb    |  1 +
 app/views/origami/mpu/index.html.erb          |  1 +
 app/views/origami/orders/show.html.erb        |  1 +
 .../origami/other_charges/index.html.erb      |  3 +-
 .../origami/others_payments/index.html.erb    |  3 ++
 app/views/origami/payments/show.html.erb      |  1 +
 .../origami/paypar_payments/index.html.erb    |  7 ++-
 .../origami/pending_order/index.html.erb      |  3 ++
 .../load_commissioners.html.erb               |  1 +
 .../origami/redeem_payments/index.html.erb    |  1 +
 .../origami/room_invoices/index.html.erb      |  1 +
 app/views/origami/rooms/show.html.erb         |  1 +
 app/views/origami/sale_edit/edit.html.erb     |  2 +
 .../origami/second_display/index.html.erb     |  1 +
 app/views/origami/shifts/show.html.erb        |  3 ++
 app/views/origami/split_bill/index.html.erb   |  1 +
 app/views/origami/surveys/_form.html.erb      |  1 +
 .../origami/table_invoices/index.html.erb     |  1 +
 .../origami/table_invoices/show.html.erb      |  1 +
 app/views/origami/unionpay/index.html.erb     |  1 +
 app/views/origami/visa/index.html.erb         |  1 +
 app/views/origami/voucher/index.html.erb      |  2 +
 49 files changed, 122 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 418b6ebe..4dda94e2 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -16,6 +16,43 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+/* Constant Varaibles */
+_ADD_ORDER_			= "/&nbsp;&nbsp;&nbsp;ADD ORDER";
+_CASH_IN_			= "/&nbsp;&nbsp;&nbsp;CASH IN";
+_CASH_OUT_			= "/&nbsp;&nbsp;&nbsp;CASH OUT";
+_CASH_MGMT_			= "/&nbsp;&nbsp;&nbsp;CASH MGMT";
+_CREDIT_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;CREDIT PAYMENTS";
+_CUSTOMERS_			= "/&nbsp;&nbsp;&nbsp;CUSTOMERS";
+_DASHBOARD_			= "/&nbsp;&nbsp;&nbsp;DASHBOARD";
+_DISCOUNTS_			= "/&nbsp;&nbsp;&nbsp;DISCOUNTS";
+_CASHIER_			= "/&nbsp;&nbsp;&nbsp;CASHIER";
+_IN_DUTIES_			= "/&nbsp;&nbsp;&nbsp;IN DUTIES";
+_JCB_				= "/&nbsp;&nbsp;&nbsp;JCB PAYMENT";
+_MASTER_			= "/&nbsp;&nbsp;&nbsp;MASTER PAYMENT";
+_MOVE_ROOM_			= "/&nbsp;&nbsp;&nbsp;MOVE ROOM";
+_MOVE_TABLE_		= "/&nbsp;&nbsp;&nbsp;MOVE TABLE";
+_MPU_				= "/&nbsp;&nbsp;&nbsp;MPU PAYMENT";
+_ORDERS_			= "/&nbsp;&nbsp;&nbsp;ORDERS";
+_OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;OTHER CHARGES";
+_OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENTS";
+_PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENTS";
+_PAYPAR_PAYMENT_	= "/&nbsp;&nbsp;&nbsp;PAYPAR PAYMENT";
+_PENDING_ORDER_		= "/&nbsp;&nbsp;&nbsp;PENDING ORDER";
+_PRODUCT_COMMISSIONS_= "/&nbsp;&nbsp;&nbsp;PRODUCT COMMISSIONS";
+_REDEEM_PAYMENT_	= "/&nbsp;&nbsp;&nbsp;REDEEM PAYMENT";
+_ROOM_INVOICES_		= "/&nbsp;&nbsp;&nbsp;ROOM INVOICES";
+_ROOM_ 				= "/&nbsp;&nbsp;&nbsp;ROOM";
+_SALE_EDIT_			= "/&nbsp;&nbsp;&nbsp;SALE EDIT";
+_SECOND_DISPLAY_	= "/&nbsp;&nbsp;&nbsp;CUSTOMER VIEW";
+_CLOSE_CASHIER_		= "/&nbsp;&nbsp;&nbsp;CLOSE CASHIER";
+_SPLIT_BILL_		= "/&nbsp;&nbsp;&nbsp;SPLIT BILL";
+_TABLE_INVOICE_		= "/&nbsp;&nbsp;&nbsp;TABLE INVOICE";
+_UNION_				= "/&nbsp;&nbsp;&nbsp;UNION PAYMENT";
+_VISA_				= "/&nbsp;&nbsp;&nbsp;VISA PAYMENT";
+_VOUCHER_			= "/&nbsp;&nbsp;&nbsp;VOUCHER";
+_TABLE_ 			= "/&nbsp;&nbsp;&nbsp;TABLE";
+_SURVEY_ 			= "/&nbsp;&nbsp;&nbsp;SURVEY";
+/* Constant Varaibles */
 
 $(document).on('turbolinks:load', function() {
 
@@ -356,4 +393,8 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 			});
     }
 }
-//end CB ECR integration
\ No newline at end of file
+//end CB ECR integration
+
+function setHeaderBreadCrumb(params){
+	$("#others_payment").html(params);
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 56566121..ed0b36f9 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -92,5 +92,12 @@
 }
 
 .style_image{
-  height : 107px;
+  height : 138px;
+  padding : 20px 0 20px 0;
+  width : 70%;
+}
+
+.style_icon{
+  font-size: 111px;
+  padding : 20px 0 20px 0;
 }
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index 06ee6087..e17c773e 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -9,7 +9,6 @@ class Origami::JcbController < BaseOrigamiController
     @jcbcount = 0
     others = 0
 
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 77ae99d2..95710f11 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -9,7 +9,6 @@ class Origami::MasterController < BaseOrigamiController
     @mastercount = 0
     others = 0
     
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index c3f74133..f577cb9d 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -8,7 +8,6 @@ class Origami::MpuController < BaseOrigamiController
     @mpucount = 0
     others    = 0
     
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index bcb8f9ae..347fd3ea 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,7 +6,6 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-        @payment_method_setting_nav = PaymentMethodSetting.all
         @shop        = Shop::ShopDetail 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 654f8a1a..b30ff1b0 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -5,7 +5,6 @@ class Origami::SurveysController < BaseOrigamiController
 		@id             = params[:id]
 		@cashier_type   = params[:type]
 
-
 	    if(@id[0,3] == "SAL")
 	       @sale             = Sale.find(@id)
 	       @receipt_no       = @sale.receipt_no
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index 707a1022..905a1ffb 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -8,7 +8,6 @@ class Origami::UnionpayController < BaseOrigamiController
     @unionpaycount = 0
     others = 0
 
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 788704eb..f04ec001 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -8,7 +8,6 @@ class Origami::VisaController < BaseOrigamiController
     @visacount = 0
     others = 0
 
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index e3e7adda..42fd0200 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -27,12 +27,10 @@
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
             </a>
-            <% if @payment_method_setting_nav.present? %>
-                <span class="navbar-brand m-0">/ &nbsp;
-                    <span id="otherPayment"></span>&nbsp; Payment
-                </span>
-            <% end %>    
-                       
+            
+            <span class="navbar-brand m-0">/ &nbsp;
+                <span id="others_payment"></span>
+            </span>
         </div>
         <!-- Start Shop Info -->
         <div class="navbar-right">
@@ -83,11 +81,6 @@
 </nav>
 
 <script type="text/javascript">
-    if((document.getElementById("otherPayment")!=undefined) && (document.getElementById("otherPayment")!=null) && (document.getElementById("otherPayment")!="")){
-        var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
-        document.getElementById("otherPayment").innerHTML = otherPayment;
-    }
-
     $(function(){
         $('.delete').click(function(){
             var method    = $(this).attr('data-method');
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 064dd572..d3e4729d 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -166,7 +166,7 @@
                                         </div>
                                     <% else %>                                     
                                         <div class="login_dashboard p-card">
-                                            <i class="material-icons" style="font-size: 100px;">person</i>
+                                            <i class="material-icons style_icon">person</i>
                                             <div class="p-name"><b><%=  employee.name%></b>
                                             </div>
                                         </div>
@@ -189,7 +189,7 @@
                                         </div>
                                     <% else %> 
                                         <div class="login_dashboard p-card">
-                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <i class="material-icons style_icon">person</i>
                                             <div class="p-name"><b><%=  employee.name%></b>
                                             </div>
                                         </div>
@@ -213,7 +213,7 @@
                                         </div>
                                     <% else %> 
                                         <div class="login_dashboard p-card">
-                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <i class="material-icons style_icon">person</i>
                                             <div class="p-name"><b><%=  employee.name%></b>
                                             </div>
                                         </div>
@@ -237,7 +237,7 @@
                                         </div>
                                     <% else %> 
                                         <div class="login_dashboard p-card">
-                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <i class="material-icons style_icon">person</i>
                                             <div class="p-name"><b><%=  employee.name%></b>
                                             </div>
                                         </div>
@@ -261,7 +261,7 @@
                                         </div>
                                     <% else %> 
                                         <div class="login_dashboard p-card">
-                                            <i class="material-icons md-48" style="font-size: 100px;">person</i>
+                                            <i class="material-icons style_icon">person</i>
                                             <div class="p-name"><b><%=  employee.name%></b>
                                             </div>
                                         </div>
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 9190ccf7..c3caae9c 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -488,6 +488,7 @@
        jQuery('.first_'+id).click();
     });
     $(document).ready(function () {
+      setHeaderBreadCrumb(_ADD_ORDER_);
     $(".tables").on('click', function () {
         $('.tables').css('background-color','');
         $('.tables').removeClass('purple')
diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb
index bda159e2..32d5215a 100755
--- a/app/views/origami/cash_ins/new.html.erb
+++ b/app/views/origami/cash_ins/new.html.erb
@@ -56,6 +56,9 @@
 </div>
 
 <script>
+  $(document).ready(function () {
+      setHeaderBreadCrumb(_CASH_IN_);
+  });
   var payment_method = "";
   $('.payment-type').on('click',function(){
     $('.payment-type').css("background-color","#7a62d3")
diff --git a/app/views/origami/cash_mgmt/index.html.erb b/app/views/origami/cash_mgmt/index.html.erb
index 1f64a3df..88195969 100755
--- a/app/views/origami/cash_mgmt/index.html.erb
+++ b/app/views/origami/cash_mgmt/index.html.erb
@@ -1,2 +1,2 @@
 <h1>CashMgmt#index</h1>
-<p>Find me in app/views/cash_mgmt/index.html.erb</p>
+<p>Find me in app/views/cash_mgmt/index.html.erb</p>
\ No newline at end of file
diff --git a/app/views/origami/cash_mgmt/new.html.erb b/app/views/origami/cash_mgmt/new.html.erb
index 9f22e0c3..6912d981 100755
--- a/app/views/origami/cash_mgmt/new.html.erb
+++ b/app/views/origami/cash_mgmt/new.html.erb
@@ -1,2 +1,5 @@
 <h1>CashMgmt#new</h1>
 <p>Find me in app/views/cash_mgmt/new.html.erb</p>
+$(document).ready(function () {
+      setHeaderBreadCrumb(_CASH_MGMT_);
+ });
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb
index 66bffa51..47558928 100755
--- a/app/views/origami/cash_outs/new.html.erb
+++ b/app/views/origami/cash_outs/new.html.erb
@@ -25,7 +25,9 @@
   </div>
 </div>
 <script>
-
+  $(document).ready(function () {
+        setHeaderBreadCrumb(_CASH_OUT_);
+  });
   $('#cash_out').on('click',function(){
     var reference = $('#reference').val();
     var remark = $('#remark').val();
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index d92ad452..cca43582 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -118,6 +118,7 @@
  <span id="cashier_type" class="hidden"><%=@cashier_type%></span>
 <script>
   $(document).ready(function() {
+    setHeaderBreadCrumb(_CREDIT_PAYMENTS_);
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
      else {
        $('#validamount').attr("value",parseFloat("<%= @can_credit %>") - parseFloat(localStorage.getItem("cash")));
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 87ff1144..3ff42c87 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -288,6 +288,10 @@
       }   
     });
 
+    $(document).ready(function () {
+      setHeaderBreadCrumb(_CUSTOMERS_);
+
+    });
     // Read Card Reader
     $("#member_acc_no").on('click', function(e){  
       var cardNo = ""; 
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 08376432..cd08965c 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -191,6 +191,9 @@
     </div>
 
 <script>
+  $(document).ready(function () {
+    setHeaderBreadCrumb(_DASHBOARD_);
+  });
 
   $(".cashier_view").on('click', function() {
     window.location.href = '/origami';
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index ccb2c0e8..af96f813 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -235,6 +235,7 @@
 <script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function(){
+    	setHeaderBreadCrumb(_DISCOUNTS_);
 
 		$('#back').on('click',function(){
 		    var id       = $("#table_id").text();
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 3577aa48..46ec6153 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -139,6 +139,7 @@
  <!-- Column One -->
 <script>
 $(document).ready(function(){
+  setHeaderBreadCrumb(_CASHIER_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 194ac82e..2f2bf4e3 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -543,6 +543,7 @@
 <script>
   var cashier_type = "cashier";
     $(document).ready(function () {
+      setHeaderBreadCrumb(_TABLE_);
       /* start check first bill or not*/
         var receipt_no = "";
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
diff --git a/app/views/origami/in_duties/_form.html.erb b/app/views/origami/in_duties/_form.html.erb
index 272d1bb3..07cee2cf 100755
--- a/app/views/origami/in_duties/_form.html.erb
+++ b/app/views/origami/in_duties/_form.html.erb
@@ -60,6 +60,7 @@
 <script type="text/javascript">
 
   $(document).ready(function () {
+      setHeaderBreadCrumb(_IN_DUTIES_);
 
   });
 
diff --git a/app/views/origami/in_duties/index.html.erb b/app/views/origami/in_duties/index.html.erb
index 19f707fa..58e4ac9c 100755
--- a/app/views/origami/in_duties/index.html.erb
+++ b/app/views/origami/in_duties/index.html.erb
@@ -44,6 +44,7 @@
 </div>
 </div>
 <script type="text/javascript">
+
     $(document).on('click', ".induty_tr", function () {
 
         $(this).closest('tr').find('.checkbox_check').prop("checked", true);
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index f7f43812..51481148 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -121,6 +121,7 @@
 <script>
 var cashier_type = "<%= @cashier_type %>";  
 	$(document).ready(function() {
+    	setHeaderBreadCrumb(_JCB_);
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 49d95e80..38237f1a 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -122,6 +122,7 @@
 <script>
   var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function() {
+      setHeaderBreadCrumb(_MASTER_);
       var sale_id = "<%= @sale_id %>";
       var bank_integration = "<%= @bank_integration %>";
       if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb
index b46834ca..d721aaa5 100755
--- a/app/views/origami/moveroom/move_dining.html.erb
+++ b/app/views/origami/moveroom/move_dining.html.erb
@@ -166,6 +166,7 @@
 </div>
 <script>
 $(document).ready(function(){
+  setHeaderBreadCrumb(_MOVE_ROOM_);
   $(".tables").on('click', function(){
       $('.tables').removeClass('selected-item');
 	    $(this).addClass('selected-item');
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 4385cad7..98d44028 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -284,6 +284,7 @@ end
 </div>
 <script>
   $(document).ready(function(){
+    setHeaderBreadCrumb(_MOVE_TABLE_);
     $(".tables").on('click', function(){
       $('.tables').removeClass('selected-item');
       $(this).addClass('selected-item');
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 51a6bdc4..f0115c0e 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -124,6 +124,7 @@
 <script>
 	var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function() {
+    	setHeaderBreadCrumb(_MPU_);
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
 		
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 57a55597..fd969a88 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -253,6 +253,7 @@
 </div>
 <script>
   $(document).ready(function(){
+    setHeaderBreadCrumb(_ORDERS_);
     $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index a194e03a..6a9e1bb6 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -210,7 +210,8 @@
 <script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>";
 
-	$(document).ready(function(){     
+	$(document).ready(function(){   
+    setHeaderBreadCrumb(_OTHER_CHARGES_);
 		$(".cashier_number").on('click', function(event){
 			if(event.handled !== true) {
 				var original_value=0;
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index a6a13a77..3e20fe8c 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -27,6 +27,9 @@
 </div>
 <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
 <script type="text/javascript">
+	$(document).ready(function () {
+	    setHeaderBreadCrumb(_OTHER_PAYMENTS_);
+	});
 	/* start check first bill or not*/
 	var cashier_type = "<%= @cashier_type %>";
         var receipt_no = "";
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index ee006c3a..92920a4c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -461,6 +461,7 @@ var cashier_type = "<%= @cashier_type %>";
 var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
+    setHeaderBreadCrumb(_PAYMENTS_);
     //start customer modal popup
     if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
       if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
diff --git a/app/views/origami/paypar_payments/index.html.erb b/app/views/origami/paypar_payments/index.html.erb
index 3b9fd2a3..3412b79b 100755
--- a/app/views/origami/paypar_payments/index.html.erb
+++ b/app/views/origami/paypar_payments/index.html.erb
@@ -13,4 +13,9 @@
   <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> Back </button>
 </div>
 	
- <div>
\ No newline at end of file
+ <div>
+ <script>
+ 	$(document).ready(function () {
+	    setHeaderBreadCrumb(_PAYPAR_PAYMENT_);
+	});
+ </script>
\ No newline at end of file
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index 8fa9a7af..16c468bd 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -39,6 +39,9 @@
     </div>
 </div>
 <script>
+    $(document).ready(function(){
+      setHeaderBreadCrumb(_PENDING_ORDER_);
+    });  
     cashier_type = "quick_service"
     $(".sales").on('click',function(){
 	    var sale_id = $(this).attr("data-id");
diff --git a/app/views/origami/product_commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb
index af01f1ee..eaf38e0d 100755
--- a/app/views/origami/product_commissions/load_commissioners.html.erb
+++ b/app/views/origami/product_commissions/load_commissioners.html.erb
@@ -121,6 +121,7 @@
 </div>
 <script>
   $(document).ready(function () {
+    setHeaderBreadCrumb(_PRODUCT_COMMISSIONS_);
     var selected_sale_item = 0;
 
     $('.sale_item').on('click', function () {
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 169eb026..4942d144 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -109,6 +109,7 @@
 <script type="text/javascript">
     var cashier_type = "<%= @cashier_type %>"; 
 	$(document).ready(function() {
+	  setHeaderBreadCrumb(_REDEEM_PAYMENT_);
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#redeemamt').attr("value",parseFloat("<%= @redeem_prices %>") - parseFloat(localStorage.getItem("cash")));
diff --git a/app/views/origami/room_invoices/index.html.erb b/app/views/origami/room_invoices/index.html.erb
index e482490a..8c6666d3 100755
--- a/app/views/origami/room_invoices/index.html.erb
+++ b/app/views/origami/room_invoices/index.html.erb
@@ -82,6 +82,7 @@
 </div>
 <script>
 $(document).ready(function(){
+    setHeaderBreadCrumb(_ROOM_INVOICES_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @room.id %>/table_invoice/' + dining_id;
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1edb07cf..5dff1385 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -484,6 +484,7 @@
 <script>
 var cashier_type = "cashier";
 $(document).ready(function(){
+  setHeaderBreadCrumb(_ROOM_);
   // $(".tables").on('click', function(){
   //     var customer_id=$(".customer-id").text();
   //     show_customer_details(customer_id);
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 745286d3..26bde1c4 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -189,6 +189,8 @@
 var cashier_type = "<%= @cashier_type %>"; 
     // Bill Request
     $(document).ready(function () {
+
+        setHeaderBreadCrumb(_SALE_EDIT_);
         $('.editModal').on('click', function () {
         $("#action").attr('data-type', $(this).attr('data-type'));
         $("#action").attr('data-id', $(this).attr('data-id'));
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
index 1973363c..899805b2 100644
--- a/app/views/origami/second_display/index.html.erb
+++ b/app/views/origami/second_display/index.html.erb
@@ -10,6 +10,7 @@
 </div>
 <script type="text/javascript">
 	$(document).ready(function () {
+    setHeaderBreadCrumb(_SECOND_DISPLAY_);
       $('#s_reload').on('click', function () {
       window.location.href = '/origami/second_display';
       });
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 4ea71dec..f8da7e63 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -58,6 +58,9 @@
   </div>
 </div>
 <script>
+  $(document).ready(function(){
+    setHeaderBreadCrumb(_CLOSE_CASHIER_);
+  });
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
     var shift_id = "<%= @shift.id rescue ""%>"
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index 517195d0..8e3197b5 100644
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -332,6 +332,7 @@
  	var split_sale_id = "";
  	var split_receipt_no = "";
  	$(document).ready(function(){
+	  setHeaderBreadCrumb(_SPLIT_BILL_);
  		$('#back').on('click',function(){
  			backToOrigami();
  		})
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 82b7c12a..68c3f59b 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -196,6 +196,7 @@
 <script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
+    setHeaderBreadCrumb(_SURVEY_);
     //click add button for new row
     $('#addForeigner').on('click',function(){
         $('#newTemplate').removeClass('hidden');
diff --git a/app/views/origami/table_invoices/index.html.erb b/app/views/origami/table_invoices/index.html.erb
index b0c328be..a29392f2 100755
--- a/app/views/origami/table_invoices/index.html.erb
+++ b/app/views/origami/table_invoices/index.html.erb
@@ -82,6 +82,7 @@
 </div>
 <script>
 $(document).ready(function(){
+    setHeaderBreadCrumb(_TABLE_INVOICE_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 515973f1..150121bb 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -212,6 +212,7 @@
 </div>
 <script>
 $(document).ready(function(){
+  setHeaderBreadCrumb(_TABLE_INVOICE_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index c48e4a80..250f97d1 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -123,6 +123,7 @@
   var cashier_type = "<%= @cashier_type %>"; 
   
   $(document).ready(function() {
+    setHeaderBreadCrumb(_UNION_);
     var sale_id = "<%= @sale_id %>";
     var bank_integration = "<%= @bank_integration %>";
 
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 2b81db65..52d14c4b 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -122,6 +122,7 @@
 <script>
   var cashier_type = "<%= @cashier_type %>";  
   $(document).ready(function() {
+    setHeaderBreadCrumb(_VISA_);
     var sale_id = "<%= @sale_id %>";
     var bank_integration = "<%= @bank_integration %>";
 
diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb
index 0d349116..06f133b5 100755
--- a/app/views/origami/voucher/index.html.erb
+++ b/app/views/origami/voucher/index.html.erb
@@ -98,6 +98,8 @@
 
 <script>
 $(document).ready(function() {
+      	setHeaderBreadCrumb(_VOUCHER_);
+
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 	  else {
 	    $('#validamount').attr("value",parseFloat("<%= @can_voucher %>") - parseFloat(localStorage.getItem("cash")));

From 1188f6e8e93bd113527338226fc03e961d47597f Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Mar 2018 13:48:52 +0630
Subject: [PATCH 421/651] Pull from master

---
 app/assets/javascripts/addorder.js            | 15 +++-
 app/assets/stylesheets/origami.scss           | 26 ++++++-
 app/controllers/crm/customers_controller.rb   |  6 +-
 app/controllers/oqs/edit_controller.rb        |  7 ++
 .../origami/discounts_controller.rb           |  2 +-
 .../origami/payments_controller.rb            | 12 ++--
 .../origami/request_bills_controller.rb       |  8 ++-
 .../origami/split_bill_controller.rb          | 70 ++++++++++++++-----
 app/controllers/origami/voucher_controller.rb |  2 +-
 app/models/customer.rb                        | 12 ++--
 app/models/sale.rb                            |  2 +-
 app/models/sale_payment.rb                    | 11 +--
 app/pdf/receipt_bill_a5_pdf.rb                |  4 +-
 app/pdf/receipt_bill_pdf.rb                   |  4 +-
 app/views/crm/customers/_new_form.html.erb    |  7 ++
 app/views/layouts/_header.html.erb            |  3 +-
 app/views/origami/addorders/detail.html.erb   |  5 ++
 app/views/origami/customers/index.html.erb    | 13 +++-
 app/views/origami/dashboard/index.html.erb    | 13 +++-
 app/views/origami/home/show.html.erb          |  8 +--
 app/views/origami/orders/show.html.erb        |  2 +-
 app/views/origami/payments/show.html.erb      | 61 ++++++++++------
 app/views/origami/pending_order/show.html.erb |  3 +-
 .../second_display/_second_display.html.erb   |  2 +-
 .../origami/second_display/index.html.erb     |  2 +-
 app/views/origami/split_bill/index.html.erb   | 23 +++++-
 config/initializers/action_controller.rb      | 10 +--
 .../20170403174111_create_sale_audits.rb      |  2 +-
 .../20170628103624_create_print_settings.rb   |  4 +-
 29 files changed, 242 insertions(+), 97 deletions(-)
 mode change 100644 => 100755 app/controllers/origami/split_bill_controller.rb
 mode change 100644 => 100755 app/views/origami/split_bill/index.html.erb

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 32054b53..1df7a16e 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -880,13 +880,24 @@ $(function() {
       dataType: "json",
        success:function(result){
           if (result.status) {
+            console.log(result)
             if (result.data == null){
-               window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+               swal({
+                  title: "Please Open Shift !",
+                  text: result.status,
+                  type: "warning",
+                  confirmButtonColor: "#DD6B55",
+                  confirmButtonText: "Ok",
+                  closeOnConfirm: false
+              }, function () {
+                  window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+              });
+
             }else{
             window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
             }
           }
-          } 
+       } 
     });
   });
 
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 623a4618..07c7428f 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -314,7 +314,7 @@ tr.discount-item-row:hover {
 	position: relative;
 	left: 42%;
 	top: 30%;
-	background-color: #d9534f;	
+	background-color: #32ad1a;	
 	color: #fff;
 	text-align: center;
     width: 200px;
@@ -396,3 +396,27 @@ i.logout_icon{
 	color: #fff !important;
 	background-color: #5DADE2 !important;
 }
+
+/* Start Is Member Modal */
+#is_memberModal .modal-body {
+	height: 200px !important;
+}
+
+#is_memberModal .btn {
+	width: 80%;
+}
+/* End Is Member Modal */
+
+/* Start iframe */
+iframe {
+	border: none;
+	overflow: hidden !important;
+	width: 400px;
+	height: 550px;
+}
+
+#pdfModal .btn {
+	width: 150%;
+	height: 100%;
+}
+/* End iframe */
\ No newline at end of file
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index eb9dc653..3082687b 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -143,7 +143,7 @@ class Crm::CustomersController < BaseCrmController
                                         :body => member_params,
                                         :headers => {
                                               'Content-Type' => 'application/json',
-                                              'Accept'       => 'application/json; version=2'
+                                              'Accept'       => 'application/json; version=3'
                                                     },
                                         :timeout => 10
                                )
@@ -269,7 +269,7 @@ end
                                       :body => member_params,
                                       :headers => {
                                                'Content-Type' => 'application/json',
-                                               'Accept'       => 'application/json; version=2'
+                                               'Accept'       => 'application/json; version=3'
                                                   },
                                       :timeout => 10
                               )
@@ -328,7 +328,7 @@ end
                                       :body => member_params,
                                       :headers => {
                                                'Content-Type' => 'application/json',
-                                               'Accept'       => 'application/json; version=2'
+                                               'Accept'       => 'application/json; version=3'
                                                   },
                                       :timeout => 10
                                             )
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index e8d9615d..b123ac73 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -25,6 +25,13 @@ class Oqs::EditController < BaseOqsController
     order_item.item_order_by = current_user.name
     order_item.qty = qty_weight
     order_item.remark = remarks
+    if !order_item.set_menu_items.nil?
+      instance_item_sets = JSON.parse(order_item.set_menu_items)
+      instance_item_sets.each_with_index do |instance_item, instance_index|
+        instance_item_sets[instance_index]["quantity"] = qty_weight
+      end
+      order_item.set_menu_items = instance_item_sets.to_json
+    end
     order_item.save
 
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 59da5387..8e390015 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -273,7 +273,7 @@ class Origami::DiscountsController < BaseOrigamiController
                                              auth_token:auth_token}.to_json,
                                   :headers => {
                                       'Content-Type' => 'application/json',
-                                      'Accept'       => 'application/json; version=2'
+                                      'Accept'       => 'application/json; version=3'
                            }, :timeout => 10)
           rescue HTTParty::Error
             response = {"status": false, "message": "Can't open membership server " }
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 8c83a356..c764b92f 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -63,9 +63,9 @@ class Origami::PaymentsController < BaseOrigamiController
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
-        member_info = Customer.get_member_account(customer)
-        current_balance = SaleAudit.paymal_search(sale_id)
-        # current_balance = 0
+        # member_info = Customer.get_member_account(customer)
+        # current_balance = SaleAudit.paymal_search(sale_id)
+         current_balance = 0
       end
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -152,8 +152,10 @@ class Origami::PaymentsController < BaseOrigamiController
         
         if customer.membership_id != nil && rebate && credit_data.nil?
           member_info    = Customer.get_member_account(customer)
-          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-          current_balance = SaleAudit.paymal_search(sale_id)
+          if member_info["status"] == true
+            rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+            current_balance = SaleAudit.paymal_search(sale_id)
+          end
         end
         
         #for card sale data
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 3bc08681..aa145b4f 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -8,9 +8,7 @@ class Origami::RequestBillsController < ApplicationController
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
-      puts params[:id]
-      puts bk_order
-      puts bk_order.booking_id
+      order = Order.find(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
       
       if check_booking.sale_id.nil?
@@ -29,6 +27,10 @@ class Origami::RequestBillsController < ApplicationController
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
+      if order.source == "quick_service"
+        result = {:status=> @status, :data => @sale.sale_id }
+          render :json => result.to_json
+      end
     else
       @status = false
       @error_message = "No Current Open Shift for This Employee"
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
old mode 100644
new mode 100755
index 1790624a..16239750
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -77,6 +77,10 @@ class Origami::SplitBillController < BaseOrigamiController
 
 	def create
 		order_ids = params[:order_ids]
+		arr_order_ids = nil
+		if !params[:arr_order_ids].nil?
+			arr_order_ids = JSON.parse(params[:arr_order_ids])
+		end
 		orders = nil
 		if !params[:orders].empty? 
 			orders = JSON.parse(params[:orders])
@@ -136,14 +140,15 @@ class Origami::SplitBillController < BaseOrigamiController
 					order_id_count = 0
 					order_id = nil
 
-					order_items.each do |order_item|
-						order_item_count = 0
-						order = Order.find(order_item["order_id"])
-						if order.order_items.count == 1
-							order_id = order.id
-							order_id_count += 1
-						else
-							order_item_count += 1
+					arr_order_ids.each do |order|
+						order.each do |odr|
+							data = Order.find(odr[0])
+							if data.order_items.count == odr[1]
+								order_id = odr[0]
+								order_id_count += 1
+							else
+								order_item_count += 1
+							end
 						end
 					end
 
@@ -158,10 +163,12 @@ class Origami::SplitBillController < BaseOrigamiController
 							puts "order_id_count > 1"
 
 							updated_order_id = Array.new
-							order_ids.each do |odr_id|
-								odr = Order.find(odr_id)
-								if odr.order_items.count > 1
-									updated_order_id.push(odr_id)
+							arr_order_ids.each do |order|
+								order.each do |odr|
+									data = Order.find(odr[0])
+									if data.order_items.count != odr[1]
+										updated_order_id.push(odr[0])
+									end
 								end
 							end
 
@@ -266,12 +273,32 @@ class Origami::SplitBillController < BaseOrigamiController
 						    end
 						end
 					else
-						# puts order_ids
-						if order_ids.count == 1 && order_id_count == 0 && order_item_count == 1
-							BookingOrder.find_by_order_id(order_ids[0]).delete
-							BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
-							order_items.each do |order_item|
-								update_order_item(order_ids[0], order_item)
+						if order_ids.count == 1 && order_item_count == 1
+							if order_id_count == 0 
+								customer = Customer.find(params[:customer_id])
+								order_type = "dine_in"
+								if !customer.nil?
+									if customer.customer_type == "Takeaway"
+										order_type = "takeaway"
+									elsif customer.customer_type == "Delivery"
+										order_type = "delivery"
+									end
+								end
+
+								# begin
+								order = create_order(params,order_type,order_items.count,current_user)
+
+							    BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
+
+							    order_items.each do |order_item|
+							    	update_order_item(order.order_id, order_item)
+							    end
+							else
+								BookingOrder.find_by_order_id(order_ids[0]).delete
+								BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
+								order_items.each do |order_item|
+									update_order_item(order_ids[0], order_item)
+							    end
 						    end
 						else
 							customer = Customer.find(params[:customer_id])
@@ -366,4 +393,11 @@ class Origami::SplitBillController < BaseOrigamiController
 
 		render :json => { status: true }
 	end
+
+	#Shop Name in Navbor
+	helper_method :shop_detail
+	def shop_detail
+		@shop = Shop.first
+	end
+
 end
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index c4b3c840..25352597 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -54,7 +54,7 @@ class Origami::VoucherController < BaseOrigamiController
                                   }.to_json,
                         :headers => {
                                   'Content-Type' => 'application/json',
-                                  'Accept' => 'application/json; version=2'
+                                  'Accept' => 'application/json; version=3'
                         }, :timeout => 10
                   )
               rescue Net::OpenTimeout
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 7f5a7a63..934d371f 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -34,7 +34,7 @@ class Customer < ApplicationRecord
                         }.to_json,
                             :headers => {
                               'Content-Type' => 'application/json',
-                              'Accept'       => 'application/json; version=2'
+                              'Accept'       => 'application/json; version=3'
                             },
                           :timeout => 10)
     rescue HTTParty::Error
@@ -71,7 +71,7 @@ class Customer < ApplicationRecord
                                             }.to_json,
                                     :headers => {
                                             'Content-Type' => 'application/json',
-                                            'Accept'       => 'application/json; version=2'
+                                            'Accept'       => 'application/json; version=3'
                                     },
                                     :timeout => 10
                                )
@@ -124,7 +124,7 @@ class Customer < ApplicationRecord
                      :body => member_params,
                      :headers => {
                               'Content-Type' => 'application/json',
-                              'Accept'       => 'application/json; version=2'
+                              'Accept'       => 'application/json; version=3'
                       })
       rescue Net::OpenTimeout
       response = { status: false, message: "Server Time out" }
@@ -201,7 +201,7 @@ class Customer < ApplicationRecord
                                 }.to_json,
                                 :headers => {
                                   'Content-Type' => 'application/json',
-                                  'Accept'       => 'application/json; version=2'
+                                  'Accept'       => 'application/json; version=3'
                                 }, :timeout => 10)
         rescue Net::OpenTimeout
            response = { "status": false , "message": "Connect To" }
@@ -277,7 +277,7 @@ class Customer < ApplicationRecord
                                   }.to_json,
                                   :headers => {
                                     'Content-Type' => 'application/json',
-                                    'Accept'       => 'application/json; version=2'
+                                    'Accept'       => 'application/json; version=3'
                                   }, :timeout => 10)
           rescue Net::OpenTimeout
              response = { "status": false , "message": "Connect To" }
@@ -312,7 +312,7 @@ class Customer < ApplicationRecord
                                       }.to_json,
        :headers => {
         'Content-Type' => 'application/json',
-        'Accept'       => 'application/json; version=2'
+        'Accept'       => 'application/json; version=3'
         },
         :timeout => 10
         )
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f0b5aeed..5d46aafc 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -884,7 +884,7 @@ def self.get_menu_item_query(order_by)
                      "(CASE WHEN si.qty IS NOT NULL THEN SUM(si.qty) ELSE 0 END) as total_item," +
                      "(CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END) as unit_price," +
                      "(CASE WHEN si.qty IS NOT NULL THEN (SUM(si.qty) * si.unit_price) ELSE 0 END) as grand_total," +
-                     "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE mii.item_instance_name END) as product_name, 
+                     "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE CONCAT(menu_items.name,' - ',mii.item_instance_name) END) as product_name, 
                      mc.name as" +
                      " menu_category_name,mc.id as menu_category_id, si.remark as status_type, 
                      si.price as price ")
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 1866a630..5809dc0f 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -85,7 +85,7 @@ class SalePayment < ApplicationRecord
                         }.to_json,
               :headers => {
                         'Content-Type' => 'application/json',
-                        'Accept' => 'application/json; version=2'
+                        'Accept' => 'application/json; version=3'
               }, :timeout => 10
         )
     rescue Net::OpenTimeout
@@ -133,7 +133,7 @@ class SalePayment < ApplicationRecord
                             auth_token:auth_token}.to_json,
                   :headers => {
                             'Content-Type' => 'application/json',
-                            'Accept' => 'application/json; version=2'
+                            'Accept' => 'application/json; version=3'
                   },
                   :timeout => 10
             )
@@ -455,7 +455,7 @@ class SalePayment < ApplicationRecord
                                 }.to_json,
                                 :headers => {
                                   'Content-Type' => 'application/json',
-                                  'Accept'       => 'application/json; version=2'
+                                  'Accept'       => 'application/json; version=3'
                                 }, :timeout => 10)
         rescue Net::OpenTimeout
            response = { "status": false , "message": " Connection timeout" }
@@ -500,7 +500,8 @@ class SalePayment < ApplicationRecord
           end
           rebate_arr.push(data)
         end
-
+        Rails.logger.debug "Rebage Response"
+          Rails.logger.debug rebate_arr.to_json
      		total_amount = rebate_prices - payparcost - overall_dis
 
         if credit == 1
@@ -531,7 +532,7 @@ class SalePayment < ApplicationRecord
                                   }.to_json,
                                   :headers => {
                                     'Content-Type' => 'application/json',
-                                    'Accept'       => 'application/json; version=2'
+                                    'Accept'       => 'application/json; version=3'
                                   }, :timeout => 10)
           rescue Net::OpenTimeout
              response = { "status": false , "message": "Connect To" }
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 206c7a0a..604d99dd 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -491,8 +491,8 @@ class ReceiptBillA5Pdf < Prawn::Document
     end
 
     #individual payment per person
-    def individual_payment(sale_data, survey, precision, delimiter)
-        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+    def individual_payment(sale_data, precision, delimiter)
+        per_person = sale_data.grand_total.to_i / sale_data.equal_persons.to_i
         stroke_horizontal_rule
         move_down line_move
         y_position = cursor
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index efc85c7f..fe1ee628 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -494,8 +494,8 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     #individual payment per person
-    def individual_payment(sale_data, survey, precision, delimiter)
-        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+    def individual_payment(sale_data, precision, delimiter)
+        per_person = sale_data.grand_total.to_i / sale_data.equal_persons.to_i
         stroke_horizontal_rule
         move_down line_move
         y_position = cursor
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 3a953e81..5dcb86b0 100755
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -162,6 +162,9 @@
 
 <div id="sxModal">
   <div id="sxModal-Content"><h3><%= t :card_tap %></h3></div>
+  <div class="m-r-20" align="right">
+      <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
+  </div>
 </div>
 <!-- The modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="modalLabelLarge" aria-hidden="true">
@@ -212,4 +215,8 @@
       $("#type").val("card");
     }
   }
+
+  $("#sxModal .btn_cancel").on('click',function(){
+    $("#sxModal").hide();
+  });
 </script>
\ No newline at end of file
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 42fd0200..23a4aba2 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -10,6 +10,7 @@
 </div> -->
 <!-- #END# Search Bar -->
 <!-- Top Bar -->
+<%if !request.path_info.include?('second_display') %>
 <nav class="navbar">
     <div class="container-fluid">
         <div class="navbar-header">
@@ -79,7 +80,7 @@
         </div>
     </div>
 </nav>
-
+<%end%>
 <script type="text/javascript">
     $(function(){
         $('.delete').click(function(){
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index c3caae9c..aba0f3f7 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -482,6 +482,11 @@
     </div>
     </div>
     <% end %>
+    <style type="text/css">
+      .fadeInRight{
+        -webkit-animation-duration: 350ms !important;
+      }
+    </style>
 <script>
     jQuery(function(){
         id = "<%=@menu[0].id%>";
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 3ff42c87..00f5694f 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -263,6 +263,9 @@
 
    <div id="sxModal">
     <div id="sxModal-Content"><h3>Card Tap</h3></div>
+    <div class="m-r-20" align="right">
+        <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
+    </div>
   </div>
 </div>
 <script type="text/javascript">
@@ -479,11 +482,11 @@
               if(booking_id!= "" && page == "pending"){
                 window.location.href = '/origami/'+cashier_type+'/pending_order/'+booking_id;
               }else{
-               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
+               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
               }
             }else{
               if(page == "payment"){
-                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/customers/payment/';
+                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
               }else{
                 if (type=="Table") {
                   window.location.href = '/origami/table/'+id
@@ -523,7 +526,11 @@
       
     }
     
- })
+ });
+
+  $("#sxModal .btn_cancel").on('click',function(){
+    $("#sxModal").hide();
+  });
 
 </script>
 
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index cd08965c..246110f5 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -189,18 +189,27 @@
       </div>
       <% end %>
     </div>
-
+ <button type="button" data-href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect second_view hidden" style="height: 45px">Customer View</button>
 <script>
   $(document).ready(function () {
     setHeaderBreadCrumb(_DASHBOARD_);
   });
 
+
+
   $(".cashier_view").on('click', function() {
     window.location.href = '/origami';
   });
 
   $(".qs_view").on('click', function() {
-    window.location.href = '/origami/quick_service';
+     document.getElementById('second_view').click();
+     window.location.href = '/origami/quick_service';
+    
+  });
+  
+ $("#second_view").on('click', function () {
+    var url = $(this).attr("data-href");
+    window.open(url,'_blank');
   });
 
 </script>
\ No newline at end of file
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 2f2bf4e3..f1b1629e 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -134,7 +134,7 @@
               <div class="tab-pane dining" id="orders" role="tabpanel">
                 <div class="card-columns">
                   <% @orders.each do |order| %>
-                      <div class="card orders red text-white" data-id="<%= order.order_id %>">
+                      <div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
                         <div class="card-block">
                           <%
                             order_status = ""
@@ -424,7 +424,7 @@
             <i class="material-icons">reply</i>
              <%= t("views.btn.back") %>
           </button>
-          <a href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect" style="height: 45px">Customer View</a>
+        <!--   <a href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect" style="height: 45px">Customer View</a> -->
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
           <% if @dining.status != "available" %> 
@@ -491,11 +491,11 @@
                 <div class="modal-dialog" role="document">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment Method</h4>
                         </div>
                         <div class="modal-body">
                            <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
-                             <option value="Cash">Cash</option>
+                             <!-- <option value="Cash">Cash</option> -->
                              <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index fd969a88..ffdc3d80 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -131,7 +131,7 @@
   <div class="tab-pane active" id="orders" role="tabpanel" style="">
    <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
      <% @orders.each do |order| %>
-     <div class="card orders red text-white" data-id = "<%= order.order_id %>">
+     <div class="card orders  <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id = "<%= order.order_id %>">
        <div class="card-block">
         <%
         order_status = ""
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 92920a4c..acd97d0b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -391,21 +391,23 @@
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <h4 class="modal-title" id="pdfModalLabel"></h4>
+      <h4 class="modal-title">
+        <span id="pdfModalLabel"></span>
+        <span id="changed_amount" class="p-l-120"></span>
+      </h4>
       </div>
       <div class="modal-body">
         <input type="hidden" name="sale_receipt_no" id="sale_receipt_no">
         <input type="hidden" name="filename" id="filename">
         <input type="hidden" name="printer_name" id="printer_name">
-        <p id="changed_amount"></p>
         <div class="text-center">
-          <iframe id="receipt_pdf" src="" style="width: 400px; height: 600px;"></iframe>
+          <iframe id="receipt_pdf" src="" class="pdf-iframe" scrolling="no"></iframe>
         </div>
       </div>
       <div class="modal-footer ">
-        <div class="row p-r-20">
+        <div class="row m-b-10 m-r-30">
           <% if ENV["SERVER_MODE"] != 'cloud' %>
-          <div class="col-md-5">
+          <div class="col-md-5 m-r-20">
             <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
           </div>
           <% end %>
@@ -424,27 +426,29 @@
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <h3 class="modal-title" id="is_memberModalLabel">Are you Member?</h3>
+        <h1 class="modal-title" id="is_memberModalLabel">Are you Member?</h1>
       </div>
       <div class="modal-body">
-        <div class="row text-center">
-          <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
-          <input type="hidden" name="qr_code" id="qr_code" />
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+        <input type="hidden" name="qr_code" id="qr_code" />
+        <div class="row text-center m-t-20">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Card Member</button>
+          </div>
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR Code</button>
+          </div>
+        </div>
+        <div class="row clearfix"></div>
+        <div class="row text-center m-t-20">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
             <button type="button" class="btn btn-lg btn-link bg-green waves-effect btn_customer_yes">Yes</button>
           </div>
 
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
             <button type="button" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">No</button>
           </div>
-
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Member</button>
-          </div>
-
-          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR</button>
-          </div>
         </div>
       </div>
       <div class="modal-footer"></div>
@@ -453,7 +457,12 @@
 </div>   
 
 <div id="sxModal">
-  <div id="sxModal-Content"><h3>Card Tap</h3></div>
+  <div id="sxModal-Content">
+    <h3>Card Tap</h3>
+  </div>
+  <div class="m-r-20" align="right">
+      <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
+  </div>
 </div> 
 
 <script type="text/javascript">
@@ -463,7 +472,7 @@ var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
     setHeaderBreadCrumb(_PAYMENTS_);
     //start customer modal popup
-    if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+    if((cashier_type=='quick_service') && (customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
       if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
         $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
       }
@@ -481,7 +490,9 @@ var customer_name = "<%= @customer.name %>";
         
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           console.log("ssssssssssss")
-          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
+          console.log(member_id);
+          console.log(member_discount);
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
@@ -601,7 +612,7 @@ var customer_name = "<%= @customer.name %>";
                 $("#printer_name").val(result.printer_name);
                 $("#receipt_pdf").attr("src", result.filename);
                 $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
-                $("#pdfModalLabel").text("Payment Successful!");
+                $("#pdfModalLabel").text("Sale Completed");
                 $("#changed_amount").text("");
                 if($('#balance').text() < 0){
                   <% if precision.to_i > 0 %>
@@ -1100,4 +1111,8 @@ var customer_name = "<%= @customer.name %>";
       });        
     });
   }
+
+  $("#sxModal .btn_cancel").on('click',function(){
+    $("#sxModal").hide();
+  });
 </script>
\ No newline at end of file
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index fade7ccb..d7c929f7 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -203,11 +203,12 @@ $(document).ready(function(){
           url: ajax_url,
           // data: 'order_id='+ order_id,
           success: function (result) {
+            console.log(result)
               if (!result.status) {
                 swal("Information!", result.error_message);
               }
               else {              
-                location.reload();
+                window.location.href = '../pending_order/'+ result.data;
               }
           }
       });   
diff --git a/app/views/origami/second_display/_second_display.html.erb b/app/views/origami/second_display/_second_display.html.erb
index a5ac8872..267be25a 100644
--- a/app/views/origami/second_display/_second_display.html.erb
+++ b/app/views/origami/second_display/_second_display.html.erb
@@ -4,7 +4,7 @@
       <div class="card">
         <div class="card-block">
           <div class="card-text" >
-          <div id="order-detail-slimscroll" data-height="150">
+          <div id="order-detail-slimscroll" data-height="160">
             <table class="table table-striped second_display_items" id="order-items-table">
               <thead>
                 <tr>
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
index 899805b2..0fc62a38 100644
--- a/app/views/origami/second_display/index.html.erb
+++ b/app/views/origami/second_display/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid" style="margin-top:-65px;">
     <button type="button" class="hidden" id="s_reload">Reload</button>
     <div class="slider" id="second_display_slider">
     	<%= render 'slider' %>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
old mode 100644
new mode 100755
index 8e3197b5..772842b5
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -624,20 +624,39 @@ function orderItemSplitBillProcess(cnt_items){
 	}
 
 	var order_ids = [];
+	var arr_order_ids = [];
 	if(order_items!=undefined && order_items!=null){
 		$.each(order_items,function(key,value){
+			var orderIds = {};
 			if($.inArray(value.order_id,order_ids) == -1){
 				order_ids.push(value.order_id);
+				orderIds[value.order_id] = 1;
+				arr_order_ids.push(orderIds);
+			}else{
+				if(arr_order_ids != null & arr_order_ids!=""){
+					if(arr_order_ids.length > 0){
+						$.each(arr_order_ids, function(k,val){
+							$.each(val,function(kk,vval){
+								if((val[kk]!= undefined) && (kk == value.order_id)){
+									val[kk] += 1;
+								}
+							});
+							arr_order_ids[k] = val;
+						});
+					}
+				}
 			}
 		});
 	}
 
+	// console.log(JSON.stringify(arr_order_ids));
+
 	var ajax_url = "/origami/split_bills";
 	$.ajax({
 		type: "POST",
 		url: ajax_url,
 		dataType: 'JSON',
-		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items), 'orders' : ''},
+		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'arr_order_ids': JSON.stringify(arr_order_ids), 'order_items' : JSON.stringify(order_items), 'orders' : ''},
 		success: function (result) {
 			if (!result.status) {
 				swal("Information!", result.error_message);
@@ -670,7 +689,7 @@ function orderSplitBillProcess(cnt_orders){
 		type: "POST",
 		url: ajax_url,
 		dataType: 'JSON',
-		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders)},
+		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders), 'arr_order_ids': []},
 		success: function (result) {
 			if (!result.status) {
 				swal("Information!", result.error_message);
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8f310dab..02e35bb8 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/db/migrate/20170403174111_create_sale_audits.rb b/db/migrate/20170403174111_create_sale_audits.rb
index e1dcfffd..1cf609df 100755
--- a/db/migrate/20170403174111_create_sale_audits.rb
+++ b/db/migrate/20170403174111_create_sale_audits.rb
@@ -9,7 +9,7 @@ class CreateSaleAudits < ActiveRecord::Migration[5.1]
       t.string :action_by, :null => false
       t.string :approved_by, :null => true
       t.datetime :approved_at, :null => true
-      t.string :remark
+      t.text :remark
       t.timestamps
     end
   end
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index 672953fc..4f27bd0c 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -6,13 +6,13 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :template  
       t.string  :font, :default => ""    
       t.string  :printer_name, :null => false
-      t.string  :api_settings,
+      t.string  :api_settings
       t.string  :brand_name
       t.string  :type
       t.decimal :page_width, :null => false, :default => 210
       t.decimal :page_height, :null => false, :default => 1450
       t.integer :print_copies, :null => false, :default => 1
-      t.string :precision
+      t.string  :precision
       t.boolean :delimiter
       t.integer :heading_space
 

From c62637af100c0ce2ad33432cfda35ed3aa6697d8 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Mar 2018 14:08:30 +0630
Subject: [PATCH 422/651] Remove / from _header

---
 app/views/layouts/_header.html.erb       |  2 +-
 config/initializers/action_controller.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 23a4aba2..e42f33ec 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -29,7 +29,7 @@
                 <span class="navbar-brand-txt">SX Restaurant</span>
             </a>
             
-            <span class="navbar-brand m-0">/ &nbsp;
+            <span class="navbar-brand m-0">
                 <span id="others_payment"></span>
             </span>
         </div>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 02e35bb8..2bcdd944 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -19,12 +19,12 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      check for license file
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From af2f3045cf1844ce5fdcef2334573099180d8608 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 15 Mar 2018 14:25:19 +0630
Subject: [PATCH 423/651] change order items api

---
 app/models/order.rb                            | 2 +-
 app/views/api/orders/view_orders.json.jbuilder | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index 1508c960..892c218c 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -152,7 +152,7 @@ class Order < ApplicationRecord
               item[:sub_items].each do |si|
                 # Retrive instance's Price
                 set_item = MenuItem.search_by_item_code(si[:item_instance_code])
-                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
+                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "item_instance_name"=>set_item[:name], "quantity"=>si[:quantity], "price"=>set_item[:price]})
               end
             end
             set_order_items = set_order_items.to_json
diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder
index ae3fea84..dd72a3a3 100755
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -46,9 +46,12 @@ if (@booking)
         child_spent += (item.price * item.qty)  
       end
       # End YGN BBQ
+      json.order_items_id        item.order_items_id
+      json.order_id              item.order_id
       json.item_code             item.item_code
       json.item_instance_code    item.item_instance_code
       json.item_name             item.item_name
+      json.set_menu_items        item.set_menu_items
       json.price                 item.price
       json.qty                   item.qty
       json.options               item.options

From f0e81caad0cf857cde16ff646660e7021dbeab91 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Mar 2018 14:35:25 +0630
Subject: [PATCH 424/651] update addorder option for set

---
 app/assets/javascripts/addorder.js           | 41 ++++++++++++--------
 app/controllers/settings/menus_controller.rb |  4 ++
 app/models/menu.rb                           | 27 ++++++++++++-
 config/application.rb                        |  1 +
 lib/tasks/receipt.rake                       | 40 -------------------
 5 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 1df7a16e..401d894a 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -180,7 +180,7 @@ $(function() {
                   image_path = "image/logo.png";
                 }
               }
-              
+              console.log(menu_items[field].options)
 
               row = '<div class="card custom-card testimonial-card animated fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                        +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
@@ -202,7 +202,7 @@ $(function() {
                           + price +"' data-instance-code = '"+ code +"' data-instance = '"
                           + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
                           + JSON.stringify(item_attributes) +"' data-options = '"
-                          + options +"' data-image='"+image_path+"' data-toggle='"
+                          + JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"' data-toggle='"
                           +data_modal+"' data-target='."+data_target+"' data-item-sets = '"
                       +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
                       +JSON.stringify(menu_items[field].instances)+"'>"
@@ -237,10 +237,10 @@ $(function() {
     //instances          = $(this).data('instance');
     item_sets          = $(this).data('item-sets');
     instances          = $(this).data('instances');
-    // item_sets          = $(data).attr('data-item-sets');
+    item_options       = $(this).data('options');
 
     for(var field in item_sets) { 
-
+     
       $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
 
       value = item_sets[field]["instances"];
@@ -283,10 +283,20 @@ $(function() {
       });
     }
 
+    for(var j in item_options) { 
+      value = item_options[j]["values"];
+      type  = item_options[j]["type"];
+      row = "<h4>"+type+"</h4>"
+      $(value).each(function(i){
+        row +="<button class='btn btn- waves-effect option_btn "+ type +"' data-type='"
+        +type+"' data-value='"+value[i]+"' data-group='set_menu_default'>"+value[i]+"</button>";   
+      });
+       $(".options-list").append(row); 
+    }
      $('.set-item').attr('data-code',instances[0]['code']);
      $('.set-item').attr('data-name',instances[0]['name']);
      $('.set-item').attr('data-price',instances[0]['price']);
-     $('.set-item').attr('data-options','[]');
+     // $('.set-item').attr('data-options','[]');
      $('.set-item').attr('data-parent',true);
 
     $('#set_change_qty').val(1);
@@ -371,32 +381,28 @@ $(function() {
       customer_display_view(item,"set_add");
 
       attribute_arr = []
-      option_arr = []
 
       var rowCount = $('.summary-items tbody tr').length+1;
-      option_arr = []
         code          = $('.set-item').attr('data-code');
         name          = $('.set-item').attr('data-name');
         price         = $('.set-item').attr('data-price');
         option        = $('.set-item').attr('data-options');
         parent        = $('.set-item').attr('data-parent');
         total         = qty * price ;
-        option_arr.push(option);
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
               +code+"' data-attributes='"
               +attribute_arr+"' data-options ='"
-              +option_arr+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
+              +option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'-' + option +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)
           +'</td>' 
           +'</tr>';
           $(".summary-items tbody").append(row);
-
       var rowCount = $('.summary-items tbody tr').length+1;
       $(items).each(function(i){
         code          = $(items[i]).attr('data-code');
@@ -406,15 +412,14 @@ $(function() {
         sub_item      = $(items[i]).attr('data-sub-item');
         option          = $(items[i]).attr('data-options');
         total         = qty * price ;
-        option_arr.push(option);
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
               +code+"' data-attributes='"
               +attribute_arr+"' data-options ='"
-              +option_arr+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
+              +option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'-' + option +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)
@@ -626,8 +631,6 @@ $(function() {
     
 
     if(group == "set_menu"){
-      code = $(this).data('code');
-      value = $(this).data('value');
 
       instance    = $(".selected-instance");
       $(instance).each(function(i){
@@ -638,6 +641,12 @@ $(function() {
         }
       });
     }
+
+    if(group == "set_menu_default"){
+          option_arr    = get_selected_attributes('selected-option');
+          $('.set-item').attr('data-options',JSON.stringify(option_arr));
+          $('.set_default_option').text(option_arr);              
+    }
     
   }); //End selecct attribute buttom
 
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 240343b1..4d7d6026 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -6,6 +6,10 @@ class Settings::MenusController < ApplicationController
   # GET /settings/menus.json
   def index
     @settings_menus = Menu.all.page(params[:page]).per(10)
+    respond_to do |format|
+      format.html
+      format.csv { send_data Menu.to_csv }
+    end
   end
 
   # GET /settings/menus/1
diff --git a/app/models/menu.rb b/app/models/menu.rb
index b96fe03a..052a7042 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -31,4 +31,29 @@ class Menu < ApplicationRecord
       menu.destroy
       return false
   end
-end
+
+  def self.to_csv
+    m_attributes = %w{id name is_active valid_days valid_time_from valid_time_to created_by created_at updated_at}    
+    CSV.generate(headers: true) do |csv|
+      csv << m_attributes
+      menu = Menu.all
+      menu.each do |user|
+        puts user
+        csv << m_attributes.map{ |attr| user.send(attr)}
+      end
+    end
+
+    # mc_attributes = %w{id menu_id code name alt_name order_by created_by menu_category_id is_available created_at updated_at}
+    # CSV.generate(headers: true) do |csv|
+    #   csv << m_attributes
+
+    #   csv << mc_attributes
+    #   MenuCategory.all.each do |user|
+    #     puts user
+    #     csv << mc_attributes.map{ |attr| user.send(attr)}
+    #   end
+    # end
+
+  end
+
+end
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index 6a3bc551..f4cbac01 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,5 +1,6 @@
 require_relative 'boot'
 
+require 'csv'
 require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index ee884fb2..fa24f481 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -1,44 +1,4 @@
 namespace :consolidate do
-
-  
-  desc 'export sers who have logged in since 2017-06-30'
-  task :export => :environment do
-    puts "Export users who have logged in since 2017-06-30"
-
-    # get a file ready, the 'data' directory has already been added in Rails.root
-    filepath = File.join(Rails.root, 'data', 'recent_users.json')
-    puts "- exporting users into #{filepath}"
-
-    # the key here is to use 'as_json', otherwise you get an ActiveRecord_Relation object, which extends
-    # array, and works like in an array, but not for exporting
-    users = Employee.all.as_json
-puts users
-    # The pretty is nice so I can diff exports easily, if that's not important, JSON(users) will do
-    File.open(filepath, 'w') do |f|
-      f.write(JSON.pretty_generate(users))
-    end
-
-    puts "- dumped #{users.size} users"
-  end
-
-  desc 'import users from recent users dump'
-  task :import => :environment do
-    puts "Importing current users"
-
-    filepath = File.join(Rails.root, 'data', 'recent_users.json')
-    abort "Input file not found: #{filepath}" unless File.exist?(filepath)
-
-    current_users = JSON.parse(File.read(filepath))
-
-    current_users.each do |cu|
-      puts cu.to_json
-      Employee.create(cu)
-    end
-
-    puts "- imported #{current_users.size} users"
-  end
-
-
   desc "Receipt"
   task :receipt => :environment do
     Receipt.delete_all

From 808b123a91849be899f6a7895021e2b66999c725 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Mar 2018 15:27:11 +0630
Subject: [PATCH 425/651] Add Date in Cashier's Dashboard and remove no need
 breadcrumb

---
 app/assets/javascripts/origami.js             | 24 ++++---------------
 app/views/origami/addorders/detail.html.erb   |  1 -
 app/views/origami/cash_ins/new.html.erb       |  3 ---
 app/views/origami/cash_mgmt/new.html.erb      |  4 +---
 app/views/origami/cash_outs/new.html.erb      |  3 ---
 app/views/origami/dashboard/index.html.erb    |  8 ++-----
 app/views/origami/home/index.html.erb         |  1 -
 app/views/origami/home/show.html.erb          |  1 -
 .../origami/moveroom/move_dining.html.erb     |  1 -
 .../origami/movetable/move_dining.html.erb    |  1 -
 app/views/origami/orders/show.html.erb        |  1 -
 .../origami/pending_order/index.html.erb      |  3 ---
 .../load_commissioners.html.erb               |  2 +-
 .../origami/room_invoices/index.html.erb      |  1 -
 app/views/origami/rooms/show.html.erb         |  1 -
 .../origami/second_display/index.html.erb     |  1 -
 app/views/origami/shifts/show.html.erb        |  3 ---
 .../origami/table_invoices/index.html.erb     |  1 -
 .../origami/table_invoices/show.html.erb      |  1 -
 config/initializers/action_controller.rb      |  2 +-
 20 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 4dda94e2..7f3febba 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -17,40 +17,24 @@
 //= require custom.js
 
 /* Constant Varaibles */
-_ADD_ORDER_			= "/&nbsp;&nbsp;&nbsp;ADD ORDER";
-_CASH_IN_			= "/&nbsp;&nbsp;&nbsp;CASH IN";
-_CASH_OUT_			= "/&nbsp;&nbsp;&nbsp;CASH OUT";
-_CASH_MGMT_			= "/&nbsp;&nbsp;&nbsp;CASH MGMT";
 _CREDIT_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;CREDIT PAYMENTS";
 _CUSTOMERS_			= "/&nbsp;&nbsp;&nbsp;CUSTOMERS";
-_DASHBOARD_			= "/&nbsp;&nbsp;&nbsp;DASHBOARD";
 _DISCOUNTS_			= "/&nbsp;&nbsp;&nbsp;DISCOUNTS";
-_CASHIER_			= "/&nbsp;&nbsp;&nbsp;CASHIER";
 _IN_DUTIES_			= "/&nbsp;&nbsp;&nbsp;IN DUTIES";
 _JCB_				= "/&nbsp;&nbsp;&nbsp;JCB PAYMENT";
 _MASTER_			= "/&nbsp;&nbsp;&nbsp;MASTER PAYMENT";
-_MOVE_ROOM_			= "/&nbsp;&nbsp;&nbsp;MOVE ROOM";
-_MOVE_TABLE_		= "/&nbsp;&nbsp;&nbsp;MOVE TABLE";
 _MPU_				= "/&nbsp;&nbsp;&nbsp;MPU PAYMENT";
-_ORDERS_			= "/&nbsp;&nbsp;&nbsp;ORDERS";
-_OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;OTHER CHARGES";
-_OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENTS";
-_PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENTS";
+_OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;CHARGES";
+_OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENT";
+_PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENT";
 _PAYPAR_PAYMENT_	= "/&nbsp;&nbsp;&nbsp;PAYPAR PAYMENT";
-_PENDING_ORDER_		= "/&nbsp;&nbsp;&nbsp;PENDING ORDER";
-_PRODUCT_COMMISSIONS_= "/&nbsp;&nbsp;&nbsp;PRODUCT COMMISSIONS";
+_COMMISSIONS_		= "/&nbsp;&nbsp;&nbsp;COMMISSIONS";
 _REDEEM_PAYMENT_	= "/&nbsp;&nbsp;&nbsp;REDEEM PAYMENT";
-_ROOM_INVOICES_		= "/&nbsp;&nbsp;&nbsp;ROOM INVOICES";
-_ROOM_ 				= "/&nbsp;&nbsp;&nbsp;ROOM";
 _SALE_EDIT_			= "/&nbsp;&nbsp;&nbsp;SALE EDIT";
-_SECOND_DISPLAY_	= "/&nbsp;&nbsp;&nbsp;CUSTOMER VIEW";
-_CLOSE_CASHIER_		= "/&nbsp;&nbsp;&nbsp;CLOSE CASHIER";
 _SPLIT_BILL_		= "/&nbsp;&nbsp;&nbsp;SPLIT BILL";
-_TABLE_INVOICE_		= "/&nbsp;&nbsp;&nbsp;TABLE INVOICE";
 _UNION_				= "/&nbsp;&nbsp;&nbsp;UNION PAYMENT";
 _VISA_				= "/&nbsp;&nbsp;&nbsp;VISA PAYMENT";
 _VOUCHER_			= "/&nbsp;&nbsp;&nbsp;VOUCHER";
-_TABLE_ 			= "/&nbsp;&nbsp;&nbsp;TABLE";
 _SURVEY_ 			= "/&nbsp;&nbsp;&nbsp;SURVEY";
 /* Constant Varaibles */
 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index aba0f3f7..6c580f40 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -493,7 +493,6 @@
        jQuery('.first_'+id).click();
     });
     $(document).ready(function () {
-      setHeaderBreadCrumb(_ADD_ORDER_);
     $(".tables").on('click', function () {
         $('.tables').css('background-color','');
         $('.tables').removeClass('purple')
diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb
index 32d5215a..bda159e2 100755
--- a/app/views/origami/cash_ins/new.html.erb
+++ b/app/views/origami/cash_ins/new.html.erb
@@ -56,9 +56,6 @@
 </div>
 
 <script>
-  $(document).ready(function () {
-      setHeaderBreadCrumb(_CASH_IN_);
-  });
   var payment_method = "";
   $('.payment-type').on('click',function(){
     $('.payment-type').css("background-color","#7a62d3")
diff --git a/app/views/origami/cash_mgmt/new.html.erb b/app/views/origami/cash_mgmt/new.html.erb
index 6912d981..b06a8d2d 100755
--- a/app/views/origami/cash_mgmt/new.html.erb
+++ b/app/views/origami/cash_mgmt/new.html.erb
@@ -1,5 +1,3 @@
 <h1>CashMgmt#new</h1>
 <p>Find me in app/views/cash_mgmt/new.html.erb</p>
-$(document).ready(function () {
-      setHeaderBreadCrumb(_CASH_MGMT_);
- });
+
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb
index 47558928..64b3909f 100755
--- a/app/views/origami/cash_outs/new.html.erb
+++ b/app/views/origami/cash_outs/new.html.erb
@@ -25,9 +25,6 @@
   </div>
 </div>
 <script>
-  $(document).ready(function () {
-        setHeaderBreadCrumb(_CASH_OUT_);
-  });
   $('#cash_out').on('click',function(){
     var reference = $('#reference').val();
     var remark = $('#remark').val();
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 246110f5..b0fcb1a1 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -1,6 +1,7 @@
 <div class="container-fluid">
   <div class="block-header">
-    <h2><%= t :dashboard %></h2>
+    <!-- <h2><%= t :dashboard %></h2> -->
+    <h2><%= t :date_time %> : <%= Time.zone.now.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %></h2>
   </div>
   <% if @print_settings.precision.to_i > 0
     precision = @print_settings.precision
@@ -191,11 +192,6 @@
     </div>
  <button type="button" data-href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect second_view hidden" style="height: 45px">Customer View</button>
 <script>
-  $(document).ready(function () {
-    setHeaderBreadCrumb(_DASHBOARD_);
-  });
-
-
 
   $(".cashier_view").on('click', function() {
     window.location.href = '/origami';
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 46ec6153..3577aa48 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -139,7 +139,6 @@
  <!-- Column One -->
 <script>
 $(document).ready(function(){
-  setHeaderBreadCrumb(_CASHIER_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f1b1629e..8c2e58bc 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -543,7 +543,6 @@
 <script>
   var cashier_type = "cashier";
     $(document).ready(function () {
-      setHeaderBreadCrumb(_TABLE_);
       /* start check first bill or not*/
         var receipt_no = "";
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb
index d721aaa5..b46834ca 100755
--- a/app/views/origami/moveroom/move_dining.html.erb
+++ b/app/views/origami/moveroom/move_dining.html.erb
@@ -166,7 +166,6 @@
 </div>
 <script>
 $(document).ready(function(){
-  setHeaderBreadCrumb(_MOVE_ROOM_);
   $(".tables").on('click', function(){
       $('.tables').removeClass('selected-item');
 	    $(this).addClass('selected-item');
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 98d44028..4385cad7 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -284,7 +284,6 @@ end
 </div>
 <script>
   $(document).ready(function(){
-    setHeaderBreadCrumb(_MOVE_TABLE_);
     $(".tables").on('click', function(){
       $('.tables').removeClass('selected-item');
       $(this).addClass('selected-item');
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index ffdc3d80..fe3a62ef 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -253,7 +253,6 @@
 </div>
 <script>
   $(document).ready(function(){
-    setHeaderBreadCrumb(_ORDERS_);
     $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index 16c468bd..8fa9a7af 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -39,9 +39,6 @@
     </div>
 </div>
 <script>
-    $(document).ready(function(){
-      setHeaderBreadCrumb(_PENDING_ORDER_);
-    });  
     cashier_type = "quick_service"
     $(".sales").on('click',function(){
 	    var sale_id = $(this).attr("data-id");
diff --git a/app/views/origami/product_commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb
index eaf38e0d..6383f1fa 100755
--- a/app/views/origami/product_commissions/load_commissioners.html.erb
+++ b/app/views/origami/product_commissions/load_commissioners.html.erb
@@ -121,7 +121,7 @@
 </div>
 <script>
   $(document).ready(function () {
-    setHeaderBreadCrumb(_PRODUCT_COMMISSIONS_);
+    setHeaderBreadCrumb(_COMMISSIONS_);
     var selected_sale_item = 0;
 
     $('.sale_item').on('click', function () {
diff --git a/app/views/origami/room_invoices/index.html.erb b/app/views/origami/room_invoices/index.html.erb
index 8c6666d3..e482490a 100755
--- a/app/views/origami/room_invoices/index.html.erb
+++ b/app/views/origami/room_invoices/index.html.erb
@@ -82,7 +82,6 @@
 </div>
 <script>
 $(document).ready(function(){
-    setHeaderBreadCrumb(_ROOM_INVOICES_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @room.id %>/table_invoice/' + dining_id;
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 5dff1385..1edb07cf 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -484,7 +484,6 @@
 <script>
 var cashier_type = "cashier";
 $(document).ready(function(){
-  setHeaderBreadCrumb(_ROOM_);
   // $(".tables").on('click', function(){
   //     var customer_id=$(".customer-id").text();
   //     show_customer_details(customer_id);
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
index 0fc62a38..dbcd1f73 100644
--- a/app/views/origami/second_display/index.html.erb
+++ b/app/views/origami/second_display/index.html.erb
@@ -10,7 +10,6 @@
 </div>
 <script type="text/javascript">
 	$(document).ready(function () {
-    setHeaderBreadCrumb(_SECOND_DISPLAY_);
       $('#s_reload').on('click', function () {
       window.location.href = '/origami/second_display';
       });
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index f8da7e63..4ea71dec 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -58,9 +58,6 @@
   </div>
 </div>
 <script>
-  $(document).ready(function(){
-    setHeaderBreadCrumb(_CLOSE_CASHIER_);
-  });
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
     var shift_id = "<%= @shift.id rescue ""%>"
diff --git a/app/views/origami/table_invoices/index.html.erb b/app/views/origami/table_invoices/index.html.erb
index a29392f2..b0c328be 100755
--- a/app/views/origami/table_invoices/index.html.erb
+++ b/app/views/origami/table_invoices/index.html.erb
@@ -82,7 +82,6 @@
 </div>
 <script>
 $(document).ready(function(){
-    setHeaderBreadCrumb(_TABLE_INVOICE_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 150121bb..515973f1 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -212,7 +212,6 @@
 </div>
 <script>
 $(document).ready(function(){
-  setHeaderBreadCrumb(_TABLE_INVOICE_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 2bcdd944..20c5624c 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -19,7 +19,7 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      check for license file
+      #check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
       else

From dcac662c8ef0208d089dcf092b839f8051abb57b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 15 Mar 2018 15:51:12 +0630
Subject: [PATCH 426/651] change set menu item format in api and origami

---
 app/controllers/origami/home_controller.rb  | 10 -----
 app/controllers/origami/rooms_controller.rb | 10 -----
 app/models/order.rb                         |  4 +-
 app/views/origami/home/show.html.erb        | 42 +++++++++++++++++++--
 app/views/origami/rooms/show.html.erb       | 42 +++++++++++++++++++--
 5 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 6a6c0c90..a8e2818c 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -74,16 +74,6 @@ class Origami::HomeController < BaseOrigamiController
                 @date = order.created_at
                 @booking= booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.nil?
-                    instance_item_sets = JSON.parse(item.set_menu_items)
-                    arr_instance_item_sets = Array.new
-                    instance_item_sets.each do |instance_item|
-                      item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-                      arr_instance_item_sets.push(item_instance_name)
-                      item.price = item.price.to_f + instance_item["price"].to_f
-                    end
-                    item.set_menu_items = arr_instance_item_sets
-                  end
                   @order_items.push(item)
                   # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
                   # if !assigned_order_items.nil?
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 3aa98282..11a7f93d 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -68,16 +68,6 @@ class Origami::RoomsController < BaseOrigamiController
                 @date = order.created_at
                 @booking = booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.nil?
-                    instance_item_sets = JSON.parse(item.set_menu_items)
-                    arr_instance_item_sets = Array.new
-                    instance_item_sets.each do |instance_item|
-                      item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-                      arr_instance_item_sets.push(item_instance_name)
-                      item.price = item.price.to_f + instance_item["price"].to_f
-                    end
-                    item.set_menu_items = arr_instance_item_sets
-                  end
                   @order_items.push(item)
                   # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
                   # if !assigned_order_items.nil?
diff --git a/app/models/order.rb b/app/models/order.rb
index 892c218c..02f4b618 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -135,7 +135,7 @@ class Order < ApplicationRecord
 
       #loop to add all items to order
       ordered_list.each do |item|
-       
+
         menu_item = MenuItem.search_by_item_code(item[:item_instance_code])
         
         # For Product while item code not in menu item
@@ -152,7 +152,7 @@ class Order < ApplicationRecord
               item[:sub_items].each do |si|
                 # Retrive instance's Price
                 set_item = MenuItem.search_by_item_code(si[:item_instance_code])
-                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "item_instance_name"=>set_item[:name], "quantity"=>si[:quantity], "price"=>set_item[:price]})
+                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "item_instance_name"=>set_item[:name], "quantity"=>si[:quantity], "price"=>set_item[:price], "options"=>si[:options]})
               end
             end
             set_order_items = set_order_items.to_json
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8c2e58bc..accbd5d9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -292,9 +292,26 @@
                                       <td><%= count %></td>
                                       <td class='item-name'>
                                         <%= order_item.item_name %>
+                                        <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+                                          <% JSON.parse(order_item.options).each do |option| %>
+                                            <br><span class="font-13">
+                                              <%= option %>
+                                            </span>
+                                          <% end %>
+                                        <% end %>
+
                                         <% if !order_item.set_menu_items.nil?  
-                                          order_item.set_menu_items.each do |item_instance| %> 
-                                          <br><span class="font-13"><%= item_instance %></span> 
+                                          JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
+                                          <br><span class="font-13">
+                                            <%= item_instance["item_instance_name"] %>
+                                              <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                                  <br><span class="font-13">
+                                                    <%= set_item_option %>
+                                                  </span>
+                                                <% end %>
+                                              <% end %>
+                                            </span> 
                                         <% end 
                                         end %>
                                       </td>
@@ -371,9 +388,26 @@
                             <td><%= count %>
                             <td class='item-name'>
                               <%= order_item.item_name %>
+                              <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+                                <% JSON.parse(order_item.options).each do |option| %>
+                                  <br><span class="font-13">
+                                    <%= option %>
+                                  </span>
+                                <% end %>
+                              <% end %>
+
                               <% if !order_item.set_menu_items.nil?  
-                                order_item.set_menu_items.each do |item_instance| %> 
-                                <br><span class="font-13"><%= item_instance %></span> 
+                                JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
+                                <br><span class="font-13">
+                                  <%= item_instance["item_instance_name"] %>
+                                    <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                                      <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                        <br><span class="font-13">
+                                          <%= set_item_option %>
+                                        </span>
+                                      <% end %>
+                                    <% end %>
+                                  </span> 
                               <% end 
                               end %>
                             </td>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1edb07cf..4a21fb24 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -277,9 +277,26 @@
                        <td><%= count %></td>
                        <td class='item-name'>
                         <%= order_item.item_name %>
+                        <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+                          <% JSON.parse(order_item.options).each do |option| %>
+                            <br><span class="font-13">
+                              <%= option %>
+                            </span>
+                          <% end %>
+                        <% end %>
+
                         <% if !order_item.set_menu_items.nil?  
-                          order_item.set_menu_items.each do |item_instance| %> 
-                          <br><span class="font-13"><%= item_instance %></span> 
+                          JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
+                          <br><span class="font-13">
+                            <%= item_instance["item_instance_name"] %>
+                              <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                  <br><span class="font-13">
+                                    <%= set_item_option %>
+                                  </span>
+                                <% end %>
+                              <% end %>
+                            </span> 
                         <% end 
                         end %>
                         </td>
@@ -345,9 +362,26 @@
                       <td><%= count %>
                       <td class='item-name'>
                         <%= order_item.item_name %>
+                        <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+                          <% JSON.parse(order_item.options).each do |option| %>
+                            <br><span class="font-13">
+                              <%= option %>
+                            </span>
+                          <% end %>
+                        <% end %>
+
                         <% if !order_item.set_menu_items.nil?  
-                          order_item.set_menu_items.each do |item_instance| %> 
-                          <br><span class="font-13"><%= item_instance %></span> 
+                          JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
+                          <br><span class="font-13">
+                            <%= item_instance["item_instance_name"] %>
+                              <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                  <br><span class="font-13">
+                                    <%= set_item_option %>
+                                  </span>
+                                <% end %>
+                              <% end %>
+                            </span> 
                         <% end 
                         end %>
                       </td>

From 6ccf3152429ddd1d1daab92a464c05c3834443e3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 15 Mar 2018 16:14:15 +0630
Subject: [PATCH 427/651] remove JSON parse in set item options

---
 app/views/origami/home/show.html.erb  | 14 +++++++-------
 app/views/origami/rooms/show.html.erb |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index accbd5d9..54b0e956 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -304,13 +304,13 @@
                                           JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
                                           <br><span class="font-13">
                                             <%= item_instance["item_instance_name"] %>
-                                              <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
-                                                  <br><span class="font-13">
-                                                    <%= set_item_option %>
-                                                  </span>
-                                                <% end %>
+                                            <% if !item_instance["options"].nil? && !item_instance["options"].empty? %>
+                                              <% (item_instance["options"]).each do |set_item_option| %>
+                                                <br><span class="font-13">
+                                                  <%= set_item_option %>
+                                                </span>
                                               <% end %>
+                                            <% end %>
                                             </span> 
                                         <% end 
                                         end %>
@@ -401,7 +401,7 @@
                                 <br><span class="font-13">
                                   <%= item_instance["item_instance_name"] %>
                                     <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                      <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                      <% (item_instance["options"]).each do |set_item_option| %>
                                         <br><span class="font-13">
                                           <%= set_item_option %>
                                         </span>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4a21fb24..d98a3fe2 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -290,7 +290,7 @@
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>
                               <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                <% (item_instance["options"]).each do |set_item_option| %>
                                   <br><span class="font-13">
                                     <%= set_item_option %>
                                   </span>
@@ -375,7 +375,7 @@
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>
                               <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                <% (item_instance["options"]).each do |set_item_option| %>
                                   <br><span class="font-13">
                                     <%= set_item_option %>
                                   </span>

From c982da42648c3eabb144fdfd5ae524e20658b51f Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 15 Mar 2018 18:56:29 +0630
Subject: [PATCH 428/651] add printer brand and api and type

---
 app/controllers/origami/payments_controller.rb | 11 ++++++++++-
 app/controllers/print_settings_controller.rb   | 13 ++++++++++++-
 app/models/print_setting.rb                    |  2 +-
 app/models/printer/printer_worker.rb           |  5 +++++
 app/models/printer/receipt_printer.rb          | 10 +++++-----
 app/pdf/receipt_bill_pdf.rb                    | 15 ++++-----------
 app/views/origami/home/show.html.erb           |  4 +++-
 app/views/print_settings/_form.html.erb        | 18 ++++++++++++++++++
 .../_print_setting.json.jbuilder               |  2 +-
 app/views/print_settings/show.html.erb         |  8 ++++++++
 config/routes.rb                               |  2 ++
 .../20170628103624_create_print_settings.rb    |  2 +-
 12 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index c764b92f..fc07f966 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -79,7 +79,16 @@ class Origami::PaymentsController < BaseOrigamiController
 
       printer = Printer::ReceiptPrinter.new(print_settings)
 
-      printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil)    
+      filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil)    
+
+      result = { 
+        :filepath => filename, 
+        :printer_model => print_settings.brand_name, 
+        :printer_url => print_settings.api_settings 
+      }
+
+      # Mobile Print
+      render :json => result.to_json
     end
   end
 
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index 710e6ea4..f12778af 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -64,6 +64,17 @@ class PrintSettingsController < ApplicationController
     end
   end
 
+  def get_printer_options    
+    printer_name = params[:printer_name]    
+    printer_options = Printer::PrinterWorker.printer_options(printer_name)
+    options = {
+      :url => printer_options['device-uri'],
+      :model => printer_options['printer-info'],
+    }
+
+    render :json => options.to_json
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_print_setting
@@ -72,7 +83,7 @@ class PrintSettingsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def print_setting_params
-      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
+      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :brand_name, :printer_type, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
     end
 
   #Shop Name in Navbor
diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb
index d28b852b..a3cfc597 100755
--- a/app/models/print_setting.rb
+++ b/app/models/print_setting.rb
@@ -1,6 +1,6 @@
 class PrintSetting < ApplicationRecord
 	# validations
-	validates_presence_of :name, :unique_code, :printer_name, :page_width, :page_height, :print_copies
+	validates_presence_of :name, :unique_code, :printer_name, :brand_name, :api_settings, :page_width, :page_height, :print_copies
 
 	def self.get_precision_delimiter
 		PrintSetting.find_by_unique_code("ReceiptBillPdf")
diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index c0485187..2924853e 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -24,6 +24,11 @@ class Printer::PrinterWorker
     end
   end
 
+  # Options from printer name
+  def self.printer_options(printer_name)
+    Cups.options_for(printer_name)
+  end
+
   def self.printers()
     Cups.show_destinations
   end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index d544c908..597f264a 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -176,7 +176,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data)
     #Use CUPS service
     #Generate PDF
-    #Print
+    #Print   
     pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data)
     receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
     if !receipt_bill_a5_pdf.empty?
@@ -202,14 +202,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
 
     begin
       if count == 1
-        filename = "/receipts/receipt_bill_#{sale_data.receipt_no}.pdf"
-        pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
+        filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
+        pdf.render_file filename
         if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
         end
       else
-        filename = "/receipts/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
-        pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
+        filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
+        pdf.render_file filename
         if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
         end
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 9926e423..c0299033 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -23,7 +23,7 @@ class ReceiptBillPdf < Prawn::Document
         # @double = @qty_width * 1.3
         # @half_qty = @qty_width / 2
         #setting page margin and width
-        super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin])
+        super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
         #precision checked
         if printer_settings.precision.to_i > 2
@@ -121,15 +121,8 @@ class ReceiptBillPdf < Prawn::Document
         end
 
         move_down line_move
-
         y_position = cursor
-        if sale_data.bookings[0].dining_facility_id.to_i > 0
-          bounding_box([0,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :left
-          end
-        end
-
-        bounding_box([self.label_width, y_position], :width =>self.label_width, :height => self.item_height) do
+        bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do
             text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
         end    
         bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
@@ -493,8 +486,8 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     #individual payment per person
-    def individual_payment(sale_data, precision, delimiter)
-        per_person = sale_data.grand_total.to_i / sale_data.equal_persons.to_i
+    def individual_payment(sale_data, survey, precision, delimiter)
+        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
         stroke_horizontal_rule
         move_down line_move
         y_position = cursor
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8c2e58bc..5f0245a9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -689,7 +689,9 @@
               receipt_no = ($("#receipt_no").html()).trim();
               if((receipt_no!=undefined) && (receipt_no!=""))
                 createReceiptNoInFirstBillData(receipt_no,"");
-              
+                            
+              // console.log(result);
+              code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
               location.reload();
             }
         });  
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index b8804dcc..bec1b931 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -12,6 +12,8 @@
           <%= f.input :template %>
           <%= f.input :font %>
           <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
+          <%= f.input :brand_name %>
+          <%= f.input :printer_type %>
           <%= f.input :api_settings %>
           <%= f.input :page_width %>
           <%= f.input :page_height %>
@@ -61,6 +63,22 @@
 </div>
 
 <script type="text/javascript">
+  $(document).ready(function(){
+
+      // if selected printer change call and bind 
+      $("#print_setting_printer_name").on("change", function(){
+        var printer_name = $(this).val();        
+        $.ajax({
+          type: "GET",
+          url: "/get_printer_options/"+printer_name,          
+          success:function(result){             
+            $("#print_setting_brand_name").val(result.model);
+            $("#print_setting_api_settings").val(result.url);
+          }
+        });
+      });
+  });
+
   function isNumberKey(evt) {
       var charCode = (evt.which) ? evt.which : event.keyCode;
       if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
diff --git a/app/views/print_settings/_print_setting.json.jbuilder b/app/views/print_settings/_print_setting.json.jbuilder
index 4279afa7..2ca3f03c 100755
--- a/app/views/print_settings/_print_setting.json.jbuilder
+++ b/app/views/print_settings/_print_setting.json.jbuilder
@@ -1,2 +1,2 @@
-json.extract! print_setting, :id, :name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies, :created_at, :updated_at
+json.extract! print_setting, :id, :name, :unique_code, :template, :printer_name, :brand_name, :printer_type, :font, :api_settings, :page_width, :page_height, :print_copies, :created_at, :updated_at
 json.url print_setting_url(print_setting, format: :json)
diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb
index 1d76a088..32445b95 100755
--- a/app/views/print_settings/show.html.erb
+++ b/app/views/print_settings/show.html.erb
@@ -30,6 +30,14 @@
               <th><%= t("views.right_panel.detail.printer_name") %></th>
               <td><%= @print_setting.printer_name %></td>
             </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.brand_name") %></th>
+              <td><%= @print_setting.brand_name %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.printer_type") %></th>
+              <td><%= @print_setting.printer_type %></td>
+            </tr>
             <tr>
               <th><%= t("views.right_panel.detail.font") %></th>
               <td><%= @print_setting.font rescue '-' %></td>
diff --git a/config/routes.rb b/config/routes.rb
index 6983cfbe..21395c32 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -434,6 +434,8 @@ scope "(:locale)", locale: /en|mm/ do
 
   #----------- Print Setup --------#
   resources :print_settings
+  get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
+  
   resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index 4f27bd0c..b95e4d2f 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -8,7 +8,7 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :printer_name, :null => false
       t.string  :api_settings
       t.string  :brand_name
-      t.string  :type
+      t.string  :printer_type
       t.decimal :page_width, :null => false, :default => 210
       t.decimal :page_height, :null => false, :default => 1450
       t.integer :print_copies, :null => false, :default => 1

From 8cea60ec02361fd40518372b2616aca1e5a82255 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Mar 2018 09:42:56 +0630
Subject: [PATCH 429/651] SQA urgent issues

---
 .../origami/payments_controller.rb            | 37 ++++++++++---------
 app/controllers/origami/shifts_controller.rb  |  1 +
 app/models/order.rb                           | 22 +++++------
 app/pdf/order_item_pdf.rb                     |  2 +-
 app/pdf/order_item_slim_pdf.rb                |  2 +-
 app/pdf/order_set_item_pdf.rb                 |  2 +-
 app/pdf/order_summary_pdf.rb                  |  3 +-
 app/pdf/order_summary_set_pdf.rb              |  2 +-
 app/pdf/order_summary_slim_pdf.rb             |  2 +-
 app/views/origami/home/index.html.erb         |  2 +-
 .../origami/pending_order/index.html.erb      | 22 ++++++++++-
 app/views/origami/pending_order/show.html.erb | 28 ++++++++++++--
 app/views/origami/shifts/show.html.erb        | 11 ++++--
 app/views/reports/product_sale/index.html.erb |  2 +-
 config/locales/en.yml                         |  1 +
 config/locales/mm.yml                         |  1 +
 config/routes.rb                              |  2 +-
 17 files changed, 96 insertions(+), 46 deletions(-)
 mode change 100644 => 100755 app/pdf/order_item_slim_pdf.rb
 mode change 100644 => 100755 app/pdf/order_set_item_pdf.rb
 mode change 100644 => 100755 app/pdf/order_summary_set_pdf.rb
 mode change 100644 => 100755 app/pdf/order_summary_slim_pdf.rb
 mode change 100644 => 100755 app/views/origami/pending_order/index.html.erb
 mode change 100644 => 100755 app/views/origami/pending_order/show.html.erb
 mode change 100644 => 100755 app/views/reports/product_sale/index.html.erb

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index c764b92f..49320273 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -104,7 +104,9 @@ class Origami::PaymentsController < BaseOrigamiController
         end
       end
       #end rounding adjustment
-
+      puts "sale"
+      puts saleObj.to_json
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
@@ -152,12 +154,24 @@ class Origami::PaymentsController < BaseOrigamiController
         
         if customer.membership_id != nil && rebate && credit_data.nil?
           member_info    = Customer.get_member_account(customer)
-          if member_info["status"] == true
-            rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-            current_balance = SaleAudit.paymal_search(sale_id)
-          end
+          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          current_balance = SaleAudit.paymal_search(sale_id)
         end
         
+        #orders print out
+        if params[:type] == "quick_service"
+          booking = Booking.find_by_sale_id(sale_id)
+          if booking.dining_facility_id.to_i>0
+            table_id = booking.dining_facility_id
+          else
+            table_id = 0
+          end
+          
+          booking.booking_orders.each do |order|
+            Order.pay_process_order_queue(order.order_id,table_id)
+          end
+        end
+
         #for card sale data
         card_data = Array.new
         card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
@@ -181,19 +195,6 @@ class Origami::PaymentsController < BaseOrigamiController
         filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
 
         render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
-
-        if params[:type] == "quick_service"
-          booking = Booking.find_by_sale_id(sale_id)
-          if booking.dining_facility_id.to_i>0
-            table_id = booking.dining_facility_id
-          else
-            table_id = 0
-          end
-          
-          booking.booking_orders.each do |order|
-          Order.pay_process_order_queue(order.order_id,table_id)
-        end
-    end
       end
     end    
   end
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 19def9b6..d0b73f99 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -3,6 +3,7 @@ class Origami::ShiftsController < BaseOrigamiController
   end
 
   def show
+    @type = params[:type]
     @shift = ShiftSale.current_open_shift(current_user.id)
     #for bank integration
     bank_integration = Lookup.collection_of('bank_integration')
diff --git a/app/models/order.rb b/app/models/order.rb
index 02f4b618..25c5db4a 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -339,17 +339,17 @@ class Order < ApplicationRecord
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)
     sidekiq      = Lookup.find_by_lookup_type("sidekiq")
-   if !sidekiq.nil?
-          OrderQueueProcessorJob.perform_later(id, table_id)
-          else
-            order        = Order.find(id) 
-            if order
-              oqs = OrderQueueStation.new
-              oqs.process_order(order, table_id)
-            end
-            assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
-            ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
-          end
+    if !sidekiq.nil?
+      OrderQueueProcessorJob.perform_later(id, table_id)
+    else
+      order        = Order.find(id) 
+      if order
+        oqs = OrderQueueStation.new
+        oqs.process_order(order, table_id)
+      end
+      assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
+      ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+    end
   end
   
   def check_cup_status(status)
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 379e919c..fabc8d11 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -37,7 +37,7 @@ class OrderItemPdf < Prawn::Document
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"     
-    if order_item.dining.to_i > 0
+    if !order_item.dining.nil?
       text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
old mode 100644
new mode 100755
index 09cce4d1..146b585f
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -37,7 +37,7 @@ class OrderItemSlimPdf < Prawn::Document
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"     
-    if order_item_slim.dining.to_i > 0
+    if !order_item_slim.dining.nil?
       text "#{ order_item_slim.type + '-' + order_item_slim.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
old mode 100644
new mode 100755
index 6aa6efc4..9aac0d0e
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -37,7 +37,7 @@ class OrderSetItemPdf < Prawn::Document
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"     
-    if order_set_item.dining.to_i > 0
+    if !order_set_item.dining.nil?
       text "#{ order_set_item.type + '-' + order_set_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 6c8dacac..17cf905c 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -36,7 +36,8 @@ class OrderSummaryPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    if order[0].dining.to_i > 0
+    
+    if !order[0].dining.nil?
       text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
old mode 100644
new mode 100755
index 8828ea43..14b2f796
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -36,7 +36,7 @@ class OrderSummarySetPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    if order[0].dining.to_i > 0
+    if !order[0].dining.nil?
       text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
old mode 100644
new mode 100755
index 73023278..c88061ea
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -36,7 +36,7 @@ class OrderSummarySlimPdf < Prawn::Document
 
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    if order[0].dining.to_i > 0
+    if !order[0].dining.nil?
       text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     else
       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 3577aa48..aa000aab 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -241,7 +241,7 @@ $('#cash_out').on('click',function(){
 
 $('#close_cashier').on('click',function(e){
     e.preventDefault(); // Prevent the href from redirecting directly
-    var linkURL = '/origami/shift/close';
+    var linkURL = '/origami/shift/cashier/close';
     warnBeforeRedirect(linkURL);
 })
 
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
old mode 100644
new mode 100755
index 8fa9a7af..2d4ba1d4
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -34,7 +34,9 @@
             <i class="material-icons">reply</i>
              <%= t("views.btn.back") %>
           </button>
-			
+          <% if current_user.role != "waiter" %>
+            <button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
+			    <% end %>
         </div>
     </div>
 </div>
@@ -51,4 +53,22 @@
     $('#back').on('click', function () {
         window.location.href = '/origami/quick_service';
     })
+
+    $('#close_cashier').on('click',function(e){
+      e.preventDefault(); // Prevent the href from redirecting directly
+      var linkURL = '/origami/shift/quick_service/close';
+      warnBeforeRedirect(linkURL);
+    });
+
+    function warnBeforeRedirect(linkURL) {
+      swal({
+        title: "Alert!", 
+        text: "Are you sure you want to close cashier?", 
+        type: "warning",
+        showCancelButton: true
+      }, function() {
+        // Redirect the user
+        window.location.href = linkURL;
+      });
+    }
 </script>
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
old mode 100644
new mode 100755
index d7c929f7..ac164636
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
  <!-- Column One -->
- <div class="col-lg-6 col-md-6 col-sm-6">
+ <div class="col-lg-5 col-md-5 col-sm-5">
     <div class="card">
       <div class="card-header">
         <strong id="order-title"> PENDING ORDER </strong>
@@ -148,7 +148,7 @@
      </div>
   </div>
  <!-- Column Three -->
- <div class="col-lg-1 col-md-1 col-sm-1">
+ <div class="col-lg-2 col-md-2 col-sm-2">
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
    <% if current_user.role != "waiter" || @status != "sale"%>
    <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
@@ -167,6 +167,9 @@
    <% if @status != "sale"%>
       <button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
    <%end%>
+   <% if current_user.role != "waiter" %>
+      <button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
+   <% end %>
  </div>
 </div>
 </div>
@@ -203,12 +206,11 @@ $(document).ready(function(){
           url: ajax_url,
           // data: 'order_id='+ order_id,
           success: function (result) {
-            console.log(result)
               if (!result.status) {
                 swal("Information!", result.error_message);
               }
               else {              
-                window.location.href = '../pending_order/'+ result.data;
+                location.reload();
               }
           }
       });   
@@ -269,5 +271,23 @@ $(document).ready(function(){
     }
     return false;
   });
+
+  $('#close_cashier').on('click',function(e){
+    e.preventDefault(); // Prevent the href from redirecting directly
+    var linkURL = '/origami/shift/quick_service/close';
+    warnBeforeRedirect(linkURL);
+  });
+
+  function warnBeforeRedirect(linkURL) {
+    swal({
+      title: "Alert!", 
+      text: "Are you sure you want to close cashier?", 
+      type: "warning",
+      showCancelButton: true
+    }, function() {
+      // Redirect the user
+      window.location.href = linkURL;
+    });
+  }
 });
 </script>
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 4ea71dec..4e42f11b 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -58,6 +58,7 @@
   </div>
 </div>
 <script>
+  var type = '<%= @type %>';
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
     var shift_id = "<%= @shift.id rescue ""%>"
@@ -72,7 +73,11 @@
   });
 
   $('#back').on('click',function(){
-    window.location.href = '/origami';
+    if(type!='quick_service'){
+      window.location.href = '/origami';
+    }else{
+      window.location.href = '/origami/quick_service';
+    }
   });
 
   /** start CB Card Settle process **/
@@ -90,7 +95,7 @@
         closeOnCancel: false,
         allowOutsideClick: false
       }, function () {
-        window.location.href = '/origami/shift/close';
+        window.location.href = '/origami/shift/'+type+'/close';
       });
     }
   });
@@ -115,7 +120,7 @@
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
-          window.location.href = '/origami/shift/close';
+          window.location.href = '/origami/shift/'+type+'/close';
         });
       }
   }
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
old mode 100644
new mode 100755
index ffad886a..3f27205a
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.product_sale_report") %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6d562366..c66d4cc3 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -449,6 +449,7 @@ en:
         gateway_url: "Gateway url"
         additional_parameter: "Additional parameter"
         lookup: "Lookup"
+        product_sale_report: "Product Sale"
         
         code_txt: "code "
         charge_txt: "charge"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 06756c1c..8ede4a79 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -444,6 +444,7 @@ mm:
         additional_parameter: "ထပ်ဖြည့်အကြောင်းအရာ"
         survey: "�ြုံငုံလေ့လာ�ြင်း"
         lookup: "သ�်မှ�်�ျက်များ"
+        product_sale_report: "Product Sale"
         
         code_txt: "ကု�်ဒ် "
         charge_txt: "ကောက်�ံသည်"
diff --git a/config/routes.rb b/config/routes.rb
index 6983cfbe..88def9dc 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -152,7 +152,7 @@ scope "(:locale)", locale: /en|mm/ do
     #---------Shift ---------------#
     resources :shifts, only: [:index, :new, :create, :edit]
     post 'close_shift' => 'shifts#update_shift'
-    get 'shift/close' => 'shifts#show'
+    get 'shift/:type/close' => 'shifts#show'
     get 'shift/sale_summary' => 'shifts#sale_summary'
     #shift - index (open/close shift landing page)
     #shift - show (sales summary display)

From acc5d737fa5055fbb3334af5db4f76d83eca4e30 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Mar 2018 10:57:32 +0630
Subject: [PATCH 430/651] tax profiles

---
 README.md                                     | 22 +++++++++++++++++++
 .../settings/tax_profiles_controller.rb       |  4 +++-
 app/models/tax_profile.rb                     |  2 +-
 .../settings/tax_profiles/_form.html.erb      |  1 +
 .../settings/tax_profiles/index.html.erb      |  4 ++++
 config/locales/en.yml                         |  1 +
 config/locales/mm.yml                         |  1 +
 .../20170403183755_create_tax_profiles.rb     |  1 +
 db/seeds.rb                                   |  4 ++--
 9 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b5d2c62b..506ab0b6 100755
--- a/README.md
+++ b/README.md
@@ -132,12 +132,34 @@ ADD COLUMN image_path VARCHAR(255);
 
 ALTER TABLE sales
 ADD COLUMN equal_persons INT(11) after rebate_status;
+
+ALTER TABLE sale_items
+ADD COLUMN remark VARCHAR(255) after status;
+
+ALTER TABLE shops
+ADD COLUMN shop_code VARCHAR(255) after name,
+ADD COLUMN client_name VARCHAR(255) after shop_code,
+ADD COLUMN client_code VARCHAR(255) after client_name;
+
+ALTER TABLE print_settings
+ADD COLUMN brand_name VARCHAR(255) after api_settings,
+ADD COLUMN type VARCHAR(255) after brand_name;
+
+ALTER TABLE tax_profiles
+ADD COLUMN group_type VARCHAR(255) after name;
+
 <---- Extra Fields Script ----->
 For CloseCashierCustomisePdf in lookups
 	*** change CloseCashierPdf to CloseCashierCustomisePdf
 	1) settings/print_settings
   	2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 }
 
+/* Tax Profile Group Types in lookups */
+1) settings/lookups => { type:tax_profiles, name: Cashier, value:cashier }
+2) settings/lookups => { type:tax_profiles, name: Quick Service, value: quick_service }
+3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal }
+/* Tax Profile Group Types in lookups */
+
 * ToDo list
 
 1. Migration
diff --git a/app/controllers/settings/tax_profiles_controller.rb b/app/controllers/settings/tax_profiles_controller.rb
index 77414c57..6e6e08f5 100755
--- a/app/controllers/settings/tax_profiles_controller.rb
+++ b/app/controllers/settings/tax_profiles_controller.rb
@@ -6,6 +6,8 @@ class Settings::TaxProfilesController < ApplicationController
   # GET /settings/tax_profiles.json
   def index
     @settings_tax_profiles = TaxProfile.all
+    tax_profiles = Lookup.collection_of("tax_profiles")
+    
   end
 
   # GET /settings/tax_profiles/1
@@ -73,6 +75,6 @@ class Settings::TaxProfilesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_tax_profile_params
-      params.require(:tax_profile).permit(:name, :rate, :inclusive, :order_by, :created_by)
+      params.require(:tax_profile).permit(:name, :group_type, :rate, :inclusive, :order_by, :created_by)
     end
 end
diff --git a/app/models/tax_profile.rb b/app/models/tax_profile.rb
index e478ecd5..a9e56fac 100755
--- a/app/models/tax_profile.rb
+++ b/app/models/tax_profile.rb
@@ -1,5 +1,5 @@
 class TaxProfile < ApplicationRecord
   default_scope { order('order_by asc') }
   # validations
-  validates_presence_of :name, :rate
+  validates_presence_of :name, :rate, :group_type
 end
diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb
index bd397920..1997e655 100755
--- a/app/views/settings/tax_profiles/_form.html.erb
+++ b/app/views/settings/tax_profiles/_form.html.erb
@@ -8,6 +8,7 @@
         <%= f.error_notification %>
 
         <div class="form-inputs p-l-15">
+          <%= f.input :group_type, :collection => Lookup.collection_of("tax_profiles"),:input_html=>{:class=>"col-md-10"},:required=>true %>
           <%= f.input :name %>
           <%= f.input :rate %>
           <%= f.input :inclusive %>
diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb
index fdfc0895..bda31d46 100755
--- a/app/views/settings/tax_profiles/index.html.erb
+++ b/app/views/settings/tax_profiles/index.html.erb
@@ -17,6 +17,7 @@
         <table class="table">
           <thead>
             <tr>
+              <th><%= t("views.right_panel.detail.group_type") %></th>
               <th><%= t("views.right_panel.detail.name") %></th>
               <th><%= t("views.right_panel.detail.rate") %></th>
               <th><%= t("views.right_panel.detail.inclusive") %></th>
@@ -29,6 +30,9 @@
           <tbody>
             <% @settings_tax_profiles.each do |settings_tax_profile| %>
             <tr>
+              <td>
+                <%= settings_tax_profile.group_type %>
+              </td>
               <td><%= settings_tax_profile.name %></td>
               <td><%= settings_tax_profile.rate %></td>
               <td><%= settings_tax_profile.inclusive %></td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c66d4cc3..dda9180c 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -450,6 +450,7 @@ en:
         additional_parameter: "Additional parameter"
         lookup: "Lookup"
         product_sale_report: "Product Sale"
+        group_type: "Group Type"
         
         code_txt: "code "
         charge_txt: "charge"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 8ede4a79..af901d6e 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -445,6 +445,7 @@ mm:
         survey: "�ြုံငုံလေ့လာ�ြင်း"
         lookup: "သ�်မှ�်�ျက်များ"
         product_sale_report: "Product Sale"
+        group_type: "Group Type"
         
         code_txt: "ကု�်ဒ် "
         charge_txt: "ကောက်�ံသည်"
diff --git a/db/migrate/20170403183755_create_tax_profiles.rb b/db/migrate/20170403183755_create_tax_profiles.rb
index 1f9dfceb..f5210bbb 100755
--- a/db/migrate/20170403183755_create_tax_profiles.rb
+++ b/db/migrate/20170403183755_create_tax_profiles.rb
@@ -2,6 +2,7 @@ class CreateTaxProfiles < ActiveRecord::Migration[5.1]
   def change
     create_table :tax_profiles do |t|
       t.string :name, :null => false
+      t.string :group_type, :null => false
       t.decimal :rate, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.boolean :inclusive, :null => false, :default => false
       t.integer :order_by, :null => false, :default => 1
diff --git a/db/seeds.rb b/db/seeds.rb
index df707508..df5e815e 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -119,8 +119,8 @@ customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contac
 # room = Room.create({name:"Table 2", zone: zone2, status:"available", seater: 4 , order_by:1, created_by:"SYSTEM DEFAULT"})
 
 #Tax Profile
-tax_profiles = TaxProfile.create({id:1, name: "Commercial Tax", rate:5.0, order_by:2, created_by:"SYSTEM DEFAULT"})
-service_charges = TaxProfile.create({id:2, name: "Service Charges", rate:10.0, order_by:1, created_by:"SYSTEM DEFAULT"})
+tax_profiles = TaxProfile.create({id:1, name: "Commercial Tax", group_type: "cashier", rate:5.0, order_by:2, created_by:"SYSTEM DEFAULT"})
+service_charges = TaxProfile.create({id:2, name: "Service Charges", group_type: "cashier", rate:10.0, order_by:1, created_by:"SYSTEM DEFAULT"})
 
 #Default menu
 menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"})

From b16483708a06e834e94238c02c7020b27f84b8d5 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Mar 2018 17:21:55 +0630
Subject: [PATCH 431/651] tax profiles

---
 .../settings/tax_profiles_controller.rb       | 30 ++++++++++++++++++-
 .../settings/tax_profiles/_form.html.erb      | 27 +++++++++++++++--
 .../settings/tax_profiles/index.html.erb      |  4 +--
 app/views/settings/tax_profiles/show.html.erb |  5 ++++
 4 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/app/controllers/settings/tax_profiles_controller.rb b/app/controllers/settings/tax_profiles_controller.rb
index 6e6e08f5..75e4343e 100755
--- a/app/controllers/settings/tax_profiles_controller.rb
+++ b/app/controllers/settings/tax_profiles_controller.rb
@@ -7,7 +7,17 @@ class Settings::TaxProfilesController < ApplicationController
   def index
     @settings_tax_profiles = TaxProfile.all
     tax_profiles = Lookup.collection_of("tax_profiles")
-    
+    if !@settings_tax_profiles.nil?
+      @settings_tax_profiles.each_with_index do |setting_tax_profile, tax_index|
+        if !tax_profiles.nil?
+          tax_profiles.each do |group|
+            if setting_tax_profile.group_type == group[1]
+              @settings_tax_profiles[tax_index].group_type = group[0]
+            end
+          end
+        end
+      end
+    end
   end
 
   # GET /settings/tax_profiles/1
@@ -17,11 +27,19 @@ class Settings::TaxProfilesController < ApplicationController
 
   # GET /settings/tax_profiles/new
   def new
+    @name = nil
     @settings_tax_profile = TaxProfile.new
+    @tax_profiles = TaxProfile.all
   end
 
   # GET /settings/tax_profiles/1/edit
   def edit
+    @settings_tax_profile = TaxProfile.find(params[:id])
+    @name = nil
+    if !@settings_tax_profile.nil?
+      @name = @settings_tax_profile.name
+    end
+    @tax_profiles = TaxProfile.all
   end
 
   # POST /settings/tax_profiles
@@ -71,6 +89,16 @@ class Settings::TaxProfilesController < ApplicationController
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_tax_profile
       @settings_tax_profile = TaxProfile.find(params[:id])
+      tax_profiles = Lookup.collection_of("tax_profiles")
+      if !@settings_tax_profile.nil?
+        if !tax_profiles.nil?
+          tax_profiles.each do |group|
+            if @settings_tax_profile.group_type == group[1]
+              @settings_tax_profile.group_type = group[0]
+            end
+          end
+        end
+      end
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb
index 1997e655..5ffd29aa 100755
--- a/app/views/settings/tax_profiles/_form.html.erb
+++ b/app/views/settings/tax_profiles/_form.html.erb
@@ -9,14 +9,15 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :group_type, :collection => Lookup.collection_of("tax_profiles"),:input_html=>{:class=>"col-md-10"},:required=>true %>
-          <%= f.input :name %>
+          <%= f.input :name, :input_html=>{:onchange=>"checkDuplicate(this.value);"} %>
+          <span id="tax_profile_nameErr" style="color:red;"></span>
           <%= f.input :rate %>
           <%= f.input :inclusive %>
           <%= f.input :order_by %>
         </div>
 
         <div class="form-actions p-l-15">
-          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect btn_submit' %>
         </div>
         <% end %>
       </div>
@@ -46,5 +47,25 @@
   </div>
 </div>
 
- 
+<script type="text/javascript">
+  function checkDuplicate(obj){
+    // $("#tax_profile_nameErr").html("");
+    var name = '<%= @name %>';
+    var tax_profiles = JSON.parse('<%= @tax_profiles.to_json.html_safe %>');
+    var group_type = $("#tax_profile_group_type").val();
+    if(tax_profiles!=undefined && tax_profiles!=null && tax_profiles!=""){
+      $.each(tax_profiles,function(key,value){
+        if(value.group_type == group_type){
+          if(name.trim().toLowerCase()!=value.name.trim().toLowerCase()){
+            if(value.name.trim().toLowerCase() == obj.trim().toLowerCase()){
+              $("#tax_profile_name").val("");
+              $("#tax_profile_nameErr").html("duplicate group type and name");
+            }
+          }
+          return;
+        }
+      });
+    }
+  }
+</script>
 
diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb
index bda31d46..e1e63c06 100755
--- a/app/views/settings/tax_profiles/index.html.erb
+++ b/app/views/settings/tax_profiles/index.html.erb
@@ -30,9 +30,7 @@
           <tbody>
             <% @settings_tax_profiles.each do |settings_tax_profile| %>
             <tr>
-              <td>
-                <%= settings_tax_profile.group_type %>
-              </td>
+              <td><%= settings_tax_profile.group_type %></td>
               <td><%= settings_tax_profile.name %></td>
               <td><%= settings_tax_profile.rate %></td>
               <td><%= settings_tax_profile.inclusive %></td>
diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb
index 77a503f2..b405066f 100755
--- a/app/views/settings/tax_profiles/show.html.erb
+++ b/app/views/settings/tax_profiles/show.html.erb
@@ -15,6 +15,11 @@
       <div class="card-block">
         <h4 class="card-title"><%= t("en.tax_profile") %></h4>
         <table class="table">
+        <tr>
+          <td><strong><%= t("views.right_panel.detail.group_type") %>:</strong></td>
+          <td><%= @settings_tax_profile.group_type %></td>
+        </tr>
+
         <tr>
           <td><strong><%= t("views.right_panel.detail.name") %>:</strong></td>
           <td><%= @settings_tax_profile.name %></td>

From e956b54886ade60a79b8f5b6a4a41d3f2ccc3a33 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 16 Mar 2018 17:41:30 +0630
Subject: [PATCH 432/651] update option and menu export csv single

---
 Gemfile                                       |   4 +-
 app/assets/javascripts/addorder.js            |  54 ++++----
 app/controllers/api/orders_controller.rb      |   3 +-
 .../origami/addorders_controller.rb           |   6 +-
 app/controllers/settings/menus_controller.rb  |  14 +-
 .../transactions/orders_controller.rb         |   9 +-
 app/models/menu.rb                            |  19 +--
 app/models/menu_category.rb                   |  17 ++-
 app/models/order_item.rb                      |   3 +-
 app/views/origami/addorders/detail.html.erb   |   2 +-
 app/views/settings/menus/index.html.erb       |   5 +
 config/application.rb                         |   2 +
 config/routes.rb                              |   1 +
 data/recent_users.json                        | 128 ------------------
 14 files changed, 84 insertions(+), 183 deletions(-)
 delete mode 100644 data/recent_users.json

diff --git a/Gemfile b/Gemfile
index 94ed4ef3..4ca47865 100755
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,6 @@ gem 'prawn'
 gem 'prawn-table'
 gem 'spreadsheet'
 gem 'to_xls-rails'
-
 #Reporting gem
 #gem 'compendium'
 #gem "cancan"
@@ -81,7 +80,6 @@ gem 'kaminari', '~> 1.0.1'
 gem 'filterrific'
 
 gem 'cancancan', '~> 1.10'
-
 #pageless no need for current
 # gem 'will_paginate'
 # gem 'pageless-rails', github: 'rorlab/pageless-rails'
@@ -129,4 +127,4 @@ gem 'momentjs-rails' # for date-range selector
 # gem 'bootstrap-datepicker-rails' # date picker
 # gem 'jquery-datetimepicker-rails'
 # gem 'select2-rails' # for multi-select and auto-complete select box
-gem "chartkick" #chart lib
+gem "chartkick" #chart lib
\ No newline at end of file
diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 401d894a..f6365db0 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -180,7 +180,6 @@ $(function() {
                   image_path = "image/logo.png";
                 }
               }
-              console.log(menu_items[field].options)
 
               row = '<div class="card custom-card testimonial-card animated fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                        +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
@@ -190,6 +189,7 @@ $(function() {
                       +JSON.stringify(menu_items[field].instances)+"' data-id = '"
                       +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
                       +JSON.stringify(item_attributes)+"' data-option = '"
+                      +JSON.stringify(menu_items[field].options)+"'data-opt = '"
                       +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
                       +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >"
                         +"<i class='fa "+fa_plus+" '>"
@@ -202,6 +202,7 @@ $(function() {
                           + price +"' data-instance-code = '"+ code +"' data-instance = '"
                           + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
                           + JSON.stringify(item_attributes) +"' data-options = '"
+                          + JSON.stringify(menu_items[field].options) +"' data-opt = '"
                           + JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"' data-toggle='"
                           +data_modal+"' data-target='."+data_target+"' data-item-sets = '"
                       +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
@@ -296,7 +297,7 @@ $(function() {
      $('.set-item').attr('data-code',instances[0]['code']);
      $('.set-item').attr('data-name',instances[0]['name']);
      $('.set-item').attr('data-price',instances[0]['price']);
-     // $('.set-item').attr('data-options','[]');
+     $('.set-item').attr('data-options','');
      $('.set-item').attr('data-parent',true);
 
     $('#set_change_qty').val(1);
@@ -351,6 +352,7 @@ $(function() {
             sub_total       = $('#set_total_price').text();
             name            = $(this).data('name');
             price           = $(this).data('price');
+            options         = $(this).attr('data-options','');
             // qty             = $('#set_change_qty').val();
             qty             = document.getElementById("set_count").value;
             total           = qty*price;
@@ -379,14 +381,14 @@ $(function() {
 
       item = get_set_item(items);
       customer_display_view(item,"set_add");
-
+      var option = ''
       attribute_arr = []
 
       var rowCount = $('.summary-items tbody tr').length+1;
         code          = $('.set-item').attr('data-code');
         name          = $('.set-item').attr('data-name');
         price         = $('.set-item').attr('data-price');
-        option        = $('.set-item').attr('data-options');
+        option        = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
         parent        = $('.set-item').attr('data-parent');
         total         = qty * price ;
         row ="<tr class='item_box' data-price ='"
@@ -396,7 +398,7 @@ $(function() {
               +attribute_arr+"' data-options ='"
               +option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'-' + option +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)
@@ -404,22 +406,23 @@ $(function() {
           +'</tr>';
           $(".summary-items tbody").append(row);
       var rowCount = $('.summary-items tbody tr').length+1;
+      var set_option = ''
       $(items).each(function(i){
         code          = $(items[i]).attr('data-code');
         name          = $(items[i]).attr('data-name');
         price         = $(items[i]).attr('data-price');
-        option        = $(items[i]).attr('data-options');
+        set_option    = ($(items[i]).attr('data-options')  === 'undefined') ? ' ' :$(items[i]).attr('data-options');
+        
         sub_item      = $(items[i]).attr('data-sub-item');
-        option          = $(items[i]).attr('data-options');
         total         = qty * price ;
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
               +code+"' data-attributes='"
               +attribute_arr+"' data-options ='"
-              +option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
+              +set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'-' + option +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)
@@ -659,7 +662,6 @@ $(function() {
 
     attribute_arr = get_selected_attributes('selected-attribute');
     option_arr    = get_selected_attributes('selected-option');
-
     if (item_row.length>0) {
       var instances = jQuery.parseJSON(item_row.attr('data-instances'));
       
@@ -700,7 +702,7 @@ $(function() {
     var item_data = $(this);
     item = get_item(item_data);
     customer_display_view(item,"add");
-    show_item_detail(item_data);
+    show_item_detail(item_data,"add_to_order");
     calculate_sub_total();
       
   }); //End add order  Click
@@ -710,11 +712,11 @@ $(function() {
     var item_data = $(this);
     item = get_item(item_data);
     customer_display_view(item,"add");
-    show_item_detail(item_data);
+    show_item_detail(item_data,"add_icon");
     calculate_sub_total(); 
   }); //End Add Icon Click
 
-  function show_item_detail(data){
+  function show_item_detail(data,click_type){
     
     qty           = parseInt(data.attr('data-qty'));
     append        = 0;
@@ -726,23 +728,26 @@ $(function() {
     }else{
       instance = "("+data.attr('data-instance')+")";
     }
-
-    d_option = data.attr('data-options');
-    if (d_option){
-      option_name = "-"+data.attr('data-options');      
+    d_option = data.attr('data-opt');
+    if (click_type != "add_icon"){
+      option_name = "-"+data.attr('data-options'); 
+      data_option =  data.attr('data-options')  ;  
     }else{
-      option_name = '';
+      option_name = ' ';
+      data_option = '[]';
     }
 
+
     var rowCount = $('.summary-items tbody tr').length+1;
     var item_row = $('.summary-items tbody tr');
     
     $(item_row).each(function(i){
       item_code = $(item_row[i]).attr('data-code');
       instance_code = $(item_row[i]).attr('data-instance-code');
-      r_option = $(item_row[i]).attr('data-options');
-
-      if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option==d_option) {
+      r_option = $(item_row[i]).attr('data-opt');
+console.log(r_option)
+console.log(d_option)
+      if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) {
         if (qty > 1) {            
           qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty;
         }else{            
@@ -766,9 +771,10 @@ $(function() {
           +instance+ "' data-code='"+data.attr('data-item-code')+"' data-instance-code='"
           +data.attr('data-instance-code')+"' data-attributes='"
           +data.attr('data-attributes')+"' data-options ='"
+          +data_option+"' data-opt ='"
           +data.attr('data-options')+"' data-row ='"+rowCount+ "'>"
       +'<td class="item-cell-no">'+rowCount+'</td>'
-      +'<td class="item-cell-name" id="item_name" >' + data.attr('data-name')+ ' ' + instance +' ' + option_name +'</td>'
+      +'<td class="item-cell-name" id="item_name" >' + data.attr('data-name')+ ' ' + instance +''+option_name+'</td>'
       +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
       +'<td class="item-cell-price" id="item_price">' 
       + parseFloat(price).toFixed(2)
@@ -822,8 +828,6 @@ $(function() {
           data: params,
           dataType: "json",
            success:function(result){ 
-            console.log(type)
-            console.log(table_type)
               if (type == "quick_service") {
                    window.location.href = "/origami/quick_service"
               }else{
@@ -889,7 +893,7 @@ $(function() {
       dataType: "json",
        success:function(result){
           if (result.status) {
-            console.log(result)
+            
             if (result.data == null){
                swal({
                   title: "Please Open Shift !",
diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 2e9602c8..43e1bd11 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -67,7 +67,8 @@ class Api::OrdersController <  Api::ApiController
          end
        }
       #end extra time
-
+ puts params[:order_items]
+    puts "ITEM aaaaaaaaaaaaaaaaaaa"
       # begin
       @order = Order.new
       @order.source = params[:order_source]
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 7dd2b3f0..3a8dea9b 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -94,10 +94,10 @@ class Origami::AddordersController < BaseOrigamiController
           extra_time = Time.at(time)
          end
        end
-       if i["parent_order_item_id"]
-         items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"parent_order_item_id": i["parent_order_item_id"],"options": i["options"]}
+       if i["parent_order_item_id"];
+         items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"parent_order_item_id": i["parent_order_item_id"],"options": JSON.parse(i["options"])}
        else
-        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
+        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": JSON.parse(i["options"])}
        end
        items_arr.push(items)
      }
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 4d7d6026..0a6d87c7 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -7,9 +7,12 @@ class Settings::MenusController < ApplicationController
   def index
     @settings_menus = Menu.all.page(params[:page]).per(10)
     respond_to do |format|
-      format.html
-      format.csv { send_data Menu.to_csv }
-    end
+        format.html
+        # format.csv { send_data MenuCsvExport.generate }
+
+format.csv { send_data Menu.to_csv }
+# format.csv { send_data MenuCategory.to_csv }
+      end
   end
 
   # GET /settings/menus/1
@@ -71,6 +74,11 @@ class Settings::MenusController < ApplicationController
     # end
   end
 
+  def import
+    Menu.import(params[:file])
+    redirect_to settings_menu_path, notice: "imported"
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_menu
diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb
index 17a117bb..52abf7fd 100755
--- a/app/controllers/transactions/orders_controller.rb
+++ b/app/controllers/transactions/orders_controller.rb
@@ -21,11 +21,12 @@ class Transactions::OrdersController < ApplicationController
 		@receipt_no = filter
     	@from       = from
     	@to         = to
-		
+	
 		respond_to do |format|
-			format.html # index.html.erb
-			format.json { render json: @orders }
-		end
+	      format.html
+	      format.json { render json: @orders }
+	      # format.csv { send_data OrdersCsvExport.generate }
+	    end
 	end
 	
 	def show
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 052a7042..12784eea 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -33,27 +33,20 @@ class Menu < ApplicationRecord
   end
 
   def self.to_csv
-    m_attributes = %w{id name is_active valid_days valid_time_from valid_time_to created_by created_at updated_at}    
+    m_attributes = %w{name is_active valid_days valid_time_from valid_time_to created_by created_at updated_at}    
     CSV.generate(headers: true) do |csv|
       csv << m_attributes
       menu = Menu.all
       menu.each do |user|
-        puts user
         csv << m_attributes.map{ |attr| user.send(attr)}
       end
     end
+  end
 
-    # mc_attributes = %w{id menu_id code name alt_name order_by created_by menu_category_id is_available created_at updated_at}
-    # CSV.generate(headers: true) do |csv|
-    #   csv << m_attributes
-
-    #   csv << mc_attributes
-    #   MenuCategory.all.each do |user|
-    #     puts user
-    #     csv << mc_attributes.map{ |attr| user.send(attr)}
-    #   end
-    # end
-
+  def self.import(file)
+      CSV.foreach(file.path, headers:true) do |row|
+      Menu.create! row.to_hash
+    end  
   end
 
 end
\ No newline at end of file
diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index acb06c4f..65477a37 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -1,7 +1,7 @@
 class MenuCategory < ApplicationRecord  
   # before_create :generate_menu_category_code
 
-  belongs_to :menu
+  belongs_to :menu , counter_cache: true
   has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id"
   belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true
   has_many :menu_items
@@ -83,4 +83,19 @@ class MenuCategory < ApplicationRecord
   # def generate_menu_category_code        
   #   self.code = SeedGenerator.generate_code(self.class.name, "C")    
   # end
+
+  def self.to_csv
+   
+    mc_attributes = %w{id menu_id code name alt_name order_by created_by menu_category_id is_available created_at updated_at}
+    CSV.generate(headers: true) do |csv|
+      csv << mc_attributes
+
+      csv << mc_attributes
+      MenuCategory.all.each do |user|
+        puts user
+        csv << mc_attributes.map{ |attr| user.send(attr)}
+      end
+    end
+
+  end
 end
diff --git a/app/models/order_item.rb b/app/models/order_item.rb
index 776bb94c..87d60e63 100755
--- a/app/models/order_item.rb
+++ b/app/models/order_item.rb
@@ -5,7 +5,8 @@ class OrderItem < ApplicationRecord
   before_create :generate_custom_id
 
   #Associations
-  belongs_to :order, autosave: true
+   belongs_to :order, autosave: true
+   # belongs_to :order, counter_cache: true
 
   #Validation
   validates_presence_of :item_code, :item_name, :qty
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 6c580f40..4e93e5a7 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -375,7 +375,7 @@
             <div class="modal-body">
                 <div class="row set-item">
                   <div class="col-md-4">
-                  <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
+                  <p class="set_default_option" style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
                       <!-- <div class="form-group">
                         <label class="col-md-6" style="margin-top:5px">Quantity</label>
                         <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 99b678ef..ed215031 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -7,6 +7,11 @@
     </span>
   </ol>
 </div>
+<!-- <h4>Import</h4>
+<%= form_tag import_settings_menus_path, multipart:true do%>
+  <%=file_field_tag :file%>
+  <%=submit_tag "Import CSV"%>
+<%end%> -->
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <br><br>
diff --git a/config/application.rb b/config/application.rb
index f4cbac01..e9a4e634 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -20,5 +20,7 @@ module SXRestaurants
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
     config.time_zone = 'Asia/Rangoon'
+    
+
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 6983cfbe..b2c167d1 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -298,6 +298,7 @@ scope "(:locale)", locale: /en|mm/ do
     #menu
     resources :menus do
       #menu_categories
+      collection { post :import }
       resources :menu_categories, only: [:new, :create, :edit, :delete]
     end
 
diff --git a/data/recent_users.json b/data/recent_users.json
deleted file mode 100644
index 4d2e6825..00000000
--- a/data/recent_users.json
+++ /dev/null
@@ -1,128 +0,0 @@
-[
-  {
-    "id": 1,
-    "name": "Administrator",
-    "role": "administrator",
-    "emp_id": "999",
-    "password_digest": "$2a$10$mfWmxBvOHt3NbWrLGOF/POTpnxF7QEtnW99qW818dkrQqVLtjQdrS",
-    "token_session": null,
-    "session_expiry": null,
-    "session_last_login": "2018-03-14 09:41:25 +0630",
-    "created_by": "SYSTEM DEFAULT",
-    "created_at": "2017-11-08 09:44:30 +0630",
-    "updated_at": "2018-03-14 16:02:09 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 2,
-    "name": "Waiter",
-    "role": "waiter",
-    "emp_id": "111",
-    "password_digest": "$2a$10$PjBemEA2yKOcoGAyXjz81OqglrASIF8RTYHVe0vqp3FQ0T4/PzJJG",
-    "token_session": "662e797ad508ab6c43b1",
-    "session_expiry": "2018-02-21 01:45:11 +0630",
-    "session_last_login": "2018-02-20 13:45:11 +0630",
-    "created_by": "SYSTEM DEFAULT",
-    "created_at": "2017-11-08 09:44:30 +0630",
-    "updated_at": "2018-02-20 13:59:17 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 3,
-    "name": "Waiter 2",
-    "role": "waiter",
-    "emp_id": "222",
-    "password_digest": "$2a$10$gXh/Tpbr8EyJSaxsbJYVh.K7Fr4bT0A1i2mWuuZm/FHQ4D/wV1E8e",
-    "token_session": "61868be9530b753ada84",
-    "session_expiry": "2018-03-14 05:41:12 +0630",
-    "session_last_login": "2018-03-13 17:11:12 +0630",
-    "created_by": "SYSTEM DEFAULT",
-    "created_at": "2017-11-08 09:44:30 +0630",
-    "updated_at": "2018-03-13 17:32:47 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 4,
-    "name": "Cashier",
-    "role": "cashier",
-    "emp_id": "333",
-    "password_digest": "$2a$10$fHo.9wOn.yr.2Ke6iuCfou6DjpyHXwQSmZQ.43O7W4SnlmzuoIEF2",
-    "token_session": "693f6e98bb90b6af9978",
-    "session_expiry": "2018-03-15 12:36:28 +0630",
-    "session_last_login": "2018-03-14 16:36:28 +0630",
-    "created_by": "SYSTEM DEFAULT",
-    "created_at": "2017-11-08 09:44:30 +0630",
-    "updated_at": "2018-03-14 17:05:14 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 5,
-    "name": "manager",
-    "role": "manager",
-    "emp_id": "888",
-    "password_digest": "$2a$10$EaU/Sxfsb8Q3kBIAyxSEJ.ZpRC9vxSdVAFvF0WXUvWiAqHyqGggoe",
-    "token_session": null,
-    "session_expiry": null,
-    "session_last_login": "2018-01-16 13:37:05 +0630",
-    "created_by": null,
-    "created_at": "2017-11-30 10:03:11 +0630",
-    "updated_at": "2018-01-16 13:48:02 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 6,
-    "name": "Account",
-    "role": "account",
-    "emp_id": "777",
-    "password_digest": "$2a$10$bJmgIxHefkvxpxJQLQPcpurTJrp8.BwP/kirJRYb1v1thrU3TDzkC",
-    "token_session": null,
-    "session_expiry": null,
-    "session_last_login": "2018-01-16 10:37:22 +0630",
-    "created_by": null,
-    "created_at": "2018-01-16 10:23:09 +0630",
-    "updated_at": "2018-01-16 10:49:24 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 7,
-    "name": "Supervisor",
-    "role": "supervisor",
-    "emp_id": "666",
-    "password_digest": "$2a$10$/WQirOw5nu6kKDiITTVa7.IGeVyxH5JmLp3/Astu/5DlOAoMLn4Ne",
-    "token_session": null,
-    "session_expiry": null,
-    "session_last_login": "2018-01-16 14:28:40 +0630",
-    "created_by": null,
-    "created_at": "2018-01-16 10:23:32 +0630",
-    "updated_at": "2018-01-16 15:32:33 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 8,
-    "name": "123",
-    "role": "waiter",
-    "emp_id": "123",
-    "password_digest": "$2a$10$v8JBsc31XkLRNZ/QhfYBg.wbVT7CyVvk83U..0PsGiz61w0Atl/WW",
-    "token_session": "4fc9a18a5df511e507fc",
-    "session_expiry": "2018-02-01 20:08:35 +0630",
-    "session_last_login": "2018-02-01 14:08:35 +0630",
-    "created_by": null,
-    "created_at": "2018-02-01 14:07:16 +0630",
-    "updated_at": "2018-02-01 17:45:10 +0630",
-    "image_path": {"url":null}
-  },
-  {
-    "id": 9,
-    "name": "Cashier 2",
-    "role": "cashier",
-    "emp_id": "444",
-    "password_digest": "$2a$10$5n34O09xmrIHbgvX.uhr9uAaUR8etjaqiicaXr017VWm/qDkjKVue",
-    "token_session": "0477edce9cf259f280c1",
-    "session_expiry": "2018-02-20 19:07:50 +0630",
-    "session_last_login": "2018-02-20 11:37:50 +0630",
-    "created_by": null,
-    "created_at": "2018-02-14 17:10:12 +0630",
-    "updated_at": "2018-02-20 13:37:46 +0630",
-    "image_path": {"url":null}
-  }
-]
\ No newline at end of file

From aa8e795d45bb36563f7a47d4571e4e348ebf3119 Mon Sep 17 00:00:00 2001
From: Moe Su <moesu@code2lab.com>
Date: Fri, 16 Mar 2018 17:50:45 +0630
Subject: [PATCH 433/651] Topup payment

---
 Gemfile                                       |   2 +-
 app/assets/javascripts/origami/paymal.coffee  |   3 +
 app/assets/stylesheets/origami/paymal.scss    |   3 +
 app/controllers/origami/paymal_controller.rb  | 101 +++++++++
 .../origami/payments_controller.rb            |   3 +
 app/helpers/origami/paymal_helper.rb          |   2 +
 app/models/sale_payment.rb                    |  85 ++++++++
 app/views/origami/home/show.html.erb          |   3 +-
 app/views/origami/paymal/create.json.jbuilder |   2 +
 app/views/origami/paymal/index.html.erb       | 201 ++++++++++++++++++
 app/views/origami/payments/show.html.erb      |  21 +-
 .../origami/redeem_payments/index.html.erb    |   1 -
 app/views/origami/rooms/show.html.erb         |   3 +-
 config/initializers/action_controller.rb      |  10 +-
 config/routes.rb                              |   2 +
 .../origami/paymal_controller_spec.rb         |  12 ++
 spec/helpers/origami/paymal_helper_spec.rb    |  15 ++
 .../origami/paymal/index.html.erb_spec.rb     |   5 +
 18 files changed, 461 insertions(+), 13 deletions(-)
 create mode 100644 app/assets/javascripts/origami/paymal.coffee
 create mode 100644 app/assets/stylesheets/origami/paymal.scss
 create mode 100644 app/controllers/origami/paymal_controller.rb
 create mode 100644 app/helpers/origami/paymal_helper.rb
 create mode 100644 app/views/origami/paymal/create.json.jbuilder
 create mode 100644 app/views/origami/paymal/index.html.erb
 create mode 100644 spec/controllers/origami/paymal_controller_spec.rb
 create mode 100644 spec/helpers/origami/paymal_helper_spec.rb
 create mode 100644 spec/views/origami/paymal/index.html.erb_spec.rb

diff --git a/Gemfile b/Gemfile
index 94ed4ef3..3d4a3c5b 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.4.1'
+ruby '2.4.0'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
diff --git a/app/assets/javascripts/origami/paymal.coffee b/app/assets/javascripts/origami/paymal.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/origami/paymal.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/origami/paymal.scss b/app/assets/stylesheets/origami/paymal.scss
new file mode 100644
index 00000000..93758d38
--- /dev/null
+++ b/app/assets/stylesheets/origami/paymal.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the origami/Paymal controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
new file mode 100644
index 00000000..bdcee917
--- /dev/null
+++ b/app/controllers/origami/paymal_controller.rb
@@ -0,0 +1,101 @@
+class Origami::PaymalController < BaseOrigamiController
+  	def index
+ 		@sale_id = params[:sale_id]
+ 		payment_method = params[:payment_method]
+        @cashier_type   = params[:type]
+ 		@membership_rebate_balance=0
+ 		sale_data = Sale.find_by_sale_id(@sale_id)
+
+        @shop        = Shop::ShopDetail 
+        # if @shop.is_rounding_adj
+        #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+        # else
+        #     new_total    = sale_data.grand_total
+        # end
+        # @rounding_adj = new_total-sale_data.grand_total  
+        @rounding_adj = sale_data.rounding_adjustment  
+
+        @payparcount = 0
+        others = 0
+        sale_data.sale_payments.each do |sale_payment|
+            if sale_payment.payment_method == "paypar"
+              @payparcount = @payparcount + sale_payment.payment_amount
+            else
+              others = others + sale_payment.payment_amount
+            end
+        end
+        @payment_prices = sale_data.grand_total - @payparcount -others
+
+
+     		if sale_data
+     			if sale_data.customer_id
+     				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+     				if customer_data
+     					@membership_id = customer_data.membership_id
+     					if !@membership_id.nil?
+     						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+     						if membership_setting.gateway_url
+     							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+     							if member_actions.gateway_url
+     								@campaign_type_id = nil
+     								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+     								merchant_uid= member_actions.merchant_account_id
+     								auth_token = member_actions.auth_token.to_s
+    		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+    		 						if membership_data["status"]==true
+    		 							@membership_rebate_balance=membership_data["balance"]
+    		 							@out = true, @membership_rebate_balance,@membership_id
+    		 						end
+    		 					else
+    		 						@out =false,0
+     							end
+     						else
+     							@out = false,0
+     						end
+
+
+     					else
+     						@out = false, 0
+     					end
+     				else
+     					@out = false, 0
+     				end
+     			else
+     				@out = false, 0
+     			end
+     		else
+     			@out = false, 0
+     		end
+     		@out = false, 0
+    end
+  	def create
+	    cash = params[:payment_amount]
+	    sale_id = params[:sale_id]
+	    if(Sale.exists?(sale_id))
+	      saleObj = Sale.find(sale_id)
+	      shop_details =  Shop::ShopDetail 
+	      
+	      # rounding adjustment
+	      # if shop_details.is_rounding_adj
+	      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+	      #   rounding_adj = new_total-saleObj.grand_total
+	      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+	      # end
+
+	      # saleObj = Sale.find(sale_id)
+	      sale_payment = SalePayment.new
+	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal")
+          if status == true
+                @out = true, "Success!"
+            else
+                @out =false, "Please try again payment!"
+            end
+	    end
+  	end
+
+	#Shop Name in Navbor
+	helper_method :shop_detail
+		def shop_detail
+		    @shop = Shop.first
+		end
+end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 563decfe..78fee237 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -211,6 +211,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @mastercount = 0.0
       @unionpaycount = 0.0
       @credit = 0.0
+      @paymalcount = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
       @balance = 0.00
       @accountable_type = ''
@@ -324,6 +325,8 @@ class Origami::PaymentsController < BaseOrigamiController
           @unionpaycount += spay.payment_amount
          elsif spay.payment_method == "creditnote"
            @credit += spay.payment_amount
+         elsif spay.payment_method == "paymal"
+           @paymalcount += spay.payment_amount
          end
       end
     end
diff --git a/app/helpers/origami/paymal_helper.rb b/app/helpers/origami/paymal_helper.rb
new file mode 100644
index 00000000..8d1787c8
--- /dev/null
+++ b/app/helpers/origami/paymal_helper.rb
@@ -0,0 +1,2 @@
+module Origami::PaymalHelper
+end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 1866a630..280101ad 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -48,6 +48,8 @@ class SalePayment < ApplicationRecord
           payment_status = paypar_payment
         when "foc"
           payment_status = foc_payment
+        when "paymal"
+          payment_status = paymal_payment
       else
          puts "it was something else"
       end
@@ -159,6 +161,60 @@ class SalePayment < ApplicationRecord
 
       return response;
 
+  end
+
+  def self.create_payment(paypar_url,token,membership_id,received_amount,sale_id)
+      membership_actions_data = MembershipAction.find_by_membership_type("create_payment");
+
+      if !membership_actions_data.nil?
+
+        url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
+        merchant_uid = membership_actions_data.merchant_account_id
+        auth_token = membership_actions_data.auth_token
+        sale_data = Sale.find_by_sale_id(sale_id)
+
+        if sale_data
+          others = 0
+          sale_data.sale_payments.each do |sale_payment|
+              others = others + sale_payment.payment_amount
+          end
+          payment_prices = sale_data.grand_total - others
+          # Control for Paypar Cloud
+          begin
+            response = HTTParty.post(url,
+                  :body => { membership_id:membership_id,
+                            amount:received_amount,
+                            receipt_no:sale_data.receipt_no,
+                            merchant_uid:merchant_uid,
+                            auth_token:auth_token}.to_json,
+                  :headers => {
+                            'Content-Type' => 'application/json',
+                            'Accept' => 'application/json; version=3'
+                  },
+                  :timeout => 10
+            )
+          rescue Net::OpenTimeout
+            response = false
+
+          rescue OpenURI::HTTPError
+            response = { status: false}
+
+          rescue SocketError
+            response = { status: false}
+          end
+        else
+            response = false;
+        end
+
+      else
+        response =false;
+      end
+
+      Rails.logger.debug "Payment response"
+      Rails.logger.debug response.to_json
+
+      return response;
+
   end
 
     # Check for Card Payment
@@ -297,6 +353,35 @@ class SalePayment < ApplicationRecord
 
   end
 
+  def paymal_payment
+    payment_status = false
+
+    #Next time - validate if the vochure number is valid - within
+    customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+    membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+
+     #record an payment in sale-audit
+      remark = "#{membership_data} PayMal Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
+      sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+
+    if membership_data["status"]==true
+      self.payment_method = "paymal"
+      self.payment_amount = self.received_amount
+      self.payment_reference  = self.voucher_no
+      self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
+      self.payment_status = "pending"
+      payment_method = self.save!
+      SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
+      sale_update_payment_status(self.received_amount.to_f)
+
+    else
+      sale_update_payment_status(0)
+    end
+    return payment_status
+
+  end
+
   def sale_update_payment_status(paid_amount,check_foc = false)    
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 194ac82e..388ce4d7 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -697,11 +697,12 @@
 
     $(".choose_payment").on('click', function () {
       $( "#loading_wrapper").show();
+      alert(parseInt(jQuery.inArray("PAYMAL", type)));
 
         var sale_id = $('#sale_id').val();
           type = $('.payment_method').val();
           if(parseInt(jQuery.inArray("Credit", type)) == -1){
-            if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
+            if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL",type))!= -1) {
                calculate_member_discount(sale_id,"Card");
                
             }else{
diff --git a/app/views/origami/paymal/create.json.jbuilder b/app/views/origami/paymal/create.json.jbuilder
new file mode 100644
index 00000000..f352b148
--- /dev/null
+++ b/app/views/origami/paymal/create.json.jbuilder
@@ -0,0 +1,2 @@
+json.set! :status, @out[0]
+json.set! :message, @out[1]
\ No newline at end of file
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
new file mode 100644
index 00000000..81684256
--- /dev/null
+++ b/app/views/origami/paymal/index.html.erb
@@ -0,0 +1,201 @@
+<div class="container-fluid">
+	<!-- <div class="page-header">
+		<ol class="breadcrumb">
+			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+			<li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+			<li class="breadcrumb-item active"><%= t("views.right_panel.details.redeem") %></li>
+			<span class="float-right">
+				<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+			</span>
+		</ol>
+	</div> -->
+	<h5>PayMal Payment</h5>
+	<div class="row">
+		<div class="col-lg-5 col-md-5 col-sm-5">
+			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">
+				<div class="rebate-form">
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">You can pay up to </label>
+							<%@payment_prices = @payment_prices +@rounding_adj%>
+							<input type="text" name="" id="paymentamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payment_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+						</div>
+						<hr>
+					</div>
+					<% if @payparcount > 0 %>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">Recent Payment Amount </label>
+							<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payparcount %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+						</div>
+						<hr>
+					</div>
+					<% end %>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">Available Balance </label>
+							<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+						</div>
+						<hr>
+					</div>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">Payment Balance</label>
+							<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+						</div>
+						<hr>
+					</div>
+				</div>
+			</div>
+			<!-- <% if @payparcount > 0 %>
+				<p class="">Last time rebate amount is <%= @payparcount %></p>
+			<% end %>
+			<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @payment_prices %></span></p> -->
+		</div>
+
+		<div class="col-lg-6 col-md-6 col-sm-6">
+			<div class="m-t-10 p-l-20">
+				<div class="row">
+					<div class="col-lg-6 col-md-1 col-sm-1">
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="1" data-type="num">1</div>
+							<div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+							<div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="4" data-type="num">4</div>
+							<div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+							<div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="7" data-type="num">7</div>
+							<div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+							<div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="0" data-type="num">0</div>
+							<div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+							<div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number green border-left" data-type="nett">Nett</div>
+							<div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+							<div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+						</div>
+					</div>
+					<div class="col-lg-6 col-md-6 col-sm-6">
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+							<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+							<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="pay purple left" id="paymal_payment">Pay</div>
+						</div>
+					</div>
+
+				</div>
+			</div>
+
+
+		</div>
+		<div class="col-lg-1 col-md-1 col-sm-1">
+		 <button type="button" class="btn bg-default m-t-10 btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+    var cashier_type = "<%= @cashier_type %>"; 
+	$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+			else {
+				$('#paymentamt').attr("value",parseFloat("<%= @payment_prices %>") - parseFloat(localStorage.getItem("cash")));
+			}
+		});
+	$(document).on('click', '.cashier_number', function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		if(event.handled !== true) {
+			var original_value;
+			original_value = $('#used_amount').text();
+
+			var input_value = $(this).attr("data-value");
+
+			var input_type = $(this).attr("data-type");
+			switch (input_type) {
+				case 'num':
+				if (original_value == "0.0"){
+					$('#used_amount').text(input_value);
+				}else{
+					$('#used_amount').append(input_value);
+				}
+				break;
+
+				case 'add':
+				var input_value = $(this).attr("data-value");
+				amount = parseInt(input_value) + parseInt(original_value);
+				$('#used_amount').html(amount);
+
+				break;
+				case 'clr':
+				$('#used_amount').html("0.0");
+				break;
+				case 'del' :
+				var cash=$('#used_amount').text();
+				$('#used_amount').text(cash.substr(0,cash.length-1));
+				break;
+				case 'nett':
+				var remain_amount = $('#paymentamt').val();
+				$('#used_amount').text(remain_amount);
+				break;
+
+			}
+			event.handled = true;
+		} else {
+			return false;
+		}
+	});
+
+	$("#paymal_payment").click(function(){
+		valid_amount = $("#valid_amount").val();
+		sale_id = $("#valid_amount").attr('data-value');
+		membership_id = $("#valid_amount").attr('data-member-value');
+		payment_amount = parseFloat($("#used_amount").text());
+		if(payment_amount<=0 ){
+			swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
+		}else if(valid_amount< payment_amount){
+			swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
+		}else{
+			if(payment_amount <= "<%= @payment_prices %>"){
+				$(this).off("click");
+				$.ajax({
+					type: "POST",
+					url:  "<%=origami_payment_paymal_path%>",
+					data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id},
+					success: function(result){
+						if(result.status == true){
+							swal({
+								title: "Information!",
+								text: result.message,
+								html: true,
+								closeOnConfirm: false,
+								closeOnCancel: false,
+								allowOutsideClick: false
+							}, function () {
+								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
+							});
+
+						}else{
+							swal ( "Information" , result.message);
+						}
+					}
+				})
+			}else {
+				swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+			}
+		}
+	});
+</script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 8c7ac778..3769505a 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -265,6 +265,17 @@
           <div class="col-md-4" id="unionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
+        <!-- PAYMAL -->
+        
+        <div class="row payment <%= @paymalcount!=0.0 ? 'payment others-color'  : 'hidden'%>">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">PAYMAL</div>
+          <% if @paymalcount != 0.0 %>
+            <div class="col-md-4 master is_card" id="paymalcount"><%= number_with_precision(@paymalcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="paymalcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
+        </div>
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
           <div class="col-md-4"><strong><span id='balance'><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong></div>
@@ -488,7 +499,7 @@ var customer_name = "<%= @customer.name %>";
               $("#credit_payment").show();
             }
 
-            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1){
+            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1, parseInt(jQuery.inArray("PAYMAL", payment_type)) !=-1){
               $("#card_payment").show();   
             } else{
              $("#card_payment").hide();
@@ -553,6 +564,8 @@ var customer_name = "<%= @customer.name %>";
       }
       else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
           swal("Oops","Please Pay with Credit Payment","warning");
+      }else if(payment_type == "PAYMAL" && $('#paymalcount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with Paymal Payment","warning");
       }else{
 
         $( "#loading_wrapper").show();
@@ -826,7 +839,8 @@ var customer_name = "<%= @customer.name %>";
           var jcb1 = $('#jcbcount').text();
           var master1 = $('#mastercount').text();
           var unionpay1 = $('#unionpaycount').text();
-          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
+          var paymal1 = $('#paymalcount').text();
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(visa1) + parseFloat(paymal1);
           var total = $('#amount_due').text();
           var amt = 0;
           <% if precision.to_i > 0 %>;
@@ -854,8 +868,9 @@ var customer_name = "<%= @customer.name %>";
     var jcb = $('#jcbcount').text();
     var master = $('#mastercount').text();
     var unionpay = $('#unionpaycount').text();
+    var paymal = $('#paymalcount').text();
     var amount_due = $('#amount_due').text();
-    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay)
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(paymal)
     var result = parseFloat(amount_due) - parseFloat(total);
     <% if precision.to_i > 0 %>
       $('#balance').text(parseFloat(result).toFixed(<%= precision %>));
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 1d29e563..286a872c 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -177,7 +177,6 @@
 					data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id},
 					success: function(result){
 						if(result.status == true){
-							console.log(result)
 							swal({
 								title: "Information!",
 								text: result.message,
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1edb07cf..5a0dbb67 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -665,11 +665,10 @@ $("#first_bill").on('click', function(){
 
 $(".choose_payment").on('click', function () {
   $( "#loading_wrapper").show();
-
   var sale_id = $('#sale_id').val();
   type = $('.payment_method').val();
   if(parseInt(jQuery.inArray("Credit", type)) == -1){
-    if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
+    if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL", type)) != -1) {
       calculate_member_discount(sale_id,"Card");
 
     }else{
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8f310dab..02e35bb8 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index 092b82d6..f4865c48 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -180,6 +180,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
+    post 'payment/paymal' => 'paymal#create'
 
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
@@ -187,6 +188,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/VISA' => "visa#index"
     get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
     get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
+    get 'sale/:sale_id/:type/payment/others_payment/PAYMAL' => "paymal#index"
     get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
     get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
diff --git a/spec/controllers/origami/paymal_controller_spec.rb b/spec/controllers/origami/paymal_controller_spec.rb
new file mode 100644
index 00000000..8dffaf69
--- /dev/null
+++ b/spec/controllers/origami/paymal_controller_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe Origami::PaymalController, type: :controller do
+
+  describe "GET #index" do
+    it "returns http success" do
+      get :index
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+end
diff --git a/spec/helpers/origami/paymal_helper_spec.rb b/spec/helpers/origami/paymal_helper_spec.rb
new file mode 100644
index 00000000..7d27aafa
--- /dev/null
+++ b/spec/helpers/origami/paymal_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Origami::PaymalHelper. For example:
+#
+# describe Origami::PaymalHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Origami::PaymalHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/origami/paymal/index.html.erb_spec.rb b/spec/views/origami/paymal/index.html.erb_spec.rb
new file mode 100644
index 00000000..c047162a
--- /dev/null
+++ b/spec/views/origami/paymal/index.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "paymal/index.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 7f6676c840d9dde16ce8c14f29d2df8db3ef0886 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 16 Mar 2018 18:07:35 +0630
Subject: [PATCH 434/651] change order item count

---
 app/views/origami/split_bill/index.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index fb97b51d..69743cf1 100755
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -53,12 +53,14 @@
 	 																</tr>
 	 															</thead>
 	 															<tbody>
+	 																<% order_item_count = 0 %>
 	 																<% if !@order_items.nil? %>
 	 																<% sub_total = 0 %>
 	 																<% @order_items.each do |order_item| %>
 	 																<% if order_item.include? ('all_order') %>
 		 																<% order_item['all_order'].each do |odr_item| %>
 			 																<% 
+			 																order_item_count = order_item_count.to_i + 1
 			 																sub_total += odr_item['qty'].to_f * odr_item['price'].to_f 
 			 																%>
 			 																<tr class="item-row" id=<%= odr_item['order_items_id'] %> >
@@ -385,10 +387,10 @@
 
 	//order_item_split
 	$('#order_item_split').on('click',function () {
-		var cnt_order_item = "<%= @order_items.count %>";
+		var cnt_order_item = "<%= order_item_count %>";
 		var order_items = get_selected_order_items();// Selected Order Items
 		
-		var cnt_items = parseInt(cnt_order_item - 1) - parseInt(order_items.length);
+		var cnt_items = parseInt(cnt_order_item) - parseInt(order_items.length);
 		if (order_items.length > 0){
 			// if(cnt_items > 0){
 				swal({

From fa125df35579b03e96c483e8203d5405357c0c48 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 16 Mar 2018 18:37:54 +0630
Subject: [PATCH 435/651] add junction pay

---
 .../origami/junction_pay_controller.rb        |  58 ++++
 .../origami/payments_controller.rb            |  11 +-
 app/models/sale_payment.rb                    |  18 ++
 app/views/origami/home/show.html.erb          |   2 +-
 .../origami/junction_pay/create.json.jbuilder |   5 +
 app/views/origami/junction_pay/index.html.erb | 259 ++++++++++++++++++
 app/views/origami/payments/show.html.erb      |  22 +-
 config/routes.rb                              |   2 +
 8 files changed, 369 insertions(+), 8 deletions(-)
 create mode 100644 app/controllers/origami/junction_pay_controller.rb
 create mode 100755 app/views/origami/junction_pay/create.json.jbuilder
 create mode 100755 app/views/origami/junction_pay/index.html.erb

diff --git a/app/controllers/origami/junction_pay_controller.rb b/app/controllers/origami/junction_pay_controller.rb
new file mode 100644
index 00000000..c02461aa
--- /dev/null
+++ b/app/controllers/origami/junction_pay_controller.rb
@@ -0,0 +1,58 @@
+class Origami::JunctionPayController < BaseOrigamiController
+
+  def index
+    @sale_id = params[:sale_id]
+    @cashier_type   = params[:type]
+    # limit jcb_amount
+    sale_data = Sale.find_by_sale_id(@sale_id)
+    total = sale_data.grand_total
+    @junction_pay_count = 0
+    others = 0
+    @cashier_id = current_user.emp_id
+
+    @payment_method_setting_nav = PaymentMethodSetting.all
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+    
+    sale_data.sale_payments.each do |sale_payment|
+        if sale_payment.payment_method == "JunctionPay"
+          @junction_pay_count = @junction_pay_count + sale_payment.payment_amount
+        else
+          others = others + sale_payment.payment_amount
+        end
+    end
+    @can_junction_pay = total - @junction_pay_count - others
+
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
+    #for bank integration
+    @receipt_no      = sale_data.receipt_no   
+  end
+
+  def create
+    cash = params[:amount]
+    sale_id = params[:sale_id]
+    if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
+
+      # saleObj = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "JunctionPay")
+    end
+  end
+
+end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fc07f966..1b4bd5bb 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -27,7 +27,7 @@ class Origami::PaymentsController < BaseOrigamiController
         cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
       end
 
-    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+    # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
       # Print for First Bill to Customer
       unique_code = "ReceiptBillPdf"
@@ -89,7 +89,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       # Mobile Print
       render :json => result.to_json
-    end
+    # end
   end
 
   def create
@@ -138,7 +138,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
 
       # For Print
-      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
         receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
         unique_code = "ReceiptBillPdf"
         if !receipt_bill_a5_pdf.empty?
@@ -202,8 +202,8 @@ class Origami::PaymentsController < BaseOrigamiController
           booking.booking_orders.each do |order|
           Order.pay_process_order_queue(order.order_id,table_id)
         end
+      # end
     end
-      end
     end    
   end
 
@@ -221,6 +221,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @jcbcount= 0.0
       @mastercount = 0.0
       @unionpaycount = 0.0
+      @junctionpaycount = 0.0
       @credit = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
       @balance = 0.00
@@ -333,6 +334,8 @@ class Origami::PaymentsController < BaseOrigamiController
            @mastercount += spay.payment_amount
          elsif spay.payment_method == "unionpay"
           @unionpaycount += spay.payment_amount
+         elsif spay.payment_method == "junctionpay"
+          @unionpaycount += spay.payment_amount
          elsif spay.payment_method == "creditnote"
            @credit += spay.payment_amount
          end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 5809dc0f..c49f30a7 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -48,6 +48,8 @@ class SalePayment < ApplicationRecord
           payment_status = paypar_payment
         when "foc"
           payment_status = foc_payment
+        when "JunctionPay"
+          payment_status = junction_pay_payment
       else
          puts "it was something else"
       end
@@ -297,6 +299,22 @@ class SalePayment < ApplicationRecord
 
   end
 
+  def junction_pay_payment
+    payment_status = false
+
+    #Next time - validate if the vochure number is valid - within
+    self.payment_method = "JunctionPay"
+    self.payment_amount = self.received_amount
+    self.payment_reference  = self.voucher_no
+    self.outstanding_amount = self.sale.grand_total- self.received_amount
+    self.payment_status = "paid"
+    payment_method = self.save!
+    sale_update_payment_status(self.received_amount)
+
+    return payment_status
+
+  end
+
   def sale_update_payment_status(paid_amount,check_foc = false)    
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 5f0245a9..571758be 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -691,7 +691,7 @@
                 createReceiptNoInFirstBillData(receipt_no,"");
                             
               // console.log(result);
-              code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
+              // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
               location.reload();
             }
         });  
diff --git a/app/views/origami/junction_pay/create.json.jbuilder b/app/views/origami/junction_pay/create.json.jbuilder
new file mode 100755
index 00000000..9767a7d8
--- /dev/null
+++ b/app/views/origami/junction_pay/create.json.jbuilder
@@ -0,0 +1,5 @@
+if(@status)
+  json.status @status
+else
+  json.status false
+end
diff --git a/app/views/origami/junction_pay/index.html.erb b/app/views/origami/junction_pay/index.html.erb
new file mode 100755
index 00000000..4e371f76
--- /dev/null
+++ b/app/views/origami/junction_pay/index.html.erb
@@ -0,0 +1,259 @@
+<div class="container-fluid">
+	<div id="loading_wrapper" style="display:none;">
+		<div id="loading"></div>
+	</div>
+	<!-- <div class="page-header">
+		<ol class="breadcrumb">
+			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+			<li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+			<li class="breadcrumb-item active"><%= t("views.btn.jcb") %></li>
+			<span class="float-right">
+				<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+			</span>
+		</ol>
+	</div> -->
+	<div class="row">
+		<div class="col-lg-5 col-md-5 col-sm-3">	
+			<span class="hidden" id="membership_id"><%= @membership_id%></span>
+			<span class="hidden" id="member_discount"><%= @member_discount%></span>
+			<span class="hidden" id="sub-total"><%= @sub_total%></span>
+			<div class="card m-l-10 m-t-10" style="padding:0px 20px;">
+				<div class="rebate-form">
+					<div class="row">
+			          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+			            <label for="com_port_name">Select Device</label>
+			            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+			              
+			            </select>
+			          </div>
+			          <hr>
+			        </div>
+
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label>You can pay up to </label>
+							<%@can_junction_pay = @can_junction_pay +@rounding_adj%>
+							<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_junction_pay %>" data-member-value="">
+						</div>
+						<hr>
+					</div>
+					<% if @jcbcount != 0 %>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label>Recent junction pay paid amount </label>
+							<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@junction_pay_count %>" data-member-value="">
+						</div>
+						<hr>
+					</div>
+					<% end %>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label>Reference Number</label>
+							<input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+							<br><span id="reference_no_Err" style="color:red;"></span>
+						</div>
+						<hr>
+					</div>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label>Amount</label>
+							<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+						</div>
+						<hr>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="col-lg-6 col-md-6 col-sm-6">
+			<div class="m-t-10 p-l-20">
+				<div class="row">
+					<div class="col-lg-6 col-md-6 col-sm-6">
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="1" data-type="num">1</div>
+							<div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+							<div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="4" data-type="num">4</div>
+							<div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+							<div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="7" data-type="num">7</div>
+							<div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+							<div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="0" data-type="num">0</div>
+							<div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+							<div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number green border-left" data-type="nett" >Nett</div>
+							<div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+							<div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+						</div>
+					</div>
+					<div class="col-lg-6 col-md-6 col-sm-6">
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+							<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+							<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="pay purple left" id="junction_pay">Pay</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	<div class="col-lg-1 col-md-1 col-sm-1">
+		<button type="button" class="btn btn-default  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+	</div>
+</div>
+</div>
+<script>
+	var cashier_type = "<%= @cashier_type %>";  
+	$(document).ready(function() {
+		var sale_id = "<%= @sale_id %>";
+		var bank_integration = "<%= @bank_integration %>";
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+		else {
+			$('#validamount').attr("value",parseFloat("<%= @can_junction_pay %>") - parseFloat(localStorage.getItem("cash")));
+		}
+		
+		code2lab.getCommPorts(); //get comportlists from jade
+	});
+
+// number key pad
+$(document).on('click', '.cashier_number', function(event){
+	event.stopPropagation();
+	event.preventDefault();
+	if(event.handled !== true) {
+		var original_value;
+		original_value = $('#amount').text();
+
+		var input_value = $(this).attr("data-value");
+
+		var input_type = $(this).attr("data-type");
+		switch (input_type) {
+			case 'num':
+			if (original_value == "0.0"){
+				$('#amount').text(input_value);
+			}else{
+				$('#amount').append(input_value);
+			}
+			break;
+
+			case 'add':
+			var input_value = $(this).attr("data-value");
+			amount = parseInt(input_value) + parseInt(original_value);
+			$('#amount').html(amount);
+
+			break;
+			case 'clr':
+			$('#amount').html("0.0");
+			break;
+			case 'del' :
+			var cash=$('#amount').text();
+			$('#amount').text(cash.substr(0,cash.length-1));
+			break;
+			case 'nett':
+			var remain_amount = $('#validamount').val();
+			$('#amount').text(remain_amount);
+			break;
+
+		}
+		event.handled = true;
+	} else {
+		return false;
+	}
+});
+
+
+$('#junction_pay').on('click',function(){
+	var amount = $('#amount').text();
+	var reference_no = $('#reference_no').val();
+	var sale_id = "<%= @sale_id %>";
+	var receipt_no = "<%= @receipt_no %>";
+	var cashier_id = "<%= @cashier_id %>";	
+	$("#reference_no_Err").html("");
+	if(reference_no.length > 0){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+			$(this).off("click");
+			  //start member discount 5% by pay card	
+				// var sub_total = $('#sub-total').text();
+				// var member_id = $('#membership_id').text();
+				// var member_discount = $('#member_discount').text();
+				// if (member_id && member_discount) {
+				// 	$.ajax({
+				// 		type: "POST",
+				// 		url: "/origami/" + sale_id + "/member_discount",
+				// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+		        //       success:function(result){           
+		        //           }
+		        //         });
+				// }
+		    //end member discount
+		    $("#loading_wrapper").show();
+		    var com_port = '/dev/' + $("#com_port_name").val();
+		    //alert(cashier_id + amount + com_port);
+		    code2lab.reqJunctionPay(true, cashier_id, parseFloat(amount), receipt_no, com_port);
+
+		    resJunctionPayUpdate(function(totalBillAmount , finalBillAmt,giftCardAmount,voucherAmount,voucherNumber,receiptNumber){
+		    	$("#loading_wrapper").hide();
+		    	$.ajax({type: "POST",
+		         	url: "/origami/payment/junctionpay",
+		         	data: "amount="+ totalBillAmount + "&sale_id="+ sale_id,
+		         	success:function(result){
+		         		if(result){
+		         			swal({
+		         				title: "Information!",
+		         				text: "Payment Successfully",
+		         				html: true,
+								closeOnConfirm: false,
+								closeOnCancel: false,
+								allowOutsideClick: false
+		         			}, function () {
+		         				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
+		         			});
+		         		}
+		         	}
+		         });
+		    })
+
+		    // resJunctionPay(function(memberno,transactionNo,finalBillingAmt){
+		    // 	$("#loading_wrapper").hide();
+		    // 	$.ajax({type: "POST",
+		    //      	url: "/origami/payment/"+payment_type,
+		    //      	data: "amount="+ finalBillingAmt + "&sale_id="+ sale_id,
+		    //      	success:function(result){
+		    //      		if(result){
+		    //      			swal({
+		    //      				title: "Information!",
+		    //      				text: "Payment Successfully",
+		    //      				html: true,
+						// 		closeOnConfirm: false,
+						// 		closeOnCancel: false,
+						// 		allowOutsideClick: false
+		    //      			}, function () {
+		    //      				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
+		    //      			});
+		    //      		}
+		    //      	}
+		    //      });
+		    // });
+
+		    resError(function(message){
+		    	$("#loading_wrapper").hide();
+		    	swal ( "Oops" ,  message ,  "error" );
+		    });
+		}
+	}
+})
+</script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 2deb9c0c..84ff842d 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -265,6 +265,20 @@
           <div class="col-md-4" id="unionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
         </div>
         <% end %>
+        <!-- Junction Pay -->
+        <% if @junctionpaycount != 0.0 %>
+        <div class="row payment others-color">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">JUNCTION PAY</div>
+          <div class="col-md-4 master is_card" id="junctionpaycount"><%= number_with_precision(@junctionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+        </div>
+        <% else %>
+        <div class="row hidden">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">JUNCTION PAY</div>
+          <div class="col-md-4" id="junctionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+        </div>
+        <% end %>
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
           <div class="col-md-4"><strong><span id='balance'><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong></div>
@@ -488,10 +502,7 @@ var customer_name = "<%= @customer.name %>";
         payment_type = '';
         
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          console.log("ssssssssssss")
           payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
-          console.log(member_id);
-          console.log(member_discount);
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
@@ -562,6 +573,9 @@ var customer_name = "<%= @customer.name %>";
       else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){
           swal("Oops","Please Pay with UNIONPAY Payment","warning");
       }
+      else if(payment_type == "JUNCTIONPAY" && $('#junctionpaycount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with JUNCTIONPAY Payment","warning");
+      }
       else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
           swal("Oops","Please Pay with Credit Payment","warning");
       }else{
@@ -837,6 +851,7 @@ var customer_name = "<%= @customer.name %>";
           var jcb1 = $('#jcbcount').text();
           var master1 = $('#mastercount').text();
           var unionpay1 = $('#unionpaycount').text();
+          var junctionpay1 = $('#junctionpaycount').text();
           var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
           var total = $('#amount_due').text();
           var amt = 0;
@@ -865,6 +880,7 @@ var customer_name = "<%= @customer.name %>";
     var jcb = $('#jcbcount').text();
     var master = $('#mastercount').text();
     var unionpay = $('#unionpaycount').text();
+    var junctionpay = $('#junctionpaycount').text();
     var amount_due = $('#amount_due').text();
     var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay)
     var result = parseFloat(amount_due) - parseFloat(total);
diff --git a/config/routes.rb b/config/routes.rb
index 21395c32..57cd404f 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -177,6 +177,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/master' => "master#create"
     post 'payment/visa' => "visa#create"
     post 'payment/unionpay' => "unionpay#create"
+    post 'payment/junctionpay' => "junction_pay#create"
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
@@ -188,6 +189,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
     get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
     get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
+    get 'sale/:sale_id/:type/payment/others_payment/JUNCTIONPAY' => "junction_pay#index"
     get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
 

From e55ff8b5e0d240c8b4eb20f819917b97f21e1e63 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Mar 2018 09:17:12 +0630
Subject: [PATCH 436/651] SQA feedback

---
 app/controllers/oqs/edit_controller.rb        | 17 ++++++++++-------
 app/views/oqs/edit/index.html.erb             |  4 ++++
 app/views/origami/pending_order/show.html.erb | 10 +++++++++-
 app/views/origami/split_bill/index.html.erb   |  5 +++--
 4 files changed, 26 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 app/controllers/oqs/edit_controller.rb
 mode change 100755 => 100644 app/views/oqs/edit/index.html.erb
 mode change 100755 => 100644 app/views/origami/pending_order/show.html.erb
 mode change 100755 => 100644 app/views/origami/split_bill/index.html.erb

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
old mode 100755
new mode 100644
index b123ac73..94ba5842
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -6,6 +6,11 @@ class Oqs::EditController < BaseOqsController
     if params[:type] == 'oqs'
       assigned_item = AssignedOrderItem.find(assigned_item_id)
       @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'")
+    elsif
+      assigned_item = OrderItem.find(assigned_item_id)
+      @booking = Booking.joins(" JOIN booking_orders as bko on bko.booking_id = bookings.booking_id")
+                .where("bko.order_id = '#{assigned_item.order_id}'").first()
+      @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.item_instance_code }'")
     else
       assigned_item = OrderItem.find(assigned_item_id)
       dining = DiningFacility.find_by_id(params[:type])
@@ -25,13 +30,6 @@ class Oqs::EditController < BaseOqsController
     order_item.item_order_by = current_user.name
     order_item.qty = qty_weight
     order_item.remark = remarks
-    if !order_item.set_menu_items.nil?
-      instance_item_sets = JSON.parse(order_item.set_menu_items)
-      instance_item_sets.each_with_index do |instance_item, instance_index|
-        instance_item_sets[instance_index]["quantity"] = qty_weight
-      end
-      order_item.set_menu_items = instance_item_sets.to_json
-    end
     order_item.save
 
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
@@ -67,4 +65,9 @@ class Oqs::EditController < BaseOqsController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
old mode 100755
new mode 100644
index 775b214d..7a1eebab
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -112,6 +112,8 @@ $(document).ready(function(){
     var remarks = $("textarea[name='remarks']").val();
     var order_items_id = $(this).attr('data-id');
     var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
+    var booking_id = '<%= @booking.booking_id %>';
+    
     $.ajax({
       type: 'POST',
       url: '/oqs/' + order_items_id,
@@ -121,6 +123,8 @@ $(document).ready(function(){
         <% if !@link_type.nil? %>
           <% if @link_type == 'oqs' %>
             window.location.href = '/oqs';
+          <% elsif @link_type == 'pending' %>
+            window.location.href = '/origami/quick_service/pending_order/'+booking_id;
           <% else %>
             <% if !@dining_type.nil? %>
               <% if @dining_type == 'Table' %>
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
old mode 100755
new mode 100644
index ac164636..a7ade0a4
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -100,7 +100,7 @@
                       @order_items.each do |order_item|
                       sub_total = sub_total + order_item.price %>
                    <input type="hidden" id="sale_id" value="<%= @bookings.booking_id %>">
-                   <tr>
+                   <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
                      <td class='item-name'><%= order_item.item_name %></td>
                      <td class='item-attr'><%= order_item.qty %></td>
                      <td class='item-attr'><%= order_item.price %></td>
@@ -289,5 +289,13 @@ $(document).ready(function(){
       window.location.href = linkURL;
     });
   }
+
+  /*edit order in oqs*/
+  $('.edit_order').on('click',function(){
+    var assigned_order_item_id = $(this).attr('data-id');
+    if((assigned_order_item_id!=undefined) && (assigned_order_item_id!='')){
+      window.location.href = '/oqs/'+ assigned_order_item_id  + "/edit/pending";
+    }
+  });
 });
 </script>
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
old mode 100755
new mode 100644
index 69743cf1..a62fb66e
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -60,7 +60,7 @@
 	 																<% if order_item.include? ('all_order') %>
 		 																<% order_item['all_order'].each do |odr_item| %>
 			 																<% 
-			 																order_item_count = order_item_count.to_i + 1
+			 																order_item_count = order_item_count.to_i + 1 
 			 																sub_total += odr_item['qty'].to_f * odr_item['price'].to_f 
 			 																%>
 			 																<tr class="item-row" id=<%= odr_item['order_items_id'] %> >
@@ -389,7 +389,6 @@
 	$('#order_item_split').on('click',function () {
 		var cnt_order_item = "<%= order_item_count %>";
 		var order_items = get_selected_order_items();// Selected Order Items
-		
 		var cnt_items = parseInt(cnt_order_item) - parseInt(order_items.length);
 		if (order_items.length > 0){
 			// if(cnt_items > 0){
@@ -425,6 +424,7 @@
 				$.each(orders, function(key,value){
 					if($("a[href$='#"+value.order_id+"']").parent().hasClass('selected-split-item')){
 						$("a[href$='#"+value.order_id+"']").parent().removeClass('selected-split-item');
+						$(".item-row").removeClass('selected-split-item');
 					}
 				});
 			}
@@ -623,6 +623,7 @@ function orderItemSplitBillProcess(cnt_items){
 	if(cnt_items == 0){
 		booking_id = json_booking.booking_id;
 	}
+	console.log(booking_id);
 
 	var order_ids = [];
 	var arr_order_ids = [];

From a9c8eb4e93a775b8bddcab462e933dfdcce812af Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Mar 2018 11:35:43 +0630
Subject: [PATCH 437/651] check tax profile

---
 .../origami/addorders_controller.rb           |  8 +--
 .../origami/payments_controller.rb            |  3 +-
 .../origami/request_bills_controller.rb       |  2 +-
 .../origami/sale_edit_controller.rb           | 18 +++++--
 app/controllers/origami/void_controller.rb    |  3 +-
 app/models/sale.rb                            | 52 +++++++++++--------
 app/views/origami/home/show.html.erb          |  2 +-
 app/views/origami/payments/show.html.erb      |  4 +-
 app/views/origami/rooms/show.html.erb         |  2 +-
 app/views/origami/sale_edit/edit.html.erb     |  4 +-
 .../origami/table_invoices/show.html.erb      |  4 +-
 config/routes.rb                              |  4 +-
 12 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 3a8dea9b..f5bb7d37 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -103,11 +103,11 @@ class Origami::AddordersController < BaseOrigamiController
      }
 
     # begin
-    if params[:order_source] == "quick_service"
-      customer_id = "CUS-000000000002" # for no customer id from mobile
-    else
+    # if params[:order_source] == "quick_service"
+    #   customer_id = "CUS-000000000002" # for no customer id from mobile
+    # else
       customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-    end
+    # end
     @order = Order.new
     @order.source = params[:order_source]
     @order.order_type = params[:order_type]
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 49320273..00ad4e4d 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -402,12 +402,13 @@ class Origami::PaymentsController < BaseOrigamiController
     member_info   = nil
     rebate_amount = nil
     current_balance = nil
+    order_source = params[:type]
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
       if saleObj.discount_type == "member_discount"
         saleObj.update_attributes(rounding_adjustment: 0)
-        saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
+        saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source)
       end
       
       saleObj.update_attributes(rounding_adjustment: 0)
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index aa145b4f..adfe35a6 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -13,7 +13,7 @@ class Origami::RequestBillsController < ApplicationController
       
       if check_booking.sale_id.nil?
         # Create Sale if it doesn't exist
-        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user)
+        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
         @sale_data = Sale.find_by_sale_id(@sale_id)
         @sale_items = SaleItem.where("sale_id=?",@sale_id)
       else
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 72df82ac..1743f881 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -76,11 +76,14 @@ class Origami::SaleEditController < BaseOrigamiController
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
 
+    order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
+    order = Order.find(order_id)
+
     action_by = current_user.id
     remark = "FOC Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}Receipt No #{saleObj.receipt_no}"
     sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMFOC" )
 
-    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount)
+    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source)
     ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
   end
 
@@ -141,7 +144,7 @@ class Origami::SaleEditController < BaseOrigamiController
       end
     end
 
-    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount)
+    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source)
 
     ProductCommission.edit_product_commission(saleitemObj)
   end
@@ -162,17 +165,21 @@ class Origami::SaleEditController < BaseOrigamiController
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
 
+    order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
+    order = Order.find(order_id)
+
     action_by = current_user.id
     remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}"
     sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"ITEMCANCELVOID" )
 
-    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount)
+    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order.source)
     ProductCommission.remove_product_commission(saleitemObj)
   end
 
   # remove all void items
   def cancel_all_void
     sale_id = params[:sale_id]
+    order_source = params[:type]
     saleObj = Sale.find(sale_id)
     saleObj.sale_items.each do |item|
       if item.qty.to_i < 0
@@ -185,13 +192,14 @@ class Origami::SaleEditController < BaseOrigamiController
     end
 
     # re-calc tax
-    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount)
+    saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source)
   end
 
   def apply_void
     sale_id = params[:sale_id]
+    order_source = params[:type]
     saleObj = Sale.find(sale_id)
-    saleObj.compute_without_void
+    saleObj.compute_without_void(order_source)
     saleObj.sale_items.each do |item|
       ProductCommission.remove_product_commission(item)
     end
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 33ff0d76..00f9d76b 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -4,12 +4,13 @@ class Origami::VoidController < BaseOrigamiController
 
     sale_id = params[:sale_id]
     remark  = params[:remark]
+    order_source = params[:type] #tax profile source
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
 
       if sale.discount_type == "member_discount"
         sale.update_attributes(total_discount: 0)
-        sale.compute_by_sale_items(sale_id, sale.sale_items,0)
+        sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
       end
 
       # update count for shift sale
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 5d46aafc..11ddd296 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -26,7 +26,7 @@ class Sale < ApplicationRecord
   SALE_STATUS_OUTSTANDING = "outstanding"
   SALE_STATUS_COMPLETED = "completed"
 
-  def generate_invoice_from_booking(booking_id, requested_by, cashier)
+  def generate_invoice_from_booking(booking_id, requested_by, cashier, order_source = nil)
     booking = Booking.find(booking_id)
     status = false
     Rails.logger.debug "Booking -> " + booking.id.to_s
@@ -36,9 +36,9 @@ class Sale < ApplicationRecord
 
       booking.booking_orders.each do |order|
         if booking.sale_id
-          status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by, cashier)
+          status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by, cashier, order_source)
         else
-          status, sale_id = generate_invoice_from_order(order.order_id, booking.sale_id, booking, requested_by, cashier)
+          status, sale_id = generate_invoice_from_order(order.order_id, booking.sale_id, booking, requested_by, cashier, order_source)
         end
         booking.sale_id = sale_id
       end
@@ -58,7 +58,7 @@ class Sale < ApplicationRecord
     end
   end
 
-  def generate_invoice_from_order (order_id, sale_id, booking, requested_by, cashier = nil)
+  def generate_invoice_from_order (order_id, sale_id, booking, requested_by, cashier = nil, order_source = nil)
     taxable = true
     #if sale_id is exsit and validate
     #add order to that invoice
@@ -128,7 +128,7 @@ class Sale < ApplicationRecord
       self.save!
 
       #compute sales summary
-      compute
+      compute(order_source)
 
       #Update the order items that is billed
       order.update_items_status_to_billed(nil)
@@ -172,7 +172,7 @@ class Sale < ApplicationRecord
             # Create Sale if it doesn't exist
             # puts "current_login_employee"
             # puts current_login_employee.name
-            @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user)
+            @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user,order.source)
             @sale_data = Sale.find_by_sale_id(@sale_id)
             @sale_items = SaleItem.where("sale_id=?",@sale_id)
           else
@@ -310,7 +310,7 @@ class Sale < ApplicationRecord
   end
 
   #compute - invoice total
-  def compute
+  def compute(order_source = nil)
     sales_items = self.sale_items
 
     #Computation Fields
@@ -329,7 +329,7 @@ class Sale < ApplicationRecord
       # total_taxable = total_taxable + (item.taxable_price * item.qty)
     end
 
-    apply_tax (total_taxable)
+    apply_tax(total_taxable, order_source)
 
     self.total_amount = subtotal_price
     self.total_discount = total_discount
@@ -342,7 +342,7 @@ class Sale < ApplicationRecord
   end
 
   #compute - invoice total
-  def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil)
+  def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil)
 
     sale = Sale.find(sale_id)
     sales_items = sale_itemss
@@ -362,7 +362,7 @@ class Sale < ApplicationRecord
       end
     end
 
-    compute_tax(sale, total_taxable, total_discount)
+    compute_tax(sale, total_taxable, total_discount, order_source)
     sale.total_amount = subtotal_price
     sale.total_discount = total_discount
     sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
@@ -376,7 +376,7 @@ class Sale < ApplicationRecord
   end
 
   # No Use too many wrong
-  def compute_without_void
+  def compute_without_void(order_source = nil)
     sales_items = self.sale_items
 
     #Computation Fields
@@ -396,7 +396,7 @@ class Sale < ApplicationRecord
       end
     end
 
-    apply_tax (total_taxable)
+    apply_tax(total_taxable, order_source)
     self.total_amount = subtotal_price
     self.total_discount = total_discount
     self.grand_total = (self.total_amount - self.total_discount) + self.total_tax
@@ -407,7 +407,7 @@ class Sale < ApplicationRecord
   end
 
   # Tax Re-Calculte
-  def compute_tax(sale, total_taxable, total_discount = 0)
+  def compute_tax(sale, total_taxable, total_discount = 0, order_source = nil)
     shop = Shop.first();
 
     #if tax is not apply create new record
@@ -423,8 +423,9 @@ class Sale < ApplicationRecord
     # #Creat new tax records
     if sale.payment_status != 'foc'
       tax_profiles.each do |tax|
-        customer.tax_profiles.each do |cus_tax|
-          if cus_tax.to_i == tax.id
+        # customer.tax_profiles.each do |cus_tax|
+        #   if cus_tax.to_i == tax.id
+        if tax.group_type.to_s == order_source.to_s
             sale_tax = SaleTax.new(:sale => sale)
             sale_tax.tax_name = tax.name
             sale_tax.tax_rate = tax.rate
@@ -447,15 +448,16 @@ class Sale < ApplicationRecord
 
             sale_tax.inclusive = tax.inclusive
             sale_tax.save
-          end
         end
+        #   end
+        # end
       end
     end
     sale.total_tax = total_tax_amount
   end
 
   # Tax Calculate
-  def apply_tax(total_taxable)
+  def apply_tax(total_taxable, order_source = nil)
     shop = Shop.first();
     
     #if tax is not apply create new record
@@ -469,11 +471,14 @@ class Sale < ApplicationRecord
     tax_profiles = TaxProfile.all.order("order_by asc")
 
     customer = Customer.find(self.customer_id)
-    
+    if order_source.to_s == "emenu"
+      order_source = "cashier"
+    end
     #Create new tax records
     tax_profiles.each do |tax|
-      customer.tax_profiles.each do |cus_tax|
-        if cus_tax.to_i == tax.id
+      # customer.tax_profiles.each do |cus_tax|
+      #   if cus_tax.to_i == tax.id
+      if tax.group_type.to_s == order_source.to_s
           sale_tax = SaleTax.new(:sale => self)
           sale_tax.tax_name = tax.name
           sale_tax.tax_rate = tax.rate
@@ -497,8 +502,9 @@ class Sale < ApplicationRecord
 
           sale_tax.inclusive = tax.inclusive
           sale_tax.save
-        end
       end
+      #   end
+      # end
     end
       self.total_tax = total_tax_amount
   end
@@ -1963,7 +1969,7 @@ end
                    end
 
                    # Re-compute for add
-                   saleobj.compute
+                   saleobj.compute(order.source)
                    saleobj.save
                    order.save
                    booking.save
@@ -1993,7 +1999,7 @@ end
                    end
 
                    # Re-compute for add
-                   saleobj.compute
+                   saleobj.compute(order.source)
                    saleobj.save
                    order.save
                    booking.save
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 54b0e956..ffbf1e4c 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -905,7 +905,7 @@
         }, function (isConfirm) {
           if (isConfirm) {
             var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
-            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
             var remark  = $("#remark").val();
 
             $.ajax({
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 2deb9c0c..a5449d35 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -691,7 +691,7 @@ var customer_name = "<%= @customer.name %>";
           if (isConfirm) {
             var sale_id = $('#sale_id').text();
             var remark  = $("#remark").val();
-            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            var ajax_url = "/origami/sale/" + sale_id +'/'+cashier_type+ '/void';
             $.ajax({
               type: 'POST',
               url: ajax_url,
@@ -897,7 +897,7 @@ var customer_name = "<%= @customer.name %>";
           if (isConfirm) {
               $.ajax({
                 type: "POST",
-                url: "<%= origami_payment_foc_path %>",
+                url: "/origami/payment/"+cashier_type+"/foc",
                 data: params,
                 success:function(result){  
                   customer_display_view(null,"reload");        
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index d98a3fe2..758a5273 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -889,7 +889,7 @@ $('#add_invoice').on('click',function(){
       var sure = confirm("Are you sure want to Void");
       if (sure == true) {
           var sale_id = $('#sale_id').val();
-          var ajax_url = "/origami/sale/" + sale_id + '/void';
+          var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
           $.ajax({
               type: 'POST',
               url: ajax_url,
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 745286d3..ff203657 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -331,7 +331,7 @@ var cashier_type = "<%= @cashier_type %>";
         $.ajax({
             type: "POST",
             url: ajax_url,
-            data: 'sale_id=' + sale_id,
+            data: 'sale_id=' + sale_id +'&type='+cashier_type,
             success: function (result) {
                 location.reload();
             }
@@ -345,7 +345,7 @@ var cashier_type = "<%= @cashier_type %>";
         $.ajax({
             type: "POST",
             url: ajax_url,
-            data: 'sale_id=' + sale_id,
+            data: 'sale_id=' + sale_id+'&type='+cashier_type,
             success: function (result) {
               if (cashier_type=="quick_service") {
                 window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 515973f1..216e5eea 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -261,7 +261,7 @@ $('#void').on('click',function () {
         if (isConfirm) {
           var sale_id = $('#sale_id').val();
           var remark  = $("#remark").val();
-          var ajax_url = "/origami/sale/" + sale_id + '/void';
+          var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
           $.ajax({
               type: 'POST',
               url: ajax_url,
@@ -291,7 +291,7 @@ $('#foc').click(function() {
     if ($(this).attr('active')=== "true") {  
         $.ajax({
           type: "POST",
-          url: "<%= origami_payment_foc_path %>",
+          url: "/origami/payment/cashier/foc",
           data: params,
           success:function(result){    
             if (cash >= 0) {
diff --git a/config/routes.rb b/config/routes.rb
index b51baca3..34020dee 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -170,7 +170,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment' => 'payments#show'
     post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
 
-    post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
+    post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
@@ -192,7 +192,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
-    post 'sale/:sale_id/void' => 'void#overall_void'
+    post 'sale/:sale_id/:type/void' => 'void#overall_void'
 
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"

From 259778a8919f32ac54ceeeea2beb5aa311913154 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 19 Mar 2018 14:38:55 +0630
Subject: [PATCH 438/651] add junctionpay(vaap)

---
 .../origami/junction_pay_controller.rb        | 16 +++-
 .../origami/payments_controller.rb            |  4 +-
 app/models/sale_payment.rb                    |  3 +-
 app/views/origami/junction_pay/index.html.erb | 91 ++++++++++++++-----
 app/views/origami/payments/show.html.erb      |  6 +-
 5 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/app/controllers/origami/junction_pay_controller.rb b/app/controllers/origami/junction_pay_controller.rb
index c02461aa..1c52a271 100644
--- a/app/controllers/origami/junction_pay_controller.rb
+++ b/app/controllers/origami/junction_pay_controller.rb
@@ -36,8 +36,20 @@ class Origami::JunctionPayController < BaseOrigamiController
   end
 
   def create
-    cash = params[:amount]
+    gift_amount = params[:gift_amount]
+    voucher_amount = params[:voucher_amount]
+    voucher_no = params[:voucher_no]
     sale_id = params[:sale_id]
+
+    # Gift card or Voucher classified and add for payment_reference
+    remarks = ''
+    cash = (gift_amount.to_f + voucher_amount.to_f)
+    if gift_amount.to_f > 0
+      remarks = "Junciton Gift Card Payment. RefNo-" + voucher_no
+    else
+      remarks = "Junciton Voucher Payment. RefNo-" + voucher_no
+    end
+
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
@@ -51,7 +63,7 @@ class Origami::JunctionPayController < BaseOrigamiController
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "JunctionPay")
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "JunctionPay", remarks)
     end
   end
 
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 1b4bd5bb..4e0c7100 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -334,8 +334,8 @@ class Origami::PaymentsController < BaseOrigamiController
            @mastercount += spay.payment_amount
          elsif spay.payment_method == "unionpay"
           @unionpaycount += spay.payment_amount
-         elsif spay.payment_method == "junctionpay"
-          @unionpaycount += spay.payment_amount
+         elsif spay.payment_method == "JunctionPay"
+          @junctionpaycount += spay.payment_amount
          elsif spay.payment_method == "creditnote"
            @credit += spay.payment_amount
          end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index c49f30a7..b82cbf18 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -11,6 +11,7 @@ class SalePayment < ApplicationRecord
   def process_payment(invoice, action_by, cash_amount, payment_method,remark=nil)
     self.sale = invoice
     self.received_amount = cash_amount
+    self.payment_reference = remark
     amount_due = invoice.grand_total
 
     #get all payment for this invoices
@@ -305,7 +306,7 @@ class SalePayment < ApplicationRecord
     #Next time - validate if the vochure number is valid - within
     self.payment_method = "JunctionPay"
     self.payment_amount = self.received_amount
-    self.payment_reference  = self.voucher_no
+    # self.payment_reference  = self.payment_reference
     self.outstanding_amount = self.sale.grand_total- self.received_amount
     self.payment_status = "paid"
     payment_method = self.save!
diff --git a/app/views/origami/junction_pay/index.html.erb b/app/views/origami/junction_pay/index.html.erb
index 4e371f76..cdbdc47d 100755
--- a/app/views/origami/junction_pay/index.html.erb
+++ b/app/views/origami/junction_pay/index.html.erb
@@ -202,32 +202,48 @@ $('#junction_pay').on('click',function(){
 		    //end member discount
 		    $("#loading_wrapper").show();
 		    var com_port = '/dev/' + $("#com_port_name").val();
+		    var is_rebate=false;
 		    //alert(cashier_id + amount + com_port);
-		    code2lab.reqJunctionPay(true, cashier_id, parseFloat(amount), receipt_no, com_port);
-
-		    resJunctionPayUpdate(function(totalBillAmount , finalBillAmt,giftCardAmount,voucherAmount,voucherNumber,receiptNumber){
+		    code2lab.reqJunctionPay(true, cashier_id, parseFloat(amount), receipt_no, com_port);  
+		    resJunctionPayUpdate = function(totalBillAmount , finalBillAmt,giftCardAmount,									voucherAmount,voucherNumber,receiptNumber){
 		    	$("#loading_wrapper").hide();
-		    	$.ajax({type: "POST",
-		         	url: "/origami/payment/junctionpay",
-		         	data: "amount="+ totalBillAmount + "&sale_id="+ sale_id,
-		         	success:function(result){
-		         		if(result){
-		         			swal({
-		         				title: "Information!",
-		         				text: "Payment Successfully",
-		         				html: true,
+
+		    	var voucher_no = voucherNumber;
+		    	if (voucher_no == ''){
+		    		voucher_no = reference_no;
+		    	}
+
+				$.ajax({
+					type: "POST",
+			     	url: "<%= origami_payment_junctionpay_path %>",
+			     	data: "gift_amount="+ giftCardAmount + "&voucher_amount=" + voucherAmount + 
+			     	"&voucher_no=" + voucher_no + "&sale_id="+ sale_id,
+			     	success:function(result){
+			     		if(result){			   
+			     			var desc = 'Payment Successfully';
+			     			// is_rebate get from resJunctionPay and if member
+			     			if(is_rebate){ desc = desc + ". And You get Rebate!"}  	
+
+			     			swal({
+			     				title: "Information!",
+			     				text: desc,
+			     				html: true,
 								closeOnConfirm: false,
 								closeOnCancel: false,
 								allowOutsideClick: false
-		         			}, function () {
-		         				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
-		         			});
-		         		}
-		         	}
-		         });
-		    })
+			     			}, function () {
+			     				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
+			     			});
+			     		}
+			     	}
+			    });
+		    };
 
-		    // resJunctionPay(function(memberno,transactionNo,finalBillingAmt){
+		    resJunctionPay = function(memberno,transactionNo,finalBillingAmt){
+		    		if(memberno != ''){ is_rebate = true; }
+			};
+
+		     
 		    // 	$("#loading_wrapper").hide();
 		    // 	$.ajax({type: "POST",
 		    //      	url: "/origami/payment/"+payment_type,
@@ -249,11 +265,36 @@ $('#junction_pay').on('click',function(){
 		    //      });
 		    // });
 
-		    resError(function(message){
-		    	$("#loading_wrapper").hide();
-		    	swal ( "Oops" ,  message ,  "error" );
-		    });
+		    // var resError = function(message){
+		    // 	console.log(message);
+		    // 	$("#loading_wrapper").hide();
+		    // 	swal ( "Oops" ,  message ,  "error" );
+		    // };
 		}
 	}
-})
+});
+
+// var resJunctionPayUpdate = function(totalBillAmount , finalBillAmt,giftCardAmount,voucherAmount,								voucherNumber,receiptNumber){
+// 	$("#loading_wrapper").hide();
+// 	// alert(voucherNumber + ' ' + totalBillAmount + ' ' + receiptNumber + ' ' + giftCardAmount);
+// 	$.ajax({
+// 		type: "POST",
+//      	url: "<%= origami_payment_junctionpay_path %>",
+//      	data: "amount="+ totalBillAmount + "&sale_id="+ sale_id,
+//      	success:function(result){
+//      		if(result){
+//      			swal({
+//      				title: "Information!",
+//      				text: "Payment Successfully",
+//      				html: true,
+// 					closeOnConfirm: false,
+// 					closeOnCancel: false,
+// 					allowOutsideClick: false
+//      			}, function () {
+//      				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
+//      			});
+//      		}
+//      	}
+//     });
+// };
 </script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 84ff842d..415a3ba2 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -510,7 +510,7 @@ var customer_name = "<%= @customer.name %>";
               $("#credit_payment").show();
             }
 
-            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1){
+            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1 || parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) !=-1){
               $("#card_payment").show();   
             } else{
              $("#card_payment").hide();
@@ -852,7 +852,7 @@ var customer_name = "<%= @customer.name %>";
           var master1 = $('#mastercount').text();
           var unionpay1 = $('#unionpaycount').text();
           var junctionpay1 = $('#junctionpaycount').text();
-          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(junctionpay1);
           var total = $('#amount_due').text();
           var amt = 0;
           <% if precision.to_i > 0 %>;
@@ -882,7 +882,7 @@ var customer_name = "<%= @customer.name %>";
     var unionpay = $('#unionpaycount').text();
     var junctionpay = $('#junctionpaycount').text();
     var amount_due = $('#amount_due').text();
-    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay)
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(junctionpay)
     var result = parseFloat(amount_due) - parseFloat(total);
     <% if precision.to_i > 0 %>
       $('#balance').text(parseFloat(result).toFixed(<%= precision %>));

From ca817197d917b017674a20f310741be6b2dd8c03 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Mar 2018 18:13:38 +0630
Subject: [PATCH 439/651] update menu import and export

---
 Gemfile                                      |   5 +-
 Gemfile.lock                                 |  18 +++-
 app/controllers/settings/menus_controller.rb |  11 +--
 app/models/menu.rb                           |  42 ++++++++-
 app/views/settings/menus/index.html.erb      |   5 +-
 app/views/settings/menus/index.xlsx.axlsx    |  86 +++++++++++++++++++
 config/application.rb                        |   2 +
 config/initializers/mime_types.rb            |   1 +
 out.xls                                      | Bin 0 -> 3584 bytes
 9 files changed, 155 insertions(+), 15 deletions(-)
 create mode 100644 app/views/settings/menus/index.xlsx.axlsx
 create mode 100644 out.xls

diff --git a/Gemfile b/Gemfile
index 4ca47865..c20dec66 100755
--- a/Gemfile
+++ b/Gemfile
@@ -46,8 +46,11 @@ gem 'mini_magick'
 gem 'cups'
 gem 'prawn'
 gem 'prawn-table'
-gem 'spreadsheet'
 gem 'to_xls-rails'
+gem 'rubyzip', '= 1.0.0'
+gem 'axlsx', '= 2.0.1'
+gem 'axlsx_rails'
+gem 'roo'
 #Reporting gem
 #gem 'compendium'
 #gem "cancan"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c7e6534..254ff760 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,13 @@ GEM
     airbrussh (1.3.0)
       sshkit (>= 1.6.1, != 1.7.0)
     arel (8.0.0)
+    axlsx (2.0.1)
+      htmlentities (~> 4.3.1)
+      nokogiri (>= 1.4.1)
+      rubyzip (~> 1.0.0)
+    axlsx_rails (0.5.1)
+      actionpack (>= 3.1)
+      axlsx (>= 2.0.1)
     bcrypt (3.1.11)
     bindex (0.5.0)
     builder (3.2.3)
@@ -100,6 +107,7 @@ GEM
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    htmlentities (4.3.4)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     i18n (0.9.1)
@@ -197,6 +205,10 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redis (3.3.5)
+    roo (1.13.2)
+      nokogiri
+      rubyzip
+      spreadsheet (> 0.6.4)
     rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -215,6 +227,7 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
     ruby-ole (1.2.12.1)
+    rubyzip (1.0.0)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -286,6 +299,8 @@ PLATFORMS
 
 DEPENDENCIES
   aescrypt
+  axlsx (= 2.0.1)
+  axlsx_rails
   bcrypt (~> 3.1.7)
   byebug
   cancancan (~> 1.10)
@@ -320,13 +335,14 @@ DEPENDENCIES
   rack-cors
   rails (~> 5.1.0)
   redis (~> 3.0)
+  roo
   rspec-rails (~> 3.5)
+  rubyzip (= 1.0.0)
   sass-rails (~> 5.0)
   schema_to_scaffold
   shoulda-matchers (~> 3.1)
   sidekiq
   simple_form
-  spreadsheet
   spring
   spring-watcher-listen (~> 2.0.0)
   tether-rails
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 0a6d87c7..8fed1e97 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -7,12 +7,9 @@ class Settings::MenusController < ApplicationController
   def index
     @settings_menus = Menu.all.page(params[:page]).per(10)
     respond_to do |format|
-        format.html
-        # format.csv { send_data MenuCsvExport.generate }
-
-format.csv { send_data Menu.to_csv }
-# format.csv { send_data MenuCategory.to_csv }
-      end
+      format.html
+      format.xlsx
+    end
   end
 
   # GET /settings/menus/1
@@ -76,7 +73,7 @@ format.csv { send_data Menu.to_csv }
 
   def import
     Menu.import(params[:file])
-    redirect_to settings_menu_path, notice: "imported"
+    redirect_to settings_menus_path, notice: "imported"
   end
 
   private
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 12784eea..09e36928 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -1,4 +1,6 @@
 class Menu < ApplicationRecord
+
+  require 'spreadsheet'
   has_many :menu_categories, dependent: :destroy
 
   validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
@@ -34,7 +36,7 @@ class Menu < ApplicationRecord
 
   def self.to_csv
     m_attributes = %w{name is_active valid_days valid_time_from valid_time_to created_by created_at updated_at}    
-    CSV.generate(headers: true) do |csv|
+    CSV.generate(headers: true, row_sep: "\r\n") do |csv|
       csv << m_attributes
       menu = Menu.all
       menu.each do |user|
@@ -44,9 +46,41 @@ class Menu < ApplicationRecord
   end
 
   def self.import(file)
-      CSV.foreach(file.path, headers:true) do |row|
-      Menu.create! row.to_hash
-    end  
+    spreadsheet = Roo::Spreadsheet.open(file.path)
+    puts spreadsheet.info
+
+    spreadsheet = Roo::Excelx.new(file.path)
+    puts spreadsheet.info
+
+    # Use the extension option if the extension is ambiguous.
+    spreadsheet = Roo::Spreadsheet.open(file.path, extension: :xlsx)
+
+    puts spreadsheet.info
+
+    header = spreadsheet.row(1)
+
+    (2..spreadsheet.last_row).each do |i|
+
+      row = Hash[[header,spreadsheet.row(i)].transpose]
+
+      menu = Menu.new
+      menu.name  = row["name"]
+      menu.is_active = row["is_active"]
+      menu.valid_days = row["valid_days"]
+      menu.valid_time_from = row["valid_time_from"]
+      menu.valid_time_to = row["valid_time_to"]
+      menu.created_by = row["created_by"]
+      menu.save
+    end
+  end
+
+  def self.open_spreadsheet(file)
+    case File.extname(file.original_filename)
+    when ".csv" then Roo::CSV.new(file.path,nil,:ignore)
+    when ".xls" then Roo::Excel.new(file.path,nil,:ignore)
+    when ".xlsx" then Roo::Excelx.new(file.path,nil,:ignore)
+    else raise "Unknown File type: #{original_filename}"
+    end
   end
 
 end
\ No newline at end of file
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index ed215031..11ae575f 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -7,11 +7,12 @@
     </span>
   </ol>
 </div>
-<!-- <h4>Import</h4>
+<h4>Import</h4>
 <%= form_tag import_settings_menus_path, multipart:true do%>
   <%=file_field_tag :file%>
   <%=submit_tag "Import CSV"%>
-<%end%> -->
+<%end%> 
+<%= link_to "Export users as spreadsheet", settings_menus_path(format: "xlsx") %>
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <br><br>
diff --git a/app/views/settings/menus/index.xlsx.axlsx b/app/views/settings/menus/index.xlsx.axlsx
new file mode 100644
index 00000000..977e9782
--- /dev/null
+++ b/app/views/settings/menus/index.xlsx.axlsx
@@ -0,0 +1,86 @@
+wb = xlsx_package.workbook
+wb.styles do |s|
+    date = s.add_style(:format_code => "yyyy-mm-dd", :border => Axlsx::STYLE_THIN_BORDER)
+    wrap_text = s.add_style :sz => 11,
+                            :alignment =>  { :horizontal => :left,:vertical => :center ,
+                            :wrap_text => true}
+    header_text = s.add_style :fg_color=> "FFFFFF",
+                            :b => true,
+                            :bg_color => "004586",
+                            :sz => 12,
+                            :border => { :style => :thin, :color => "00" },
+                            :alignment => { :horizontal => :left,
+                                            :vertical => :center ,
+                                            :header_text => true}
+
+	wb.add_worksheet(name: "Menu") do |sheet|
+	  sheet.add_row %w( name is_active valid_days valid_time_from valid_time_to created_by ), :style=>header_text
+	  @settings_menus.each do |menu|
+	    sheet.add_row [ menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[date,wrap_text]
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Category") do |sheet|
+	  sheet.add_row %w(menu_id code name alt_name order_by created_by menu_category_id is_available created_at updated_at), :style=>header_text
+	  MenuCategory.all.each do |mc|
+	    sheet.add_row [mc.menu_id, mc.code, mc.name, mc.alt_name, mc.order_by, mc.created_by, mc.menu_category_id, mc.is_available, mc.created_at, mc.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Item") do |sheet|
+	  sheet.add_row %w(item_code name alt_name image_path description information unit type menu_category_id item_attributes item_options account_id _qty taxable is_sub_item is_available created_by created_at updated_at), :style=>header_text
+	  MenuItem.all.each do |mi|
+	    sheet.add_row [mi.item_code, mi.name, mi.alt_name, mi.image_path, mi.description, mi.information, mi.unit, mi.type, mi.menu_category_id, mi.item_attributes, mi.item_options, mi.account_id, mi.min_qty, mi.taxable, mi.is_sub_item, mi.is_available, mi.created_by, mi.created_at, mi.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Item Instance") do |sheet|
+	  sheet.add_row %w(menu_item_id item_instance_code item_instance_name item_attributes price is_on_promotion promotion_price is_available is_default created_at updated_at), :style=>header_text
+	  MenuItemInstance.all.each do |mii|
+	    sheet.add_row [mii.menu_item_id, mii.item_instance_code, mii.item_instance_name, mii.item_attributes, mii.price, mii.is_on_promotion, mii.promotion_price, mii.is_available, mii.is_default, mii.created_at, mii.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Options") do |sheet|
+	  sheet.add_row %w(option_type name value created_at updated_at), :style=>header_text
+	  MenuItemOption.all.each do |option|
+	    sheet.add_row [option.option_type, option.name, option.value, option.created_at, option.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Item Attributes") do |sheet|
+	  sheet.add_row %w(attribute_type name value created_at updated_at), :style=>header_text
+	  MenuItemAttribute.all.each do |attr|
+	    sheet.add_row [ attr.attribute_type,attr.name,attr.value,attr.created_at,attr.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Account") do |sheet|
+	  sheet.add_row %w(title account_type discount point bonus rebate created_at updated_at), :style=>header_text
+	  Account.all.each do |acc|
+	    sheet.add_row [acc.title,acc.account_type,acc.discount,acc.point,acc.bonus,acc.rebate,acc.created_at,acc.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Item Set") do |sheet|
+	  sheet.add_row %w(name alt_name min_selectable_qty max_selectable_qty created_at updated_at), :style=>header_text
+	  ItemSet.all.each do |set|
+	    sheet.add_row [set.name, set.alt_name, set.min_selectable_qty, set.max_selectable_qty, set.created_at, set.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Instance Item Set") do |sheet|
+	  sheet.add_row %w(item_set_id menu_item_instance_id created_at updated_at), :style=>header_text
+	  MenuInstanceItemSet.all.each do |miis|
+	    sheet.add_row [miis.item_set_id, miis.menu_item_instance_id, miis.created_at, miis.updated_at], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Item Set") do |sheet|
+	  sheet.add_row %w(item_set_id menu_item_id created_at updated_at), :style=>header_text
+	  MenuItemSet.all.each do |mis|
+	    sheet.add_row [mis.item_set_id, mis.menu_item_id, mis.created_at, mis.updated_at], :style=>wrap_text
+	  end
+	end   
+
+end
diff --git a/config/application.rb b/config/application.rb
index e9a4e634..5e672414 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,6 +2,8 @@ require_relative 'boot'
 
 require 'csv'
 require 'rails/all'
+require 'creek'
+# require 'iconv'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 3859c754..3e0fb279 100755
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -3,3 +3,4 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 Mime::Type.register 'application/vnd.ms-excel', :xls
+Mime::Type.register "application/xlsx", :xlsx
diff --git a/out.xls b/out.xls
new file mode 100644
index 0000000000000000000000000000000000000000..ffe4b922dd3da5584007d3d2209613a7f913243e
GIT binary patch
literal 3584
zcmeHJy=xRv5dXc+UcA%G*Ckpg$P(}i(#SS~#53YyqZTKUQlhy<Imy8pi&U<Ky(k>K
zGLV13Mhgqi&SD{ooz*D_mO(5v&)>}59x+^D1dAg(yYpt=yf^dS&b*m@?>DD9>o1Oe
z#x6LI5p25xMt8^!`H{3g3Haniw(Xn~agInfgCX)jA<saL=J0wfIUq5Vcwd5tQgz9A
z<mcHMlqdnFwVh{A;Ua=_${2jbtd5PdHF%|(pHy-dhw+ZH+@q&*R6N5|ve3M@bpN<t
z#0I$LmCE%>b>V6UGaTQ*4;KJ@^M2m<&<-;B|M7!5d4QjH%b$Bp^BC?KzMva!o^EKq
z_Zmrlm5_-+=ru8EEFCiKcAF%IwGK9nSSAuAoFDOVlp|t45rbSx9%0p<T2LFZ3YAnZ
zp}un#mVIZbOS>+y2qT9uNhs%RK}(EiKC)=FTHpkPmV%Hk(JE3FQkQ}!IEKqw<EC+K
zEx1v;(^y#!78}j_gS)lb>QCgkuP!*A?-?9qr<+5Qf8<b+qsy4ke3;TqxTSpDvtXDf
zC&ab*j>jB%>)&Kc>)v?Jeo8KQCA`$!OeI3snQ;ZKAa)Ej=gges7ok&5sln;~ez(de
z`~0`^sU7^8KEG9#ugPFPd7z30pH)`e3RXy)SliR*A3@Hfzq{T6{44#E9DTwfS8t+@
z+q#c>SGb3kf2RKWvX6nPA2w$nzWHd7Qcg<OA2@#>2_<IoZ<m@UA(1<r+ySKENUbXn
qr79dE7Kvj-sZbL{-W>Gqm&QM%!{>oC{&I&;@z?NuMz-UB^uTWm^<U%w

literal 0
HcmV?d00001


From 8f2aa994b586ceabe564ea4621b46062f200d2a9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 19 Mar 2018 18:22:15 +0630
Subject: [PATCH 440/651] update addorder sytle

---
 app/assets/javascripts/addorder.js | 2 +-
 app/models/menu.rb                 | 2 --
 config/application.rb              | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index f6365db0..d3723026 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -196,7 +196,7 @@ $(function() {
                         +add+ '</i>'
                         +'</div>'
                        +'</div>'
-                    +"<div  class='"+add_icon+" p-t-65 m-r--5' data-item-code='"
+                    +"<div  class='"+add_icon+" p-t-65 m-r-' data-item-code='"
                           + menu_items[field].code +"' data-name='"
                           + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
                           + price +"' data-instance-code = '"+ code +"' data-instance = '"
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 09e36928..e42ad876 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -47,10 +47,8 @@ class Menu < ApplicationRecord
 
   def self.import(file)
     spreadsheet = Roo::Spreadsheet.open(file.path)
-    puts spreadsheet.info
 
     spreadsheet = Roo::Excelx.new(file.path)
-    puts spreadsheet.info
 
     # Use the extension option if the extension is ambiguous.
     spreadsheet = Roo::Spreadsheet.open(file.path, extension: :xlsx)
diff --git a/config/application.rb b/config/application.rb
index 5e672414..0e75d195 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,7 +2,6 @@ require_relative 'boot'
 
 require 'csv'
 require 'rails/all'
-require 'creek'
 # require 'iconv'
 
 # Require the gems listed in Gemfile, including any gems

From bf84392ef8a31369cd614696e127b24ca0cce662 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Mar 2018 19:34:34 +0630
Subject: [PATCH 441/651] SQA feedback

---
 app/assets/javascripts/origami.js             |  4 +-
 app/controllers/oqs/edit_controller.rb        |  2 +-
 app/controllers/origami/jcb_controller.rb     | 61 +++++++++------
 app/controllers/origami/master_controller.rb  | 60 +++++++++------
 app/controllers/origami/mpu_controller.rb     | 63 ++++++++++------
 .../origami/payments_controller.rb            |  5 +-
 .../origami/unionpay_controller.rb            | 59 +++++++++------
 app/controllers/origami/visa_controller.rb    | 59 +++++++++------
 app/models/order.rb                           | 10 +--
 app/models/order_queue_station.rb             | 74 +++++++++++++++++++
 app/models/sale_payment.rb                    | 13 +++-
 .../origami/pending_order/index.html.erb      |  0
 app/views/origami/pending_order/show.html.erb |  8 +-
 13 files changed, 289 insertions(+), 129 deletions(-)
 mode change 100755 => 100644 app/controllers/origami/jcb_controller.rb
 mode change 100755 => 100644 app/controllers/origami/master_controller.rb
 mode change 100755 => 100644 app/controllers/origami/mpu_controller.rb
 mode change 100755 => 100644 app/controllers/origami/visa_controller.rb
 mode change 100755 => 100644 app/views/origami/pending_order/index.html.erb

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 418b6ebe..7388529b 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -249,7 +249,7 @@ function setCommPorts(comPortLists) {
 		  closeOnCancel: false,
 		  allowOutsideClick: false
 		}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+			window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment/others_payment";
 		});
     }
 }
@@ -342,6 +342,8 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
     }else{
     	if(payment_type!="master"){
     		payment_type = payment_type.toUpperCase();
+    	}else{
+    		payment_type = "Master";
     	}
         swal({
 		  title: 'Oops',
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 94ba5842..98ec1d63 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -6,7 +6,7 @@ class Oqs::EditController < BaseOqsController
     if params[:type] == 'oqs'
       assigned_item = AssignedOrderItem.find(assigned_item_id)
       @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'")
-    elsif
+    elsif params[:type] == "pending"
       assigned_item = OrderItem.find(assigned_item_id)
       @booking = Booking.joins(" JOIN booking_orders as bko on bko.booking_id = bookings.booking_id")
                 .where("bko.order_id = '#{assigned_item.order_id}'").first()
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
old mode 100755
new mode 100644
index 06ee6087..5c06f9fe
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -5,33 +5,43 @@ class Origami::JcbController < BaseOrigamiController
     @cashier_type   = params[:type]
     # limit jcb_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
     @jcbcount = 0
-    others = 0
+    @shop        = Shop::ShopDetail
+    @rounding_adj = 0
+    @can_jcb = 0
+    @member_discount= 0
+    @sub_total = 0
+    @membership_id = nil
+    @receipt_no = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      
+      others = 0
+       
+      if @shop.is_rounding_adj
+           new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+      else
+          new_total    = sale_data.grand_total
+      end
+      @rounding_adj = new_total-sale_data.grand_total  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "jcb"
+            @jcbcount = @jcbcount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_jcb = total - @jcbcount - others
 
-    @payment_method_setting_nav = PaymentMethodSetting.all
-    @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
     end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "jcb"
-          @jcbcount = @jcbcount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_jcb = total - @jcbcount - others
 
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
     bank_integration = Lookup.collection_of('bank_integration')
     @bank_integration = 0
     if !bank_integration[0].nil?
@@ -59,4 +69,9 @@ class Origami::JcbController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
old mode 100755
new mode 100644
index 77ae99d2..858d0125
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -5,32 +5,41 @@ class Origami::MasterController < BaseOrigamiController
     @cashier_type   = params[:type]
     # limit master_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
     @mastercount = 0
-    others = 0
-    
-    @payment_method_setting_nav = PaymentMethodSetting.all
-    @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
-    end
-    @rounding_adj = new_total-sale_data.grand_total  
+    @shop        = Shop::ShopDetail
+    @rounding_adj = 0
+    @can_master = 0
+    @member_discount = 0
+    @sub_total       = 0
+    @membership_id   = nil
+    @receipt_no      = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      
+      others = 0
+       
+      if @shop.is_rounding_adj
+           new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+      else
+          new_total    = sale_data.grand_total
+      end
+      @rounding_adj = new_total-sale_data.grand_total  
 
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "master"
-          @mastercount = @mastercount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "master"
+            @mastercount = @mastercount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_master = total - @mastercount - others
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
     end
-    @can_master = total - @mastercount - others
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
     bank_integration = Lookup.collection_of('bank_integration')
     @bank_integration = 0
     if !bank_integration[0].nil?
@@ -58,4 +67,9 @@ class Origami::MasterController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
old mode 100755
new mode 100644
index c3f74133..1b125bda
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -4,33 +4,43 @@ class Origami::MpuController < BaseOrigamiController
     @cashier_type   = params[:type]
     # limit mpu_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total     = sale_data.grand_total
+    total = 0
     @mpucount = 0
-    others    = 0
-    
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
-    end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "mpu"
-          @mpucount = @mpucount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_mpu = total - @mpucount - others
+    @rounding_adj = 0
+    @can_mpu = 0
+    @member_discount = 0
+    @sub_total = 0
+    @membership_id = nil
+    @receipt_no = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      
+      others    = 0
+      
+      if @shop.is_rounding_adj
+           new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+      else
+          new_total    = sale_data.grand_total
+      end
+      @rounding_adj = new_total-sale_data.grand_total  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "mpu"
+            @mpucount = @mpucount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_mpu = total - @mpucount - others
+
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
+    end
 
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
     bank_integration = Lookup.collection_of('bank_integration')
     @bank_integration = 0
     if !bank_integration[0].nil?
@@ -58,4 +68,9 @@ class Origami::MpuController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index f9aaa51c..edee8a03 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -177,8 +177,11 @@ class Origami::PaymentsController < BaseOrigamiController
           end
           
           booking.booking_orders.each do |order|
-            Order.pay_process_order_queue(order.order_id,table_id)
+            # Order.pay_process_order_queue(order.order_id, table_id)
+            oqs = OrderQueueStation.new
+            oqs.pay_process_order_queue(order.order_id, table_id)
           end
+          
         end
 
         #for card sale data
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index 707a1022..7213af6d 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -4,32 +4,40 @@ class Origami::UnionpayController < BaseOrigamiController
     @cashier_type   = params[:type]
     # limit unionpay_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
     @unionpaycount = 0
-    others = 0
-
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
+    @rounding_adj = 0
+    @can_unionpay = 0
+    @member_discount = 0
+    @sub_total       = 0
+    @membership_id   = nil
+    @receipt_no      = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      others = 0
+      
+      if @shop.is_rounding_adj
+           new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+      else
+          new_total    = sale_data.grand_total
+      end
+      @rounding_adj = new_total-sale_data.grand_total  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "unionpay"
+            @unionpaycount = @unionpaycount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_unionpay = total - @unionpaycount - others
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
     end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "unionpay"
-          @unionpaycount = @unionpaycount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_unionpay = total - @unionpaycount - others
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
     bank_integration = Lookup.collection_of('bank_integration')
     @bank_integration = 0
     if !bank_integration[0].nil?
@@ -58,4 +66,9 @@ class Origami::UnionpayController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
old mode 100755
new mode 100644
index 788704eb..346b66d1
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -4,32 +4,40 @@ class Origami::VisaController < BaseOrigamiController
     @cashier_type   = params[:type]
     # limit visa_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
     @visacount = 0
-    others = 0
-
-    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
+    @rounding_adj = 0
+    @can_visa = 0
+    @member_discount = 0
+    @sub_total = 0
+    @membership_id = nil
+    @receipt_no = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total  
+      others = 0
+
+      if @shop.is_rounding_adj
+           new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+      else
+          new_total    = sale_data.grand_total
+      end
+      @rounding_adj = new_total-sale_data.grand_total  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "visa"
+            @visacount = @visacount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_visa = total - @visacount - others
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
     end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "visa"
-          @visacount = @visacount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_visa = total - @visacount - others
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
     bank_integration = Lookup.collection_of('bank_integration')
     @bank_integration = 0
     if !bank_integration[0].nil?
@@ -58,4 +66,9 @@ class Origami::VisaController < BaseOrigamiController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
diff --git a/app/models/order.rb b/app/models/order.rb
index 25c5db4a..fcc8b6c2 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -71,9 +71,9 @@ class Order < ApplicationRecord
       BookingOrder.create({:booking_id => booking.booking_id, :order => self})
 
       #Send order to queue one it done!
-      if self.source != "quick_service"
+      # if self.source != "quick_service"
         process_order_queue
-      end      
+      # end      
 
       #send order to broadcast job
       send_order_broadcast(booking)
@@ -297,7 +297,7 @@ class Order < ApplicationRecord
       else
         if order
           oqs = OrderQueueStation.new
-          oqs.process_order(order, self.table_id)
+          oqs.process_order(order, self.table_id, self.source)
         end
         assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
         ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
@@ -313,7 +313,7 @@ class Order < ApplicationRecord
         else
           if order
             oqs = OrderQueueStation.new
-            oqs.process_order(order, self.table_id)
+            oqs.process_order(order, self.table_id, self.source)
           end
           assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
           ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
@@ -326,7 +326,7 @@ class Order < ApplicationRecord
           else
             if order
               oqs = OrderQueueStation.new
-              oqs.process_order(order, self.table_id)
+              oqs.process_order(order, self.table_id, self.source)
             end
             assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
             ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index af544ce5..3380f244 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -101,6 +101,80 @@ class OrderQueueStation < ApplicationRecord
     end #end else  
   end
 
+  def pay_process_order_queue (order_id, table_id)    
+
+    oqs_stations = OrderQueueStation.active
+    
+    order = Order.find(order_id)
+    order_items = order.order_items
+
+    if table_id.to_i > 0
+      # get dining    
+      dining = DiningFacility.find(table_id)    
+      oqs_by_zones = OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}")
+      booking = Booking.find_by_dining_facility_id(dining.id)    
+             
+      # ToDo per item per printer
+
+      oqs_by_zones.each do |oqpbz|
+        oqs = OrderQueueStation.find(oqpbz.order_queue_station_id)
+        is_auto_printed = false  
+        oqs_order_items = []
+
+        if oqs.is_active
+          #Get List of items -
+          pq_items = JSON.parse(oqs.processing_items)
+          #Loop through the processing items
+          pq_items.each do |pq_item|
+            #Processing through the looping items
+            order_items.each  do |order_item|
+              if (pq_item == order_item.item_code)
+               if (order_item.qty > 0)
+                oqs_order_items.push(order_item)
+               end                                      
+              end
+            end
+          end
+          
+          if oqs.auto_print
+            if oqs_order_items.length > 0     
+              print_slip(oqs, order, oqs_order_items)
+              is_auto_printed = true
+            end
+          end 
+        end
+      end
+    else
+      oqs_stations.each do |oqs|
+        is_auto_printed = false  
+        oqs_order_items = []
+
+        if oqs.is_active
+          #Get List of items -
+          pq_items = JSON.parse(oqs.processing_items)
+          #Loop through the processing items
+          pq_items.each do |pq_item|
+            #Processing through the looping items
+            order_items.each  do |order_item|
+              if (pq_item == order_item.item_code)      
+                if (order_item.qty > 0)
+                  oqs_order_items.push(order_item)
+                end                                      
+              end
+            end
+          end
+          
+          if oqs.auto_print
+            if oqs_order_items.length > 0     
+              print_slip(oqs, order, oqs_order_items)
+              is_auto_printed = true
+            end
+          end 
+        end
+      end
+    end #end else  
+  end
+
   private
   #Print order_items in 1 slip
   def print_slip(oqs, order, order_items)
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index b82cbf18..91a4db1e 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -325,6 +325,7 @@ class SalePayment < ApplicationRecord
     sObj = Sale.find(self.sale_id)
     is_credit = 0
     is_foc    = 0
+    is_cash   = false
     sObj.sale_payments.each do |spay|
         all_received_amount += spay.payment_amount.to_f
         if spay.payment_method == "creditnote"
@@ -333,8 +334,12 @@ class SalePayment < ApplicationRecord
         if spay.payment_method == "foc"
           is_foc = 1
         end
+        if spay.payment_method.to_s == "cash"
+          is_cash = true
+        end
     end
-    if (self.sale.grand_total <= all_received_amount)
+
+    if (self.sale.grand_total <= all_received_amount) && is_cash
       if is_credit == 0
         self.sale.payment_status = "paid"
       else
@@ -374,11 +379,15 @@ class SalePayment < ApplicationRecord
       end
 
       self.sale.save!
-      table_update_status(sObj)
       
       if check_foc
+        table_update_status(sObj)
         update_shift
       elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
+        table_update_status(sObj)
+        update_shift
+      elsif is_cash && paid_amount.to_f == 0
+        table_update_status(sObj)
         update_shift
       end
     end
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
old mode 100755
new mode 100644
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index a7ade0a4..19750c4d 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -97,13 +97,15 @@
                    <% end%>
                 <% else%>
                    <% sub_total = 0
+                      total = 0
                       @order_items.each do |order_item|
-                      sub_total = sub_total + order_item.price %>
+                        total = order_item.qty * order_item.price
+                      sub_total = sub_total + total %>
                    <input type="hidden" id="sale_id" value="<%= @bookings.booking_id %>">
                    <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
                      <td class='item-name'><%= order_item.item_name %></td>
                      <td class='item-attr'><%= order_item.qty %></td>
-                     <td class='item-attr'><%= order_item.price %></td>
+                     <td class='item-attr'><%= total %></td>
                    </tr>
                    <% end%>
                 <% end%>
@@ -210,7 +212,7 @@ $(document).ready(function(){
                 swal("Information!", result.error_message);
               }
               else {              
-                location.reload();
+                 window.location.href = '/origami/quick_service/pending_order';
               }
           }
       });   

From 27a3026c2a8642e826a66898149708fdef6887e0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 19 Mar 2018 19:41:32 +0630
Subject: [PATCH 442/651] oqs edit

---
 app/models/order_queue_station.rb | 6 +++---
 app/views/oqs/edit/index.html.erb | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 3380f244..889491ed 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -13,7 +13,7 @@ class OrderQueueStation < ApplicationRecord
   # validations
   validates_presence_of :station_name, :printer_name
 
-  def process_order (order, table_id)    
+  def process_order (order, table_id, order_source = nil)    
 
     oqs_stations = OrderQueueStation.active
     
@@ -55,7 +55,7 @@ class OrderQueueStation < ApplicationRecord
             end
           end
           
-          if oqs.auto_print 
+          if oqs.auto_print && order_source != "quick_service"
             if oqs_order_items.length > 0     
               print_slip(oqs, order, oqs_order_items)
               is_auto_printed = true
@@ -90,7 +90,7 @@ class OrderQueueStation < ApplicationRecord
             end
           end
           
-          if oqs.auto_print 
+          if oqs.auto_print && order_source != "quick_service"
             if oqs_order_items.length > 0     
               print_slip(oqs, order, oqs_order_items)
               is_auto_printed = true
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 7a1eebab..70e9a0ff 100644
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -144,9 +144,12 @@ $(document).ready(function(){
   });
 
    $('#back').on('click', function () {
+      var booking_id = '<%= @booking.booking_id %>';
       <% if !@link_type.nil? %>
         <% if @link_type == 'oqs' %>
           window.location.href = '/oqs';
+        <% elsif @link_type == 'pending' %>
+          window.location.href = '/origami/quick_service/pending_order/'+booking_id;
         <% else %>
          <% if !@dining_type.nil? %>
           <% if @dining_type == 'Table' %>

From 829c09040d6bbf3c531a7d9c41698c6c15a2eb73 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 20 Mar 2018 09:54:15 +0630
Subject: [PATCH 443/651] delete receipts

---
 .gitignore                                    |   2 +-
 public/receipts/receipt_bill_20180219-75.pdf  | 483 ------------------
 .../receipt_bill_qwer-20180307-77.pdf         | 455 -----------------
 .../receipt_bill_qwer-20180307-78.pdf         | 455 -----------------
 .../receipt_bill_qwer-20180307-79.pdf         | 455 -----------------
 .../receipt_bill_qwer-20180307-80.pdf         | 455 -----------------
 .../receipt_bill_qwer-20180307-81.pdf         | 455 -----------------
 .../receipt_bill_qwer-20180307-82.pdf         | 455 -----------------
 .../receipt_bill_qwer-20180307-83.pdf         | 455 -----------------
 9 files changed, 1 insertion(+), 3669 deletions(-)
 delete mode 100644 public/receipts/receipt_bill_20180219-75.pdf
 delete mode 100644 public/receipts/receipt_bill_qwer-20180307-77.pdf
 delete mode 100644 public/receipts/receipt_bill_qwer-20180307-78.pdf
 delete mode 100644 public/receipts/receipt_bill_qwer-20180307-79.pdf
 delete mode 100644 public/receipts/receipt_bill_qwer-20180307-80.pdf
 delete mode 100644 public/receipts/receipt_bill_qwer-20180307-81.pdf
 delete mode 100644 public/receipts/receipt_bill_qwer-20180307-82.pdf
 delete mode 100644 public/receipts/receipt_bill_qwer-20180307-83.pdf

diff --git a/.gitignore b/.gitignore
index b404db53..e32934b1 100755
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ capybara-*.html
 /public/assets/*
 /public/uploads/*
 /public/swf/*
-/public/receipts
+/public/receipts/
 /coverage/
 /spec/tmp/*
 *.orig
diff --git a/public/receipts/receipt_bill_20180219-75.pdf b/public/receipts/receipt_bill_20180219-75.pdf
deleted file mode 100644
index 95238846..00000000
--- a/public/receipts/receipt_bill_20180219-75.pdf
+++ /dev/null
@@ -1,483 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4242
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a2032303138303231392d3735>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207432>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2031392d30322d323031382831303a323920414d2d31303a333620414d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<56> 80 <6f646b61202d>] TJ
-ET
-
-
-BT
-93.864 1282.2 Td
-/F1.0 8 Tf
-[<31302c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-172.864 1282.2 Td
-/F1.0 8 Tf
-[<31302c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1267.952 Td
-/F1.0 8 Tf
-[<746573745f6974656d31202d>] TJ
-ET
-
-
-BT
-0.0 1258.704 Td
-/F1.0 8 Tf
-[<74657374315f736d616c6c>] TJ
-ET
-
-
-BT
-98.312 1267.952 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1267.952 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1267.952 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-0.0 1250.2 m
-210.0 1250.2 l
-S
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-170.864 1239.456 Td
-/F1.0 8 Tf
-[<31312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1225.208 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-175.312 1210.96 Td
-/F1.0 8 Tf
-[<312c3130302e30>] TJ
-ET
-
-
-BT
-0.0 1196.712 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-181.984 1196.712 Td
-/F1.0 8 Tf
-[<3535302e30>] TJ
-ET
-
-
-BT
-0.0 1181.028 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-163.08 1181.028 Td
-/F2.0 10 Tf
-[<31322c3635302e30>] TJ
-ET
-
-0.0 1171.308 m
-210.0 1171.308 l
-S
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-170.864 1160.564 Td
-/F1.0 8 Tf
-[<31322c3635302e30>] TJ
-ET
-
-
-BT
-0.0 1146.316 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-190.88 1146.316 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1127.068 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1127.068 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1118.564 m
-210.0 1118.564 l
-S
-
-BT
-0.0 1107.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1107.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1098.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1098.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1089.324 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1089.324 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1080.82 m
-210.0 1080.82 l
-S
-
-BT
-0.0 1070.076 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1070.076 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1060.828 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-170.864 1060.828 Td
-/F1.0 8 Tf
-[<31302c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1051.58 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1051.58 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1043.076 m
-210.0 1043.076 l
-S
-
-BT
-0.0 1031.614 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1017.332 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1017.332 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1008.828 m
-210.0 1008.828 l
-S
-
-BT
-0.0 996.648 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 998.084 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004509 00000 n 
-0000004792 00000 n 
-0000004889 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4991
-%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-77.pdf b/public/receipts/receipt_bill_qwer-20180307-77.pdf
deleted file mode 100644
index 13df612b..00000000
--- a/public/receipts/receipt_bill_qwer-20180307-77.pdf
+++ /dev/null
@@ -1,455 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4003
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3737>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207431>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2030372d30332d323031382830353a333320504d2d30353a353020504d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<746573745f6974656d31202d>] TJ
-ET
-
-
-BT
-0.0 1272.952 Td
-/F1.0 8 Tf
-[<74657374315f736d616c6c>] TJ
-ET
-
-
-BT
-98.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-0.0 1264.448 m
-210.0 1264.448 l
-S
-
-BT
-0.0 1253.704 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-175.312 1253.704 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1239.456 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-181.984 1225.208 Td
-/F1.0 8 Tf
-[<3130302e30>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-186.432 1210.96 Td
-/F1.0 8 Tf
-[<35302e30>] TJ
-ET
-
-
-BT
-0.0 1195.276 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-168.64 1195.276 Td
-/F2.0 10 Tf
-[<312c3135302e30>] TJ
-ET
-
-0.0 1185.556 m
-210.0 1185.556 l
-S
-
-BT
-0.0 1174.812 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-175.312 1174.812 Td
-/F1.0 8 Tf
-[<312c3135302e30>] TJ
-ET
-
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-190.88 1160.564 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1141.316 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1141.316 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1132.812 m
-210.0 1132.812 l
-S
-
-BT
-0.0 1122.068 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1122.068 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1112.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1112.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1103.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1103.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1095.068 m
-210.0 1095.068 l
-S
-
-BT
-0.0 1084.324 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1084.324 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1075.076 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-190.88 1075.076 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1065.828 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1065.828 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1057.324 m
-210.0 1057.324 l
-S
-
-BT
-0.0 1045.862 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1031.58 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1031.58 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1023.076 m
-210.0 1023.076 l
-S
-
-BT
-0.0 1010.896 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 1012.332 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004270 00000 n 
-0000004553 00000 n 
-0000004650 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4752
-%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-78.pdf b/public/receipts/receipt_bill_qwer-20180307-78.pdf
deleted file mode 100644
index 0167d798..00000000
--- a/public/receipts/receipt_bill_qwer-20180307-78.pdf
+++ /dev/null
@@ -1,455 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4003
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3738>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207431>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2030372d30332d323031382830363a303320504d2d30363a303420504d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<746573745f6974656d31202d>] TJ
-ET
-
-
-BT
-0.0 1272.952 Td
-/F1.0 8 Tf
-[<74657374315f736d616c6c>] TJ
-ET
-
-
-BT
-98.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-0.0 1264.448 m
-210.0 1264.448 l
-S
-
-BT
-0.0 1253.704 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-175.312 1253.704 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1239.456 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-181.984 1225.208 Td
-/F1.0 8 Tf
-[<3130302e30>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-186.432 1210.96 Td
-/F1.0 8 Tf
-[<35302e30>] TJ
-ET
-
-
-BT
-0.0 1195.276 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-168.64 1195.276 Td
-/F2.0 10 Tf
-[<312c3135302e30>] TJ
-ET
-
-0.0 1185.556 m
-210.0 1185.556 l
-S
-
-BT
-0.0 1174.812 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-175.312 1174.812 Td
-/F1.0 8 Tf
-[<312c3135302e30>] TJ
-ET
-
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-190.88 1160.564 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1141.316 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1141.316 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1132.812 m
-210.0 1132.812 l
-S
-
-BT
-0.0 1122.068 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1122.068 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1112.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1112.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1103.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1103.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1095.068 m
-210.0 1095.068 l
-S
-
-BT
-0.0 1084.324 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1084.324 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1075.076 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-190.88 1075.076 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1065.828 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1065.828 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1057.324 m
-210.0 1057.324 l
-S
-
-BT
-0.0 1045.862 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1031.58 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1031.58 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1023.076 m
-210.0 1023.076 l
-S
-
-BT
-0.0 1010.896 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 1012.332 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004270 00000 n 
-0000004553 00000 n 
-0000004650 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4752
-%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-79.pdf b/public/receipts/receipt_bill_qwer-20180307-79.pdf
deleted file mode 100644
index 8720c5b6..00000000
--- a/public/receipts/receipt_bill_qwer-20180307-79.pdf
+++ /dev/null
@@ -1,455 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4003
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3739>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207432>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2030372d30332d323031382830363a303620504d2d30363a303620504d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<746573745f6974656d31202d>] TJ
-ET
-
-
-BT
-0.0 1272.952 Td
-/F1.0 8 Tf
-[<74657374315f736d616c6c>] TJ
-ET
-
-
-BT
-98.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-0.0 1264.448 m
-210.0 1264.448 l
-S
-
-BT
-0.0 1253.704 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-175.312 1253.704 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1239.456 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-181.984 1225.208 Td
-/F1.0 8 Tf
-[<3130302e30>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-186.432 1210.96 Td
-/F1.0 8 Tf
-[<35302e30>] TJ
-ET
-
-
-BT
-0.0 1195.276 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-168.64 1195.276 Td
-/F2.0 10 Tf
-[<312c3135302e30>] TJ
-ET
-
-0.0 1185.556 m
-210.0 1185.556 l
-S
-
-BT
-0.0 1174.812 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-175.312 1174.812 Td
-/F1.0 8 Tf
-[<312c3135302e30>] TJ
-ET
-
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-190.88 1160.564 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1141.316 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1141.316 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1132.812 m
-210.0 1132.812 l
-S
-
-BT
-0.0 1122.068 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1122.068 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1112.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1112.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1103.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1103.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1095.068 m
-210.0 1095.068 l
-S
-
-BT
-0.0 1084.324 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1084.324 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1075.076 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-190.88 1075.076 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1065.828 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1065.828 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1057.324 m
-210.0 1057.324 l
-S
-
-BT
-0.0 1045.862 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1031.58 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1031.58 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1023.076 m
-210.0 1023.076 l
-S
-
-BT
-0.0 1010.896 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 1012.332 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004270 00000 n 
-0000004553 00000 n 
-0000004650 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4752
-%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-80.pdf b/public/receipts/receipt_bill_qwer-20180307-80.pdf
deleted file mode 100644
index e1ecd3dd..00000000
--- a/public/receipts/receipt_bill_qwer-20180307-80.pdf
+++ /dev/null
@@ -1,455 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4003
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3830>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207432>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2030372d30332d323031382830363a303720504d2d30363a303720504d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<746573745f6974656d31202d>] TJ
-ET
-
-
-BT
-0.0 1272.952 Td
-/F1.0 8 Tf
-[<74657374315f736d616c6c>] TJ
-ET
-
-
-BT
-98.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-0.0 1264.448 m
-210.0 1264.448 l
-S
-
-BT
-0.0 1253.704 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-175.312 1253.704 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1239.456 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-181.984 1225.208 Td
-/F1.0 8 Tf
-[<3130302e30>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-186.432 1210.96 Td
-/F1.0 8 Tf
-[<35302e30>] TJ
-ET
-
-
-BT
-0.0 1195.276 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-168.64 1195.276 Td
-/F2.0 10 Tf
-[<312c3135302e30>] TJ
-ET
-
-0.0 1185.556 m
-210.0 1185.556 l
-S
-
-BT
-0.0 1174.812 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-175.312 1174.812 Td
-/F1.0 8 Tf
-[<312c3135302e30>] TJ
-ET
-
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-190.88 1160.564 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1141.316 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1141.316 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1132.812 m
-210.0 1132.812 l
-S
-
-BT
-0.0 1122.068 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1122.068 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1112.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1112.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1103.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1103.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1095.068 m
-210.0 1095.068 l
-S
-
-BT
-0.0 1084.324 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1084.324 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1075.076 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-190.88 1075.076 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1065.828 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1065.828 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1057.324 m
-210.0 1057.324 l
-S
-
-BT
-0.0 1045.862 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1031.58 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1031.58 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1023.076 m
-210.0 1023.076 l
-S
-
-BT
-0.0 1010.896 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 1012.332 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004270 00000 n 
-0000004553 00000 n 
-0000004650 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4752
-%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-81.pdf b/public/receipts/receipt_bill_qwer-20180307-81.pdf
deleted file mode 100644
index c2c35188..00000000
--- a/public/receipts/receipt_bill_qwer-20180307-81.pdf
+++ /dev/null
@@ -1,455 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4005
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3831>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207432>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2030372d30332d323031382830363a303920504d2d30363a303920504d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<746573745f6974656d32202d>] TJ
-ET
-
-
-BT
-0.0 1272.952 Td
-/F1.0 8 Tf
-[<74657374315f736d616c32>] TJ
-ET
-
-
-BT
-98.312 1282.2 Td
-/F1.0 8 Tf
-[<322c3032302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1282.2 Td
-/F1.0 8 Tf
-[<322c3032302e30>] TJ
-ET
-
-0.0 1264.448 m
-210.0 1264.448 l
-S
-
-BT
-0.0 1253.704 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-175.312 1253.704 Td
-/F1.0 8 Tf
-[<322c3032302e30>] TJ
-ET
-
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1239.456 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-181.984 1225.208 Td
-/F1.0 8 Tf
-[<3230322e30>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-181.984 1210.96 Td
-/F1.0 8 Tf
-[<3130312e30>] TJ
-ET
-
-
-BT
-0.0 1195.276 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-168.64 1195.276 Td
-/F2.0 10 Tf
-[<322c3332332e30>] TJ
-ET
-
-0.0 1185.556 m
-210.0 1185.556 l
-S
-
-BT
-0.0 1174.812 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-175.312 1174.812 Td
-/F1.0 8 Tf
-[<322c3332332e30>] TJ
-ET
-
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-190.88 1160.564 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1141.316 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1141.316 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1132.812 m
-210.0 1132.812 l
-S
-
-BT
-0.0 1122.068 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1122.068 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1112.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1112.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1103.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1103.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1095.068 m
-210.0 1095.068 l
-S
-
-BT
-0.0 1084.324 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1084.324 Td
-/F1.0 8 Tf
-[<322c3032302e30>] TJ
-ET
-
-
-BT
-0.0 1075.076 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-190.88 1075.076 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1065.828 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1065.828 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1057.324 m
-210.0 1057.324 l
-S
-
-BT
-0.0 1045.862 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1031.58 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1031.58 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1023.076 m
-210.0 1023.076 l
-S
-
-BT
-0.0 1010.896 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 1012.332 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004272 00000 n 
-0000004555 00000 n 
-0000004652 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4754
-%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-82.pdf b/public/receipts/receipt_bill_qwer-20180307-82.pdf
deleted file mode 100644
index 088b1130..00000000
--- a/public/receipts/receipt_bill_qwer-20180307-82.pdf
+++ /dev/null
@@ -1,455 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4012
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3832>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207431>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2030372d30332d323031382830363a313320504d2d30363a313320504d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<746573745f6974656d31202d>] TJ
-ET
-
-
-BT
-0.0 1272.952 Td
-/F1.0 8 Tf
-[<74657374315f736d616c6c>] TJ
-ET
-
-
-BT
-98.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-0.0 1264.448 m
-210.0 1264.448 l
-S
-
-BT
-0.0 1253.704 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-175.312 1253.704 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1239.456 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-181.984 1225.208 Td
-/F1.0 8 Tf
-[<3130302e30>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-186.432 1210.96 Td
-/F1.0 8 Tf
-[<35302e30>] TJ
-ET
-
-
-BT
-0.0 1195.276 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-168.64 1195.276 Td
-/F2.0 10 Tf
-[<312c3135302e30>] TJ
-ET
-
-0.0 1185.556 m
-210.0 1185.556 l
-S
-
-BT
-0.0 1174.812 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-175.312 1174.812 Td
-/F1.0 8 Tf
-[<322c3330302e30>] TJ
-ET
-
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-175.312 1160.564 Td
-/F1.0 8 Tf
-[<312c3135302e30>] TJ
-ET
-
-
-BT
-0.0 1141.316 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1141.316 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1132.812 m
-210.0 1132.812 l
-S
-
-BT
-0.0 1122.068 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1122.068 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1112.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1112.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1103.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1103.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1095.068 m
-210.0 1095.068 l
-S
-
-BT
-0.0 1084.324 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1084.324 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1075.076 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-190.88 1075.076 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1065.828 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1065.828 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1057.324 m
-210.0 1057.324 l
-S
-
-BT
-0.0 1045.862 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1031.58 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1031.58 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1023.076 m
-210.0 1023.076 l
-S
-
-BT
-0.0 1010.896 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 1012.332 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004279 00000 n 
-0000004562 00000 n 
-0000004659 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4761
-%%EOF
diff --git a/public/receipts/receipt_bill_qwer-20180307-83.pdf b/public/receipts/receipt_bill_qwer-20180307-83.pdf
deleted file mode 100644
index ebac5da2..00000000
--- a/public/receipts/receipt_bill_qwer-20180307-83.pdf
+++ /dev/null
@@ -1,455 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 3 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-4 0 obj
-<< /Length 4003
->>
-stream
-q
-
-BT
-48.975 1417.82 Td
-/F1.0 10 Tf
-[<4f53414b41204f4853484f2854> 120 <616d77> 10 <6529>] TJ
-ET
-
-
-BT
-10.268 1402.696 Td
-/F1.0 8 Tf
-[<4e6f> 40 <2e203235362c204b> 50 <79> 20 <61696b6b6173616e20526f61642c2054> 120 <616d77> 10 <652054> 120 <6f> 15 <776e73686970> 35 <2c2059> 140 <616e676f6e>] TJ
-ET
-
-
-BT
-71.904 1388.448 Td
-/F1.0 8 Tf
-[<54> 120 <656c3a2030392d323538363736363131>] TJ
-ET
-
-0.0 1379.944 m
-210.0 1379.944 l
-S
-0.0 1379.944 m
-210.0 1379.944 l
-S
-
-BT
-0.0 1367.2 Td
-/F1.0 8 Tf
-[<52656365697074204e6f3a207177> 10 <65722d32303138303330372d3833>] TJ
-ET
-
-
-BT
-0.0 1347.2 Td
-/F1.0 8 Tf
-[<54> 120 <6162> 20 <6c65202d207431>] TJ
-ET
-
-
-BT
-100.0 1347.2 Td
-/F1.0 8 Tf
-[<573a2043617368696572>] TJ
-ET
-
-
-BT
-160.216 1347.2 Td
-/F1.0 8 Tf
-[<433a2043617368696572>] TJ
-ET
-
-
-BT
-0.0 1327.2 Td
-/F1.0 8 Tf
-[<44617465203a2030372d30332d323031382830363a313720504d2d30363a313720504d29>] TJ
-ET
-
-0.0 1312.944 m
-210.0 1312.944 l
-S
-
-BT
-0.0 1302.2 Td
-/F1.0 8 Tf
-[<4974656d73>] TJ
-ET
-
-
-BT
-106.656 1302.2 Td
-/F1.0 8 Tf
-[<5072> -15 <696365>] TJ
-ET
-
-
-BT
-138.276 1302.2 Td
-/F1.0 8 Tf
-[<517479>] TJ
-ET
-
-
-BT
-187.176 1302.2 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c>] TJ
-ET
-
-0.0 1292.944 m
-210.0 1292.944 l
-S
-
-BT
-0.0 1282.2 Td
-/F1.0 8 Tf
-[<746573745f6974656d31202d>] TJ
-ET
-
-
-BT
-0.0 1272.952 Td
-/F1.0 8 Tf
-[<74657374315f736d616c6c>] TJ
-ET
-
-
-BT
-98.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-138.94 1282.2 Td
-/F1.0 8 Tf
-[<312e30>] TJ
-ET
-
-
-BT
-177.312 1282.2 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-0.0 1264.448 m
-210.0 1264.448 l
-S
-
-BT
-0.0 1253.704 Td
-/F1.0 8 Tf
-[<5375622054> 120 <6f74616c>] TJ
-ET
-
-
-BT
-175.312 1253.704 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1239.456 Td
-/F1.0 8 Tf
-[<4f76> 25 <6572> 10 <616c6c20446973636f756e743a>] TJ
-ET
-
-
-BT
-181.104 1239.456 Td
-/F1.0 8 Tf
-[<2820302e302029>] TJ
-ET
-
-
-BT
-0.0 1225.208 Td
-/F1.0 8 Tf
-[<536572> -30 <76696365204368617267657320282031302529>] TJ
-ET
-
-
-BT
-181.984 1225.208 Td
-/F1.0 8 Tf
-[<3130302e30>] TJ
-ET
-
-
-BT
-0.0 1210.96 Td
-/F1.0 8 Tf
-[<436f6d6d65726369616c2054> 120 <6178202820352529>] TJ
-ET
-
-
-BT
-186.432 1210.96 Td
-/F1.0 8 Tf
-[<35302e30>] TJ
-ET
-
-
-BT
-0.0 1195.276 Td
-/F2.0 10 Tf
-[<4772616e642054> 80 <6f74616c>] TJ
-ET
-
-
-BT
-168.64 1195.276 Td
-/F2.0 10 Tf
-[<312c3135302e30>] TJ
-ET
-
-0.0 1185.556 m
-210.0 1185.556 l
-S
-
-BT
-0.0 1174.812 Td
-/F1.0 8 Tf
-[<436173682050> 40 <61> 30 <796d656e74>] TJ
-ET
-
-
-BT
-175.312 1174.812 Td
-/F1.0 8 Tf
-[<312c3135302e30>] TJ
-ET
-
-
-BT
-0.0 1160.564 Td
-/F1.0 8 Tf
-[<4368616e676520416d6f756e74>] TJ
-ET
-
-
-BT
-190.88 1160.564 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1141.316 Td
-/F1.0 8 Tf
-[<437573746f6d6572204e616d65>] TJ
-ET
-
-
-BT
-169.064 1141.316 Td
-/F1.0 8 Tf
-[<57> 50 <414c4b2d494e>] TJ
-ET
-
-0.0 1132.812 m
-210.0 1132.812 l
-S
-
-BT
-0.0 1122.068 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2046> 30 <6f6f6420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1122.068 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1112.82 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c204265> 30 <76> 25 <6572> 10 <61676520446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1112.82 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-
-BT
-0.0 1103.572 Td
-/F1.0 8 Tf
-[<54> 120 <6f74616c2050726f6475637420446973636f756e7473>] TJ
-ET
-
-
-BT
-185.552 1103.572 Td
-/F1.0 8 Tf
-[<28302e3029>] TJ
-ET
-
-0.0 1095.068 m
-210.0 1095.068 l
-S
-
-BT
-0.0 1084.324 Td
-/F1.0 8 Tf
-[<46> 30 <6f6f64>] TJ
-ET
-
-
-BT
-175.312 1084.324 Td
-/F1.0 8 Tf
-[<312c3030302e30>] TJ
-ET
-
-
-BT
-0.0 1075.076 Td
-/F1.0 8 Tf
-[<4265> 30 <76> 25 <6572> 10 <616765>] TJ
-ET
-
-
-BT
-190.88 1075.076 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-
-BT
-0.0 1065.828 Td
-/F1.0 8 Tf
-[<50726f64756374>] TJ
-ET
-
-
-BT
-190.88 1065.828 Td
-/F1.0 8 Tf
-[<302e30>] TJ
-ET
-
-0.0 1057.324 m
-210.0 1057.324 l
-S
-
-BT
-0.0 1045.862 Td
-/F1.0 9 Tf
-[<53706c69742042696c6c2066> 30 <6f72203020706572736f6e73>] TJ
-ET
-
-
-BT
-0.0 1031.58 Td
-/F1.0 8 Tf
-[<416d6f756e7420447565202870657220706572736f6e29>] TJ
-ET
-
-
-BT
-193.104 1031.58 Td
-/F1.0 8 Tf
-[<496e66>] TJ
-ET
-
-0.0 1023.076 m
-210.0 1023.076 l
-S
-
-BT
-0.0 1010.896 Td
-/F2.0 10 Tf
-[<50> 30 <616964>] TJ
-ET
-
-
-BT
-102.0 1012.332 Td
-/F1.0 8 Tf
-[<5468616e6b2059> 140 <6f7521205365652079> 20 <6f7520416761696e>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 210 1450]
-/CropBox [0 0 210 1450]
-/BleedBox [0 0 210 1450]
-/TrimBox [0 0 210 1450]
-/ArtBox [0 0 210 1450]
-/Contents 4 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
-/F2.0 7 0 R
->>
->>
->>
-endobj
-6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000015 00000 n 
-0000000109 00000 n 
-0000000158 00000 n 
-0000000215 00000 n 
-0000004270 00000 n 
-0000004553 00000 n 
-0000004650 00000 n 
-trailer
-<< /Size 8
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-4752
-%%EOF

From e3f9ecbc878e6f9d0a7da4ca23efb7695e274690 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 20 Mar 2018 11:38:51 +0630
Subject: [PATCH 444/651] add jade print

---
 app/views/origami/home/show.html.erb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6c38ba99..d36a6715 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -715,6 +715,7 @@
     $("#first_bill").on('click', function () {
         var sale_id = $('#sale_id').val();
         var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+        var server_mode = 
 
         $.ajax({
             type: "GET",
@@ -723,12 +724,17 @@
               receipt_no = ($("#receipt_no").html()).trim();
               if((receipt_no!=undefined) && (receipt_no!=""))
                 createReceiptNoInFirstBillData(receipt_no,"");
+
+                // For Server Print - from jade
+                if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath, result.printer_url);
+                }
                             
               // console.log(result);
               // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
               location.reload();
             }
-        });  
+        });          
     });
 
     $(".choose_payment").on('click', function () {

From 510e3aabec4cd018cea6774c8bc6726c0fa22dd8 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 20 Mar 2018 14:32:08 +0630
Subject: [PATCH 445/651] check current user session

---
 app/controllers/base_crm_controller.rb         |  8 ++++++--
 app/controllers/base_inventory_controller.rb   |  8 ++++++--
 app/controllers/base_oqs_controller.rb         | 10 +++++++---
 app/controllers/base_origami_controller.rb     |  8 +++++---
 app/controllers/base_report_controller.rb      |  8 ++++++++
 app/controllers/base_waiter_controller.rb      | 16 ++++++++++++----
 app/controllers/concerns/login_verification.rb |  6 +++---
 app/controllers/home_controller.rb             | 13 +++++++++++++
 8 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index 3b9e0176..65350605 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -2,6 +2,8 @@ class BaseCrmController < ActionController::Base
   include LoginVerification
 	layout "CRM"
 
+  before_action :check_user
+
   #before_action :check_installation
   protect_from_forgery with: :exception
 
@@ -22,8 +24,10 @@ class BaseCrmController < ActionController::Base
     { locale: I18n.locale }
   end
 
-  def current_user
-  	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
   end
 
   #Shop Name in Navbor
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index a88a3abb..ebbd32e3 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -2,6 +2,8 @@ class BaseInventoryController < ActionController::Base
   include LoginVerification
 	layout "inventory"
 
+  before_action :check_user
+
   #before_action :check_installation
   protect_from_forgery with: :exception
 
@@ -12,8 +14,10 @@ class BaseInventoryController < ActionController::Base
   	redirect_to root_path
   end
 
-  def current_user
-  	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
   end
 
   #Shop Name in Navbor
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index 0f093913..2b621cf1 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -2,6 +2,8 @@ class BaseOqsController < ActionController::Base
   include LoginVerification
   layout "OQS"
 
+  before_action :check_user
+
   #before_action :check_installation
   protect_from_forgery with: :exception
   
@@ -21,9 +23,11 @@ class BaseOqsController < ActionController::Base
   def default_url_options
     { locale: I18n.locale }
   end
-  
-  def current_user
-  	@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
   end
 
   #Shop Name in Navbor
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 8c4f3aaa..e14a6959 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -2,7 +2,7 @@ class BaseOrigamiController < ActionController::Base
   include LoginVerification
   layout "origami"
 
-  # before_action :checkin_process
+  before_action :check_user
 
   #before_action :check_installation
   protect_from_forgery with: :exception
@@ -14,8 +14,10 @@ class BaseOrigamiController < ActionController::Base
     redirect_to origami_dashboard_path
   end
 
-  def current_user
-    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
   end
 
   # def checkin_process
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index e96e97c8..51c250f8 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -2,6 +2,8 @@ class BaseReportController < ActionController::Base
   include LoginVerification
   layout "application" 
 
+  before_action :check_user
+
   #before_action :check_installation
   protect_from_forgery with: :exception
 
@@ -83,6 +85,12 @@ class BaseReportController < ActionController::Base
 	    return from, to 
 	end
 
+	def check_user
+		if current_user.nil?
+		  redirect_to root_path
+		end
+	end
+
 	#Shop Name in Navbor
   	def shop_detail
     	@shop = Shop.first
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index 71303213..94d1cd45 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -2,13 +2,21 @@ class BaseWaiterController < ActionController::Base
   include LoginVerification  
   layout "waiter"
 
+  before_action :check_user
+
   #before_action :check_installation
   protect_from_forgery with: :exception
 
   helper_method :shop_detail
 
-	#Shop Name in Navbor
-	def shop_detail
-		@shop = Shop.first
-	end
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+
+  #Shop Name in Navbor
+  def shop_detail
+	@shop = Shop.first
+  end
 end
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index bb9df067..14b1e2e1 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -33,10 +33,10 @@ module LoginVerification
   protected
   # Authenticate the user with token based authentication
   def authenticate   
-    authenticate_session_token || render_unauthorized
+    authenticate_session_token || render_unauthorized    
   end
 
-  def authenticate_session_token
+  def authenticate_session_token    
     token = session[:session_token]
     if (token)
       #@current_user = User.find_by(api_key: token)
@@ -50,7 +50,7 @@ module LoginVerification
     end
   end
 
-  def render_unauthorized()
+  def render_unauthorized
     redirect_to root_path
   end
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 147b2ee4..f097ba6f 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,8 +2,21 @@ class HomeController < ApplicationController
   # layout "application", except: [:index, :show]
   # skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] 
 
+  before_action :check_user, only: :dashboard
+
   helper_method :shop_detail 
 
+  # Special check for only dashboard
+  def check_user    
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+
+  def current_user
+    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
+  end
+
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")
     @employees = Employee.all.order("name asc")

From f354e32e319762024c807ca12931ad66fe4a5562 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 20 Mar 2018 15:55:00 +0630
Subject: [PATCH 446/651] SQA feedback

---
 app/controllers/origami/shifts_controller.rb |  2 +-
 app/models/sale.rb                           | 22 ++++++++++++++++++++
 app/views/origami/shifts/show.html.erb       | 10 ++++-----
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index d0b73f99..acce6c65 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -3,7 +3,7 @@ class Origami::ShiftsController < BaseOrigamiController
   end
 
   def show
-    @type = params[:type]
+    @cashier_type = params[:type]
     @shift = ShiftSale.current_open_shift(current_user.id)
     #for bank integration
     bank_integration = Lookup.collection_of('bank_integration')
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 11ddd296..5e7042e5 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -371,6 +371,8 @@ class Sale < ApplicationRecord
     end
     #compute rounding adjustment
     # adjust_rounding
+    sale.rounding_adjustment = compute_adjust_rounding(sale.grand_total)
+
     sale.save!
 
   end
@@ -552,6 +554,26 @@ class Sale < ApplicationRecord
     
   end
 
+  def compute_adjust_rounding(grand_total)
+    shop_details =  Shop::ShopDetail 
+      # rounding adjustment
+    if shop_details.is_rounding_adj
+      a = grand_total % 25 # Modulus
+      b = grand_total / 25 # Division
+      #not calculate rounding if modulus is 0 and division is even
+      #calculate rounding if modulus is zero or not zero and division are not even
+      if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+        new_total    = Sale.get_rounding_adjustment(grand_total)
+        rounding_adjustment = new_total - grand_total
+      else
+        rounding_adjustment = 0.00
+      end
+    else
+      rounding_adjustment = 0.00
+    end
+    return rounding_adjustment
+  end
+
   #Generate new Receipt No when it is not assigned
   def generate_receipt_no
     #shop_code and client_code
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 4e42f11b..006763eb 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -58,7 +58,7 @@
   </div>
 </div>
 <script>
-  var type = '<%= @type %>';
+  var cashier_type = '<%= @cashier_type %>';
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
     var shift_id = "<%= @shift.id rescue ""%>"
@@ -73,7 +73,7 @@
   });
 
   $('#back').on('click',function(){
-    if(type!='quick_service'){
+    if(cashier_type!='quick_service'){
       window.location.href = '/origami';
     }else{
       window.location.href = '/origami/quick_service';
@@ -95,7 +95,7 @@
         closeOnCancel: false,
         allowOutsideClick: false
       }, function () {
-        window.location.href = '/origami/shift/'+type+'/close';
+        window.location.href = '/origami/shift/'+cashier_type+'/close';
       });
     }
   });
@@ -120,7 +120,7 @@
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
-          window.location.href = '/origami/shift/'+type+'/close';
+          window.location.href = '/origami/shift/'+cashier_type+'/close';
         });
       }
   }
@@ -184,7 +184,7 @@
                 closeOnCancel: false,
                 allowOutsideClick: false
               }, function () {
-                window.location.href = '/origami/shift/close';
+                window.location.href = '/origami/shift/'+cashier_type+'/close';
               });
               // reqCBBankAlipaySettlement();
             }

From 26765111fa5b29c70fb4f300ca7f6290507145d1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 20 Mar 2018 17:04:52 +0630
Subject: [PATCH 447/651] add edit order item api and second display route

---
 app/controllers/api/orders_controller.rb | 63 ++++++++++++++++++++++--
 config/routes.rb                         | 19 ++-----
 2 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 43e1bd11..ac26e052 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -67,8 +67,8 @@ class Api::OrdersController <  Api::ApiController
          end
        }
       #end extra time
- puts params[:order_items]
-    puts "ITEM aaaaaaaaaaaaaaaaaaa"
+    puts params[:order_items]
+    puts "ORDER ITEMS"
       # begin
       @order = Order.new
       @order.source = params[:order_source]
@@ -172,9 +172,9 @@ class Api::OrdersController <  Api::ApiController
   # Update customer info, Guest Info
   # Input Params
   # order_id , order_items {[item_code, item_instance_code , qty, option, variants]}
-  def update
+  # def update
 
-  end
+  # end
 
   def order_params
     params.permits(:order_source, :booking_id,:order_type,
@@ -199,4 +199,59 @@ class Api::OrdersController <  Api::ApiController
     end
     return status
   end
+
+  def update
+    Rails.logger.debug "Booking ID - " + params[:booking_id].to_s
+    if checkin_checkout_time(params[:booking_id])
+      Rails.logger.debug "Order Item ID - " + params[:order_item_id].to_s
+
+      order_items_id = params[:order_item_id]
+      qty_weight = params[:quantity].to_f
+      remarks = params[:remark]
+
+      order_item = OrderItem.find(order_items_id)
+      before_updated_qty = order_item.qty
+
+      order_item.item_order_by = current_login_employee.name
+      order_item.qty = qty_weight
+      order_item.remark = remarks
+      order_item.save
+
+      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        # print
+        assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
+        # order queue stations
+        oqs = assigned_item.order_queue_station
+
+        order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
+        
+        unique_code="OrderItemPdf"
+        if !order_slim_pdf.empty?
+          order_slim_pdf.each do |order_item_slim|
+            if order_item_slim[0] == 'OrderSlimPdf' 
+              if order_item_slim[1] == '1'
+                unique_code="OrderItemSlimPdf"
+              else
+                unique_code="OrderItemPdf"
+              end
+            elsif order_item_slim[0] == 'OrderSetPdf' 
+              if order_item_slim[1] == '1'
+                unique_code="OrderSetItemPdf"
+              else
+                unique_code="OrderItemPdf"
+              end
+            end
+          end
+        end
+
+        print_settings=PrintSetting.find_by_unique_code(unique_code)
+        order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+        order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
+      end
+
+      return return_json_status_with_code(400, "updated successfully!")
+    else
+      return return_json_status_with_code(406, "Checkout time is over!")
+    end
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index e8c33e34..7234f5a3 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,6 +55,7 @@ scope "(:locale)", locale: /en|mm/ do
       post "bill" => "bill#create"
     end
     get 'view_orders' => "orders#view_orders"
+    post "update_order_item" => "orders#update"
 
     #Current active bookings
     resources :bookings, only: [:index, :show, :create, :update]
@@ -95,9 +96,6 @@ scope "(:locale)", locale: /en|mm/ do
     get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
     post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
     
-    resources :second_display
-
-    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]
@@ -170,14 +168,13 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment' => 'payments#show'
     post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
 
-    post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
+    post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
     post 'payment/master' => "master#create"
     post 'payment/visa' => "visa#create"
     post 'payment/unionpay' => "unionpay#create"
-    post 'payment/junctionpay' => "junction_pay#create"
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
@@ -189,12 +186,11 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
     get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
     get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
-    get 'sale/:sale_id/:type/payment/others_payment/JUNCTIONPAY' => "junction_pay#index"
     get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
-    post 'sale/:sale_id/:type/void' => 'void#overall_void'
+    post 'sale/:sale_id/void' => 'void#overall_void'
 
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
@@ -246,6 +242,7 @@ scope "(:locale)", locale: /en|mm/ do
 
     post '/split_bills/equal_person', to: 'split_bill#update_sale'
 
+    resources :second_display #second display routes
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -291,16 +288,12 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- System Settings ------------#
   namespace :settings do
-    resources :shops do
-      resources :display_images
-    end
-
+    resources :shops
     #employees
     resources :employees
     #menu
     resources :menus do
       #menu_categories
-      collection { post :import }
       resources :menu_categories, only: [:new, :create, :edit, :delete]
     end
 
@@ -437,8 +430,6 @@ scope "(:locale)", locale: /en|mm/ do
 
   #----------- Print Setup --------#
   resources :print_settings
-  get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
-  
   resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end

From fd12af244d0974cde1bcfc173ecd3a5ef091998f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Mar 2018 17:42:19 +0630
Subject: [PATCH 448/651] update menu import and export

---
 README.md                                 |   3 +
 app/models/menu.rb                        | 112 +++++++++++++++++-----
 app/models/menu_category.rb               |   2 +-
 app/views/settings/menus/index.xlsx.axlsx | 105 ++++++++++----------
 lib/tasks/clear_data.rake                 |  22 +++++
 5 files changed, 168 insertions(+), 76 deletions(-)

diff --git a/README.md b/README.md
index 506ab0b6..015eaa5a 100755
--- a/README.md
+++ b/README.md
@@ -103,6 +103,9 @@ For Sidekiq
     1) If you want to use  sidekiq
        => Create New Lookups => lookup_type = sidekiq, Name = sidekiq , Value = 1 or 0
 
+For Clear Menu
+    1) rake clear:menu # menu,menu item,menu category,menu item instance,account,item option,item 		attribute,item set 
+    
 For Check CUp status	
 ###please open 	
 sudo cat /etc/sudoers
diff --git a/app/models/menu.rb b/app/models/menu.rb
index e42ad876..9f4e6b14 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -46,30 +46,98 @@ class Menu < ApplicationRecord
   end
 
   def self.import(file)
-    spreadsheet = Roo::Spreadsheet.open(file.path)
+   
+    spreadsheet = open_spreadsheet(file)
+    sheet_count = spreadsheet.sheets.count-1
+    for i in 0..sheet_count do
+      header      = spreadsheet.sheet(i).row(1)
+      sheet_name = spreadsheet.sheets[i]
 
-    spreadsheet = Roo::Excelx.new(file.path)
-
-    # Use the extension option if the extension is ambiguous.
-    spreadsheet = Roo::Spreadsheet.open(file.path, extension: :xlsx)
-
-    puts spreadsheet.info
-
-    header = spreadsheet.row(1)
-
-    (2..spreadsheet.last_row).each do |i|
-
-      row = Hash[[header,spreadsheet.row(i)].transpose]
-
-      menu = Menu.new
-      menu.name  = row["name"]
-      menu.is_active = row["is_active"]
-      menu.valid_days = row["valid_days"]
-      menu.valid_time_from = row["valid_time_from"]
-      menu.valid_time_to = row["valid_time_to"]
-      menu.created_by = row["created_by"]
-      menu.save
+      (2..spreadsheet.sheet(i).last_row).each do |ii|
+        row = Hash[[header,spreadsheet.sheet(i).row(ii)].transpose]
+        if sheet_name == "Account"
+           # Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+           account = Account.find_by_id(row["id"]) 
+          if account
+            Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+          else
+            Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+          end
+        elsif sheet_name == "Item Set"
+           # ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
+           item_set = ItemSet.find_by_id(row["id"]) 
+          if item_set
+            ItemSet.create( name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
+          else
+            ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
+          end
+        elsif sheet_name == "Menu Item Options"
+           # MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
+           item_options = MenuItemOption.find_by_id(row["id"])
+          if item_options
+            MenuItemOption.create( option_type: row["option_type"],name: row["name"],value: row["value"])
+          else
+            MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
+          end
+        elsif sheet_name == "Menu Item Attributes"
+           # MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+           item_attributes = MenuItemAttribute.find_by_id(row["id"])
+          if item_attributes
+            MenuItemAttribute.create( attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+          else
+            MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+          end
+        elsif sheet_name == "Menu"
+          menu = Menu.find_by_id(row["id"])
+          if menu
+            Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+          else
+            Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+          end
+        elsif sheet_name == "Menu Category"
+           # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+           menu_category = MenuCategory.find_by_id(row["id"])
+          if menu_category
+            MenuCategory.create(menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+          else
+            MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+          end
+        elsif sheet_name == "Menu Item"
+           # MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: row["item_attributes"], item_options: row["item_options"], account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+           menu_item = MenuItem.find_by_id(row["id"])
+          if menu_item
+            MenuItem.create(item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+          else
+            MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+          end
+        elsif sheet_name == "Menu Item Instance"
+           # MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: row["item_attributes"], price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+           item_instance = MenuItemInstance.find_by_id(row["id"])
+          if item_instance
+            MenuItemInstance.create(menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+          else
+            MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+          end
+        elsif sheet_name == "Menu Instance Item Set"
+           # MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+           menu_instance_set = MenuInstanceItemSet.find_by_id(row["id"])
+          if menu_instance_set
+            MenuInstanceItemSet.create(item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+          else
+            MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+          end
+        elsif sheet_name == "Menu Item Set" 
+           # MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+           menu_item_set = MenuItemSet.find_by_id(row["id"])
+          if menu_item_set
+            MenuItemSet.create(item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+          else
+            MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+          end
+        end
+      end
     end
+ 
   end
 
   def self.open_spreadsheet(file)
diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 65477a37..666f251a 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -1,7 +1,7 @@
 class MenuCategory < ApplicationRecord  
   # before_create :generate_menu_category_code
 
-  belongs_to :menu , counter_cache: true
+  belongs_to :menu 
   has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id"
   belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true
   has_many :menu_items
diff --git a/app/views/settings/menus/index.xlsx.axlsx b/app/views/settings/menus/index.xlsx.axlsx
index 977e9782..eccd6d7e 100644
--- a/app/views/settings/menus/index.xlsx.axlsx
+++ b/app/views/settings/menus/index.xlsx.axlsx
@@ -12,75 +12,74 @@ wb.styles do |s|
                             :alignment => { :horizontal => :left,
                                             :vertical => :center ,
                                             :header_text => true}
-
-	wb.add_worksheet(name: "Menu") do |sheet|
-	  sheet.add_row %w( name is_active valid_days valid_time_from valid_time_to created_by ), :style=>header_text
-	  @settings_menus.each do |menu|
-	    sheet.add_row [ menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[date,wrap_text]
-	  end
-	end
-
-	wb.add_worksheet(name: "Menu Category") do |sheet|
-	  sheet.add_row %w(menu_id code name alt_name order_by created_by menu_category_id is_available created_at updated_at), :style=>header_text
-	  MenuCategory.all.each do |mc|
-	    sheet.add_row [mc.menu_id, mc.code, mc.name, mc.alt_name, mc.order_by, mc.created_by, mc.menu_category_id, mc.is_available, mc.created_at, mc.updated_at], :style=>wrap_text
-	  end
-	end
-
-	wb.add_worksheet(name: "Menu Item") do |sheet|
-	  sheet.add_row %w(item_code name alt_name image_path description information unit type menu_category_id item_attributes item_options account_id _qty taxable is_sub_item is_available created_by created_at updated_at), :style=>header_text
-	  MenuItem.all.each do |mi|
-	    sheet.add_row [mi.item_code, mi.name, mi.alt_name, mi.image_path, mi.description, mi.information, mi.unit, mi.type, mi.menu_category_id, mi.item_attributes, mi.item_options, mi.account_id, mi.min_qty, mi.taxable, mi.is_sub_item, mi.is_available, mi.created_by, mi.created_at, mi.updated_at], :style=>wrap_text
-	  end
-	end
-
-	wb.add_worksheet(name: "Menu Item Instance") do |sheet|
-	  sheet.add_row %w(menu_item_id item_instance_code item_instance_name item_attributes price is_on_promotion promotion_price is_available is_default created_at updated_at), :style=>header_text
-	  MenuItemInstance.all.each do |mii|
-	    sheet.add_row [mii.menu_item_id, mii.item_instance_code, mii.item_instance_name, mii.item_attributes, mii.price, mii.is_on_promotion, mii.promotion_price, mii.is_available, mii.is_default, mii.created_at, mii.updated_at], :style=>wrap_text
-	  end
-	end
-
-	wb.add_worksheet(name: "Menu Options") do |sheet|
-	  sheet.add_row %w(option_type name value created_at updated_at), :style=>header_text
-	  MenuItemOption.all.each do |option|
-	    sheet.add_row [option.option_type, option.name, option.value, option.created_at, option.updated_at], :style=>wrap_text
-	  end
-	end
-
-	wb.add_worksheet(name: "Item Attributes") do |sheet|
-	  sheet.add_row %w(attribute_type name value created_at updated_at), :style=>header_text
-	  MenuItemAttribute.all.each do |attr|
-	    sheet.add_row [ attr.attribute_type,attr.name,attr.value,attr.created_at,attr.updated_at], :style=>wrap_text
-	  end
-	end
-
-	wb.add_worksheet(name: "Account") do |sheet|
-	  sheet.add_row %w(title account_type discount point bonus rebate created_at updated_at), :style=>header_text
+    wb.add_worksheet(name: "Account") do |sheet|
+	  sheet.add_row %w(id title account_type discount point bonus rebate), :style=>header_text
 	  Account.all.each do |acc|
-	    sheet.add_row [acc.title,acc.account_type,acc.discount,acc.point,acc.bonus,acc.rebate,acc.created_at,acc.updated_at], :style=>wrap_text
+	    sheet.add_row [acc.id, acc.title,acc.account_type,acc.discount,acc.point,acc.bonus,acc.rebate], :style=>wrap_text
 	  end
 	end
 
 	wb.add_worksheet(name: "Item Set") do |sheet|
-	  sheet.add_row %w(name alt_name min_selectable_qty max_selectable_qty created_at updated_at), :style=>header_text
+	  sheet.add_row %w(id name alt_name min_selectable_qty max_selectable_qty), :style=>header_text
 	  ItemSet.all.each do |set|
-	    sheet.add_row [set.name, set.alt_name, set.min_selectable_qty, set.max_selectable_qty, set.created_at, set.updated_at], :style=>wrap_text
+	    sheet.add_row [set.id,set.name, set.alt_name, set.min_selectable_qty, set.max_selectable_qty], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Item Options") do |sheet|
+	  sheet.add_row %w(id option_type name value), :style=>header_text
+	  MenuItemOption.all.each do |option|
+	    sheet.add_row [option.id, option.option_type, option.name, option.value], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Item Attributes") do |sheet|
+	  sheet.add_row %w(id attribute_type name value), :style=>header_text
+	  MenuItemAttribute.all.each do |attr|
+	    sheet.add_row [attr.id, attr.attribute_type,attr.name,attr.value], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu") do |sheet|
+	  sheet.add_row %w( id name is_active valid_days valid_time_from valid_time_to created_by ), :style=>header_text
+	  @settings_menus.each do |menu|
+	    sheet.add_row [ menu.id, menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[wrap_text]
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Category") do |sheet|
+	  sheet.add_row %w(id menu_id code name alt_name order_by created_by menu_category_id is_available), :style=>header_text
+	  MenuCategory.all.each do |mc|
+	    sheet.add_row [mc.id, mc.menu_id, mc.code, mc.name, mc.alt_name, mc.order_by, mc.created_by, mc.menu_category_id, mc.is_available], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Item") do |sheet|
+	  sheet.add_row %w(id item_code name alt_name image_path description information unit type menu_category_id item_attributes item_options account_id min_qty taxable is_sub_item is_available created_by), :style=>header_text
+	  MenuItem.all.each do |mi|
+	    sheet.add_row [mi.id,mi.item_code, mi.name, mi.alt_name, mi.image_path, mi.description, mi.information, mi.unit, mi.type, mi.menu_category_id, mi.item_attributes, mi.item_options, mi.account_id, mi.min_qty, mi.taxable, mi.is_sub_item, mi.is_available, mi.created_by], :style=>wrap_text
+	  end
+	end
+
+	wb.add_worksheet(name: "Menu Item Instance") do |sheet|
+	  sheet.add_row %w(id menu_item_id item_instance_code item_instance_name item_attributes price is_on_promotion promotion_price is_available is_default), :style=>header_text
+	  MenuItemInstance.all.each do |mii|
+	    sheet.add_row [mii.id, mii.menu_item_id, mii.item_instance_code, mii.item_instance_name, mii.item_attributes, mii.price, mii.is_on_promotion, mii.promotion_price, mii.is_available, mii.is_default], :style=>wrap_text
 	  end
 	end
 
 	wb.add_worksheet(name: "Menu Instance Item Set") do |sheet|
-	  sheet.add_row %w(item_set_id menu_item_instance_id created_at updated_at), :style=>header_text
+	  sheet.add_row %w(id item_set_id menu_item_instance_id), :style=>header_text
 	  MenuInstanceItemSet.all.each do |miis|
-	    sheet.add_row [miis.item_set_id, miis.menu_item_instance_id, miis.created_at, miis.updated_at], :style=>wrap_text
+	    sheet.add_row [miis.id ,miis.item_set_id, miis.menu_item_instance_id], :style=>wrap_text
 	  end
 	end
 
 	wb.add_worksheet(name: "Menu Item Set") do |sheet|
-	  sheet.add_row %w(item_set_id menu_item_id created_at updated_at), :style=>header_text
+	  sheet.add_row %w(id item_set_id menu_item_id), :style=>header_text
 	  MenuItemSet.all.each do |mis|
-	    sheet.add_row [mis.item_set_id, mis.menu_item_id, mis.created_at, mis.updated_at], :style=>wrap_text
+	    sheet.add_row [mis.id,mis.item_set_id, mis.menu_item_id], :style=>wrap_text
 	  end
-	end   
+	end 
 
 end
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 43ba291e..9d476d67 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -20,4 +20,26 @@ namespace :clear do
     SeedGenerator.where("id > 1").update(:current => 0, :next => 1)
     puts "Clear Data Done."
   end
+
+  desc "Clear Menu"
+  task :menu => :environment do
+   
+    
+    MenuItemOption.destroy_all
+    MenuItemAttribute.destroy_all
+   
+    MenuItemSet.destroy_all
+    
+    MenuInstanceItemSet.destroy_all
+    ItemSet.destroy_all
+    
+    MenuItemInstance.destroy_all
+    MenuItem.destroy_all
+   
+    MenuCategory.destroy_all
+    Menu.destroy_all
+
+    Account.destroy_all
+    puts "Clear all Menu Done."
+  end
 end

From c43cacc85b5adac486b5aef9e82c502196bffd5f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Mar 2018 17:52:45 +0630
Subject: [PATCH 449/651] update second display for option

---
 app/assets/javascripts/addorder.js            | 10 +++++-----
 .../channels/second_display_view.js           | 20 ++++++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index d3723026..50b1a150 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -700,7 +700,7 @@ $(function() {
     $('.add_to_order').attr('data-attributes',JSON.stringify(attribute_arr));
     $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
     var item_data = $(this);
-    item = get_item(item_data);
+    item = get_item(item_data,"add_to_order");
     customer_display_view(item,"add");
     show_item_detail(item_data,"add_to_order");
     calculate_sub_total();
@@ -710,7 +710,7 @@ $(function() {
   // click plus icon for add 
   $(document).on('click', '.add_icon', function(event){ 
     var item_data = $(this);
-    item = get_item(item_data);
+    item = get_item(item_data,"add_icon");
     customer_display_view(item,"add");
     show_item_detail(item_data,"add_icon");
     calculate_sub_total(); 
@@ -745,8 +745,6 @@ $(function() {
       item_code = $(item_row[i]).attr('data-code');
       instance_code = $(item_row[i]).attr('data-instance-code');
       r_option = $(item_row[i]).attr('data-opt');
-console.log(r_option)
-console.log(d_option)
       if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) {
         if (qty > 1) {            
           qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty;
@@ -1195,7 +1193,7 @@ console.log(d_option)
   }
 
   /* Get  Item rows */
- function get_item(data){
+ function get_item(data,click_type){
   var sale_items = [];  
   
     var sale_item = {};
@@ -1206,6 +1204,8 @@ console.log(d_option)
     sale_item.instance_code  = data.attr('data-instance-code')
     sale_item.attributes  = data.attr('data-attributes')
     sale_item.options  = data.attr('data-options')
+    sale_item.opt  = data.attr('data-opt')
+    sale_item.click_type  = click_type
     sale_item.instance  = data.attr('data-instance')
     sale_items.push(sale_item);
   
diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js
index c6ac124c..1a1cba86 100644
--- a/app/assets/javascripts/channels/second_display_view.js
+++ b/app/assets/javascripts/channels/second_display_view.js
@@ -30,11 +30,20 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
           instance = "("+items[i].instance+")";
         }
 
-        d_option = items[i].options;
-        if (d_option){
-          option_name = "-"+items[i].options;      
+        // d_option = items[i].options;
+        // if (d_option){
+        //   option_name = "-"+items[i].options;      
+        // }else{
+        //   option_name = '';
+        // }
+
+        d_option = items[i].opt;
+        if (items[i].click_type != "add_icon"){
+          option_name = "-"+items[i].options; 
+          data_option =  items[i].options  ;  
         }else{
-          option_name = '';
+          option_name = ' ';
+          data_option = '[]';
         }
 
         var rowCount = $('.second_display_items tbody tr').length+1;
@@ -68,7 +77,8 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
               +instance+ "' data-code='"+items[i].item_code+"' data-instance-code='"
               +items[i].instance_code+"' data-attributes='"
               +items[i].attributes+"' data-options ='"
-              +items[i].options+"' data-row ='"+rowCount+ "'>"
+          +data_option+"' data-opt ='"
+          +items[i].options+"' data-row ='"+rowCount+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
           +'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance + ' ' + option_name +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'

From d2da43de75801b9b40cc58b3f7007b7a9451790b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 20 Mar 2018 18:08:27 +0630
Subject: [PATCH 450/651] check print error in payment

---
 app/controllers/api/orders_controller.rb | 2 +-
 app/models/printer/receipt_printer.rb    | 4 ++--
 app/views/origami/payments/show.html.erb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index ac26e052..dd648bb4 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -249,7 +249,7 @@ class Api::OrdersController <  Api::ApiController
         order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
       end
 
-      return return_json_status_with_code(400, "updated successfully!")
+      return return_json_status_with_code(200, "updated successfully!")
     else
       return return_json_status_with_code(406, "Checkout time is over!")
     end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 597f264a..a5482b31 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -262,11 +262,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   def print_receipt_pdf(filename,receipt_no,print_copies,printer_name)
     count = print_copies.to_i
     # if count == 0
-    #   self.print("public"+filename, printer_name)
+    #   self.print(filename, printer_name)
     # else
       begin
         if count == 1
-          self.print("public"+filename, printer_name)
+          self.print(filename, printer_name)
         else
           filename = "public/receipts/receipt_bill_#{receipt_no}_#{count}.pdf"
           self.print(filename, printer_name)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1d25c5c4..457bd6ab 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -623,7 +623,7 @@ var customer_name = "<%= @customer.name %>";
                 $("#sale_receipt_no").val(result.receipt_no);
                 $("#filename").val(result.filename);
                 $("#printer_name").val(result.printer_name);
-                $("#receipt_pdf").attr("src", result.filename);
+                $("#receipt_pdf").attr("src", result.filename.substring(6));
                 $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
                 $("#pdfModalLabel").text("Sale Completed");
                 $("#changed_amount").text("");

From 9db3ec07cc59bd909b411081043ea9c55f792a64 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Mar 2018 10:30:28 +0630
Subject: [PATCH 451/651] update menu import/export ui

---
 app/controllers/settings/menus_controller.rb |  7 +++++--
 app/views/settings/menus/index.html.erb      | 15 +++++++++------
 app/views/settings/menus/index.xlsx.axlsx    |  5 +++--
 config/routes.rb                             |  4 +++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 8fed1e97..b7e02fb5 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -72,8 +72,11 @@ class Settings::MenusController < ApplicationController
   end
 
   def import
-    Menu.import(params[:file])
-    redirect_to settings_menus_path, notice: "imported"
+    if params[:file]
+      Menu.import(params[:file])
+      redirect_to settings_menus_path, notice: "Menu was successfully Imported"
+    end
+    
   end
 
   private
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 11ae575f..5fafa5db 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -7,12 +7,6 @@
     </span>
   </ol>
 </div>
-<h4>Import</h4>
-<%= form_tag import_settings_menus_path, multipart:true do%>
-  <%=file_field_tag :file%>
-  <%=submit_tag "Import CSV"%>
-<%end%> 
-<%= link_to "Export users as spreadsheet", settings_menus_path(format: "xlsx") %>
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <br><br>
@@ -30,7 +24,16 @@
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
   <div class="m-b-10 clearfix">
+    <div class="float-left">
+      <%= form_tag import_settings_menus_path,class:"col-md-", multipart:true  do%>
+      <%=file_field_tag :file, :class => "img-thumbnail col-md-7" %>
+      <%=submit_tag "Import",:class => 'btn btn-primary btn-lg waves-effect' %>
+    <%end%> 
+    </div>
     <%= link_to t("views.btn.new"),new_settings_menu_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+
+    <%= link_to "Export", settings_menus_path(format: "xlsx"),:class => 'btn btn-info btn-lg waves-effect float-right m-r-10' %>
+
   </div>
   <div class="card">
     <table class="table table-striped">
diff --git a/app/views/settings/menus/index.xlsx.axlsx b/app/views/settings/menus/index.xlsx.axlsx
index eccd6d7e..b148931a 100644
--- a/app/views/settings/menus/index.xlsx.axlsx
+++ b/app/views/settings/menus/index.xlsx.axlsx
@@ -1,6 +1,7 @@
 wb = xlsx_package.workbook
 wb.styles do |s|
-    date = s.add_style(:format_code => "yyyy-mm-dd", :border => Axlsx::STYLE_THIN_BORDER)
+    time_format = wb.styles.add_style :format_code => 'hh:mm:ss'
+
     wrap_text = s.add_style :sz => 11,
                             :alignment =>  { :horizontal => :left,:vertical => :center ,
                             :wrap_text => true}
@@ -43,7 +44,7 @@ wb.styles do |s|
 	wb.add_worksheet(name: "Menu") do |sheet|
 	  sheet.add_row %w( id name is_active valid_days valid_time_from valid_time_to created_by ), :style=>header_text
 	  @settings_menus.each do |menu|
-	    sheet.add_row [ menu.id, menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[wrap_text]
+	    sheet.add_row [ menu.id, menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[wrap_text,time_format]
 	  end
 	end
 
diff --git a/config/routes.rb b/config/routes.rb
index 7234f5a3..c7eff8a7 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -293,7 +293,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :employees
     #menu
     resources :menus do
-      #menu_categories
+      collection do
+        post :import
+      end
       resources :menu_categories, only: [:new, :create, :edit, :delete]
     end
 

From a0d27bd1d1a9a5619692c590991cd6efd96bcbfd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Mar 2018 11:18:49 +0630
Subject: [PATCH 452/651] update route for print setting and addorder

---
 README.md                                   | 1 +
 app/views/origami/addorders/detail.html.erb | 2 +-
 config/routes.rb                            | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 015eaa5a..ef595739 100755
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ BITP
     Campaign Id      => {"campaign_type_id": 1}
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
+java -jar ~/Documents/c2l_jade.jar http://192.168.1.88:3002
 
 Person and Extra Time
   category_code = SPL... //for menu categories special
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 4e93e5a7..183a819f 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -87,7 +87,7 @@
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
       <div class="card">
         <div class="card-block">
-          <div id="custom-slimscroll">
+          <div id="custom-">
              <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
                <!-- append data -->
                <% @menu.each do |menu| %>
diff --git a/config/routes.rb b/config/routes.rb
index c7eff8a7..cc24bbbd 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -432,6 +432,8 @@ scope "(:locale)", locale: /en|mm/ do
 
   #----------- Print Setup --------#
   resources :print_settings
+  
+get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
   resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end

From 09773635188fa8639ccd52fc1aaa29f81100b57d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Mar 2018 11:53:27 +0630
Subject: [PATCH 453/651] check tax profile process

---
 app/controllers/origami/customers_controller.rb  | 10 +++++-----
 app/controllers/origami/discounts_controller.rb  | 14 +++++++++-----
 app/controllers/origami/payments_controller.rb   |  1 -
 app/controllers/origami/split_bill_controller.rb |  6 ++++--
 app/models/sale.rb                               |  1 -
 app/models/sale_payment.rb                       | 13 ++++++-------
 app/views/origami/discounts/index.html.erb       |  8 ++++----
 app/views/origami/home/show.html.erb             |  2 +-
 app/views/origami/rooms/show.html.erb            |  2 +-
 app/views/origami/split_bill/index.html.erb      |  5 +++--
 config/routes.rb                                 |  8 ++++----
 11 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 234a1dc5..c3a3d3b9 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -98,10 +98,10 @@ class Origami::CustomersController < BaseOrigamiController
 
   def update_sale_by_customer
 
-    id = params[:sale_id][0,3]
-    customer_id = params[:customer_id]
-    customer    = Customer.find(customer_id)
-
+    id           = params[:sale_id][0,3]
+    customer_id  = params[:customer_id]
+    customer     = Customer.find(customer_id)
+    order_source = params[:type]
     # Check and find with card no
     # if(!customer_id.include? "CUS")
     #   customer = Customer.find_by_paypar_account_no(customer_id)
@@ -135,7 +135,7 @@ class Origami::CustomersController < BaseOrigamiController
     if status == true
         render json: JSON.generate({:status => true})
         if(id == "SAL")
-        sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount)
+          sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount, nil, order_source)
         end 
     else
         render json: JSON.generate({:status => false, :error_message => "Record not found"})
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 8e390015..6add4a12 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -20,10 +20,12 @@ class Origami::DiscountsController < BaseOrigamiController
 
   #discount page show from origami index with selected order
   def create
+    order_source = params[:cashier_type]
     sale_id = params[:sale_id]
     discount_items = JSON.parse(params[:discount_items])
     overall_discount = params[:overall_discount]
     sub_total = params[:sub_total]
+    
 
     if Sale.exists?(sale_id)
       sale = Sale.find(sale_id)
@@ -82,7 +84,7 @@ class Origami::DiscountsController < BaseOrigamiController
         
         sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"OVERALLDISCOUNT" )
       end 
-      sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f)   
+      sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f, nil,order_source)   
       if !table.nil?
         result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
       else
@@ -102,6 +104,7 @@ class Origami::DiscountsController < BaseOrigamiController
 
   # Remove selected discount Items
   def remove_discount_items
+    order_source = params[:cashier_type]
     sale_id = params[:sale_id]
     discount_items = JSON.parse(params[:discount_items])
     if Sale.exists?(sale_id)
@@ -136,7 +139,7 @@ class Origami::DiscountsController < BaseOrigamiController
       # sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;   
       # sale.save
       # Re-calc All Amount in Sale
-      sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount)  
+      sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount, nil, order_source)  
       if table.nil?
         result = {:status=> "Success"}
       else
@@ -158,6 +161,7 @@ class Origami::DiscountsController < BaseOrigamiController
   # Remove all discount Items
   def remove_all_discount
     sale_id = params[:id]
+    order_source = params[:type]
 
     if Sale.exists?(sale_id)
       sale = Sale.find(sale_id)    
@@ -197,7 +201,7 @@ class Origami::DiscountsController < BaseOrigamiController
       sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEALLDISCOUNT" )
       
       # Re-calc All Amount in Sale
-      sale.compute_by_sale_items(sale_id, sale.sale_items, 0)
+      sale.compute_by_sale_items(sale_id, sale.sale_items, 0, nil, order_source)
       if table.nil?
         result = {:status=> "Success"}
       else
@@ -218,7 +222,7 @@ class Origami::DiscountsController < BaseOrigamiController
 
   # Member Discount
   def member_discount
-    
+    order_source    = params[:cashier_type]
     sale_id         = params[:sale_id]
     is_card         = params[:is_card]
     sub_total       = params[:sub_total]
@@ -297,7 +301,7 @@ class Origami::DiscountsController < BaseOrigamiController
           if response["discount_bonus_earned"]
             discount_amount = discount_amount + response["discount_bonus_earned"]
           end
-          sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount')
+          sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount', order_source)
           result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type }
       elsif response["status"] == "500"
           result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index edee8a03..e5c0e741 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -443,7 +443,6 @@ class Origami::PaymentsController < BaseOrigamiController
       
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
-
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")
       # if bookings.count > 1 
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 16239750..ef38d04f 100755
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -3,6 +3,7 @@ class Origami::SplitBillController < BaseOrigamiController
 
 	def index
 		dining_id = params[:dining_id]
+		@cashier_type = params[:type]
 		@table = DiningFacility.find(dining_id) 
 		@booking = @table.get_booking
 		@orders = Array.new
@@ -76,6 +77,7 @@ class Origami::SplitBillController < BaseOrigamiController
 	end
 
 	def create
+		cashier_type = params[:cashier_type]
 		order_ids = params[:order_ids]
 		arr_order_ids = nil
 		if !params[:arr_order_ids].nil?
@@ -111,7 +113,7 @@ class Origami::SplitBillController < BaseOrigamiController
 				if booking
 					if booking.sale_id.nil?
 					  sale = Sale.new
-					  status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, current_user)
+					  status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, current_user, cashier_type)
 					  sale_data = Sale.find_by_sale_id(sale_id)
 					else
 					  status = true
@@ -324,7 +326,7 @@ class Origami::SplitBillController < BaseOrigamiController
 				end
 
 				sale = Sale.new
-				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, current_user)
+				status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, current_user, cashier_type)
 	    	end
 
 			Promotion.promo_activate(sale)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 5e7042e5..c95617b2 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -343,7 +343,6 @@ class Sale < ApplicationRecord
 
   #compute - invoice total
   def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil)
-
     sale = Sale.find(sale_id)
     sales_items = sale_itemss
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 91a4db1e..3ff4697e 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -208,8 +208,7 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)    
-
+    sale_update_payment_status(self.received_amount)  
     return payment_status
   end
   
@@ -325,7 +324,7 @@ class SalePayment < ApplicationRecord
     sObj = Sale.find(self.sale_id)
     is_credit = 0
     is_foc    = 0
-    is_cash   = false
+    method_status   = false
     sObj.sale_payments.each do |spay|
         all_received_amount += spay.payment_amount.to_f
         if spay.payment_method == "creditnote"
@@ -334,12 +333,12 @@ class SalePayment < ApplicationRecord
         if spay.payment_method == "foc"
           is_foc = 1
         end
-        if spay.payment_method.to_s == "cash"
-          is_cash = true
+        if spay.payment_method == "cash" || spay.payment_method == "foc" || spay.payment_method == "creditnote"
+          method_status = true
         end
     end
 
-    if (self.sale.grand_total <= all_received_amount) && is_cash
+    if (self.sale.grand_total <= all_received_amount) && method_status
       if is_credit == 0
         self.sale.payment_status = "paid"
       else
@@ -386,7 +385,7 @@ class SalePayment < ApplicationRecord
       elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
         table_update_status(sObj)
         update_shift
-      elsif is_cash && paid_amount.to_f == 0
+      elsif method_status && paid_amount.to_f == 0
         table_update_status(sObj)
         update_shift
       end
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index ccb2c0e8..744ef62e 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -414,7 +414,7 @@ var cashier_type = "<%= @cashier_type %>";
 		var sub_total = $('#order-sub-total').text();		
 		var ajax_url = "/origami/" + sale_id + "/discount";	
 
-		var params = { 'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount };
+		var params = { 'cashier_type' : cashier_type,'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount };
 
 		$.ajax({
 			type: "POST",
@@ -465,7 +465,7 @@ var cashier_type = "<%= @cashier_type %>";
 			}
 		}
 
-		var params = { 'sale_id': sale_id, 'discount_items': JSON.stringify(discount_items) };
+		var params = { 'cashier_type': cashier_type,'sale_id': sale_id, 'discount_items': JSON.stringify(discount_items) };
 		$.ajax({
 			type: "POST",
 			url: "/origami/" + sale_id + "/remove_discount_items",
@@ -496,7 +496,7 @@ var cashier_type = "<%= @cashier_type %>";
 		var sale_id = $('#sale-id').text();
 		$.ajax({
 			type: "GET",
-			url: "/origami/" + sale_id + "/remove_all_discount",
+			url: "/origami/" + sale_id + "/" + cashier_type + "/remove_all_discount",
 			success: function(result){
 				swal({
 			        title: "Information!",
@@ -532,7 +532,7 @@ var cashier_type = "<%= @cashier_type %>";
 
 		// var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
 
-		var params = {'sale_id':sale_id, 'sub_total':sub_total };
+		var params = {'cashier_type': cashier_type,'sale_id':sale_id, 'sub_total':sub_total };
 
 		$.ajax({
 			type: "POST",
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index eda3524a..47d5650f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -809,7 +809,7 @@
     //split bill process
     $('#split_bills').click(function(){
       var dining_id = "<%= @dining.id %>";
-      window.location.href = '/origami/table/' + dining_id + "/split_bills";
+      window.location.href = '/origami/table/' + dining_id + "/" + cashier_type +"/split_bills";
     });    
 
     $('#move').on('click', function () {
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 758a5273..867f6034 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -776,7 +776,7 @@ $('#request_bills').click(function() {
 //split bill process
 $('#split_bills').click(function(){
   var dining_id = "<%= @room.id %>";
-  window.location.href = '/origami/room/' + dining_id + "/split_bills";
+  window.location.href = '/origami/room/' + dining_id + "/" + cashier_type + "/split_bills";
 });
 
 $('#move').on('click',function(){
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index a62fb66e..95061960 100644
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -333,6 +333,7 @@
  <script type="text/javascript">
  	var split_sale_id = "";
  	var split_receipt_no = "";
+ 	var cashier_type = '<%= @cashier_type %>';
  	$(document).ready(function(){
  		$('#back').on('click',function(){
  			backToOrigami();
@@ -658,7 +659,7 @@ function orderItemSplitBillProcess(cnt_items){
 		type: "POST",
 		url: ajax_url,
 		dataType: 'JSON',
-		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'arr_order_ids': JSON.stringify(arr_order_ids), 'order_items' : JSON.stringify(order_items), 'orders' : ''},
+		data: {'cashier_type':cashier_type,'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'arr_order_ids': JSON.stringify(arr_order_ids), 'order_items' : JSON.stringify(order_items), 'orders' : ''},
 		success: function (result) {
 			if (!result.status) {
 				swal("Information!", result.error_message);
@@ -691,7 +692,7 @@ function orderSplitBillProcess(cnt_orders){
 		type: "POST",
 		url: ajax_url,
 		dataType: 'JSON',
-		data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders), 'arr_order_ids': []},
+		data: {'cashier_type':cashier_type,'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders), 'arr_order_ids': []},
 		success: function (result) {
 			if (!result.status) {
 				swal("Information!", result.error_message);
diff --git a/config/routes.rb b/config/routes.rb
index 7234f5a3..23bc3a27 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -138,7 +138,7 @@ scope "(:locale)", locale: /en|mm/ do
     # Discount
     get "/:id/:type/discount" => "discounts#index"
     post "/:id/discount" => "discounts#create"
-    get "/:id/remove_all_discount" => "discounts#remove_all_discount"
+    get "/:id/:type/remove_all_discount" => "discounts#remove_all_discount"
     post "/:id/remove_discount_items" => "discounts#remove_discount_items"
 
     # Discount for Member
@@ -168,7 +168,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment' => 'payments#show'
     post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
 
-    post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
+    post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
@@ -236,8 +236,8 @@ scope "(:locale)", locale: /en|mm/ do
     post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
 
     #split bill
-    get '/table/:dining_id/split_bills' => 'split_bill#index'
-    get '/room/:dining_id/split_bills' => 'split_bill#index'
+    get '/table/:dining_id/:type/split_bills' => 'split_bill#index'
+    get '/room/:dining_id/:type/split_bills' => 'split_bill#index'
     post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
 
     post '/split_bills/equal_person', to: 'split_bill#update_sale'

From e6719462d176b5fccb549953855b486f274f4aa5 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Mar 2018 13:10:12 +0630
Subject: [PATCH 454/651] update route

---
 README.md                            |  2 +-
 app/views/origami/home/show.html.erb |  4 ++--
 config/routes.rb                     | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ef595739..a14a0926 100755
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ BITP
     Campaign Id      => {"campaign_type_id": 1}
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
-java -jar ~/Documents/c2l_jade.jar http://192.168.1.88:3002
+java -jar ~/Documents/c2l_jade.jar http://192.168.1.151:3002
 
 Person and Extra Time
   category_code = SPL... //for menu categories special
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index eda3524a..caa651c4 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -726,9 +726,9 @@
                 createReceiptNoInFirstBillData(receipt_no,"");
 
                 // For Server Print - from jade
-                if ($("#server_mode").val() == "cloud") {
+                // if ($("#server_mode").val() == "cloud") {
                   code2lab.printFile(result.filepath, result.printer_url);
-                }
+                // }
                             
               // console.log(result);
               // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
diff --git a/config/routes.rb b/config/routes.rb
index cc24bbbd..058c7891 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -168,7 +168,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment' => 'payments#show'
     post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
 
-    post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
+    post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
@@ -190,7 +190,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
-    post 'sale/:sale_id/void' => 'void#overall_void'
+    post 'sale/:sale_id/:type/void' => 'void#overall_void'
 
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
@@ -243,6 +243,8 @@ scope "(:locale)", locale: /en|mm/ do
     post '/split_bills/equal_person', to: 'split_bill#update_sale'
 
     resources :second_display #second display routes
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -432,8 +434,9 @@ scope "(:locale)", locale: /en|mm/ do
 
   #----------- Print Setup --------#
   resources :print_settings
-  
-get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
+
+  get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
+
   resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end

From 0a84e0d29ed7f657db47907941f456b375bba689 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 21 Mar 2018 13:46:33 +0630
Subject: [PATCH 455/651] add yan home path for jade printer

---
 app/views/origami/home/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index eda3524a..da3c6e55 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -727,7 +727,7 @@
 
                 // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath, result.printer_url);
+                  code2lab.printFile("/home/yan/workspace/sxrestaurant/" + result.filepath, result.printer_url);
                 }
                             
               // console.log(result);

From 16d60add2206c9769d8d7f2e0eb7d756ae0ea8ae Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Mar 2018 15:07:57 +0630
Subject: [PATCH 456/651] add FOC,VOID remark in Transaction/Sale and new
 Transaction/Survey

---
 .../transactions/sales_controller.rb          |  2 +-
 .../transactions/surveys_controller.rb        |  5 ++
 app/views/layouts/_left_sidebar.html.erb      |  9 +++-
 app/views/transactions/sales/show.html.erb    | 24 ++++-----
 app/views/transactions/surveys/index.html.erb | 53 +++++++++++++++++++
 config/locales/en.yml                         |  5 +-
 config/locales/mm.yml                         | 11 ++--
 config/routes.rb                              |  1 +
 8 files changed, 88 insertions(+), 22 deletions(-)
 create mode 100644 app/controllers/transactions/surveys_controller.rb
 mode change 100755 => 100644 app/views/layouts/_left_sidebar.html.erb
 create mode 100644 app/views/transactions/surveys/index.html.erb
 mode change 100755 => 100644 config/locales/en.yml
 mode change 100755 => 100644 config/locales/mm.yml

diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index fafc89f3..321fa44a 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -11,7 +11,7 @@ class Transactions::SalesController < ApplicationController
     to         = params[:to]
 
     if receipt_no.nil? && from.nil? && to.nil?
-        @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc") 
+        @sales = Sale.order("sale_id desc") 
         @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
     else
         sale = Sale.search(receipt_no,from,to)
diff --git a/app/controllers/transactions/surveys_controller.rb b/app/controllers/transactions/surveys_controller.rb
new file mode 100644
index 00000000..8d11fa41
--- /dev/null
+++ b/app/controllers/transactions/surveys_controller.rb
@@ -0,0 +1,5 @@
+class Transactions::SurveysController < ApplicationController
+  def index
+  	@surveys = Survey.all
+  end
+end
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
old mode 100755
new mode 100644
index e3d08824..f06b52ab
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -69,14 +69,14 @@
 					<% end %>	
 				</ul>
 			</li>
-			<% if can? :menage, Inventory %>
+			<!-- <% if can? :menage, Inventory %>
 			<li>
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
 				</a>
 			</li>
-			<%end%>
+			<%end%> -->
 			<li class="header"><%= t :backend %></li>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
@@ -109,6 +109,11 @@
 							<a href="<%= transactions_shift_sales_path %>"><%= (t :shiftsale) %></a>
 						</li>
 					<% end %>
+					<% if can? :menage, Survey %>
+						<li>
+							<a href="<%= transactions_surveys_path %>"><%= t("views.right_panel.detail.survey") %></a>
+						</li>
+					<% end %>
 				</ul>
 			</li>
 			<% if can? :index, :dailysale %> 
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index bd6ce960..9cab82a5 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -52,7 +52,7 @@
                             <td><%= @sale.receipt_no %></td>
                             <td><%= @sale.cashier_name rescue '-' %></td>
                             <td> <%= @sale.sale_status %> </td>
-                            <td> <%= @sale.requested_at.strftime("%m-%d-%Y %H:%M %p") %> </td>
+                            <td colspan="2"> <%= @sale.requested_at.strftime("%m-%d-%Y %H:%M %p") %> </td>
                           </tr> 
                           <tr style="border-top:2px solid #000">
                             <th><%= t :sale %> <%= t("views.right_panel.detail.item_txt") %> <%= t("views.right_panel.detail.name_txt2") %></th>
@@ -60,6 +60,7 @@
                             <th><%= t("views.right_panel.detail.unit_price") %></th>
                             <th><%= t("views.right_panel.detail.total_price") %></th>
                             <th><%= t("views.right_panel.detail.created_at") %></th>
+                            <th><%= t("views.right_panel.detail.remark") %></th>
                           </tr>   
                           <% @sale.sale_items.each do |s| %>
 
@@ -69,42 +70,43 @@
                             <td><%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             <td><%= number_with_precision(s.qty * s.price, :precision => 2, :delimiter => ',') rescue ' '%></td>  
                             <td><%=l s.created_at.utc.getlocal , :format => :short rescue ' ' %></td>
+                            <td><%=s.remark rescue ' '%></td>
                           </tr>
                           <% end %>  
                           <tr style="border-top:2px solid #000">
                               <td colspan=2 style="text-align:center"></td>
                               <td><%= t("views.right_panel.detail.total") %></td>    
-                              <td colspan="2"><%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                              <td colspan="3"><%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                           </tr>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td><%= t("views.right_panel.detail.discount") %></td>
-                            <td colspan="2"><%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                            <td colspan="3"><%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           <% @sale.sale_taxes.each do |r|%>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td><%= r.tax_name %> </td>    
-                            <td colspan="2"><%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                            <td colspan="3"><%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           <% end %> 
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td><%= t("views.right_panel.detail.grand_total") %></td>
-                            <td colspan="2"><%= number_with_precision(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                            <td colspan="3"><%= number_with_precision(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           <tr><td colspan="5">&nbsp;<td></tr>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td><%= t("views.right_panel.detail.total_pay_amount") %></td>
-                            <td colspan="2"><%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                            <td colspan="3"><%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           
                           <% @sale_receivables.each do |r|%>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td> <%= r.payment_method.capitalize rescue ' '%> Payment</td>
-                            <td colspan="2"><%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%>
+                            <td colspan="3"><%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%>
                             </td>
                           </tr> 
 
@@ -114,7 +116,7 @@
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td><%= t("views.right_panel.detail.change") %></td>
-                            <td colspan="2"><%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                            <td colspan="3"><%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%></td>
                           </tr>
 
                       </tbody>
@@ -258,9 +260,3 @@
 
 
 </div>
-
-
-
-
-     
-
diff --git a/app/views/transactions/surveys/index.html.erb b/app/views/transactions/surveys/index.html.erb
new file mode 100644
index 00000000..4e1c02d3
--- /dev/null
+++ b/app/views/transactions/surveys/index.html.erb
@@ -0,0 +1,53 @@
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.survey") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
+</div>
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+      <div class="main-box-body clearfix p-l-15 p-r-15">
+        <div class="card">
+          	<div class="table-responsive">
+	          <table class="table ">
+	            <thead>
+	              	<th><%= t("views.right_panel.detail.dining") %></th>
+	              	<th><%= t("views.right_panel.detail.receipt_no") %></th>
+	              	<th><%= t("views.right_panel.detail.created_by") %></th>
+	              	<th><%= t("views.right_panel.detail.child") %></th>
+	              	<th><%= t("views.right_panel.detail.adult") %></th>
+	              	<th><%= t("views.right_panel.detail.male") %></th>
+	              	<th><%= t("views.right_panel.detail.female") %></th>
+	              	<th><%= t("views.right_panel.detail.foreigner") %></th>
+	            </thead>
+	            <tbody>
+	              <% if !@surveys.nil? %>
+	              	<% @surveys.each do |survey| %>
+	              		<tr>
+	              			<td><%= survey.dining_name rescue ' '%></td>
+	              			<td><%= survey.receipt_no rescue '-'%></td>
+	              			<td><%= survey.created_by rescue ' '%></td>
+	              			<td><%= survey.child rescue ' '%></td>
+	              			<td><%= survey.adult rescue ' '%></td>
+	              			<td><%= survey.male rescue ' '%></td>
+	              			<td><%= survey.female rescue ' '%></td>
+	              			<td>
+	              				<% if !survey.foreigner.nil? %>
+		              				<%= JSON.parse(survey.foreigner) %>
+	              				<% end %>
+	              			</td>
+	              		</tr>
+	              	<% end %>
+	              <% end %>
+	            </tbody>
+	          </table>
+          	<br>
+        	</div>
+        </div>
+      </div>
+
+  </div>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
old mode 100755
new mode 100644
index dda9180c..4852f454
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -450,7 +450,10 @@ en:
         additional_parameter: "Additional parameter"
         lookup: "Lookup"
         product_sale_report: "Product Sale"
-        group_type: "Group Type"
+        dining: "Dining"
+        child: "Child"
+        adult: "Adult"
+        foreigner: "Foreigner"
         
         code_txt: "code "
         charge_txt: "charge"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
old mode 100755
new mode 100644
index af901d6e..b8a567bc
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -65,8 +65,8 @@ mm:
   sale_audits: "အရောင်းပြင်ဆင်�ြင်းများ"
   bottom: "အရောင်းအနဲဆုံး"
   payment: "ငွေပေး�ျေမှု"
-  backend: "Backend"
-  date_time: "DateTime"
+  backend: "နောက်ကွယ်"
+  date_time: "ရက်စွဲအ�ျိန်"
   
   views:
     btn:       
@@ -444,8 +444,11 @@ mm:
         additional_parameter: "ထပ်ဖြည့်အကြောင်းအရာ"
         survey: "�ြုံငုံလေ့လာ�ြင်း"
         lookup: "သ�်မှ�်�ျက်များ"
-        product_sale_report: "Product Sale"
-        group_type: "Group Type"
+        product_sale_report: "ကုန်ပစ္စည်းရောင်းရမှုအစီရင်�ံစာ"
+        dining: "ဆိုင်စား"
+        child: "ကလေး"
+        adult: "လူကြီး"
+        foreigner: "နိုင်ငံ�ြားသား"
         
         code_txt: "ကု�်ဒ် "
         charge_txt: "ကောက်�ံသည်"
diff --git a/config/routes.rb b/config/routes.rb
index 5bb51b19..4293a341 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -383,6 +383,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :credit_notes
     resources :bookings
     resources :shift_sales
+    resources :surveys
 
     get "/sales/:sale_id/manual_complete_sale" => "manual_sales#manual_complete_sale", :as => "manual_complete_sale"
     get "/sales/:sale_id/void" => "manual_sales#void", :as => "void"

From 80853fb66635c88d3f36c399f44bb943ec76566b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Mar 2018 15:37:45 +0630
Subject: [PATCH 457/651] update jade print in pay,void and foc

---
 .../origami/payments_controller.rb            | 27 ++++++++++++++++---
 app/controllers/origami/void_controller.rb    | 18 ++++++++-----
 app/views/origami/home/show.html.erb          | 12 ++++++---
 app/views/origami/payments/show.html.erb      | 18 ++++++++++---
 4 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index e5c0e741..348a518a 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -464,7 +464,7 @@ class Origami::PaymentsController < BaseOrigamiController
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
 
-      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
         unique_code = "ReceiptBillPdf"
         customer= Customer.find(saleObj.customer_id)
         
@@ -478,7 +478,17 @@ class Origami::PaymentsController < BaseOrigamiController
         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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)   
+
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil)
+        result = { 
+              :status => true,
+              :filepath => filename, 
+              :printer_model => print_settings.brand_name, 
+              :printer_url => print_settings.api_settings 
+            }
+
+            # Mobile Print
+        render :json => result.to_json
 
         if params[:type] == "quick_service"
           booking = Booking.find_by_sale_id(sale_id)
@@ -492,7 +502,7 @@ class Origami::PaymentsController < BaseOrigamiController
             Order.pay_process_order_queue(order.order_id,table_id)
           end
         end
-      end
+      # end
     end    
   end
 
@@ -538,6 +548,15 @@ class Origami::PaymentsController < BaseOrigamiController
     printer = Printer::ReceiptPrinter.new(print_settings)
     printer.print_receipt_pdf(filename,receipt_no,print_settings.print_copies,printer_name)
     
-    render :json => {status: true}
+    result = { 
+          :status => true,
+          :filepath => filename, 
+          :printer_model => print_settings.brand_name, 
+          :printer_url => print_settings.api_settings 
+        }
+
+        # Mobile Print
+    render :json => result.to_json
+    # render :json => {status: true}
   end
 end
\ No newline at end of file
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 00f9d76b..74e495ca 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -87,8 +87,6 @@ class Origami::VoidController < BaseOrigamiController
         if bookings[0].dining_facility_id.to_i>0
           table = DiningFacility.find(bookings[0].dining_facility_id)
         end
-        
-
       end
 
       if bookings[0].dining_facility_id.to_i > 0
@@ -100,7 +98,7 @@ class Origami::VoidController < BaseOrigamiController
       end
       
 
-      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
         unique_code = "ReceiptBillPdf"
         customer= Customer.find(sale.customer_id)
         
@@ -120,9 +118,17 @@ class Origami::VoidController < BaseOrigamiController
         item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale.sale_items)
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
-        printer = Printer::ReceiptPrinter.new(print_settings)
-        printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
-      end
+        printer = Printer::ReceiptPrinter.new(print_settings)                                    
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
+        result = { 
+              :filepath => filename, 
+              :printer_model => print_settings.brand_name, 
+              :printer_url => print_settings.api_settings 
+            }
+
+        # Mobile Print
+        render :json => result.to_json
+      # end
       
       #end print
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 85fdf585..1251e529 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -726,9 +726,9 @@
                 createReceiptNoInFirstBillData(receipt_no,"");
 
                 // For Server Print - from jade
-                // if ($("#server_mode").val() == "cloud") {
+                 if ($("#server_mode").val() == "cloud") {
                   code2lab.printFile(result.filepath, result.printer_url);
-                // }
+                 }
                             
               // console.log(result);
               // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
@@ -920,8 +920,12 @@
                 type: 'POST',
                 url: ajax_url,
                 data: "remark="+ remark + "&sale_id=" + sale_id,
-                success: function () {
-                    window.location.href = '/origami/';
+                success: function (result) {
+                   // For Server Print - from jade
+                if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath, result.printer_url);
+                }
+                window.location.href = '/origami/';
                 }
             });
           }
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 457bd6ab..e79ab813 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -420,11 +420,11 @@
       </div>
       <div class="modal-footer ">
         <div class="row m-b-10 m-r-30">
-          <% if ENV["SERVER_MODE"] != 'cloud' %>
+          
           <div class="col-md-5 m-r-20">
             <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
           </div>
-          <% end %>
+          
           <div class="col-md-5">
             <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
           </div>
@@ -710,8 +710,12 @@ var customer_name = "<%= @customer.name %>";
               type: 'POST',
               url: ajax_url,
               data: "remark="+ remark + "&sale_id=" + sale_id,
-              success: function () {
+              success: function (result) {result
                 customer_display_view(null,"reload");
+                // For Server Print - from jade
+                if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath, result.printer_url);
+                }
                if (cashier_type=="cashier") {
                  window.location.href = '/origami';
                }else{
@@ -922,6 +926,10 @@ var customer_name = "<%= @customer.name %>";
                        title: "Information!",
                        text: 'Thank You !',
                        }, function () {
+                        // For Server Print - from jade
+                         if ($("#server_mode").val() == "cloud") {
+                          code2lab.printFile(result.filepath, result.printer_url);
+                         }
                         if (cashier_type=="cashier") {
                            window.location.href = '/origami';
                          }else{
@@ -997,6 +1005,10 @@ var customer_name = "<%= @customer.name %>";
             data: params,
             success:function(result){
               console.log(result);
+              // For Server Print - from jade
+                 if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath, result.printer_url);
+                 }
               if (cashier_type=="cashier") {
                 window.location.href = '/origami';
               }else{

From 28a2ae3852f52ec68ca58f9fe3f7530631a49451 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Mar 2018 17:04:49 +0630
Subject: [PATCH 458/651] update remove animated class for ui  addorder

---
 app/assets/javascripts/addorder.js          | 6 +++---
 app/views/origami/addorders/detail.html.erb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 50b1a150..47c6cd4f 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -36,7 +36,7 @@ $(function() {
               image_path = "/image/logo.png";
             }
 
-            row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+            row = '<div class="card custom-card testimonial-card fadeInRight" style="">'
                      +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
                       +'<div class="col-md-9">'+ product[field].name +'</div>'
                       +"<div class='col-md-3 add_icon' data-item-code='"
@@ -181,7 +181,7 @@ $(function() {
                 }
               }
 
-              row = '<div class="card custom-card testimonial-card animated fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+              row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                        +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
                         +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
                         +"<div class='col-md-3 "+menu_item_box+"' data-item-code='"
@@ -1180,7 +1180,7 @@ $(function() {
           
         for(var i in data) { 
 
-              row = '<li class="menu_category fadeInTop animated" data-id="'+data[i].id+'">'
+              row = '<li class="menu_category fadeInTop" data-id="'+data[i].id+'">'
                        +'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ data[i].name+'</a>'
                      +'</li>' ; 
               $(sub_category).append(row);
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 183a819f..05d50339 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -86,8 +86,8 @@
 
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
       <div class="card">
-        <div class="card-block">
-          <div id="custom-">
+        <div class="card-block" style="">
+          <div class="card-text" id="custom-slimscroll">
              <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
                <!-- append data -->
                <% @menu.each do |menu| %>

From 7063d937e32240c3e18f3abf7b2e04e858f52b34 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 21 Mar 2018 17:45:55 +0630
Subject: [PATCH 459/651] latest Aston req from OPT team

---
 .../transactions/sales_controller.rb          | 20 +++++-
 .../transactions/surveys_controller.rb        | 25 +++++++-
 app/models/sale.rb                            |  2 +-
 app/models/survey.rb                          | 15 +++++
 app/views/transactions/sales/index.html.erb   | 21 +++++-
 app/views/transactions/surveys/index.html.erb | 64 ++++++++++++++++++-
 config/locales/en.yml                         |  1 +
 config/locales/mm.yml                         |  1 +
 8 files changed, 143 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 app/views/transactions/sales/index.html.erb

diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index 321fa44a..f996142d 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -11,7 +11,7 @@ class Transactions::SalesController < ApplicationController
     to         = params[:to]
 
     if receipt_no.nil? && from.nil? && to.nil?
-        @sales = Sale.order("sale_id desc") 
+        @sales = Sale.where("NOT sale_status='new'").order("sale_id desc") 
         @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
     else
         sale = Sale.search(receipt_no,from,to)
@@ -45,6 +45,24 @@ class Transactions::SalesController < ApplicationController
     #     end
     # end
 
+    @sale_audits = []
+    @sale_item_audits = []
+    if !@sales.nil?
+      @sales.each do |sale|
+        sale_audit = SaleAudit.where("(action = 'SALEPAYMENT' or action = 'SALEVOID') and sale_id = ? and remark IS NOT NULL",sale.sale_id)
+        if !sale_audit.nil?
+          sale_audit.each do |audit|
+            @sale_audits.push({sale.sale_id => audit.remark})
+          end
+        end
+
+        sale_item_audit = SaleAudit.where("(action LIKE '%ITEM%') and sale_id = ?",sale.sale_id)
+        if !sale_item_audit.nil? && sale_item_audit.count > 0
+          @sale_item_audits.push({sale.sale_id => sale_item_audit.count})
+        end
+      end
+    end
+
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sales }
diff --git a/app/controllers/transactions/surveys_controller.rb b/app/controllers/transactions/surveys_controller.rb
index 8d11fa41..b6c48215 100644
--- a/app/controllers/transactions/surveys_controller.rb
+++ b/app/controllers/transactions/surveys_controller.rb
@@ -1,5 +1,28 @@
 class Transactions::SurveysController < ApplicationController
   def index
-  	@surveys = Survey.all
+  	filter   = params[:filter]
+  	from   = params[:from]
+	to     = params[:to]
+
+	if filter.nil? && from.nil? && to.nil?
+	    surveys = Survey.all
+	else
+	    surveys = Survey.search(filter,from,to)
+	end    
+	    
+	if !surveys.nil?
+		@surveys = Kaminari.paginate_array(surveys).page(params[:page]).per(20)
+	else
+		@surveys = []
+	end
+
+	@filter     = filter
+	@from       = from
+	@to         = to
+	
+	respond_to do |format|
+		format.html # index.html.erb
+		format.json { render json: @surveys }
+	end
   end
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index c95617b2..2b93cfb2 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -605,7 +605,7 @@ class Sale < ApplicationRecord
     end
 
     if from.present? && to.present?
-       sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'void' ", from,to)
+       sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'new' ", from,to)
        query = sale.where(keyword)
     else
         where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%")
diff --git a/app/models/survey.rb b/app/models/survey.rb
index 27b6229e..840b4c1e 100644
--- a/app/models/survey.rb
+++ b/app/models/survey.rb
@@ -1,2 +1,17 @@
 class Survey < ApplicationRecord
+
+	def self.search(filter,from,to)
+		if filter.blank?
+	        keyword = ''
+	    else
+	        keyword = "dining_name LIKE ?","%#{filter}%"
+	    end
+
+	    if from.present? && to.present?
+	      	survey = Survey.where("DATE_FORMAT(created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(created_at,'%d-%m-%Y') <= ?", from,to)
+	    	query = survey.where(keyword)
+	    else
+	    	where("dining_name LIKE ?", "%#{filter}%")
+	    end
+	end
 end
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
old mode 100755
new mode 100644
index 172320df..5bfc4e61
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -59,6 +59,7 @@
                 <th><%= t("views.right_panel.detail.grand_total") %></th>
                 <th><%= t :cashier %></th>
                 <th><%= t("views.right_panel.detail.sales_status") %></th>
+                <th><%= t("views.right_panel.detail.remark") %></th>
                 <th><%= t("views.right_panel.detail.receipt_date") %></th>
               </tr>
             </thead>
@@ -67,7 +68,16 @@
               <% if @sales != 0 %>
                   <% @sales.each do |sale| %>
                     <tr>
-                      <td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
+                      <td>
+                        <% if !@sale_item_audits.nil? %>
+                          <% @sale_item_audits.each do |audit| %>
+                            <%if audit.include?(sale.sale_id) %>
+                              <span style="color:#2196f3;">*</span>
+                            <% end %>
+                          <% end %>
+                        <% end %>
+                        <%= link_to sale.sale_id, transactions_sale_path(sale) %>
+                      </td>
                       <td><%= sale.receipt_no %></td>
                       <td><%= sale.total_discount %></td>
                       <td><%= sale.total_tax %></td>
@@ -75,6 +85,15 @@
                       <td><%= sale.grand_total rescue '-' %></td>
                       <td><%= sale.cashier_name rescue '-' %></td>
                       <td> <%= sale.sale_status %> </td>
+                      <td>
+                        <% if !@sale_audits.nil? %>
+                          <% @sale_audits.each do |audit| %>
+                            <%if audit.include?(sale.sale_id) %>
+                              <%= audit[sale.sale_id] %>
+                            <% end %>
+                          <% end %>
+                        <% end %>
+                      </td>
                       <td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
                     </tr>
                   <% end %>
diff --git a/app/views/transactions/surveys/index.html.erb b/app/views/transactions/surveys/index.html.erb
index 4e1c02d3..66defdc0 100644
--- a/app/views/transactions/surveys/index.html.erb
+++ b/app/views/transactions/surveys/index.html.erb
@@ -10,9 +10,32 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
       <div class="main-box-body clearfix p-l-15 p-r-15">
+      	<%= form_tag transactions_surveys_path, :method => :get do %>
+            <div class="row clearfix">
+            	<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+	                <label class="form-control-label"><%= t("views.right_panel.button.search_keyboard") %></label>
+	                 <input type="text" id="dining_name" name="filter" placeholder="Dining Name" class="form-control input-md" >
+	            </div>
+
+	            <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> 
+	                <label class="form-control-label"><%= t("views.right_panel.detail.from") %></label>
+	             <input class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
+	            </div>
+
+	            <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+	              <label class="form-control-label"><%= t("views.right_panel.detail.to") %></label>
+	              <input class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
+	            </div>
+	            
+	            <div class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1">
+	              <label >  &nbsp;</label>
+	             <br> <input type="submit" value="Search" class='btn btn-primary btn-md'>
+	            </div> 
+            </div>             
+      <% end %>
         <div class="card">
           	<div class="table-responsive">
-	          <table class="table ">
+	          <table class="table table-bordered table-striped table-hover">
 	            <thead>
 	              	<th><%= t("views.right_panel.detail.dining") %></th>
 	              	<th><%= t("views.right_panel.detail.receipt_no") %></th>
@@ -21,11 +44,26 @@
 	              	<th><%= t("views.right_panel.detail.adult") %></th>
 	              	<th><%= t("views.right_panel.detail.male") %></th>
 	              	<th><%= t("views.right_panel.detail.female") %></th>
+	              	<th><%= t("views.right_panel.detail.total") %> <%= t :customer %>
+	              	<th><%= t("views.right_panel.detail.local") %></th>
+	              	</th>
 	              	<th><%= t("views.right_panel.detail.foreigner") %></th>
 	            </thead>
 	            <tbody>
+	            	<% total_child = 0 %>
+	            	<% total_adult = 0 %>
+	            	<% total_male = 0 %>
+	            	<% total_female = 0 %>
+	            	<% total_local = 0 %>
+	            	<% total_customer = 0 %>
 	              <% if !@surveys.nil? %>
 	              	<% @surveys.each do |survey| %>
+	              		<% total_child = total_child.to_i + survey.child.to_i %>
+		            	<% total_adult = total_adult.to_i + survey.adult.to_i %>
+		            	<% total_male = total_male.to_i + survey.male.to_i %>
+		            	<% total_female = total_female.to_i + survey.female.to_i %>
+		            	<% total_local = total_local.to_i + survey.local.to_i %>
+		            	<% total_customer = total_customer.to_i + survey.total_customer.to_i %>
 	              		<tr>
 	              			<td><%= survey.dining_name rescue ' '%></td>
 	              			<td><%= survey.receipt_no rescue '-'%></td>
@@ -34,17 +72,39 @@
 	              			<td><%= survey.adult rescue ' '%></td>
 	              			<td><%= survey.male rescue ' '%></td>
 	              			<td><%= survey.female rescue ' '%></td>
+	              			<td><%= survey.total_customer rescue ' '%></td>
+	              			<td><%= survey.local rescue ' '%></td>
 	              			<td>
 	              				<% if !survey.foreigner.nil? %>
-		              				<%= JSON.parse(survey.foreigner) %>
+		              				<% JSON.parse(survey.foreigner).each do |foreign| %>
+		              					<% foreigner_lists = foreign.split(",") %>
+		              					<% if !foreigner_lists.empty? %>
+			              					<% foreigner_lists.each do |fgn| %>
+	              								<% if !fgn.scan(/\D/).empty? %>
+			              								<%= fgn %> :<% end %> <%= fgn.to_i unless fgn.match(/[^[:digit:]]+/) %><br>
+		              						<% end %>
+	              						<% end %>
+	              					<% end %>
 	              				<% end %>
 	              			</td>
 	              		</tr>
 	              	<% end %>
 	              <% end %>
+	              <tr>
+	              	<td colspan="3"><strong><%= t("views.right_panel.detail.total") %></strong></td>
+	              	<td><strong><%= total_child %></strong></td>
+	              	<td><strong><%= total_adult %></strong></td>
+	              	<td><strong><%= total_male %></strong></td>
+	              	<td><strong><%= total_female %></strong></td>
+	              	<td><strong><%= total_customer %></strong></td>
+	              	<td colspan="2"><strong><%= total_local %></strong></td>
+	              </tr>
 	            </tbody>
 	          </table>
           	<br>
+          	<%if !@orders.nil?%>
+	            <%= paginate @surveys %>
+	        <%end%>
         	</div>
         </div>
       </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4852f454..da68414c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -454,6 +454,7 @@ en:
         child: "Child"
         adult: "Adult"
         foreigner: "Foreigner"
+        local: "Local"
         
         code_txt: "code "
         charge_txt: "charge"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index b8a567bc..d3ca2d0f 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -449,6 +449,7 @@ mm:
         child: "ကလေး"
         adult: "လူကြီး"
         foreigner: "နိုင်ငံ�ြားသား"
+        local: "နိုင်ငံသား"
         
         code_txt: "ကု�်ဒ် "
         charge_txt: "ကောက်�ံသည်"

From 25c3a489a6c7ceeb97b393377df5c96cc1150c16 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Mar 2018 18:06:12 +0630
Subject: [PATCH 460/651] update first bill for jade print

---
 README.md                            |  2 +-
 app/views/origami/home/show.html.erb | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a14a0926..18eaed7b 100755
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ ruby 2.4.1p111
 * Membership Details
 Osaka =>
 	Auth Token       => wu8YvlLmah0CL => New => v3
-			         => rj0MJ0XI5GsKZehE => Old => v
+			         => rj0MJ0XI5GsKZehE => Old => v2
 			         => code2lab => Old
 
 	Merchant account => RxzaYyAGzm7VqAZ4hKnv
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 1251e529..73ab8ea7 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -498,15 +498,13 @@
                   <% end %>
                 <% if current_login_employee.role != "waiter" %>
                    <!-- first bill not used in cloud -->
-                  <% if ENV["SERVER_MODE"] == "cloud" %>
-                    <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
-                  <% else %>
+                 
                     <%if @membership.discount && @obj_sale.customer.membership_id %>
                       <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
                     <%else%>
                       <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
                     <%end%> 
-                  <% end %> 
+                 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
               <% end %>
             <% end %>
@@ -759,7 +757,11 @@
                   receipt_no = ($("#receipt_no").html()).trim();
                   if((receipt_no!=undefined) && (receipt_no!=""))
                     createReceiptNoInFirstBillData(receipt_no,type);
-                    location.reload();
+                  // For Server Print - from jade
+                   if ($("#server_mode").val() == "cloud") {
+                    code2lab.printFile(result.filepath, result.printer_url);
+                   }
+                  location.reload();
               }
           });  
     });

From fbbe2c0ab94f039921e110006e5a7a29b4dd1ef0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 22 Mar 2018 09:45:30 +0630
Subject: [PATCH 461/651] update order controlelr

---
 app/controllers/api/orders_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index dd648bb4..383a6606 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -219,7 +219,7 @@ class Api::OrdersController <  Api::ApiController
 
       if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
         # print
-        assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
+        assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)  
         # order queue stations
         oqs = assigned_item.order_queue_station
 

From b8a71079f47d52b64d8ce5cba1874dc28167e283 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 22 Mar 2018 10:24:58 +0630
Subject: [PATCH 462/651] update room show for jade print

---
 app/views/origami/rooms/show.html.erb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 867f6034..5b026ba1 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -465,15 +465,15 @@
         <% end %>
         <% if current_login_employee.role != "waiter" %>
          <!-- first bill not used in cloud -->
-         <% if ENV["SERVER_MODE"] == "cloud" %>
+         <!--<% if ENV["SERVER_MODE"] == "cloud" %>
          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
-         <% else %>
+         <% else %>-->
          <%if @membership.discount && @obj_sale.customer.membership_id %>
             <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
          <%else%>
             <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
          <%end%>
-         <%end%>
+         <!-- <%end%>-->
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
         <% end %>
        <!--  <button type="button" id="void" class="btn bg-blue btn-block" > Void </button> -->
@@ -691,7 +691,10 @@ $("#first_bill").on('click', function(){
           receipt_no = ($("#receipt_no").html()).trim();
           if((receipt_no!=undefined) && (receipt_no!=""))
             createReceiptNoInFirstBillData(receipt_no,"");
-          
+          // For Server Print - from jade
+          if ($("#server_mode").val() == "cloud") {
+            code2lab.printFile(result.filepath, result.printer_url);
+          }
           location.reload();
         }
     });
@@ -719,6 +722,12 @@ $(".choose_payment").on('click', function () {
       receipt_no = ($("#receipt_no").html()).trim();
       if((receipt_no!=undefined) && (receipt_no!=""))
         createReceiptNoInFirstBillData(receipt_no,type);
+
+      // For Server Print - from jade
+      if ($("#server_mode").val() == "cloud") {
+        code2lab.printFile(result.filepath, result.printer_url);
+      }
+
       location.reload();
     }
   });  

From ebadfff25ba468cd59e1e961e271a8899d46d31d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Mar 2018 11:09:12 +0630
Subject: [PATCH 463/651] add tax in charges

---
 app/controllers/origami/other_charges_controller.rb | 3 ++-
 app/models/sale.rb                                  | 5 +++--
 app/views/origami/other_charges/index.html.erb      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index 8bba3800..def94a1f 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -19,6 +19,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 		sale_id = params[:sale_id]
 	    other_charges_items = JSON.parse(params[:other_charges_items])
 	    sub_total = params[:sub_total]
+	    cashier_type = params[:cashier_type]
 
 	    if Sale.exists?(sale_id)
 	      sale = Sale.find(sale_id)
@@ -68,7 +69,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 	      end 
 
 	      # Re-calc All Amount in Sale
-	      sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount)	      
+	      sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount, nil, cashier_type)	      
 	    end	     
 	    if !table.nil?
 	    	dining = {:table_id => table_id, :table_type => table.type }
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 2b93cfb2..5fc0c06f 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -361,7 +361,6 @@ class Sale < ApplicationRecord
       end
     end
 
-    compute_tax(sale, total_taxable, total_discount, order_source)
     sale.total_amount = subtotal_price
     sale.total_discount = total_discount
     sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
@@ -372,8 +371,9 @@ class Sale < ApplicationRecord
     # adjust_rounding
     sale.rounding_adjustment = compute_adjust_rounding(sale.grand_total)
 
-    sale.save!
+    compute_tax(sale, total_taxable, total_discount, order_source)
 
+    sale.save!
   end
 
   # No Use too many wrong
@@ -454,6 +454,7 @@ class Sale < ApplicationRecord
         # end
       end
     end
+    
     sale.total_tax = total_tax_amount
   end
 
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index a194e03a..caa578a5 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -308,7 +308,7 @@ var cashier_type = "<%= @cashier_type %>";
 			var other_charges_items = JSON.stringify(get_other_item_rows());
 			var ajax_url = "/origami/" + sale_id + "/other_charges";	
 
-			var params = { 'sale_id': sale_id, 'sub_total': sub_total, 'other_charges_items': other_charges_items };
+			var params = { 'cashier_type' : cashier_type,'sale_id': sale_id, 'sub_total': sub_total, 'other_charges_items': other_charges_items };
 
 			$.ajax({
 				type: "POST",

From 75a3576a77fbacfdf9f0db4dd2aaadbe5e72b0e6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 22 Mar 2018 12:42:17 +0630
Subject: [PATCH 464/651] update check user

---
 .../settings/commissioners_controller.rb          |  7 ++++++-
 .../settings/commissions_controller.rb            |  7 +++++++
 .../settings/order_queue_stations_controller.rb   |  7 +++++++
 app/controllers/settings/products_controller.rb   |  7 +++++++
 .../settings/promotion_products_controller.rb     |  7 +++++++
 app/controllers/settings/promotions_controller.rb |  7 +++++++
 .../transactions/credit_notes_controller.rb       | 15 +++++++++++----
 app/controllers/transactions/orders_controller.rb |  8 ++++++++
 app/controllers/transactions/sales_controller.rb  |  7 +++++++
 .../transactions/shift_sales_controller.rb        |  7 +++++++
 10 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/app/controllers/settings/commissioners_controller.rb b/app/controllers/settings/commissioners_controller.rb
index f8314bcb..fb8c1993 100755
--- a/app/controllers/settings/commissioners_controller.rb
+++ b/app/controllers/settings/commissioners_controller.rb
@@ -1,6 +1,7 @@
 class Settings::CommissionersController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_commissioner, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /commissioners
   # GET /commissioners.json
@@ -82,7 +83,11 @@ class Settings::CommissionersController < ApplicationController
     end
     render json: @transactions
   end
-
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
   private
   # Use callbacks to share common setup or constraints between actions.
   def set_commissioner
diff --git a/app/controllers/settings/commissions_controller.rb b/app/controllers/settings/commissions_controller.rb
index 5a41de17..1ac6b2cc 100755
--- a/app/controllers/settings/commissions_controller.rb
+++ b/app/controllers/settings/commissions_controller.rb
@@ -1,6 +1,7 @@
 class Settings::CommissionsController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_commission, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /commissions
   # GET /commissions.json
@@ -68,6 +69,12 @@ class Settings::CommissionsController < ApplicationController
     # end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   private
   # Use callbacks to share common setup or constraints between actions.
   def set_commission
diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index b6baf64d..adcbc507 100755
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -1,6 +1,7 @@
 class Settings::OrderQueueStationsController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /settings/order_queue_stations
   # GET /settings/order_queue_stations.json
@@ -67,6 +68,12 @@ class Settings::OrderQueueStationsController < ApplicationController
     # end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_order_queue_station
diff --git a/app/controllers/settings/products_controller.rb b/app/controllers/settings/products_controller.rb
index c0be149e..66e8f162 100755
--- a/app/controllers/settings/products_controller.rb
+++ b/app/controllers/settings/products_controller.rb
@@ -1,6 +1,7 @@
 class Settings::ProductsController < ApplicationController
 load_and_authorize_resource except: [:create]
   before_action :set_settings_product, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /settings/products
   # GET /settings/products.json
@@ -65,6 +66,12 @@ load_and_authorize_resource except: [:create]
     # end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_product
diff --git a/app/controllers/settings/promotion_products_controller.rb b/app/controllers/settings/promotion_products_controller.rb
index d297fb71..c66761d7 100755
--- a/app/controllers/settings/promotion_products_controller.rb
+++ b/app/controllers/settings/promotion_products_controller.rb
@@ -1,6 +1,7 @@
 class Settings::PromotionProductsController < ApplicationController
   before_action :set_promotion, only: [:show, :edit, :update, :destroy,:new]
   before_action :set_promotion_product, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /promotion_products
   # GET /promotion_products.json
@@ -63,6 +64,12 @@ class Settings::PromotionProductsController < ApplicationController
     # end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_promotion
diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb
index ec00c5f6..7272ab0c 100755
--- a/app/controllers/settings/promotions_controller.rb
+++ b/app/controllers/settings/promotions_controller.rb
@@ -1,6 +1,7 @@
 class Settings::PromotionsController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_promotion, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /promotions
   # GET /promotions.json
@@ -119,6 +120,12 @@ class Settings::PromotionsController < ApplicationController
     render json: res
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_promotion
diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb
index e35baa77..27f52f12 100755
--- a/app/controllers/transactions/credit_notes_controller.rb
+++ b/app/controllers/transactions/credit_notes_controller.rb
@@ -1,6 +1,7 @@
 class Transactions::CreditNotesController < ApplicationController
   
   before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /transactions/sales
   # GET /transactions/sales.json
@@ -25,12 +26,18 @@ class Transactions::CreditNotesController < ApplicationController
              @credit_notes = 0
            end  
       end    
-puts "sssssssssssss"
-puts @credit_notes.to_json
+
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @credit_notes }
     end
 
- end
-  end
\ No newline at end of file
+  end
+
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
+end
\ No newline at end of file
diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb
index 52abf7fd..c2132ff6 100755
--- a/app/controllers/transactions/orders_controller.rb
+++ b/app/controllers/transactions/orders_controller.rb
@@ -1,5 +1,7 @@
 class Transactions::OrdersController < ApplicationController
 	load_and_authorize_resource except: [:create]
+	before_action :check_user
+
 	def index
 
 		filter = params[:filter]
@@ -39,4 +41,10 @@ class Transactions::OrdersController < ApplicationController
 	    end
 	end
 
+	def check_user
+	    if current_user.nil?
+	      redirect_to root_path
+	    end
+	  end
+
 end
diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index fafc89f3..fa7d58f7 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -1,6 +1,7 @@
 class Transactions::SalesController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   # GET /transactions/sales
   # GET /transactions/sales.json
@@ -129,6 +130,12 @@ class Transactions::SalesController < ApplicationController
     end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_transactions_sale
diff --git a/app/controllers/transactions/shift_sales_controller.rb b/app/controllers/transactions/shift_sales_controller.rb
index ce226d30..f3a9fc05 100644
--- a/app/controllers/transactions/shift_sales_controller.rb
+++ b/app/controllers/transactions/shift_sales_controller.rb
@@ -1,6 +1,7 @@
 class Transactions::ShiftSalesController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_transactions_shift_sale, only: [:show, :edit, :update, :destroy]
+  before_action :check_user
 
   def index
 
@@ -53,6 +54,12 @@ class Transactions::ShiftSalesController < ApplicationController
     end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_transactions_shift_sale

From 246f9afff54daa6cd7e020a788bcde0d9eae968f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Mar 2018 15:13:41 +0630
Subject: [PATCH 465/651] sqa req:

---
 .../origami/payments_controller.rb            |   4 +-
 .../origami/table_invoices_controller.rb      |   2 +
 .../origami/table_invoices/show.html.erb      | 121 ++++++++++++++++++
 3 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 348a518a..18d24dc4 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -241,7 +241,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @junctionpaycount = 0.0
       @credit = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
-      @balance = 0.00
+      @balance = 0
       @accountable_type = ''
       @table_no = ''
       @dining  = ''
@@ -311,7 +311,7 @@ class Origami::PaymentsController < BaseOrigamiController
         if response["status"]==true
          response["account_data"].each do |res|
           if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount"
-             @balance += res["balance"]
+             @balance = @balance.to_f + res["balance"].to_f
             #  @accountable_type = res["accountable_type"]
              @accountable_type = "Rebate Balance"
           end
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index a84f6ca7..5cd22054 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -31,6 +31,8 @@ class Origami::TableInvoicesController < BaseOrigamiController
 
   def show
     @table = DiningFacility.find(params[:table_id])
+    @membership = MembershipSetting::MembershipSetting
+    @payment_methods = PaymentMethodSetting.all
     shop        =  Shop::ShopDetail  
     @sale_array = Array.new
     @table.bookings.each do |booking|
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 216e5eea..f6317dc3 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -156,6 +156,15 @@
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
+  <% if ENV["SERVER_MODE"] == "cloud" %>
+    <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+  <% else %>
+    <%if @membership.discount && @sale.customer.membership_id %>
+      <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+    <%else%>
+      <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+    <%end%> 
+  <% end %>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
    <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
    <button type="button" data-toggle="modal" data-target="#voidModal" class="btn bg-danger btn-block" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
@@ -163,6 +172,38 @@
 </div>
 </div>
 
+<!-- membership paymentmodal -->
+<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
+<span class="hidden" id="member_discount"><%= @membership.discount%></span>
+<span class="hidden" id="membership_id"><%= @sale.customer.membership_id rescue 0%></span>
+<div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+            </div>
+            <div class="modal-body">
+               <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
+                 <option value="Cash">Cash</option>
+                 <option value="Credit">Credit</option>
+                <% @payment_methods.each do |pay| %>
+                  <option value="<%= pay.payment_method %>">
+                    <%= pay.payment_method %>
+                  </option>
+                <%end %>
+                
+                </select>   
+            </div>
+            <div class="modal-footer  p-r-30">
+                <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                &nbsp;  &nbsp;
+               <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- membership paymentmodal -->
+
 <div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -212,6 +253,24 @@
 </div>
 <script>
 $(document).ready(function(){
+  /* start check first bill or not*/
+    var receipt_no = "";
+    if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+      receipt_no = ($("#receipt_no").html()).trim();
+    }
+    
+    discount="<%= @membership.discount%>"
+    if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+      if (discount) {
+        if(checkReceiptNoInFirstBillData(receipt_no,"")){
+          $("#pay").show();
+        }else{
+          $("#pay").hide();
+        }
+      }
+    }
+  /* end check first bill or not*/
+
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
@@ -222,6 +281,68 @@ $(document).ready(function(){
 //    window.location.href = '/origami/sale/<%= @sale.id %>/payment';
 // });
 
+// Print for first bill
+  $("#first_bill").on('click', function () {
+      var sale_id = '<%= @sale.id %>';
+      var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+
+      $.ajax({
+          type: "GET",
+          url: ajax_url,
+          success: function (result) {
+            receipt_no = ($("#receipt_no").html()).trim();
+            if((receipt_no!=undefined) && (receipt_no!=""))
+              createReceiptNoInFirstBillData(receipt_no,"");
+            
+            location.reload();
+          }
+      });  
+  });
+
+  $(".choose_payment").on('click', function () {
+    $( "#loading_wrapper").show();
+
+      var sale_id = '<%= @sale.id %>';
+      type = $('.payment_method').val();
+      if(parseInt(jQuery.inArray("Credit", type)) == -1){
+        if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
+           calculate_member_discount(sale_id,"Card");
+           
+        }else{
+          calculate_member_discount(sale_id,"Cash");
+        }         
+      }
+      var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+      $.ajax({
+          type: "GET",
+          url: ajax_url,
+          success: function (result) {
+              $( "#loading_wrapper" ).hide();
+              receipt_no = ($("#receipt_no").html()).trim();
+              if((receipt_no!=undefined) && (receipt_no!=""))
+                createReceiptNoInFirstBillData(receipt_no,type);
+                location.reload();
+          }
+      });  
+  });
+
+  function calculate_member_discount(sale_id,type) {
+    var sub_total = $('#sub-total').text();
+     if (type == "Cash") {
+       is_card = false
+     }else{
+      is_card = true
+     }
+    $.ajax({
+      type: "POST",
+      url: "/origami/" + sale_id + "/member_discount",
+      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+      async: false,
+      success:function(result){ 
+      }
+    });
+  }
+
 $('#pay').on('click',function() {
    var sale_id = '<%= @sale.id %>';
 

From 7350a24a5d239cdab4da85b9ce17802ac4e991cc Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Mar 2018 15:30:37 +0630
Subject: [PATCH 466/651] check split bill for item

---
 app/controllers/origami/split_bill_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index ef38d04f..e18828fc 100755
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -235,7 +235,7 @@ class Origami::SplitBillController < BaseOrigamiController
 							puts "order_id_count < 1"
 							new_order_status = true
 							order_items.each do |order_item|
-								orderItem = OrderItem.find_by_order_id(order_id)
+								orderItem = OrderItem.find(order_item["id"])
 								if !orderItem.nil?
 									if order_item["id"] == orderItem.order_items_id
 										if orderItem.qty.to_f != order_item['qty'].to_f

From 3066a0ca1a20b7c5fd3792aff2b02db595d0c631 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Mar 2018 10:08:33 +0630
Subject: [PATCH 467/651] update payment select

---
 app/views/origami/home/show.html.erb | 92 +++++++++++++++++-----------
 1 file changed, 57 insertions(+), 35 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 73ab8ea7..83816151 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -520,30 +520,31 @@
            <span class="hidden" id="member_discount"><%= @membership.discount%></span>
            <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
           <div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
-                <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment Method</h4>
-                        </div>
-                        <div class="modal-body">
-                           <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
+              <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                  <div class="modal-header">
+                      <h4 class="modal-title" id="paymentModalLabel">Choose Payment Method</h4>
+                  </div>
+                  <div class="modal-body">
+                   <!--  <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" > -->
                              <!-- <option value="Cash">Cash</option> -->
-                             <option value="Credit">Credit</option>
-                            <% @payment_methods.each do |pay| %>
-                              <option value="<%= pay.payment_method %>">
-                                <%= pay.payment_method %>
-                              </option>
-                            <%end %>
+                       <button class='btn btn- waves-effect payment_btn ' data-type='Credit' data-value='Credit'>Credit</button>
+                      <% @payment_methods.each do |pay| %>
+                    <!-- <option value="<%= pay.payment_method %>">
+                        <%= pay.payment_method %>
+                      </option> -->
+                      <button class='btn btn- waves-effect payment_btn ' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
+                    <%end %>
                             
-                            </select>   
-                        </div>
-                        <div class="modal-footer  p-r-30">
-                            <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                   <!--  </select>   --> 
+                  </div>
+                  <div class="modal-footer  p-r-30">
+                    <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
                             &nbsp;  &nbsp;
-                           <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
-                        </div>
-                    </div>
+                    <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+                  </div>
                 </div>
+              </div>
             </div>
         </div>
     </div>
@@ -735,11 +736,32 @@
         });          
     });
 
+    // click select option icon for add 
+  $(document).on('click', '.payment_btn', function(event){ 
+    active     = $(this).hasClass('selected-payment');
+    value      = $(this).data('value');
+    type       = $(this).data('type');
+    group      = $(this).data('group');
+    payments    = $(".payment_btn");
+    $(payments).each(function(i){
+      if ($(payments[i]).attr('data-type')==type){
+        $('.'+type).removeClass("selected-payment");
+      }
+    });
+    if (active) {
+      $(this).removeClass('selected-payment');
+    }else{
+      $(this).addClass('selected-payment');
+    }
+    
+  }); //End selecct attribute buttom
+
     $(".choose_payment").on('click', function () {
       $( "#loading_wrapper").show();
 
         var sale_id = $('#sale_id').val();
           type = $('.payment_method').val();
+          console.log(type)
           if(parseInt(jQuery.inArray("Credit", type)) == -1){
             if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
                calculate_member_discount(sale_id,"Card");
@@ -749,21 +771,21 @@
             }         
           }
           var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
-          $.ajax({
-              type: "GET",
-              url: ajax_url,
-              success: function (result) {
-                  $( "#loading_wrapper" ).hide();
-                  receipt_no = ($("#receipt_no").html()).trim();
-                  if((receipt_no!=undefined) && (receipt_no!=""))
-                    createReceiptNoInFirstBillData(receipt_no,type);
-                  // For Server Print - from jade
-                   if ($("#server_mode").val() == "cloud") {
-                    code2lab.printFile(result.filepath, result.printer_url);
-                   }
-                  location.reload();
-              }
-          });  
+          // $.ajax({
+          //     type: "GET",
+          //     url: ajax_url,
+          //     success: function (result) {
+          //         $( "#loading_wrapper" ).hide();
+          //         receipt_no = ($("#receipt_no").html()).trim();
+          //         if((receipt_no!=undefined) && (receipt_no!=""))
+          //           createReceiptNoInFirstBillData(receipt_no,type);
+          //         // For Server Print - from jade
+          //          if ($("#server_mode").val() == "cloud") {
+          //           code2lab.printFile(result.filepath, result.printer_url);
+          //          }
+          //         location.reload();
+          //     }
+          // });  
     });
 
     function calculate_member_discount(sale_id,type) {

From 3e8c3f8225af0e0d42b9aae174a3479c4cf62ea3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Mar 2018 13:54:19 +0630
Subject: [PATCH 468/651] check tax profile and member poup

---
 app/assets/stylesheets/origami.scss           |  2 +-
 .../origami/payments_controller.rb            |  7 +++--
 app/views/layouts/_left_sidebar.html.erb      |  4 +--
 app/views/origami/payments/show.html.erb      | 30 +++++++++++++++----
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 07c7428f..2aca4c29 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -399,7 +399,7 @@ i.logout_icon{
 
 /* Start Is Member Modal */
 #is_memberModal .modal-body {
-	height: 200px !important;
+	height: 260px !important;
 }
 
 #is_memberModal .btn {
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 18d24dc4..f034aa57 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -248,6 +248,8 @@ class Origami::PaymentsController < BaseOrigamiController
 
       @shop        =  Shop::ShopDetail  #show shop info 
 
+      @customer_lists = Customer.where("customer_id = 'CUS-000000000001' or customer_id = 'CUS-000000000002'")
+
       saleObj = Sale.find(sale_id)
 
       #total customer with individual total amount
@@ -297,10 +299,11 @@ class Origami::PaymentsController < BaseOrigamiController
 
       #get customer amount
       @customer = Customer.find(@sale_data.customer_id)
-      accounts = @customer.tax_profiles
+      # accounts = @customer.tax_profiles
+      accounts = TaxProfile.where("group_type = ?",@cashier_type).order("order_by ASC")
       @account_arr =[]
       accounts.each do |acc|
-        account = TaxProfile.find(acc)
+        account = TaxProfile.find(acc.id)
         @account_arr.push(account)
       end
       
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index f06b52ab..63067ec0 100644
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -69,14 +69,14 @@
 					<% end %>	
 				</ul>
 			</li>
-			<!-- <% if can? :menage, Inventory %>
+			<% if can? :menage, Inventory %>
 			<li>
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
 				</a>
 			</li>
-			<%end%> -->
+			<%end%>
 			<li class="header"><%= t :backend %></li>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index e79ab813..001adc53 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -100,10 +100,10 @@
               <td class="charges-name"><strong>Tax
               (<% @i = 0
                @account_arr.each do |ct| %>
-              <%=ct.name%>
-             <% if @account_arr.count != @i+1%>
-              +       <% @i =+1 %>
-             <%end%>
+                <%=ct.name%>
+                <% if @account_arr.count != @i+1%>
+                  +       <% @i =+1 %>
+                <%end%>
               <%end %>)
               </strong></td>
               <td class="item-attr"><strong><span><%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></span></strong></td>
@@ -445,6 +445,17 @@
       <div class="modal-body">
         <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
         <input type="hidden" name="qr_code" id="qr_code" />
+        <div class="row text-center m-t-20">
+          <% if !@customer_lists.nil? %>
+            <% @customer_lists.each do |cus| %>
+              <% if cus.customer_id != @customer.id %>
+                <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+                  <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_customer_assign" data-id='<%= cus.customer_id %>'><%= cus.name %></button>
+                </div>
+              <% end %>
+            <% end %>
+          <% end %>
+        </div>
         <div class="row text-center m-t-20">
           <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
             <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Card Member</button>
@@ -486,9 +497,9 @@ var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
     //start customer modal popup
     if((cashier_type=='quick_service') && (customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
-      if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
+      // if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
         $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
-      }
+      // }
     }
 
     /* start check first bill or not*/
@@ -1142,4 +1153,11 @@ var customer_name = "<%= @customer.name %>";
   $("#sxModal .btn_cancel").on('click',function(){
     $("#sxModal").hide();
   });
+
+  $(".btn_customer_assign").on('click', function(){
+    var customer_id = $(this).attr('data-id');
+    var customer_name = $(this).text();
+    var sale_id     = $("#sale_id").text() || 0;
+    update_sale("", customer_id, customer_name, sale_id);
+  });
 </script>
\ No newline at end of file

From dfb998f9e7e922cc0b1c1cb6eb17575e2309d87c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Mar 2018 13:55:07 +0630
Subject: [PATCH 469/651] update paymemt multiple ui

---
 app/assets/stylesheets/origami.scss   | 12 ++++++
 app/views/origami/home/show.html.erb  | 61 +++++++++++++++------------
 app/views/origami/rooms/show.html.erb | 45 +++++++++++++++-----
 3 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 07c7428f..c417613a 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -198,6 +198,18 @@ select.form-control {
 	background-color: blue !important;
 }
 
+.selected-payment {
+  color: #fff !important;
+  background-color: blue !important;
+}
+.payment_btn {
+  white-space: normal !important;
+  margin-bottom: 15px;
+  margin-right: 15px;
+  color:#fff !important;
+ # background-color: green !important;
+} 
+
 /* Reciept Style */
 #order-charges-table td {
 	border-top: none !important;
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 83816151..4922c1df 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -528,12 +528,12 @@
                   <div class="modal-body">
                    <!--  <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" > -->
                              <!-- <option value="Cash">Cash</option> -->
-                       <button class='btn btn- waves-effect payment_btn ' data-type='Credit' data-value='Credit'>Credit</button>
+                       <button class='btn waves-effect payment_btn green' data-type='Credit' data-value='Credit'>Credit</button>
                       <% @payment_methods.each do |pay| %>
                     <!-- <option value="<%= pay.payment_method %>">
                         <%= pay.payment_method %>
                       </option> -->
-                      <button class='btn btn- waves-effect payment_btn ' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
+                      <button class='btn btn-lg waves-effect payment_btn green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
                     <%end %>
                             
                    <!--  </select>   --> 
@@ -743,25 +743,20 @@
     type       = $(this).data('type');
     group      = $(this).data('group');
     payments    = $(".payment_btn");
-    $(payments).each(function(i){
-      if ($(payments[i]).attr('data-type')==type){
-        $('.'+type).removeClass("selected-payment");
-      }
-    });
-    if (active) {
+
+    if (active) {      
       $(this).removeClass('selected-payment');
-    }else{
+    }else{      
       $(this).addClass('selected-payment');
     }
-    
   }); //End selecct attribute buttom
 
     $(".choose_payment").on('click', function () {
       $( "#loading_wrapper").show();
 
         var sale_id = $('#sale_id').val();
-          type = $('.payment_method').val();
-          console.log(type)
+          // type = $('.payment_method').val();
+          type    = get_selected_attributes('selected-payment');
           if(parseInt(jQuery.inArray("Credit", type)) == -1){
             if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
                calculate_member_discount(sale_id,"Card");
@@ -771,21 +766,21 @@
             }         
           }
           var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
-          // $.ajax({
-          //     type: "GET",
-          //     url: ajax_url,
-          //     success: function (result) {
-          //         $( "#loading_wrapper" ).hide();
-          //         receipt_no = ($("#receipt_no").html()).trim();
-          //         if((receipt_no!=undefined) && (receipt_no!=""))
-          //           createReceiptNoInFirstBillData(receipt_no,type);
-          //         // For Server Print - from jade
-          //          if ($("#server_mode").val() == "cloud") {
-          //           code2lab.printFile(result.filepath, result.printer_url);
-          //          }
-          //         location.reload();
-          //     }
-          // });  
+          $.ajax({
+              type: "GET",
+              url: ajax_url,
+              success: function (result) {
+                  $( "#loading_wrapper" ).hide();
+                  receipt_no = ($("#receipt_no").html()).trim();
+                  if((receipt_no!=undefined) && (receipt_no!=""))
+                    createReceiptNoInFirstBillData(receipt_no,type);
+                  // For Server Print - from jade
+                   if ($("#server_mode").val() == "cloud") {
+                    code2lab.printFile(result.filepath, result.printer_url);
+                   }
+                  location.reload();
+              }
+          });  
     });
 
     function calculate_member_discount(sale_id,type) {
@@ -1007,4 +1002,16 @@
         window.location.href = '/oqs/'+ assigned_order_item_id  + "/edit/"+dining_id;
       }
     });
+
+     // Get Selected Class
+    function get_selected_attributes(selected_class) {
+      var item_row      = $('.'+selected_class);
+      var attribute_arr = [];
+      $(item_row).each(function(i){
+        value = $(item_row[i]).attr('data-value');
+        str = value;
+        attribute_arr.push(str);
+      });
+      return attribute_arr;
+    }
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 867f6034..a5497ed0 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -489,16 +489,13 @@
                             <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
                         </div>
                         <div class="modal-body">
-                           <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
-                             <option value="Cash">Cash</option>
-                             <option value="Credit">Credit</option>
+                            <button class='btn waves-effect payment_btn green' data-type='Credit' data-value='Credit'>Credit</button>
                             <% @payment_methods.each do |pay| %>
-                              <option value="<%= pay.payment_method %>">
-                                <%= pay.payment_method %>
-                              </option>
-                            <%end %>
-                            
-                            </select>   
+                          <!-- <option value="<%= pay.payment_method %>">
+                              <%= pay.payment_method %>
+                            </option> -->
+                            <button class='btn btn-lg waves-effect payment_btn green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
+                          <%end %>   
                         </div>
                         <div class="modal-footer  p-r-30">
                             <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
@@ -680,6 +677,21 @@ $(document).ready(function(){
 
 });
 
+ // click select option icon for add 
+  $(document).on('click', '.payment_btn', function(event){ 
+    active     = $(this).hasClass('selected-payment');
+    value      = $(this).data('value');
+    type       = $(this).data('type');
+    group      = $(this).data('group');
+    payments    = $(".payment_btn");
+
+    if (active) {
+      $(this).removeClass('selected-payment');
+    }else{
+      $(this).addClass('selected-payment');
+    }
+}); //End selecct attribute buttom
+
 // Print for first bill
 $("#first_bill").on('click', function(){ 
   var sale_id = $('#sale_id').val();
@@ -701,7 +713,9 @@ $(".choose_payment").on('click', function () {
   $( "#loading_wrapper").show();
 
   var sale_id = $('#sale_id').val();
-  type = $('.payment_method').val();
+  type    = get_selected_attributes('selected-payment');
+ 
+  // type = $('.payment_method').val();
   if(parseInt(jQuery.inArray("Credit", type)) == -1){
     if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
       calculate_member_discount(sale_id,"Card");
@@ -945,4 +959,15 @@ $('#add_invoice').on('click',function(){
         window.location.href = '/oqs/'+ assigned_order_item_id  + "/edit/"+dining_id;
       }
     });
+    // Get Selected Class
+    function get_selected_attributes(selected_class) {
+      var item_row      = $('.'+selected_class);
+      var attribute_arr = [];
+      $(item_row).each(function(i){
+        value = $(item_row[i]).attr('data-value');
+        str = value;
+        attribute_arr.push(str);
+      });
+      return attribute_arr;
+    }
 </script>

From 15d8588e63a094fc8da7b3dd9be4c4602288ef41 Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Fri, 23 Mar 2018 07:38:39 +0000
Subject: [PATCH 470/651] sidekiq.yml edited online with Bitbucket

---
 config/sidekiq.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index ac1bb2d5..672a4e9a 100755
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -8,7 +8,7 @@
 
 ---
 :concurrency: 25
-:pidfile: ./tmp/pids/sidekiq.pid
+:pidfile: ./tmp/sidekiq.pid
 :logfile: ./log/sidekiq.log
 :queues:
   - default

From fe8a923c22842211c6cb5e7beee4835adf215be5 Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Fri, 23 Mar 2018 07:39:10 +0000
Subject: [PATCH 471/651] secrets.yml edited online with Bitbucket

---
 config/secrets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index 7930204e..a2654dd1 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -24,7 +24,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.dev/api #192.168.1.147:3002/api
+  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
   server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From 65d33a9ba7a466d4bb2c2f5be1a1de91a2c6513f Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Fri, 23 Mar 2018 07:39:39 +0000
Subject: [PATCH 472/651] secrets.yml edited online with Bitbucket

---
 config/secrets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index a2654dd1..076b6691 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -25,7 +25,7 @@ test:
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From 5d3723e48cad73ac2794ab9a5e065169f1051998 Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Fri, 23 Mar 2018 07:40:13 +0000
Subject: [PATCH 473/651] license.rb edited online with Bitbucket

---
 app/models/license.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/license.rb b/app/models/license.rb
index 7d935185..ac82721c 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -1,7 +1,7 @@
 class License
   include HTTParty
 
-  base_uri "connect.smartsales.dev/api"
+  base_uri "connect.smartsales.asia/api"
 
   attr_accessor :name, :address_1, :address_2, :township, :city, :country, :email, :phone, :fax, :logo, :subdomain,
   :plan_activation_date, :plan_next_renewal_date, :plan_max_products,:plan_max_customers, :plan_active_connections,

From 2412fe8462caa317b9ec3fda7e13dcfaf53b1d3d Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Fri, 23 Mar 2018 07:40:30 +0000
Subject: [PATCH 474/651] .database.yml.swp deleted online with Bitbucket

---
 config/.database.yml.swp | Bin 1024 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 config/.database.yml.swp

diff --git a/config/.database.yml.swp b/config/.database.yml.swp
deleted file mode 100755
index 09f1aac2254ab80602bde572a7cb45dd3e551f06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmYc?$V<%2S1{5u)iY*50$w}}48^4dsYRv5sYOWQ*qCs2x&i*d*c3p;QW8rNlM;(l
V^(u37@F*LV8V!Nb5TH{C002=+5nBKN


From 65345d1addd1bd31fbe8cb0f19ed327337fde7f4 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Mar 2018 14:51:14 +0630
Subject: [PATCH 475/651] update scroll for menu

---
 app/assets/javascripts/custom.js            | 9 +++++++++
 app/views/origami/addorders/detail.html.erb | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index a2011022..7c4c8301 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -20,6 +20,15 @@ $(document).ready(function() {
     borderRadius: '0',
     railBorderRadius: '0'
   });
+
+  $('#menu-slimscroll').slimScroll({
+    height: height-$('#menu-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0'
+  });
   
   // $('.delete').click(function(){
   //   var method    = $(this).attr('data-method');
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 05d50339..607f4c0e 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -35,6 +35,7 @@
            <%end%>
         </ul>
       </li> 
+       <div id="menu-slimscroll" data-height="0">
         <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
@@ -80,6 +81,7 @@
               <% end %>
             <%end %>
         </ul>
+      </div>
     </div>
 
 
@@ -199,7 +201,7 @@
           
         </div>
         <div class="card-block">
-            <div class="card-text" id="order-detail-slimscroll" data-height="180">
+            <div class="card-text" id="order-detail-slimscroll" data-height="140">
                <table class="table table-striped summary-items" id="order-items-table" >
                  <thead>
                    <tr>

From a75d3e08df80cdd96d45fe3d8c597a95e551df26 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Mar 2018 16:22:35 +0630
Subject: [PATCH 476/651] update scroll speed

---
 app/assets/javascripts/custom.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 7c4c8301..778de553 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -9,7 +9,8 @@ $(document).ready(function() {
     color: 'rgba(0,0,0,0.5)',
     alwaysVisible: false,
     borderRadius: '0',
-    railBorderRadius: '0'
+    railBorderRadius: '0',
+    touchScrollStep : 25
   });
 
   $('#order-detail-slimscroll').slimScroll({
@@ -18,7 +19,8 @@ $(document).ready(function() {
     color: 'rgba(0,0,0,0.5)',
     alwaysVisible: false,
     borderRadius: '0',
-    railBorderRadius: '0'
+    railBorderRadius: '0',
+    touchScrollStep : 25
   });
 
   $('#menu-slimscroll').slimScroll({
@@ -27,7 +29,8 @@ $(document).ready(function() {
     color: 'rgba(0,0,0,0.5)',
     alwaysVisible: false,
     borderRadius: '0',
-    railBorderRadius: '0'
+    railBorderRadius: '0',
+    touchScrollStep : 25
   });
   
   // $('.delete').click(function(){

From 37f80a8ac69542e6193dfab892df0da81a4c1614 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Mar 2018 17:59:28 +0630
Subject: [PATCH 477/651] update sale

---
 app/models/sale.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 5fc0c06f..b459f16c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -799,10 +799,13 @@ def self.get_by_shift_sale(from,to,status)
 end
 
 def self.get_item_query()
-  query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
-                     "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
+  query = Sale.select("acc.title as account_name,mi.account_id, 
+                      i.item_instance_code as item_code,i.account_id as account_id, " +
+                     "SUM(i.qty * i.unit_price) as grand_total,
+                      SUM(i.qty) as total_item,i.qty as qty," +
                      "i.status as status_type,"+
-                     " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     " i.unit_price,i.price as price,i.product_name as product_name,
+                      mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 

From 2a88bd4409b99e580cd10d4a1812bb18c367015d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 23 Mar 2018 18:02:41 +0630
Subject: [PATCH 478/651] updae session error

---
 app/controllers/origami/addorders_controller.rb     |  2 +-
 app/controllers/origami/quick_service_controller.rb | 13 ++++++++++++-
 app/controllers/origami/request_bills_controller.rb |  8 +++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index f5bb7d37..0e905724 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -1,6 +1,6 @@
 class Origami::AddordersController < BaseOrigamiController
   # before_action :set_dining, only: [:detail]
-
+  
   def index
       @tables = Table.all.active.order('zone_id asc').group("zone_id")
       @rooms = Room.all.active.order('zone_id asc').group("zone_id")
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 44dcfcb8..8abcfcc8 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -1,6 +1,12 @@
 class Origami::QuickServiceController < ApplicationController
   # before_action :set_dining, only: [:detail]
-
+   before_action :check_user
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   def index
     today = DateTime.now
     day = Date.today.wday
@@ -211,6 +217,11 @@ class Origami::QuickServiceController < ApplicationController
     end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
   # this can always true
   def check_order_with_booking(booking)
     if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index adfe35a6..e2553a83 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -1,5 +1,11 @@
 class Origami::RequestBillsController < ApplicationController
-
+  before_action :check_user
+ 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
   # Print Request Bill and add to sale tables
   def print
     @sale = Sale.new

From e0fe0ee8ab69dec19a1cb73eac16c30b911d3213 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Mar 2018 18:06:53 +0630
Subject: [PATCH 479/651] dashboard update

---
 app/controllers/home_controller.rb         | 21 +++++---
 app/views/home/dashboard.html.erb          | 56 +++++++++++++++++++---
 app/views/origami/dashboard/index.html.erb |  4 +-
 config/locales/en.yml                      |  2 +
 config/locales/mm.yml                      |  2 +
 5 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index f097ba6f..da8695d8 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -80,14 +80,21 @@ class HomeController < ApplicationController
   end
 
   def dashboard
-    @from, @to = get_date_range_from_params
+    @from, @to, @from_time, @to_time = get_date_range_from_params
 
     @shop = Shop.first
 
     today = DateTime.now.strftime('%Y-%m-%d')
-    @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
-    @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
-
+    if !@from.nil? && !@to.nil?
+      @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
+    else
+      @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
+    end
+    if !@from.nil? && !@to.nil?
+      @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
+    else
+      @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
+    end
     @top_products = Sale.top_products(today,@from,@to).sum('i.qty')
     @bottom_products = Sale.bottom_products(today,@from,@to).sum('i.qty')
     @hourly_sales = Sale.hourly_sales(today,@from,@to).sum(:grand_total)
@@ -190,7 +197,9 @@ class HomeController < ApplicationController
 
   def get_date_range_from_params
       from = params[:from]
-      to = params[:to]   
+      to = params[:to]  
+      from_time = params[:from_time]
+      to_time   = params[:to_time]
 
       if from.present? && to.present?
         f_date = DateTime.parse(from)
@@ -201,7 +210,7 @@ class HomeController < ApplicationController
         to     = t_time.end_of_day.utc.getlocal  
       end
 
-    return from, to 
+    return from, to, from_time, to_time
   end
 
   #Shop Name in Navbor
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index aee947c7..6ee68d97 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -68,16 +68,26 @@
 
   <!-- Date range for dashboard -->
   <div class="row clearfix">
-    <div class="col-lg-4 col-md-4 col-sm-4">
+    <div class="col-lg-3 col-md-3 col-sm-3">
       <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" value="<%= Time.now.utc.strftime('%d-%m-%Y') %>" placeholder="From date" style="height: 35px;">
+      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" value="<%= Time.now.utc.getlocal.strftime('%d-%m-%Y') %>" placeholder="From date" style="height: 35px;">
       <span id="fromErr" style="color:red;"></span>
     </div>
-    <div class="col-lg-4 col-md-4 col-sm-4">
+    <div class="col-lg-3 col-md-3 col-sm-3">
       <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" value="<%= Time.now.utc.strftime('%d-%m-%Y') %>" placeholder="To date" style="height: 35px;">
+      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" value="<%= Time.now.utc.getlocal.strftime('%d-%m-%Y') %>" placeholder="To date" style="height: 35px;">
       <span id="toErr" style="color:red;"></span>
     </div>
+    <div class="col-lg-2 col-md-2 col-sm-2">
+      <label class="font-14"><%= t("views.right_panel.detail.from_time") %></label>
+      <input data-behaviour='timepicker' class="form-control timepicker" name="from_time" id="from_time" type="text" value="" placeholder="From Time" style="height: 35px;">
+      <span id="from_timeErr" style="color:red;"></span>
+    </div>
+    <div class="col-lg-2 col-md-2 col-sm-2">
+      <label class="font-14"><%= t("views.right_panel.detail.to_time") %></label>
+      <input data-behaviour='timepicker' class="form-control timepicker" name="to_time" id="to_time" type="text" value="" placeholder="To time" style="height: 35px;">
+      <span id="to_timeErr" style="color:red;"></span>
+    </div>
     <div class="col-lg-2 col-md-2 col-sm-2">
       <label></label><br>
       <input type="button" value="Generate" class='btn btn-primary btn_generate'>
@@ -340,21 +350,53 @@
   $('.btn_generate').on('click',function(){
     var from = $("#from").val();
     var to = $("#to").val();
+    var from_time = $("#from_time").val();
+    var to_time = $("#to_time").val();
+    
+    if(check(from,to,from_time,to_time)){
+      var params = '?';
+      if((from!='' && to!='') && (from_time!='' && to_time!='')){
+        params += 'from='+from+'&to='+to+'&from_time='+from_time+'&to_time='+to_time;
+      }else{
+        params += 'from='+from+'&to='+to;
+      }
+      window.location.href = '/dashboard'+params;
+    }
+  });
+
+  function check(from,to,from_time,to_time){
+    var status = true;
     if((from=='') && (to=='')){
+      status = false;
       $('#fromErr').html("can't be blank");
       $('#toErr').html("can't be blank");
     }else if((from!='') && (to=='')){
+      status = false;
       $('#fromErr').html("");
       $('#toErr').html("can't be blank");
     }else if((from=='') && (to!='')){
+      status = false;
       $('#fromErr').html("can't be blank");
       $('#toErr').html("");
     }else{
+      status = true;
       $('#fromErr').html("");
       $('#toErr').html("");
     }
-    if((from!='') && (to!='')){
-      window.location.href = '/dashboard?from='+from+'&to='+to;
+
+    if(((from_time=='') && (to_time=='')) || ((from_time!='') && (to_time!=''))){
+      status = true;
+      $('#from_timeErr').html("");
+      $('#to_timeErr').html("");
+    }else if((from_time!='') && (to_time=='')){
+      status = false;
+      $('#from_timeErr').html("");
+      $('#to_timeErr').html("can't be blank");
+    }else if((from_time=='') && (to_time!='')){
+      status = false;
+      $('#from_timeErr').html("can't be blank");
+      $('#to_timeErr').html("");
     }
-  });
+    return status;
+  }
 </script>
\ No newline at end of file
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 5361ac27..228da935 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -22,7 +22,7 @@
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
           </div>
-          <div class="text font-20 m-l-5" style="line-height: 80px;">Quick Service</div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :quick_service %></div>
         </div>
       </div>
       <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 cashier_view">
@@ -30,7 +30,7 @@
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
           </div>
-          <div class="text font-20 m-l-5" style="line-height: 80px;">Cashier</div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_order %></div>
         </div>
       </div>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index da68414c..84a7b03a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -72,6 +72,8 @@ en:
   payment: "Payment"
   backend: "Backend"
   date_time: "DateTime"
+  dine_in_order: "Dine In Order"
+  quick_service: "Quick Service"
 
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index d3ca2d0f..f18136c4 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -67,6 +67,8 @@ mm:
   payment: "ငွေပေး�ျေမှု"
   backend: "နောက်ကွယ်"
   date_time: "ရက်စွဲအ�ျိန်"
+  dine_in_order: "Dine In Order"
+  quick_service: "Quick Service"
   
   views:
     btn:       

From f9aa3310fa3c6d16a1f2ed1c016eda4e2dfa2bb7 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Mar 2018 19:37:32 +0630
Subject: [PATCH 480/651] check ability in booking

---
 app/models/ability.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index de43d71f..0b1edcc3 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -105,7 +105,7 @@ class Ability
         can :show, :home
         can :read, Order
         can :update, Order
-        can :menage, Booking
+        can :manage, Booking
         can :manage, OrderQueueStation
         can :read, Sale  
         can :update, Sale    

From 186353acb0410ee59034120a4dae68c11aba5103 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 26 Mar 2018 11:40:04 +0630
Subject: [PATCH 481/651] Multiple image upload finished

---
 app/controllers/settings/shops_controller.rb | 10 ++++------
 app/models/display_image.rb                  |  2 +-
 app/views/settings/shops/_form.html.erb      | 17 +++--------------
 app/views/settings/shops/show.html.erb       |  2 +-
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/controllers/settings/shops_controller.rb b/app/controllers/settings/shops_controller.rb
index 97c6422d..975d9e25 100644
--- a/app/controllers/settings/shops_controller.rb
+++ b/app/controllers/settings/shops_controller.rb
@@ -47,15 +47,13 @@ class Settings::ShopsController < ApplicationController
   # PATCH/PUT /settings/shops/1
   # PATCH/PUT /settings/shops/1.json
   def update
+
     respond_to do |format|
       if @settings_shop.update(shop_params)
         if params[:display_images].present?
-          params[:display_images]['image'].each do |a|
-            
-            aa = a.read
-            base64_encoded = Base64.encode64(aa)
-            byebug
-            @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => base64_encoded)
+          params[:display_images][:image].each do |a|
+            @aa = Base64.encode64(a.read)
+            @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => "data:image/jpeg;base64,"+@aa)
           end
         end
         format.html { redirect_to settings_shops_url, notice: 'Shop was successfully updated.' }
diff --git a/app/models/display_image.rb b/app/models/display_image.rb
index 63405b26..7f6624e2 100644
--- a/app/models/display_image.rb
+++ b/app/models/display_image.rb
@@ -1,5 +1,5 @@
 class DisplayImage < ApplicationRecord
-	mount_uploader :image, DisplayImageUploader
+	#mount_uploader :image, DisplayImageUploader
     belongs_to :shop
 
 end
diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb
index 38555333..7a3c0a04 100755
--- a/app/views/settings/shops/_form.html.erb
+++ b/app/views/settings/shops/_form.html.erb
@@ -44,25 +44,14 @@
           <div class="panel padding-10">
             <div class="form-group">
               <div class="menu-item-img">
-  
                 <%= f.fields_for :display_images do |p| %>
-                 <div class="field">
-                   <%= image_tag p.object.image, :class => "img-thumbnail" %>
-                   
-                   <%= link_to "Destroy", settings_shop_display_image_path(p.object), method: :delete %>
-                 </div>
-               <% end %>   
-                     
+                    <%= image_tag "#{p.object.image}", :class => "img-thumbnail" %>
+                    <%= link_to "Destroy", settings_shop_display_image_path(p.object), method: :delete %> 
+                <% end %>   
               </div>
             </div>
           </div> 
           <%= f.file_field :image, :multiple => true, name:     "display_images[image][]" %>
-<!--           <%= f.fields_for :display_images do |p| %>
-           <div class="field">
-             <%= p.label :image %><br>
-             <%= p.file_field :image, :multiple => true, name:     "display_images[image][]" %>
-           </div>
-         <% end %> -->
 
         <div class="form-actions p-l-15">
           <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
diff --git a/app/views/settings/shops/show.html.erb b/app/views/settings/shops/show.html.erb
index d30ca274..7d04d504 100755
--- a/app/views/settings/shops/show.html.erb
+++ b/app/views/settings/shops/show.html.erb
@@ -103,7 +103,7 @@
               <td style="width:20%">Shop Images</td>
               <td>
                 <% @display_images.each do |p| %>
-                     <%= image_tag p.image , :size => '200x200'%><br>
+                  <%= image_tag "#{p.image}" %>
                 <% end %>
               </td>
             </tr>

From ac0ee37136a90039b7a7eed7b3f27c5808eb081f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 26 Mar 2018 15:54:24 +0630
Subject: [PATCH 482/651] add foc , void and discount item in sale item report

---
 .../reports/saleitem_controller.rb            |   6 +-
 app/models/sale.rb                            |  33 +-
 .../_shift_sale_report_filter.html.erb        |  33 +-
 app/views/reports/saleitem/index.html.erb     |  94 ++---
 app/views/reports/saleitem/index.xls.erb      | 188 +++++----
 .../reports/saleitem/indexbackup.html.erb     | 366 ++++++++++++++++++
 6 files changed, 573 insertions(+), 147 deletions(-)
 create mode 100644 app/views/reports/saleitem/indexbackup.html.erb

diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 796b02ad..a731cb44 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -15,8 +15,10 @@ class Reports::SaleitemController < BaseReportController
         shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
       end
     end
-    @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
-
+    @type = params[:sale_type]
+    @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)
+puts @other_charges.to_json
+puts "oooooooooooooooooooooooo"
     @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
 
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b459f16c..fb422a73 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -798,15 +798,27 @@ def self.get_by_shift_sale(from,to,status)
   return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
-def self.get_item_query()
+def self.get_item_query(type)
+
+  if type == "revenue" || type.nil?
+   sale_type = "i.status IS NULL and i.qty >0 "
+  elsif type == "all"
+    sale_type = ""
+  elsif type == "discount"
+    sale_type = "i.status = 'Discount'"
+  elsif type == "foc"
+    sale_type = "i.status = 'foc' and i.qty > 0"
+  elsif type == "void"
+    sale_type = "i.status = 'void' and i.qty > 0"
+  elsif type == "other"
+    sale_type = "i.item_instance_code IS NULL"
+  end
   query = Sale.select("acc.title as account_name,mi.account_id, 
                       i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,
                       SUM(i.qty) as total_item,i.qty as qty," +
                      "i.status as status_type,"+
-                     " i.unit_price,i.price as price,i.product_name as product_name,
-                      mc.name as" +
-                     " menu_category_name,mc.id as menu_category_id ")
+                     "i.unit_price,i.price as price,i.product_name as product_name,mc.name as " +"menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
                      " JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
@@ -815,7 +827,7 @@ def self.get_item_query()
                      " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
-  # query = query.where("i.item_instance_code IS NOT NULL")
+  query = query.where("#{sale_type}")
   query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name,i.unit_price")
                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
 end
@@ -830,10 +842,15 @@ def self.get_other_charges()
   query = query.group("i.sale_item_id")
 end
 
-def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
+def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type)
   # date_type_selection = get_sql_function_for_report_type(report_type)
-  query = self.get_item_query()
-
+  if type == "other"
+    other_charges = self.get_other_charges()
+    query = self.get_item_query(type)
+  else
+    query = self.get_item_query(type)
+  end
+  
   discount_query = 0
   total_card_amount = 0
   total_cash_amount = 0
diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
index 88f26c1f..75a331e9 100755
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -18,13 +18,25 @@
 				<option value="9">Last year</option>
 			</select>
 		</div>
-		<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->		
-		<div class="col-lg-3 col-md-3 col-sm-3">					
+		<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->	
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Select Type</label>
+			<select name="sale_type" id="sel_sale_type" class="form-control">
+			    <option value="">Select Typess</option>
+			    <option value="revenue" selected>Revenue Only</option>
+				<option value="all">All Type</option>
+				<option value="discount">Discount Only</option>
+				<option value="void">Void Only</option>
+				<option value="foc">Foc Only</option>
+				<option value="other">Other Amount Only</option>
+			</select>
+		</div>	
+		<div class="col-lg-2 col-md-2 col-sm-2">					
 			<!-- <label class="">Select Shift Period</label> -->
 			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
 			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 		</div>
-		<div class="col-lg-3 col-md-3 col-sm-3">
+		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
 			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 		</div>
@@ -52,7 +64,7 @@
 			$('#frm_report').attr('action',url)
 			$('#frm_report').submit();
 		// window.location = url;
-	});
+	    });
 
 		var item = $('#item').val();
 		var payment_type = $('#payment_type');
@@ -76,17 +88,18 @@
 	});
 
 	<% if params[:shift_name].to_i > 0%>
-	shift_id = '<%= params[:shift_name] %>'
-	local_date = '<%= @shift_from %> - <%= @shift_to %> '
-	var shift = $('#shift_name');
-	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
-	shift.append(str);
+		shift_id   = '<%= params[:shift_name] %>'
+		local_date = '<%= @shift_from %> - <%= @shift_to %> '
+		var shift  = $('#shift_name');
+		str        = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+		shift.append(str);
 	<% end %>
 
 	$("#from").val("<%=params[:from] rescue '-'%>");
 	$("#to").val("<%=params[:to] rescue '-'%>");
 	$("#sel_period").val(<%=params[:period] rescue '-'%>);
-	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+	var sale_type = "<%=params[:sale_type]%>";
+	$("#sel_sale_type").val(sale_type);
 
 
 	<% if params[:period_type] == 1 || params[:period_type] == "1" %>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 3c03dec2..531d289b 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -57,8 +57,7 @@
 								delimiter = ""
 						    end
 							 %>	
-							<% unless @sale_data.blank? %>
-							<% acc_arr = Array.new %>
+							 <% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>	 
 
 							<% sub_qty = 0 %>
@@ -75,24 +74,27 @@
 							<% total_item_foc = 0 %>
 							<% total_item_dis = 0.0 %>
 							<% total_tax = 0 %>
-
+							<% unless @sale_data.blank? %>
 							<% @sale_data.each do |sale| %>
 							<!-- all total qty sum -->
+							<!--
 								<% if sale.status_type != "Discount" && sale.status_type != "foc"
 									total_qty += sale.total_item
 								end %>
 								<% if sale.status_type == "foc" && sale.price > 0
 									total_qty += sale.total_item
 								end %>
+							-->
 							<!-- end all total qty -->
-								<% if sale.status_type == "foc" && sale.grand_total < 0
+							<!--	
+							    <% if sale.status_type == "foc" && sale.grand_total < 0
 									total_item_foc += sale.grand_total*(-1)
 								end %>	 
 
 								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
 									total_item_dis += sale.grand_total*(-1)
 								end %>
-
+							-->
 								<% if !acc_arr.include?(sale.account_id) %>
 									<tr>
 										<td><b><%= sale.account_name %></b></td>
@@ -151,7 +153,8 @@
 							<!-- end sub total -->
 						<% end %>
 							<!--Other Charges -->
-							<% if @other_charges.present? %>
+							<% if @type == "other"%>
+							
 							   <tr>
 									<td><b>Other Charges</b></td>
 									<td colspan="4">&nbsp;</td>
@@ -191,55 +194,38 @@
 								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
 							</tr>
 							<% end %>
-
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= number_with_precision(total_item_foc ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(total_item_dis ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td>
-									<span><%= number_with_precision(@foc_data,  precision:precision.to_i, delimiter:delimiter) %></span>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;">
-									<span>
-										<%= number_with_precision(@discount_data ,  precision: precision.to_i,delimiter: delimiter) %>
-									</span>
-								</td>
-							</tr>	
+							<% if @type == "other"%>
 							
-								<% @sale_taxes.each do |tax| %>
-								<!-- <tr>
-								    <td colspan="5">&nbsp;</td>
-									<td><%= tax.tax_name %></td>
-									<td><%= tax.st_amount.round(2) %>
-										<%total_tax += tax.st_amount%>
-									</td>
-								</tr> -->
-							<% end %>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-top:2px solid grey;">Net Amount</td>
-								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td> 
-							</tr>
-							<!-- <tr>
-								<td colspan="5">&nbsp;</td>
-								<td>Grand Total</td>
-							
-								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
-							</tr>	 -->
+							   <tr>
+									<td><b>Other Charges</b></td>
+									<td colspan="4">&nbsp;</td>
+									<td></td>
+								</tr>
+								<% @other_charges.each do |other| %>
+									<% if other.total_item > 0
+										total_qty += other.total_item
+									end %>
+									<% grand_total +=other.grand_total%>
+									<tr>
+									<td>&nbsp;</td>
+										<td>Other Charges</td>
+										<td><%= other.item_code rescue '-' %></td>
+										<td><%= other.product_name rescue '-' %></td>
+										<td><%= other.total_item rescue '-' %></td>
+										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									</tr>
+									<!-- sub total -->
+									
+									    <% other_sub_total += other.grand_total %>
+								    <!-- end sub total -->								
+								<% end %>
+								<tr>
+									<td colspan="5">&nbsp;</td>
+									<td><%= t("views.right_panel.detail.sub_total") %></td>
+									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+								</tr>
+						    <%end%>
 						</tbody>
 					</table>
 				</div>
diff --git a/app/views/reports/saleitem/index.xls.erb b/app/views/reports/saleitem/index.xls.erb
index f97edbb8..85c666a5 100755
--- a/app/views/reports/saleitem/index.xls.erb
+++ b/app/views/reports/saleitem/index.xls.erb
@@ -27,10 +27,22 @@
 							</tr>	
 						</thead>
 						<tbody>
-							<% unless @sale_data.blank? %>
-							<% acc_arr = Array.new %>
+							<% if @print_settings.precision.to_i > 0
+								precision = @print_settings.precision
+							else
+								precision = 0
+							end
+							#check delimiter
+							if @print_settings.delimiter
+								delimiter = ","
+						    else
+								delimiter = ""
+						    end
+							 %>	
+							 <% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>	 
 
+							<% sub_qty = 0 %>
 							<% sub_total = 0 %>
 							<% other_sub_total = 0 %>
 							<% count = 0 %>
@@ -42,14 +54,29 @@
 							<% total_amount = 0 %>
 							<% discount = 0 %>
 							<% total_item_foc = 0 %>
-							<% total_item_dis = 0 %>
-
+							<% total_item_dis = 0.0 %>
+							<% total_tax = 0 %>
+							<% unless @sale_data.blank? %>
 							<% @sale_data.each do |sale| %>
-
-								<% if sale.total_item > 0
+							<!-- all total qty sum -->
+							<!--
+								<% if sale.status_type != "Discount" && sale.status_type != "foc"
 									total_qty += sale.total_item
 								end %>
+								<% if sale.status_type == "foc" && sale.price > 0
+									total_qty += sale.total_item
+								end %>
+							-->
+							<!-- end all total qty -->
+							<!--	
+							    <% if sale.status_type == "foc" && sale.grand_total < 0
+									total_item_foc += sale.grand_total*(-1)
+								end %>	 
 
+								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
+									total_item_dis += sale.grand_total*(-1)
+								end %>
+							-->
 								<% if !acc_arr.include?(sale.account_id) %>
 									<tr>
 										<td><b><%= sale.account_name %></b></td>
@@ -58,7 +85,7 @@
 										<td>
 											<% @totalByAccount.each do |account, total| %>
 											<% if sale.account_id == account %>
-											<b><%= total %></b>
+											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
 											<% grand_total += total %>	  
 											<% end %>
 											<% end %>
@@ -77,95 +104,110 @@
 									<td><%= sale.item_code rescue '-' %></td>
 									<td><%= sale.product_name rescue '-' %></td>
 									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= sale.unit_price rescue '-' %></td>
-									<td><%= sale.grand_total rescue '-' %></td>
+									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
-								<% @menu_cate_count.each do |key,value| %>
-								<% if sale.menu_category_id == key %>
 
+							<% @menu_cate_count.each do |key,value| %>
+								<% if sale.account_id == key %>
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
+								    <% #sub_qty += sale.total_item %>
+								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
+										sub_qty += sale.total_item
+									end %>
+
 									<% if count == value %>	
 										<tr>
-											<td colspan="5">&nbsp;</td>
+											<td colspan="3">&nbsp;</td>
+											<td><b>Total <%= sale.account_name %> Qty </b> </td>
+											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%= sub_total %></span></td>
+											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
 										</tr>
-										<% if sale.status_type === "foc"
-											total_item_foc += sale.grand_total 
-										end %>	 
-
-										<% if sale.status_type === "Discount"
-											total_item_dis += sale.grand_total 
-										end %>
 										<% sub_total = 0.0%>
+										<% sub_qty = 0 %>
 										<% count = 0%>
 									<% end %>
-							      <% end %>
 							    <% end %>
+							<% end %>
 							<!-- end sub total -->
-							<% end %>
+						<% end %>
 							<!--Other Charges -->
-							<tr>
-								<td><b>Other Charges</b></td>
-								<td colspan="4">&nbsp;</td>
-								<td></td>
-							</tr>
-							<% @other_charges.each do |other| %>
-								<% if other.total_item > 0
-									total_qty += other.total_item
-								end %>
-								<% grand_total +=other.grand_total%>
-								<tr>
-								<td>&nbsp;</td>
-									<td>Other Charges</td>
-									<td><%= other.item_code rescue '-' %></td>
-									<td><%= other.product_name rescue '-' %></td>
-									<td><%= other.total_item rescue '-' %></td>
-									<td><%= other.unit_price rescue '-' %></td>
-									<td><%= other.grand_total rescue '-' %></td>
+							<% if @type == "other"%>
+							
+							   <tr>
+									<td><b>Other Charges</b></td>
+									<td colspan="4">&nbsp;</td>
+									<td></td>
 								</tr>
-								<!-- sub total -->
-								
-								    <% other_sub_total += other.grand_total %>
-							    <!-- end sub total -->								
-							<% end %>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.sub_total") %></td>
-								<td ><span class="underline"><%= other_sub_total %></span></td>
-							</tr>
+								<% @other_charges.each do |other| %>
+									<% if other.total_item > 0
+										total_qty += other.total_item
+									end %>
+									<% grand_total +=other.grand_total%>
+									<tr>
+									<td>&nbsp;</td>
+										<td>Other Charges</td>
+										<td><%= other.item_code rescue '-' %></td>
+										<td><%= other.product_name rescue '-' %></td>
+										<td><%= other.total_item rescue '-' %></td>
+										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									</tr>
+									<!-- sub total -->
+									
+									    <% other_sub_total += other.grand_total %>
+								    <!-- end sub total -->								
+								<% end %>
+								<tr>
+									<td colspan="5">&nbsp;</td>
+									<td><%= t("views.right_panel.detail.sub_total") %></td>
+									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+								</tr>
+						    <%end%>
 							<!-- End Other Charges -->
 							<tr style="border-top:2px solid grey;">
 								<td colspan="3">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
-								<td><%= t("views.right_panel.detail.net_amount") %></td>
-								<td><span><%= grand_total%></span></td> 
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
 							</tr>
 							<% end %>
-
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_foc %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_dis %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td><span><%= @foc_data %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= @discount_data %></span></td>
-							</tr>		
+							<% if @type == "other"%>
+							
+							   <tr>
+									<td><b>Other Charges</b></td>
+									<td colspan="4">&nbsp;</td>
+									<td></td>
+								</tr>
+								<% @other_charges.each do |other| %>
+									<% if other.total_item > 0
+										total_qty += other.total_item
+									end %>
+									<% grand_total +=other.grand_total%>
+									<tr>
+									<td>&nbsp;</td>
+										<td>Other Charges</td>
+										<td><%= other.item_code rescue '-' %></td>
+										<td><%= other.product_name rescue '-' %></td>
+										<td><%= other.total_item rescue '-' %></td>
+										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									</tr>
+									<!-- sub total -->
+									
+									    <% other_sub_total += other.grand_total %>
+								    <!-- end sub total -->								
+								<% end %>
+								<tr>
+									<td colspan="5">&nbsp;</td>
+									<td><%= t("views.right_panel.detail.sub_total") %></td>
+									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+								</tr>
+						    <%end%>
 						</tbody>
 					</table>
 				</div>
diff --git a/app/views/reports/saleitem/indexbackup.html.erb b/app/views/reports/saleitem/indexbackup.html.erb
new file mode 100644
index 00000000..3c03dec2
--- /dev/null
+++ b/app/views/reports/saleitem/indexbackup.html.erb
@@ -0,0 +1,366 @@
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %>
+
+		<hr />
+
+		<div class="text-right">
+			<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
+		</div>	  			
+
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="table-responsive">				
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+							<tr>
+								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							</tr>
+							<% if @shift_from %>
+							<tr>
+								<% if @shift_data.employee %>		
+								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+								<% end %>			
+								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							</tr>
+							<% end %>
+							<tr>
+								<th>&nbsp;</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
+								<th><%= t("views.right_panel.detail.code") %></th>
+								<th><%= t("views.right_panel.detail.product") %></th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<th><%= t("views.right_panel.detail.revenue") %></th>
+							</tr>	
+						</thead>
+						<tbody>
+							<% if @print_settings.precision.to_i > 0
+								precision = @print_settings.precision
+							else
+								precision = 0
+							end
+							#check delimiter
+							if @print_settings.delimiter
+								delimiter = ","
+						    else
+								delimiter = ""
+						    end
+							 %>	
+							<% unless @sale_data.blank? %>
+							<% acc_arr = Array.new %>
+							<% cate_arr = Array.new %>	 
+
+							<% sub_qty = 0 %>
+							<% sub_total = 0 %>
+							<% other_sub_total = 0 %>
+							<% count = 0 %>
+							<% total_price = 0 %>
+							<% cate_count = 0 %>
+							<% acc_count = 0 %>
+							<% grand_total = 0 %>
+							<% total_qty = 0 %>
+							<% total_amount = 0 %>
+							<% discount = 0 %>
+							<% total_item_foc = 0 %>
+							<% total_item_dis = 0.0 %>
+							<% total_tax = 0 %>
+
+							<% @sale_data.each do |sale| %>
+							<!-- all total qty sum -->
+								<% if sale.status_type != "Discount" && sale.status_type != "foc"
+									total_qty += sale.total_item
+								end %>
+								<% if sale.status_type == "foc" && sale.price > 0
+									total_qty += sale.total_item
+								end %>
+							<!-- end all total qty -->
+								<% if sale.status_type == "foc" && sale.grand_total < 0
+									total_item_foc += sale.grand_total*(-1)
+								end %>	 
+
+								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
+									total_item_dis += sale.grand_total*(-1)
+								end %>
+
+								<% if !acc_arr.include?(sale.account_id) %>
+									<tr>
+										<td><b><%= sale.account_name %></b></td>
+										<td colspan="4">&nbsp;</td>
+										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
+										<td>
+											<% @totalByAccount.each do |account, total| %>
+											<% if sale.account_id == account %>
+											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
+											<% grand_total += total %>	  
+											<% end %>
+											<% end %>
+										</td>
+									</tr>
+								   <% acc_arr.push(sale.account_id) %>
+								<% end %>
+								<tr>
+									<td>&nbsp;</td>
+									<% if !cate_arr.include?(sale.menu_category_id) %>	
+									<td><%= sale.menu_category_name %></td>
+									<% cate_arr.push(sale.menu_category_id) %>
+									<% else %>
+									<td>&nbsp;</td>
+									<% end %>
+									<td><%= sale.item_code rescue '-' %></td>
+									<td><%= sale.product_name rescue '-' %></td>
+									<td><%= sale.total_item rescue '-' %></td>
+									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								</tr>
+								<!-- sub total -->
+
+							<% @menu_cate_count.each do |key,value| %>
+								<% if sale.account_id == key %>
+								    <% count = count + 1 %>	
+								    <% sub_total += sale.grand_total %>
+								    <% #sub_qty += sale.total_item %>
+								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
+										sub_qty += sale.total_item
+									end %>
+
+									<% if count == value %>	
+										<tr>
+											<td colspan="3">&nbsp;</td>
+											<td><b>Total <%= sale.account_name %> Qty </b> </td>
+											<td><b><%= sub_qty %></b></td>
+											<td><%= t("views.right_panel.detail.sub_total") %></td>
+											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
+										</tr>
+										<% sub_total = 0.0%>
+										<% sub_qty = 0 %>
+										<% count = 0%>
+									<% end %>
+							    <% end %>
+							<% end %>
+							<!-- end sub total -->
+						<% end %>
+							<!--Other Charges -->
+							<% if @other_charges.present? %>
+							   <tr>
+									<td><b>Other Charges</b></td>
+									<td colspan="4">&nbsp;</td>
+									<td></td>
+								</tr>
+								<% @other_charges.each do |other| %>
+									<% if other.total_item > 0
+										total_qty += other.total_item
+									end %>
+									<% grand_total +=other.grand_total%>
+									<tr>
+									<td>&nbsp;</td>
+										<td>Other Charges</td>
+										<td><%= other.item_code rescue '-' %></td>
+										<td><%= other.product_name rescue '-' %></td>
+										<td><%= other.total_item rescue '-' %></td>
+										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									</tr>
+									<!-- sub total -->
+									
+									    <% other_sub_total += other.grand_total %>
+								    <!-- end sub total -->								
+								<% end %>
+								<tr>
+									<td colspan="5">&nbsp;</td>
+									<td><%= t("views.right_panel.detail.sub_total") %></td>
+									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+								</tr>
+						    <%end%>
+							<!-- End Other Charges -->
+							<tr style="border-top:2px solid grey;">
+								<td colspan="3">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
+								<td><span><%= total_qty%></span></td>
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
+							</tr>
+							<% end %>
+
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td><span><%= number_with_precision(total_item_foc ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(total_item_dis ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.foc_sales") %></td>
+								<td>
+									<span><%= number_with_precision(@foc_data,  precision:precision.to_i, delimiter:delimiter) %></span>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;">
+									<span>
+										<%= number_with_precision(@discount_data ,  precision: precision.to_i,delimiter: delimiter) %>
+									</span>
+								</td>
+							</tr>	
+							
+								<% @sale_taxes.each do |tax| %>
+								<!-- <tr>
+								    <td colspan="5">&nbsp;</td>
+									<td><%= tax.tax_name %></td>
+									<td><%= tax.st_amount.round(2) %>
+										<%total_tax += tax.st_amount%>
+									</td>
+								</tr> -->
+							<% end %>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td style="border-top:2px solid grey;">Net Amount</td>
+								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
+								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td> 
+							</tr>
+							<!-- <tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Grand Total</td>
+							
+								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
+							</tr>	 -->
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+
+
+		var check_arr = [];
+
+		var search = '<%= params[:period_type] %>';
+
+		if(search){
+
+			if(parseInt(search) == 0){
+				search_by_period();	
+			}
+			else{
+				search_by_date();				
+			}
+		}else{
+			search_by_period();		
+		}	
+
+		$('#sel_period').change(function(){
+			search_by_period();
+		});
+
+		function search_by_period(){
+			var period = $('#sel_period').val();
+			var period_type = 0;
+			var from = "";
+			var to = "";
+
+			show_shift_name(period,period_type,from,to,'shift_item');	
+		}   
+
+		// OK button is clicked
+		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
+			search_by_date();
+		});
+		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
+			search_by_date();
+		});     
+
+		function search_by_date(){
+			from = $("#from").val();
+	  		to   = $("#to").val();
+			var period = 0;
+			var period_type = 1;	   
+
+			if(to != '' && from != ''){
+				shift_name = from + ',' + to;
+
+				check_arr.push(to);
+
+				console.log(check_arr.length)
+				if(check_arr.length == 1){
+					show_shift_name(period,period_type,from,to,'shift_item');		   			   	
+				}
+				if(check_arr.length == 3){
+					check_arr = [];
+				}
+			}
+
+		}
+
+		function show_shift_name(period,period_type,from,to,shift_item){
+			var shift = $('#shift_name');
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
+			shift.empty();
+			var selected = '';
+			var str = '';
+			var param_shift = '<%= params[:shift_name]%>';
+			
+			url = '<%= reports_get_shift_by_date_path %>';
+			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
+				console.log(data)
+
+				str = '<option value="0">--- All Shift ---</option>';
+				$(data.message).each(function(index){	
+
+					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
+					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
+					var shift_id = data.message[index].shift_id ;
+
+					if(param_shift != ''){
+						if(shift_id == param_shift){
+							selected = 'selected = "selected"';
+						}
+						else{
+							selected = '';				   
+						}			   	
+					}
+					else{
+						selected = '';		   
+					}			   
+
+
+					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
+
+			   // console.log(sh_date)
+			}) 
+				shift.append(str);
+			});
+		}
+
+	});
+</script>
\ No newline at end of file

From 4b78de3f9a5635964c03d3bd8188a2a46cf265da Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 26 Mar 2018 16:42:17 +0630
Subject: [PATCH 483/651] add filter in dashboard and Transaction/Sale

---
 app/controllers/home_controller.rb            |  75 +-
 .../transactions/sales_controller.rb          |  93 +-
 app/models/sale.rb                            | 850 ++++++++++++++----
 app/models/stock_journal.rb                   |  10 +-
 app/views/home/dashboard.html.erb             |  30 +-
 app/views/transactions/sales/index.html.erb   | 144 ++-
 6 files changed, 972 insertions(+), 230 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index da8695d8..d2b0ad36 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -86,64 +86,72 @@ class HomeController < ApplicationController
 
     today = DateTime.now.strftime('%Y-%m-%d')
     if !@from.nil? && !@to.nil?
-      @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
+      if !@from_time.nil? && @to_time.nil?
+        @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}' and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%m') between '#{@from_time}' and '#{@to_time}'").count()
+      else
+        @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
+      end
     else
       @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
     end
     if !@from.nil? && !@to.nil?
-      @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
+      if !@from_time.nil? && @to_time.nil?
+        @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}' and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%m') between '#{@from_time}' and '#{@to_time}'").count()
+      else
+        @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
+      end
     else
       @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
     end
-    @top_products = Sale.top_products(today,@from,@to).sum('i.qty')
-    @bottom_products = Sale.bottom_products(today,@from,@to).sum('i.qty')
-    @hourly_sales = Sale.hourly_sales(today,@from,@to).sum(:grand_total)
+    @top_products = Sale.top_products(today,current_user,@from,@to,@from_time,@to_time).sum('i.qty')
+    @bottom_products = Sale.bottom_products(today,current_user,@from,@to,@from_time,@to_time).sum('i.qty')
+    @hourly_sales = Sale.hourly_sales(today,current_user,@from,@to,@from_time,@to_time).sum(:grand_total)
     # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
     # .sum(:grand_total)
-    @employee_sales = Sale.employee_sales(today,@from,@to)
+    @employee_sales = Sale.employee_sales(today,current_user,@from,@to,@from_time,@to_time)
                     .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
-    @inventories    = StockJournal.inventory_balances(today,@from,@to).sum(:balance)
+    @inventories    = StockJournal.inventory_balances(today,@from,@to,@from_time,@to_time).sum(:balance)
 
-    @total_sale     = Sale.total_sale(today,current_user,@from,@to)
-    @total_count    = Sale.total_count(today,current_user,@from,@to)
-    @total_card     = Sale.total_card_sale(today,current_user,@from,@to)
-    @total_credit   = Sale.credit_payment(today,current_user,@from,@to)
+    @total_sale     = Sale.total_sale(today,current_user,@from,@to,@from_time,@to_time)
+    @total_count    = Sale.total_count(today,current_user,@from,@to,@from_time,@to_time)
+    @total_card     = Sale.total_card_sale(today,current_user,@from,@to,@from_time,@to_time)
+    @total_credit   = Sale.credit_payment(today,current_user,@from,@to,@from_time,@to_time)
 
     @sale_data = Array.new
-    @total_payment_methods = Sale.total_payment_methods(today,current_user,@from,@to)
+    @total_payment_methods = Sale.total_payment_methods(today,current_user,@from,@to,@from_time,@to_time)
 
     if !@total_payment_methods.nil?
       @total_payment_methods.each do |payment|
-        if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
-          pay = Sale.payment_sale('card', today, current_user,@from,@to)
+        if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" || payment.payment_method == "unionpay"
+          pay = Sale.payment_sale('card', today, current_user,@from,@to,@from_time,@to_time)
           @sale_data.push({'card' => pay.payment_amount})
         else 
-          pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to)
+          pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to,@from_time,@to_time)
           @sale_data.push({payment.payment_method => pay.payment_amount})
         end
       end
     end
-    @summ_sale              = Sale.summary_sale_receipt(today,current_user,@from,@to)
-    @total_customer         = Sale.total_customer(today,current_user,@from,@to)
-    @total_dinein           = Sale.total_dinein(today,current_user,@from,@to)
-    @total_takeaway         = Sale.total_takeaway(today,current_user,@from,@to)
-    @total_other_customer   = Sale.total_other_customer(today,current_user,@from,@to)
-    @total_membership       = Sale.total_membership(today,current_user,@from,@to)
+    @summ_sale              = Sale.summary_sale_receipt(today,current_user,@from,@to,@from_time,@to_time)
+    @total_customer         = Sale.total_customer(today,current_user,@from,@to,@from_time,@to_time)
+    @total_dinein           = Sale.total_dinein(today,current_user,@from,@to,@from_time,@to_time)
+    @total_takeaway         = Sale.total_takeaway(today,current_user,@from,@to,@from_time,@to_time)
+    @total_other_customer   = Sale.total_other_customer(today,current_user,@from,@to,@from_time,@to_time)
+    @total_membership       = Sale.total_membership(today,current_user,@from,@to,@from_time,@to_time)
 
-    @total_order            = Sale.total_order(today,current_user,@from,@to)
-    @total_accounts         = Sale.total_account(today,current_user,@from,@to)
+    @total_order            = Sale.total_order(today,current_user,@from,@to,@from_time,@to_time)
+    @total_accounts         = Sale.total_account(today,current_user,@from,@to,@from_time,@to_time)
     @account_data = Array.new
     if !@total_accounts.nil?
       @total_accounts.each do |account|
-        acc = Sale.account_data(account.account_id, today,current_user,@from,@to)
+        acc = Sale.account_data(account.account_id, today,current_user,@from,@to,@from_time,@to_time)
         if !acc.nil?
           @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
         end
       end
     end
 
-    @top_items         = Sale.top_items(today,current_user,@from,@to)
-    @total_foc_items   = Sale.total_foc_items(today,current_user,@from,@to) 
+    @top_items         = Sale.top_items(today,current_user,@from,@to,@from_time,@to_time)
+    @total_foc_items   = Sale.total_foc_items(today,current_user,@from,@to,@from_time,@to_time) 
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
@@ -202,12 +210,15 @@ class HomeController < ApplicationController
       to_time   = params[:to_time]
 
       if from.present? && to.present?
-        f_date = DateTime.parse(from)
-        t_date = DateTime.parse(to)
-        f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
-        t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
-        from   = f_time.beginning_of_day.utc.getlocal
-        to     = t_time.end_of_day.utc.getlocal  
+        # f_date = DateTime.parse(from)
+        # t_date = DateTime.parse(to)
+        # f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
+        # t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
+        # from   = f_time.beginning_of_day.utc.getlocal
+        # to     = t_time.end_of_day.utc.getlocal
+
+        from      = DateTime.parse(from).utc.getlocal.strftime('%Y-%m-%d') 
+        to        = DateTime.parse(to).utc.getlocal.strftime('%Y-%m-%d') 
       end
 
     return from, to, from_time, to_time
diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index bae9c353..be370371 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -8,14 +8,23 @@ class Transactions::SalesController < ApplicationController
   def index
     
     receipt_no = params[:receipt_no]
-    from       = params[:from]
-    to         = params[:to]
+    # from       = params[:from]
+    # to         = params[:to]
+    from, to  = get_date_range_from_params
+    @shift = ''
+    if params[:shift_name].to_i != 0
+            @shift = ShiftSale.find(params[:shift_name])
+    end
 
     if receipt_no.nil? && from.nil? && to.nil?
-        @sales = Sale.where("NOT sale_status='new'").order("sale_id desc") 
+      if @shift.blank?
+        @sales = Sale.where("NOT sale_status='new'").order("sale_id desc")
+      else 
+        @sales = Sale.where("NOT sale_status='new' and shift_sale_id ='#{@shift.id}'").order("sale_id desc")
+      end
         @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
     else
-        sale = Sale.search(receipt_no,from,to)
+        sale = Sale.search(receipt_no,from,to,@shift)
         if sale.count > 0
            @sales = sale 
            @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
@@ -26,6 +35,12 @@ class Transactions::SalesController < ApplicationController
     @receipt_no = receipt_no
     @from       = from
     @to         = to
+
+    if @shift.present?
+      @shift_from = @shift.shift_started_at.nil? ? '-' : @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
+      @shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
+      @shift_data = @shift
+    end
     
     # if receipt_no.nil? && search_date.nil?
     #      @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) 
@@ -48,7 +63,7 @@ class Transactions::SalesController < ApplicationController
 
     @sale_audits = []
     @sale_item_audits = []
-    if !@sales.nil?
+    if @sales != 0
       @sales.each do |sale|
         sale_audit = SaleAudit.where("(action = 'SALEPAYMENT' or action = 'SALEVOID') and sale_id = ? and remark IS NOT NULL",sale.sale_id)
         if !sale_audit.nil?
@@ -148,6 +163,74 @@ class Transactions::SalesController < ApplicationController
     end
   end
 
+  # date range
+  PERIOD = {
+    "today" => 0,
+    "yesterday" => 1,
+    "this_week" => 2,
+    "last_week" => 3,
+    "last_7" => 4,
+    "this_month" => 5,
+    "last_month" => 6,
+    "last_30" => 7,
+    "this_year" => 8,
+    "last_year" => 9
+  }
+
+  def get_date_range_from_params
+      period_type = params[:period_type]
+      period = params[:period]
+      from = params[:from]
+      to = params[:to]   
+      day_ref = Time.now.utc.getlocal
+
+        if from.present? && to.present?
+            f_date = DateTime.parse(from)
+            t_date = DateTime.parse(to)
+            f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
+            t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
+            from   = f_time.beginning_of_day.utc.getlocal
+            to     = t_time.end_of_day.utc.getlocal 
+        else 
+            case period.to_i
+              when PERIOD["today"]
+                from = day_ref.beginning_of_day.utc
+                to = day_ref.end_of_day.utc
+
+              when PERIOD["yesterday"]
+                from = (day_ref - 1.day).beginning_of_day.utc
+                to = (day_ref - 1.day).end_of_day.utc
+
+              when PERIOD["this_week"]
+                from = Time.now.beginning_of_week.utc
+                to = Time.now.utc
+              when PERIOD["last_week"]
+                from = (day_ref - 7.day).beginning_of_week.utc
+                to = (day_ref - 7.day).end_of_week.utc
+              when PERIOD["last_7"]
+                from = (day_ref - 7.day).utc
+                to = Time.now.utc
+              when PERIOD["this_month"]
+                from = Time.now.beginning_of_month.utc
+                to = Time.now.utc
+              when PERIOD["last_month"]
+                from = (day_ref - 1.month).beginning_of_month.utc
+                to = (day_ref - 1.month).end_of_month.utc
+              when PERIOD["last_30"]
+                from = (day_ref - 30.day).utc
+                to = Time.now.utc
+              when PERIOD["this_year"]
+                from = Time.now.beginning_of_year.utc
+                to = Time.now.utc
+              when PERIOD["last_year"]
+                from = (day_ref - 1.year).beginning_of_year.utc
+                to = (day_ref - 1.year).end_of_year.utc
+            end  
+        end
+
+      return from, to 
+  end
+
   def check_user
     if current_user.nil?
       redirect_to root_path
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 5fc0c06f..a997e27f 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -598,7 +598,7 @@ class Sale < ApplicationRecord
     end
   end
 
-  def self.search(filter,from,to)
+  def self.search(filter,from,to,shift)
     if filter.blank?
         keyword = ''
     else
@@ -606,10 +606,18 @@ class Sale < ApplicationRecord
     end
 
     if from.present? && to.present?
-       sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'new' ", from,to)
-       query = sale.where(keyword)
+      if shift.blank?
+        sale = Sale.where("DATE_FORMAT(receipt_date,'%Y-%m-%d') >= ?" + " AND DATE_FORMAT(receipt_date,'%Y-%m-%d') <= ? and NOT sale_status = 'new' ", from,to)
+      else
+        sale = Sale.where("DATE_FORMAT(receipt_date,'%Y-%m-%d') >= ?" + " AND DATE_FORMAT(receipt_date,'%Y-%m-%d') <= ? and NOT sale_status = 'new' and shift_sale_id = '#{shift.id}'", from,to)
+      end
+        query = sale.where(keyword)
     else
+      if shift.blank?
         where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%")
+      else
+        where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}' and shift_sale_id = ?","%#{filter}%","%#{filter}%",shift.id)
+      end
     end
 
   end
@@ -1134,88 +1142,319 @@ end
      return tax
   end
 
-  def self.top_products(today,from,to)
+  def self.top_products(today,current_user,from,to,from_time,to_time)
     if !from.nil? && !to.nil?
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+      if current_user.nil?
+        query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                          " i.price as unit_price,mi.name as product_name")
+                  .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                  if !from_time.nil? && !to_time.nil?
+        query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                  else
+        query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                        " and sale_status= 'completed'")
+                  end
+        query =   query.group('mi.name')
+                  .order("SUM(i.qty) DESC").limit(20)
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
-                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and sale_status= 'completed'")
-                .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(20)
+                if !from_time.nil? && !to_time.nil?
+          query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                    else
+          query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                          " and sale_status= 'completed'")
+                    end
+          query =   query.group('mi.name')
+                    .order("SUM(i.qty) DESC").limit(20)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                          " i.price as unit_price,mi.name as product_name")
+                  .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                  if !from_time.nil? && !to_time.nil?
+            query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                      else
+            query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                            " and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                      end
+            query =   query.group('mi.name')
+                      .order("SUM(i.qty) DESC").limit(20)
+          end
+        end
+      end
     else
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+      if current_user.nil?
+        query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
-                      "and sale_status= 'completed'")
+                      " and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) DESC").limit(20)
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
+                      " and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) DESC").limit(20)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
+                      " and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                .group('mi.name')
+                .order("SUM(i.qty) DESC").limit(20)
+          end
+        end
+      end
     end
   end
 
-  def self.bottom_products(today,from,to)
+  def self.bottom_products(today,current_user,from,to,from_time,to_time)
     if !from.nil? && !to.nil?
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
-                        " i.price as unit_price,mi.name as product_name")
-                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
-                .where("(i.qty > 0 and i.price > 0) and receipt_date between '#{from}' and '#{to}'"+
-                      "and sale_status= 'completed'")
-                .group('mi.name')
+      if current_user.nil?
+        query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                          " i.price as unit_price,mi.name as product_name")
+                  .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                  if !from_time.nil? && !to_time.nil?
+        query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                  else
+        query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                        " and sale_status= 'completed'")
+                  end
+        query = query.group('mi.name')
                 .order("SUM(i.qty) ASC").limit(20)
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                          " i.price as unit_price,mi.name as product_name")
+                  .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                  if !from_time.nil? && !to_time.nil?
+          query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                    else
+          query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                          " and sale_status= 'completed'")
+                    end
+          query = query.group('mi.name')
+                  .order("SUM(i.qty) ASC").limit(20)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                            " i.price as unit_price,mi.name as product_name")
+                    .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                    if !from_time.nil? && !to_time.nil?
+            query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
+                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                      else
+            query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30') between '#{from}' and '#{to}'"+
+                            " and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                      end
+            query = query.group('mi.name')
+                    .order("SUM(i.qty) ASC").limit(20)
+          end
+        end
+      end
     else
-      query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+      if current_user.nil?
+        query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
                         " i.price as unit_price,mi.name as product_name")
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and sale_status= 'completed'")
                 .group('mi.name')
                 .order("SUM(i.qty) ASC").limit(20)
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
+                      "and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) ASC").limit(20)
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
+                      " and sale_status= 'completed' and shift_sale_id=#{shift.id}")
+                .group('mi.name')
+                .order("SUM(i.qty) ASC").limit(20)
+          end
+        end
+      end
     end
   end
 
-  def self.hourly_sales(today,from,to)
+  def self.hourly_sales(today,current_user,from,to,from_time,to_time)
     if !from.nil? && !to.nil?
-      query= Sale.select("grand_total")
-            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
-            .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
-            .order('receipt_date')
+      if current_user.nil?
+        query = Sale.select("grand_total")
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              else
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+              end
+        query = query.group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+              .order('receipt_date')
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          query = Sale.select("grand_total")
+            if !from_time.nil? && !to_time.nil?
+              query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+            else
+              query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+            end
+          query = query.group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+                .order('receipt_date')
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("grand_total")
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              else
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',from,to,shift.id)
+              end
+            query = query.group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+              .order('receipt_date')
+          end
+        end
+      end
     else
-      query= Sale.select("grand_total")
+      if current_user.nil?
+        query = Sale.select("grand_total")
             .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
             .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
             .order('receipt_date')
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          query = Sale.select("grand_total")
+            .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+            .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+            .order('receipt_date')
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.select("grand_total")
+              .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ? and shift_sale_id=?',today,shift.id)
+              .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+              .order('receipt_date')
+          end
+        end
+      end
     end
   end
 
-  def self.employee_sales(today,from,to)
+  def self.employee_sales(today,current_user,from,to,from_time,to_time)
     if !from.nil? && !to.nil?
-      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+      if current_user.nil?
+        query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                  .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                  if !from_time.nil? && !to_time.nil?
+        query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
+                  else
+        query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
+                  end
+        query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                  .order("e.name")
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
-                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between '#{from}' and '#{to}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
-                .order("e.name")
+                    if !from_time.nil? && !to_time.nil?
+          query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
+                    else
+          query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
+                    end
+          query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                    .order("e.name")
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                  .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                      if !from_time.nil? && !to_time.nil?
+            query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and shift_sale_id='#{shift.id}'")
+                      else
+            query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and shift_sale_id='#{shift.id}'")
+                      end
+            query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                      .order("e.name")
+          end
+        end
+      end
     else
-      query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+      if current_user.nil?
+        query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
                 .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
-    end
-  end
-
-  def self.total_sale(today,current_user=nil,from=nil,to=nil)
-    if !from.nil? && !to.nil?
-      if current_user.nil?
-        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
-          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).sum("grand_total")
+          query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .order("e.name")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            total = Sale.where('sale_status = "completed" and sales.receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
+            query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}' and shift_sale_id='#{shift.id}'")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .order("e.name")
+          end
+        end
+      end
+    end
+  end
+
+  def self.total_sale(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
+    if !from.nil? && !to.nil?
+      if current_user.nil?
+        if !from_time.nil? && !to_time.nil?
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).sum("grand_total")
+        else
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to).sum("grand_total")
+        end
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          if !from_time.nil? && !to_time.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).sum("grand_total")
+          else
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to).sum("grand_total")
+          end
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            if !from_time.nil? && !to_time.nil?
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                   .sum("grand_total")
+            else
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',from,to,shift.id)
+                  .sum("grand_total")
+            end
           end
         end
       end
@@ -1236,17 +1475,29 @@ end
     end
   end
 
-  def self.total_count(today,current_user=nil,from=nil,to=nil)
+  def self.total_count(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+        if !from_time.nil? && !to_time.nil?
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).count
+        else
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to).count
+        end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
-          total = Sale.where('sale_status = "completed" and receipt_date between ? and ?',from,to).count
+          if !from_time.nil? && !to_time.nil?
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).count
+          else
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to).count
+          end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            total = Sale.where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id = ?',from,to,shift.id).count
+            if !from_time.nil? && !to_time.nil?
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and shift_sale_id = ?',from,to,from_time,to_time,shift.id).count
+            else
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id = ?',from,to,shift.id).count
+            end
           end
         end
       end
@@ -1266,23 +1517,41 @@ end
     end
   end
 
-  def self.total_card_sale(today,current_user=nil,from=nil,to=nil)
+  def self.total_card_sale(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
-              .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
-              .sum("sp.payment_amount")
-      else
-        if current_user.role == 'administrator' || current_user.role == 'manager'
-          query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+        if !from_time.nil? && !to_time.nil?
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = Sale.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
+        end
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          if !from_time.nil? && !to_time.nil?
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+                .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+                .sum("sp.payment_amount")
+          else
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+                .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+                .sum("sp.payment_amount")
+          end
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            if !from_time.nil? && !to_time.nil?
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+                .sum("sp.payment_amount")
+            else
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
+                .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
+                .sum("sp.payment_amount")
+            end
           end
         end
       end
@@ -1308,23 +1577,41 @@ end
     end
   end
 
-  def self.credit_payment(today,current_user=nil,from=nil,to=nil)
+  def self.credit_payment(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
-              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
-              .sum("payment_amount")
-      else
-        if current_user.role == 'administrator' || current_user.role == 'manager'
-          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ?',from,to)
+        if !from_time.nil? && !to_time.nil?
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
         else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
-            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and s.receipt_date between ? and ? and s.shift_sale_id=?',from,to,shift.id)
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
+        end
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          if !from_time.nil? && !to_time.nil?
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+                .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+                .sum("payment_amount")
+          else
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+              .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+              .sum("payment_amount")
+          end
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            if !from_time.nil? && !to_time.nil?
+              query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and s.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+                .sum("payment_amount")
+            else
+              query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and s.shift_sale_id=?',from,to,shift.id)
+                .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+                .sum("payment_amount")
+            end
           end
         end
       end
@@ -1350,23 +1637,41 @@ end
     end
   end
 
-  def self.summary_sale_receipt(today,current_user=nil,from=nil,to=nil)
+  def self.summary_sale_receipt(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
+        if !from_time.nil? && !to_time.nil?
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
             .first()
+        else
+          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+            .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+            .first()
+        end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
-          query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and receipt_date between ? and ?',from,to)
-            .first()
+          if !from_time.nil? && !to_time.nil?
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              .first()
+          else
+            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+              .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+              .first()
+          end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-              .where('sale_status = "completed" and receipt_date between ? and ? and shift_sale_id=?',from,to,shift.id)
-              .first()
+            if !from_time.nil? && !to_time.nil?
+              query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+                .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .first()
+            else
+              query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
+                .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',from,to,shift.id)
+                .first()
+            end
           end
         end
       end
@@ -1392,23 +1697,41 @@ end
     end
   end
 
-  def self.total_payment_methods(today,current_user=nil,from=nil,to=nil)
+  def self.total_payment_methods(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = Sale.select("distinct sp.payment_method")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+        if !from_time.nil? && !to_time.nil?
+          query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        else
+          query = Sale.select("distinct sp.payment_method")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+            .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+        end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
-          query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+          if !from_time.nil? && !to_time.nil?
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
               .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          else
+            query = Sale.select("distinct sp.payment_method")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+          end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
-              .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if !from_time.nil? && !to_time.nil?
+              query = Sale.select("distinct sp.payment_method")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            else
+              query = Sale.select("distinct sp.payment_method")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+                .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            end
           end
         end
       end
@@ -1434,35 +1757,69 @@ end
     end
   end
 
-  def self.payment_sale(payment_method, today, current_user=nil,from=nil,to=nil)
+  def self.payment_sale(payment_method, today, current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
+    time_query = ''
+    if !from_time.nil? && !to_time.nil?
+      time_query = " and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'"
+    end
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
-            if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
-            else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
-            end
-            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
-      else
-        if current_user.role == 'administrator' || current_user.role == 'manager'
+        if !from_time.nil? && !to_time.nil?
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
             else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ?",from,to)
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
         else
-          shift = ShiftSale.current_open_shift(current_user.id)
-          if !shift.nil?
+          query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+        end
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          if !from_time.nil? && !to_time.nil?
             query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
               if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
               else
-                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
               end
               query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          else
+            query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+            if payment_method == 'card'
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            else
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+            end
+            query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+          end
+        else
+          shift = ShiftSale.current_open_shift(current_user.id)
+          if !shift.nil?
+            if !from_time.nil? && !to_time.nil?
+              query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+                if payment_method == 'card'
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                else
+                  query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                end
+                query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+            else
+              query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
+                if payment_method == 'card'
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
+                else
+                  query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+                end
+                query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
+            end
           end
         end
       end
@@ -1500,10 +1857,10 @@ end
     end
   end
 
-  def self.total_customer(today,current_user=nil,from=nil,to=nil)
-    dinein_cnt = self.total_dinein(today,current_user,from,to)
-    takeaway_cnt = self.total_takeaway(today,current_user,from,to)
-    membership_cnt = self.total_membership(today,current_user,from,to)
+  def self.total_customer(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
+    dinein_cnt = self.total_dinein(today,current_user,from,to,from_time,to_time)
+    takeaway_cnt = self.total_takeaway(today,current_user,from,to,from_time,to_time)
+    membership_cnt = self.total_membership(today,current_user,from,to,from_time,to_time)
 
     total_cus = 0
     if !dinein_cnt.nil? || !takeaway_cnt.nil? || !membership_cnt.nil?
@@ -1513,26 +1870,47 @@ end
     return total_cus
   end
 
-  def self.total_dinein(today,current_user=nil,from=nil,to=nil)
+  def self.total_dinein(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+        if !from_time.nil? && !to_time.nil?
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
             .first()
+        else
+          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+            .first()
+        end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
-          query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+          if !from_time.nil? && !to_time.nil?
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
               .first()
+          else
+            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to)
+              .first()
+          end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+            if !from_time.nil? && !to_time.nil?
+              query = Sale.select("count(sales.customer_id) as total_dinein_cus")
                 .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-                .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .first()
+            else
+              query = Sale.select("count(sales.customer_id) as total_dinein_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+                .first()
+            end
           end
         end
       end
@@ -1561,26 +1939,47 @@ end
     end
   end
 
-  def self.total_takeaway(today,current_user=nil,from=nil,to=nil)
+  def self.total_takeaway(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
-              .first()
-      else
-        if current_user.role == 'administrator' || current_user.role == 'manager'
+        if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZsales.receipt_date,"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
               .first()
+        else
+          query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
+        end
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          if !from_time.nil? && !to_time.nil?
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
+              .first()
+          else
+            query = Sale.select("count(sales.customer_id) as total_take_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to)
+              .first()
+          end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            query = Sale.select("count(sales.customer_id) as total_take_cus")
-              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
+            if !from_time.nil? && !to_time.nil?
+              query = Sale.select("count(sales.customer_id) as total_take_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .first()
+            else
+              query = Sale.select("count(sales.customer_id) as total_take_cus")
+                .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+                .first()
+            end
           end
         end
       end
@@ -1609,26 +2008,43 @@ end
     end
   end
 
-  def self.total_membership(today,current_user=nil,from=nil,to=nil)
+  def self.total_membership(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
-        query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
-            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
-            .first()
-      else
-        if current_user.role == 'administrator' || current_user.role == 'manager'
+        if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
             .first()
+        else
+          query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+            .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+            .first()
+        end
+      else
+        if current_user.role == 'administrator' || current_user.role == 'manager'
+          if !from_time.nil? && !to_time.nil?
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
+              .first()
+          else
+            query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
+              .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to)
+              .first()
+          end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id).first()
+              else 
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id).first()
+              end
           end
         end
       end
@@ -1657,26 +2073,41 @@ end
     end
   end
 
-  def self.total_other_customer(today,current_user=nil,from=nil,to=nil)
+  def self.total_other_customer(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
         query = Sale.select("count(sales.customer_id) as total_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
+                            .first()
+              else
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+                            .first()
+              end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
-            .first()
+            if !from_time.nil? && !to_time.nil?
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
+                          .first()
+            else
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
+                          .first()
+            end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             query = Sale.select("count(sales.customer_id) as total_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                      .first()
+              else
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
+                      .first()
+              end
           end
         end
       end
@@ -1705,29 +2136,44 @@ end
     end
   end
 
-  def self.total_order(today,current_user=nil,from=nil,to=nil)
+  def self.total_order(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
         query = Sale.select("count(distinct a.order_id) as total_order")
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
-            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
-            .first()
+            if !from_time.nil? && !to_time.nil?
+              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+                    .first()
+            else
+               query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+                    .first()
+            end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(distinct a.order_id) as total_order")
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
-            .where('b.status = "billed" and sales.receipt_date between ? and ?',from,to)
-            .first()
+            if !from_time.nil? && !to_time.nil?
+              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+                          .first()
+            else
+              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+                          .first()
+            end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             query = Sale.select("count(distinct a.order_id) as total_order")
               .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
               .joins("JOIN orders as b ON b.order_id = a.order_id")
-              .where('b.status = "billed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                          .first()
+              else
+                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+                          .first()
+              end
           end
         end
       end
@@ -1759,26 +2205,38 @@ end
     end
   end
 
-  def self.total_account(today,current_user=nil,from=nil,to=nil)
+  def self.total_account(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
         query = Sale.select("distinct b.id as account_id, b.title as title")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .joins("JOIN accounts as b ON b.id = a.account_id")
-            .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+            if !from_time.nil? && !to_time.nil?
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to,from_time,to_time)
+            else
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+            end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("distinct b.id as account_id, b.title as title")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ?',from,to)
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              else
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
+              end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             query = Sale.select("distinct b.id as account_id, b.title as title")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
-              .where('sales.sale_status = "completed" and sales.receipt_date between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              if !from_time.nil? && !to_time.nil?
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              else
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
+              end
           end
         end
       end
@@ -1807,26 +2265,41 @@ end
     end
   end
 
-  def self.account_data(account_id, today, current_user=nil,from=nil,to=nil)
+  def self.account_data(account_id, today, current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
         query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
-            .first()
+            if !from_time.nil? && !to_time.nil?
+              query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                        .first()
+            else
+              query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+                        .first()
+            end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ?",from,to)
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                          .first()
+              else
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+                          .first()
+              end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                          .first()
+              else
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+                          .first()
+              end
           end
         end
       end
@@ -1855,32 +2328,44 @@ end
     end
   end
 
-  def self.top_items(today,current_user=nil,from=nil,to=nil)
+  def self.top_items(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
         query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
-            .group("a.product_code")
-            .order("SUM(a.qty) DESC")
-            .first()
+            if !from_time.nil? && !to_time.nil?
+              query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+            else  
+              query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+            end
+        query = query.group("a.product_code")
+                    .order("SUM(a.qty) DESC")
+                    .first()
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ?",from,to)
-              .group("a.product_code")
-              .order("SUM(a.qty) DESC")
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              else  
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+              end
+          query = query.group("a.product_code")
+                      .order("SUM(a.qty) DESC")
+                      .first()
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
-              .group("a.product_code")
-              .order("SUM(a.qty) DESC")
-              .first()
+              if !from_time.nil? && !to_time.nil?
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+              else
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+              end
+            query = query.group("a.product_code")
+                    .order("SUM(a.qty) DESC")
+                    .first()
           end
         end
       end
@@ -1915,23 +2400,38 @@ end
     end
   end
 
-  def self.total_foc_items(today,current_user=nil,from=nil,to=nil)
+  def self.total_foc_items(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     if !from.nil? && !to.nil?
       if current_user.nil?
         query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
-            .sum("a.qty")
+          if !from_time.nil? && !to_time.nil?
+            query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                        .sum("a.qty")
+          else
+            query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+                        .sum("a.qty")
+          end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-              .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ?",from,to)
-              .sum("a.qty")
+            if !from_time.nil? && !to_time.nil?
+              query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                          .sum("a.qty")
+            else
+              query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
+                          .sum("a.qty")
+            end
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-                .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and sales.receipt_date between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
-                .sum("a.qty")
+                if !from_time.nil? && !to_time.nil?
+                  query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                            .sum("a.qty")
+                else
+                  query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
+                            .sum("a.qty")
+                end
           end
         end
       end
diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb
index c2a12f4a..f2904b13 100755
--- a/app/models/stock_journal.rb
+++ b/app/models/stock_journal.rb
@@ -36,12 +36,16 @@ class StockJournal < ApplicationRecord
     journal.save
   end
 
-  def self.inventory_balances(today,from,to)
+  def self.inventory_balances(today,from,to,from_time,to_time)
     if !from.nil? && !to.nil?
       query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
             .joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
-            .where("stock_journals.created_at between '#{from}' and '#{to}'")
-            .group("mii.item_instance_name")
+            if !from_time.nil? && !to_time.nil?
+              query = query.where("DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
+            else  
+              query = query.where("DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
+            end
+      query = query.group("mii.item_instance_name")
             .order("mii.item_instance_name ASC")
     else
       query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 6ee68d97..865202b0 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -68,24 +68,46 @@
 
   <!-- Date range for dashboard -->
   <div class="row clearfix">
+    <%
+      if !@from.nil?
+        from_date = DateTime.parse(@from).utc.getlocal.strftime("%d-%m-%Y")
+      else
+        from_date = Time.now.utc.getlocal.strftime('%d-%m-%Y')
+      end
+      if !@to.nil?
+        to_date = DateTime.parse(@to).utc.getlocal.strftime("%d-%m-%Y")
+      else
+        to_date = Time.now.utc.getlocal.strftime('%d-%m-%Y')
+      end
+      if !@from_time.nil?
+        from_time = @from_time
+      else
+        from_time = ''
+      end
+      if !@to_time.nil?
+        to_time = @to_time
+      else
+        to_time = ''
+      end
+    %>
     <div class="col-lg-3 col-md-3 col-sm-3">
       <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" value="<%= Time.now.utc.getlocal.strftime('%d-%m-%Y') %>" placeholder="From date" style="height: 35px;">
+      <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" value="<%= from_date %>" placeholder="From date" style="height: 35px;">
       <span id="fromErr" style="color:red;"></span>
     </div>
     <div class="col-lg-3 col-md-3 col-sm-3">
       <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" value="<%= Time.now.utc.getlocal.strftime('%d-%m-%Y') %>" placeholder="To date" style="height: 35px;">
+      <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" value="<%= to_date %>" placeholder="To date" style="height: 35px;">
       <span id="toErr" style="color:red;"></span>
     </div>
     <div class="col-lg-2 col-md-2 col-sm-2">
       <label class="font-14"><%= t("views.right_panel.detail.from_time") %></label>
-      <input data-behaviour='timepicker' class="form-control timepicker" name="from_time" id="from_time" type="text" value="" placeholder="From Time" style="height: 35px;">
+      <input data-behaviour='timepicker' class="form-control timepicker" name="from_time" id="from_time" type="text" value="<%= from_time %>" placeholder="From Time" style="height: 35px;">
       <span id="from_timeErr" style="color:red;"></span>
     </div>
     <div class="col-lg-2 col-md-2 col-sm-2">
       <label class="font-14"><%= t("views.right_panel.detail.to_time") %></label>
-      <input data-behaviour='timepicker' class="form-control timepicker" name="to_time" id="to_time" type="text" value="" placeholder="To time" style="height: 35px;">
+      <input data-behaviour='timepicker' class="form-control timepicker" name="to_time" id="to_time" type="text" value="<%= to_time %>" placeholder="To time" style="height: 35px;">
       <span id="to_timeErr" style="color:red;"></span>
     </div>
     <div class="col-lg-2 col-md-2 col-sm-2">
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index 5bfc4e61..26fbbcc5 100644
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -17,17 +17,41 @@
                  <td colspan="8">
                     <%= form_tag transactions_sales_path, :method => :get do %>
                     <div class="row clearfix">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
+                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                          <label><%= t("views.right_panel.detail.enter_keyboards") %></label>
-                         <input type="text" id="receipt_no" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
+                         <input type="text" id="receipt_no" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px;height: 34px;">
                        </div>
-                       <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> 
-                         <label class=""><%= t("views.right_panel.detail.from") %></label>
-                         <input class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
+
+                       <div class="col-lg-2 col-md-2 col-sm-2">
+                        <label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
+                        <select name="period" id="sel_period" class="form-control">
+                        <option value=""><%= t("views.right_panel.detail.select_period") %></option>
+                          <option value="0">Today</option>
+                          <option value="1">Yesterday</option>
+                          <option value="2">This week</option>
+                          <option value="3">Last week</option>
+                          <option value="4">Last 7 days</option>
+                          <option value="5">This month</option>
+                          <option value="6">Last month</option>
+                          <option value="7">Last 30 days</option>
+                          <option value="8">This year</option>
+                          <option value="9">Last year</option>
+                        </select>
                       </div>
-                      <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+
+                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> 
+                         <label class=""><%= t("views.right_panel.detail.from") %></label>
+                         <input class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
+                      </div>
+                      <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                         <label class=""><%= t("views.right_panel.detail.to") %></label>
-                        <input class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
+                        <input class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
+                      </div>
+
+                      <div class="col-lg-2 col-md-2 col-sm-2">
+                        <label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
+                        <select class="form-control select" name="shift_name" id="shift_name" >
+                        </select>
                       </div>
                       
                       <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
@@ -98,7 +122,7 @@
                     </tr>
                   <% end %>
               <% else %>
-                    <tr><td colspan="8"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
+                    <tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
               <% end %>
             </tbody>
           </table>
@@ -116,9 +140,107 @@
 
 <script type="text/javascript">
   $(function(){
-    $("#receipt_no").val("<%=params[:receipt_no]%>");
-    $("#from").val("<%=params[:from]%>");
-    $("#to").val("<%=params[:to]%>");
+    $('#receipt_no').val("<%= params[:receipt_no] %>");
+    $('#from').val("<%= params[:from] %>");
+    $('#to').val("<%= params[:to] %>");
+    $('#sel_period').val("<%= params[:period] %>");
+    
+    var check_arr = [];
+    search_by_period();
+    $('#sel_period').change(function(){
+      
+      search_by_period();
+      
+    });
+    
+    function search_by_period(){
+      var period = $('#sel_period').val();
+      var period_type = 0;
+      var from = "";
+      var to = "";
+
+      show_shift_name(period,period_type,from,to,'shift_item'); 
+    }   
+    
+    // OK button is clicked
+    $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
+      new_date = new Date(date) ;
+      month    = parseInt(new_date.getMonth()+1)
+      from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+      $('#from').val(from);
+      search_by_date();
+    });
+    $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
+      new_date = new Date(date) ;
+      month    = parseInt(new_date.getMonth()+1)
+      to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+      $('#to').val(to);
+      search_by_date();
+    });   
+    
+    function search_by_date(){
+
+      from = $("#from").val();
+        to   = $("#to").val();  
+
+      var period = 0;
+      var period_type = 1;     
+
+      if(to != '' && from != ''){
+        shift_name = from + ',' + to;
+
+        check_arr.push(to);
+        
+        console.log(check_arr.length)
+        if(check_arr.length == 1){
+          show_shift_name(period,period_type,from,to,'shift_item');     
+        }
+        if(check_arr.length == 3){
+          check_arr = [];
+        }
+      }
+      
+    }
+    
+    function show_shift_name(period,period_type,from,to,shift_item){
+      var shift = $('#shift_name');
+      if (from == '' && to == '') {
+        from = $("#from").val();
+            to   = $("#to").val();
+      }
+      shift.empty();
+      
+      var str = '';
+      var param_shift = '';    
+      var param_shift = '<%= params[:shift_name] rescue '-'%>';
+
+      url = '<%= reports_get_shift_by_date_path %>';
+      
+      $.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
+
+        str = '<option value="0">--- All Shift ---</option>';
+        $(data.message).each(function(index){ 
+          
+          var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
+          var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
+          var shift_id = data.message[index].shift_id ;
+          if(param_shift != ''){
+            if(shift_id == param_shift){
+              selected = 'selected = "selected"';
+            }
+            else{
+              selected = '';         
+            }         
+          }else{
+            selected = '';         
+          }              
+          str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
+          
+         // console.log(sh_date)
+      }) 
+        shift.append(str);
+      });
+    }
   });
 
 </script>

From c602988f42f30d1ead81e1e2ecf6f92d01a3d1de Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 26 Mar 2018 18:05:09 +0630
Subject: [PATCH 484/651] Add Room and Table Moving

---
 README.md                                     | 12 ++++
 .../origami/movetable_controller.rb           | 11 ++++
 app/models/printer/receipt_printer.rb         | 10 ++++
 app/pdf/move_table_pdf.rb                     | 58 +++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 app/pdf/move_table_pdf.rb

diff --git a/README.md b/README.md
index b5d2c62b..0cfa2458 100755
--- a/README.md
+++ b/README.md
@@ -138,6 +138,18 @@ For CloseCashierCustomisePdf in lookups
 	1) settings/print_settings
   	2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 }
 
+<---- Extra Fields Script -----> 
+For MoveTablePdf in lookups 
+    *** Both Table and Room Moving ***
+    1) settings/lookups => { type:print_settings, name: MoveTablePdf, value:1 }
+
+For MoveTablePdf in print settings 
+	* Backend > Printer > Print Settings > New 
+	i) Name : Move Table 
+	ii) Unique Code: MoveTablePdf 
+	iii)Template: ... 
+	iv) Font: Zawgyi-One v) Printer: #printer name   	
+
 * ToDo list
 
 1. Migration
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index dfdfcabf..61af7458 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -69,6 +69,17 @@ class Origami::MovetableController < BaseOrigamiController
      end
 
      @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
+
+    # get printer info
+    @from    = (DiningFacility.find(change_from)).name
+    @to      = (DiningFacility.find(change_to)).name
+    @type          = (DiningFacility.find(change_to)).type
+    @date          = DateTime.now
+    @shop          = Shop::ShopDetail
+    unique_code    = "MoveTablePdf" 
+    print_settings = PrintSetting.find_by_unique_code(unique_code)
+    printer        = Printer::ReceiptPrinter.new(print_settings)   
+    printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type)
    end
       
 end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index d544c908..a55b737d 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -238,6 +238,16 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     self.print("tmp/print_queue_no.pdf")
   end
 
+  #Move Table Print
+  def print_move_table(printer_settings,to,from,shop_detail,date,type)
+    #Use CUPS service
+    #Generate PDF
+    #Print
+    pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type)
+    pdf.render_file "tmp/print_move_table.pdf"
+    self.print("tmp/print_move_table.pdf")
+  end
+
   #Bill Receipt Print
   def print_crm_order(booking,order_items,setting)
     #Use CUPS service
diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb
new file mode 100644
index 00000000..4d4463bc
--- /dev/null
+++ b/app/pdf/move_table_pdf.rb
@@ -0,0 +1,58 @@
+class MoveTablePdf < Prawn::Document
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+  def initialize(printer_settings,to,from,shop_detail,date,type)
+    self.page_width = printer_settings.page_width
+    self.page_height = printer_settings.page_height
+    self.margin = 5
+    self.price_width = 35
+    self.qty_width = 20
+    self.total_width = 35
+    self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
+    self.item_height = 15
+    self.item_description_width = (self.page_width-20) / 2
+    self.label_width = 100
+
+    super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if printer_settings.font != ""
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+
+    self.header_font_size = 10
+    self.item_font_size = 8
+
+    header(printer_settings.name,type)
+
+    call_move_table(to,from,date,type)
+
+    move_down 5
+    stroke_horizontal_rule
+    move_down 5
+
+  end
+
+  def header (name,type)
+    text "Move #{type}", :left_margin => -10, :size => self.header_font_size,:align => :center
+    # move_down self.item_height
+    move_down 5
+    stroke_horizontal_rule
+    move_down 5
+  end
+
+  def call_move_table (to,from,date,type)
+    move_down 3
+    text "Date Time : #{date.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :left_margin => -10, :size => self.header_font_size
+    text "Change    [#{from}]   To  [#{to}]", :left_margin => -10, :size => self.header_font_size
+  end
+
+
+end
\ No newline at end of file

From f126d2faf601dcad552025ca0264d5169a9c2504 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 28 Mar 2018 09:29:54 +0630
Subject: [PATCH 485/651] update print file.substring for jade

---
 app/views/origami/home/show.html.erb     | 8 ++++----
 app/views/origami/payments/show.html.erb | 6 +++---
 app/views/origami/rooms/show.html.erb    | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 4922c1df..7afa2769 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -726,9 +726,9 @@
 
                 // For Server Print - from jade
                  if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath, result.printer_url);
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
                  }
-                            
+                           
               // console.log(result);
               // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
               location.reload();
@@ -776,7 +776,7 @@
                     createReceiptNoInFirstBillData(receipt_no,type);
                   // For Server Print - from jade
                    if ($("#server_mode").val() == "cloud") {
-                    code2lab.printFile(result.filepath, result.printer_url);
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
                    }
                   location.reload();
               }
@@ -942,7 +942,7 @@
                 success: function (result) {
                    // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath, result.printer_url);
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
                 }
                 window.location.href = '/origami/';
                 }
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 001adc53..eb3eefe3 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -725,7 +725,7 @@ var customer_name = "<%= @customer.name %>";
                 customer_display_view(null,"reload");
                 // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath, result.printer_url);
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
                 }
                if (cashier_type=="cashier") {
                  window.location.href = '/origami';
@@ -939,7 +939,7 @@ var customer_name = "<%= @customer.name %>";
                        }, function () {
                         // For Server Print - from jade
                          if ($("#server_mode").val() == "cloud") {
-                          code2lab.printFile(result.filepath, result.printer_url);
+                          code2lab.printFile(result.filepath.substr(6), result.printer_url);
                          }
                         if (cashier_type=="cashier") {
                            window.location.href = '/origami';
@@ -1018,7 +1018,7 @@ var customer_name = "<%= @customer.name %>";
               console.log(result);
               // For Server Print - from jade
                  if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath, result.printer_url);
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
                  }
               if (cashier_type=="cashier") {
                 window.location.href = '/origami';
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1b034655..424690ff 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -705,7 +705,7 @@ $("#first_bill").on('click', function(){
             createReceiptNoInFirstBillData(receipt_no,"");
           // For Server Print - from jade
           if ($("#server_mode").val() == "cloud") {
-            code2lab.printFile(result.filepath, result.printer_url);
+            code2lab.printFile(result.filepath.substr(6), result.printer_url);
           }
           location.reload();
         }
@@ -739,7 +739,7 @@ $(".choose_payment").on('click', function () {
 
       // For Server Print - from jade
       if ($("#server_mode").val() == "cloud") {
-        code2lab.printFile(result.filepath, result.printer_url);
+        code2lab.printFile(result.filepath.substr(6), result.printer_url);
       }
 
       location.reload();

From 1873633ab27c58e027404d1c7a5c56fe0833620c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Mar 2018 11:07:48 +0630
Subject: [PATCH 486/651] check inventory

---
 app/controllers/origami/payments_controller.rb | 14 +-------------
 app/models/inventory_definition.rb             |  4 ++--
 app/models/stock_journal.rb                    |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index f034aa57..5397c7f0 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -208,19 +208,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
         render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
 
-        if params[:type] == "quick_service"
-          booking = Booking.find_by_sale_id(sale_id)
-          if booking.dining_facility_id.to_i>0
-            table_id = booking.dining_facility_id
-          else
-            table_id = 0
-          end
-          
-          booking.booking_orders.each do |order|
-          Order.pay_process_order_queue(order.order_id,table_id)
-        end
-      # end
-    end
+      #end
     end    
   end
 
diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb
index 91823068..4634ff73 100755
--- a/app/models/inventory_definition.rb
+++ b/app/models/inventory_definition.rb
@@ -12,7 +12,7 @@ class InventoryDefinition < ApplicationRecord
   end
 
   def self.find_product_in_inventory(item)
-    product = InventoryDefinition.find_by_item_code(item.product_code)
+    product = InventoryDefinition.find_by_item_code(item.item_instance_code)
     if product.nil?
       return false, nil
     else
@@ -21,7 +21,7 @@ class InventoryDefinition < ApplicationRecord
   end
 
   def self.check_balance(item,inventory_definition) # item => saleItemOBj
-     stock = StockJournal.where('item_code=?', item.product_code).order('created_at desc').take
+     stock = StockJournal.where('item_code=?', item.item_instance_code).order('created_at desc').take
      unless stock.nil?
        modify_balance(item, stock, inventory_definition)
      else
diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb
index f2904b13..fa4bd285 100755
--- a/app/models/stock_journal.rb
+++ b/app/models/stock_journal.rb
@@ -8,7 +8,7 @@ class StockJournal < ApplicationRecord
     balance = calculate_balance(balance, item.qty)
 
     journal = StockJournal.new
-    journal.item_code = item.product_code
+    journal.item_code = item.item_instance_code
     journal.inventory_definition_id = inventory_definition.id
     journal.debit = item.qty
     journal.balance = balance

From 204f622876241bf5221cfbacb0865af2cd588daa Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 28 Mar 2018 11:10:37 +0630
Subject: [PATCH 487/651] update sale item report

---
 .../reports/saleitem_controller.rb            |  3 +--
 .../_shift_sale_report_filter.html.erb        |  2 +-
 app/views/reports/saleitem/index.html.erb     | 23 +++++++++++++------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index a731cb44..24c812eb 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -17,8 +17,7 @@ class Reports::SaleitemController < BaseReportController
     end
     @type = params[:sale_type]
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)
-puts @other_charges.to_json
-puts "oooooooooooooooooooooooo"
+
     @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
 
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
index 75a331e9..068a3f58 100755
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -22,7 +22,7 @@
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14">Select Type</label>
 			<select name="sale_type" id="sel_sale_type" class="form-control">
-			    <option value="">Select Typess</option>
+			    <option value="">Select Type</option>
 			    <option value="revenue" selected>Revenue Only</option>
 				<option value="all">All Type</option>
 				<option value="discount">Discount Only</option>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 531d289b..a972443f 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -77,16 +77,18 @@
 							<% unless @sale_data.blank? %>
 							<% @sale_data.each do |sale| %>
 							<!-- all total qty sum -->
-							<!--
+							
 								<% if sale.status_type != "Discount" && sale.status_type != "foc"
 									total_qty += sale.total_item
 								end %>
 								<% if sale.status_type == "foc" && sale.price > 0
 									total_qty += sale.total_item
 								end %>
-							-->
+								<% if sale.status_type == "Discount"
+									total_qty += sale.total_item*(-1)
+								end %>
 							<!-- end all total qty -->
-							<!--	
+								
 							    <% if sale.status_type == "foc" && sale.grand_total < 0
 									total_item_foc += sale.grand_total*(-1)
 								end %>	 
@@ -94,7 +96,7 @@
 								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
 									total_item_dis += sale.grand_total*(-1)
 								end %>
-							-->
+							
 								<% if !acc_arr.include?(sale.account_id) %>
 									<tr>
 										<td><b><%= sale.account_name %></b></td>
@@ -121,7 +123,12 @@
 									<% end %>
 									<td><%= sale.item_code rescue '-' %></td>
 									<td><%= sale.product_name rescue '-' %></td>
-									<td><%= sale.total_item rescue '-' %></td>
+									<% if sale.status_type != "Discount" %>
+										<td><%= sale.total_item rescue '-' %></td>
+									<%else%>
+									    <td><%= sale.total_item*(-1) rescue '-' %></td>
+							        <% end %>
+									
 									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
@@ -132,10 +139,12 @@
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
 								    <% #sub_qty += sale.total_item %>
-								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
+								    <% if sale.status_type !="Discount" && (!sale.product_name.include? "FOC")
 										sub_qty += sale.total_item
 									end %>
-
+									 <% if sale.status_type =="Discount"
+										sub_qty += sale.total_item*(-1)
+									end %>
 									<% if count == value %>	
 										<tr>
 											<td colspan="3">&nbsp;</td>

From e2c4fea589e5ee864117cd035ba64a41fe568097 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Mar 2018 13:41:50 +0630
Subject: [PATCH 488/651] check order edit error

---
 app/views/oqs/edit/index.html.erb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 70e9a0ff..27595303 100644
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -112,7 +112,10 @@ $(document).ready(function(){
     var remarks = $("textarea[name='remarks']").val();
     var order_items_id = $(this).attr('data-id');
     var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
-    var booking_id = '<%= @booking.booking_id %>';
+    var booking_id = '';
+    <% if !@booking.nil? %>
+      booking_id = '<%= @booking.booking_id %>';
+    <% end %>
     
     $.ajax({
       type: 'POST',
@@ -144,7 +147,10 @@ $(document).ready(function(){
   });
 
    $('#back').on('click', function () {
-      var booking_id = '<%= @booking.booking_id %>';
+      var booking_id = '';
+      <% if !@booking.nil? %>
+        booking_id = '<%= @booking.booking_id %>';
+      <% end %>
       <% if !@link_type.nil? %>
         <% if @link_type == 'oqs' %>
           window.location.href = '/oqs';

From e11ea255953806a34c1d97d055fdc2dda66fc541 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Mar 2018 13:47:45 +0630
Subject: [PATCH 489/651] check alt_name error

---
 app/pdf/order_item_pdf.rb      | 2 +-
 app/pdf/order_item_slim_pdf.rb | 2 +-
 app/pdf/order_set_item_pdf.rb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index fabc8d11..58682d8a 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -110,7 +110,7 @@ class OrderItemPdf < Prawn::Document
     end
 
     if alt_name
-        if !(order_item.alt_name).empty?
+        if order_item.alt_name
             move_down 4
             font("public/fonts/NotoSansCJKtc-Regular.ttf") do
                 text "(#{order_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 146b585f..05add2c9 100755
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -110,7 +110,7 @@ class OrderItemSlimPdf < Prawn::Document
     end
 
     # if alt_name
-    #     if !(order_item_slim.alt_name).empty?
+    #     if order_item_slim.alt_name
     #         move_down 1
     #         font("public/fonts/NotoSansCJKtc-Regular.ttf") do
     #             text "(#{order_item_slim.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 9aac0d0e..ce06081f 100755
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -109,7 +109,7 @@ class OrderSetItemPdf < Prawn::Document
     end
 
     if alt_name
-        if !(order_set_item.alt_name).empty?
+        if order_set_item.alt_name
             move_down 4
             font("public/fonts/NotoSansCJKtc-Regular.ttf") do
                 text "(#{order_set_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true

From ff19f20a188532811c9ba82e2a350cba1c4de5da Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 28 Mar 2018 14:52:57 +0630
Subject: [PATCH 490/651] Edit UI design for shop images

---
 app/assets/stylesheets/application.scss |  5 +++++
 app/views/settings/shops/_form.html.erb | 26 ++++++++++++++-----------
 app/views/settings/shops/show.html.erb  |  4 ++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 2249d049..15e8a986 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -98,4 +98,9 @@ nav.pagination .page a:hover,
 i.logout_icon{
   position: relative;
   top: 5px;
+}
+
+/* Second display image */
+.second-display{
+  margin : 12px;
 }
\ No newline at end of file
diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb
index 7a3c0a04..57665164 100755
--- a/app/views/settings/shops/_form.html.erb
+++ b/app/views/settings/shops/_form.html.erb
@@ -40,18 +40,22 @@
             </div>
           </div> 
 
-        <label>Shop Images</label>
-          <div class="panel padding-10">
-            <div class="form-group">
-              <div class="menu-item-img">
-                <%= f.fields_for :display_images do |p| %>
-                    <%= image_tag "#{p.object.image}", :class => "img-thumbnail" %>
-                    <%= link_to "Destroy", settings_shop_display_image_path(p.object), method: :delete %> 
-                <% end %>   
+        <div class="card">
+        <div class="card-block">
+          <label class="card-title">Shop Images</label>
+            <div class="panel padding-10">
+              <div class="form-group">
+                <div class="menu-item-img">
+                  <%= f.fields_for :display_images do |p| %>
+                      <%= image_tag "#{p.object.image}", :class => "img-thumbnail second-display", :size => "150x185"%>
+                      <%= link_to '<i class="material-icons">delete</i>'.html_safe, settings_shop_display_image_path(p.object), method: :delete %>
+                  <% end %>   
+                </div>
               </div>
-            </div>
-          </div> 
-          <%= f.file_field :image, :multiple => true, name:     "display_images[image][]" %>
+              </div>
+            </div> 
+            <%= f.file_field :image, :multiple => true, name:     "display_images[image][]" %>
+        </div>    
 
         <div class="form-actions p-l-15">
           <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
diff --git a/app/views/settings/shops/show.html.erb b/app/views/settings/shops/show.html.erb
index 7d04d504..40082d72 100755
--- a/app/views/settings/shops/show.html.erb
+++ b/app/views/settings/shops/show.html.erb
@@ -97,13 +97,13 @@
             </tr>
             <tr>
               <td style="width:20%">Shop Image</td>
-              <td><%= image_tag @settings_shop.logo, :size => '200x200'%></td>
+              <td><%= image_tag @settings_shop.logo, :class => "img-thumbnail second-display", :size => "155x185"%></td>
             </tr>
             <tr>
               <td style="width:20%">Shop Images</td>
               <td>
                 <% @display_images.each do |p| %>
-                  <%= image_tag "#{p.image}" %>
+                  <%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%>
                 <% end %>
               </td>
             </tr>

From bc922a68c813fa7ff6154a1f4b4fe362daf0899d Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 28 Mar 2018 16:17:41 +0630
Subject: [PATCH 491/651] Add Moved By in MoveTablePdf

---
 app/controllers/origami/movetable_controller.rb | 7 ++++---
 app/models/printer/receipt_printer.rb           | 4 ++--
 app/pdf/move_table_pdf.rb                       | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 61af7458..09d9669e 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -71,15 +71,16 @@ class Origami::MovetableController < BaseOrigamiController
      @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
 
     # get printer info
-    @from    = (DiningFacility.find(change_from)).name
-    @to      = (DiningFacility.find(change_to)).name
+    @from          = (DiningFacility.find(change_from)).name
+    @to            = (DiningFacility.find(change_to)).name
     @type          = (DiningFacility.find(change_to)).type
+    @moved_by      = @current_user.name
     @date          = DateTime.now
     @shop          = Shop::ShopDetail
     unique_code    = "MoveTablePdf" 
     print_settings = PrintSetting.find_by_unique_code(unique_code)
     printer        = Printer::ReceiptPrinter.new(print_settings)   
-    printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type)
+    printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by)
    end
       
 end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index a55b737d..abc4c49c 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -239,11 +239,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Move Table Print
-  def print_move_table(printer_settings,to,from,shop_detail,date,type)
+  def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by)
     #Use CUPS service
     #Generate PDF
     #Print
-    pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type)
+    pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by)
     pdf.render_file "tmp/print_move_table.pdf"
     self.print("tmp/print_move_table.pdf")
   end
diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb
index 4d4463bc..7b4ad8e4 100644
--- a/app/pdf/move_table_pdf.rb
+++ b/app/pdf/move_table_pdf.rb
@@ -1,6 +1,6 @@
 class MoveTablePdf < Prawn::Document
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(printer_settings,to,from,shop_detail,date,type)
+  def initialize(printer_settings,to,from,shop_detail,date,type,moved_by)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 5
@@ -32,7 +32,7 @@ class MoveTablePdf < Prawn::Document
 
     header(printer_settings.name,type)
 
-    call_move_table(to,from,date,type)
+    call_move_table(to,from,date,type,moved_by)
 
     move_down 5
     stroke_horizontal_rule
@@ -41,17 +41,18 @@ class MoveTablePdf < Prawn::Document
   end
 
   def header (name,type)
-    text "Move #{type}", :left_margin => -10, :size => self.header_font_size,:align => :center
+    text "Move #{type}", :left_margin => -10, :size => self.header_font_size.to_i + 3,:align => :center
     # move_down self.item_height
     move_down 5
     stroke_horizontal_rule
     move_down 5
   end
 
-  def call_move_table (to,from,date,type)
+  def call_move_table (to,from,date,type,moved_by)
     move_down 3
     text "Date Time : #{date.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :left_margin => -10, :size => self.header_font_size
     text "Change    [#{from}]   To  [#{to}]", :left_margin => -10, :size => self.header_font_size
+    text "Moved By  : #{moved_by}", :left_margin => -10, :size => self.header_font_size
   end
 
 

From 56870f94b0dff042c1b19abd4ef666961e469372 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Mar 2018 17:12:43 +0630
Subject: [PATCH 492/651] add booking data

---
 app/controllers/oqs/edit_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 98ec1d63..ccef4e4a 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -3,6 +3,7 @@ class Oqs::EditController < BaseOqsController
   	assigned_item_id = params[:id]
     @link_type = params[:type]
     @dining_type = nil
+    @booking = nil
     if params[:type] == 'oqs'
       assigned_item = AssignedOrderItem.find(assigned_item_id)
       @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'")

From 2bf08827e7590cfe0505d19651372d1500cef492 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 29 Mar 2018 10:03:21 +0630
Subject: [PATCH 493/651] Second Display Image finished

---
 .../origami/second_display_controller.rb      |  5 +-
 app/models/display_image.rb                   |  2 -
 app/uploaders/display_image_uploader.rb       | 59 -------------------
 .../second_display/_second_display.html.erb   |  9 ++-
 .../origami/second_display/_slider.html.erb   | 22 +++----
 5 files changed, 24 insertions(+), 73 deletions(-)
 delete mode 100644 app/uploaders/display_image_uploader.rb

diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb
index 8d2efd6f..a2bf34fd 100644
--- a/app/controllers/origami/second_display_controller.rb
+++ b/app/controllers/origami/second_display_controller.rb
@@ -1,7 +1,10 @@
 class Origami::SecondDisplayController < BaseOrigamiController
 
   def index
-   
+    @display_images = DisplayImage.all
+  end
+
+  def show
   end
 
   def customer_view
diff --git a/app/models/display_image.rb b/app/models/display_image.rb
index 7f6624e2..30d83566 100644
--- a/app/models/display_image.rb
+++ b/app/models/display_image.rb
@@ -1,5 +1,3 @@
 class DisplayImage < ApplicationRecord
-	#mount_uploader :image, DisplayImageUploader
     belongs_to :shop
-
 end
diff --git a/app/uploaders/display_image_uploader.rb b/app/uploaders/display_image_uploader.rb
deleted file mode 100644
index 33e28997..00000000
--- a/app/uploaders/display_image_uploader.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-class DisplayImageUploader < CarrierWave::Uploader::Base
-
-  # Include RMagick or MiniMagick support:
-  # include CarrierWave::RMagick
-  include CarrierWave::MiniMagick
-
-  # Choose what kind of storage to use for this uploader:
-  storage :file
-  # storage :fog
-
-  # def root
-  #   Rails.root.join 'public/'
-  # end
-
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    #"image/image"
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-  end
-
-  # def cache_dir
-  #   '/tmp/images'
-  # end
-
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url(*args)
-  #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
-  #
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process scale: [200, 300]
-  process :resize_to_fit => [200, 150]
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
-
-  # Create different versions of your uploaded files:
-  # version :thumb do
-  #   process resize_to_fit: [50, 50]
-  # end
-
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  def extension_whitelist
-    %w(jpg jpeg gif png)
-  end
-
-  # Override the filename of the uploaded files:
-  # Avoid using model.id or version_name here, see uploader/store.rb for details.
-  # def filename
-  #   "something.jpg" if original_filename
-  # end	
-
-end
\ No newline at end of file
diff --git a/app/views/origami/second_display/_second_display.html.erb b/app/views/origami/second_display/_second_display.html.erb
index 267be25a..c09d6c4c 100644
--- a/app/views/origami/second_display/_second_display.html.erb
+++ b/app/views/origami/second_display/_second_display.html.erb
@@ -54,7 +54,14 @@
     
   </div>
   <div class="col-lg-6 col-md-6 col-sm-6">
-    <%= image_tag("slider/s2.jpg", :alt => "rss feed") %>
+    <div id="wowslider-container" style="max-width: 100%;">
+      <div class="ws_images full_screen">
+        <% @display_images.each do |p| %>
+          <%= image_tag "#{p.image}", :alt => "rss feed"%>
+          <% break %>
+        <% end %>
+      </div>
+    </div>
   </div>
 </div>
 
diff --git a/app/views/origami/second_display/_slider.html.erb b/app/views/origami/second_display/_slider.html.erb
index 61c71203..71f463b7 100644
--- a/app/views/origami/second_display/_slider.html.erb
+++ b/app/views/origami/second_display/_slider.html.erb
@@ -2,17 +2,19 @@
 <%= javascript_include_tag 'wowslider', 'data-turbolinks-track': 'reload' %> 
 <%= javascript_include_tag 'wow_script', 'data-turbolinks-track': 'reload' %>
 <div class="row">
-	 <div class="col-lg-12 col-md-12 col-sm-12">
-	 <div id="wowslider-container" style="max-width: 100%;">
-				<div class="ws_images full_screen">
-					<ul>
-					<li><%= image_tag("slider/s1.jpg", :alt => "rss feed") %></li>
-					<li><%= image_tag("slider/s2.jpg", :alt => "rss feed") %></li>
-					<li><%= image_tag("slider/s4.jpg", :alt => "rss feed") %></li>
-					</ul>
-				</div>
-				<div class="ws_bullets"></div>
+ 	<div class="col-lg-12 col-md-12 col-sm-12">
+ 		<div id="wowslider-container" style="max-width: 100%;">
+			<div class="ws_images full_screen">
+				<ul>
+					<% @display_images.each do |p| %>
+						<li>
+		                	<%= image_tag "#{p.image}", :alt => "rss feed"%>
+		                </li>	
+		            <% end %>
+				</ul>
 			</div>
+			<div class="ws_bullets"></div>
+		</div>
 	</div> 
 </div>	
 

From 1c13b0469758fb968c0dfcc1f0a876ed2c5e395a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 29 Mar 2018 10:47:29 +0630
Subject: [PATCH 494/651] product sale checked

---
 app/models/sale.rb                            |  2 +-
 app/views/reports/product_sale/index.html.erb | 21 +++++------
 app/views/reports/product_sale/index.xls.erb  | 35 ++++++++++++-------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 5d3c6b4d..970896bf 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -942,7 +942,7 @@ def self.get_menu_item_query(order_by)
                      "(CASE WHEN si.qty IS NOT NULL THEN (SUM(si.qty) * si.unit_price) ELSE 0 END) as grand_total," +
                      "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE CONCAT(menu_items.name,' - ',mii.item_instance_name) END) as product_name, 
                      mc.name as" +
-                     " menu_category_name,mc.id as menu_category_id, si.remark as status_type, 
+                     " menu_category_name,mc.id as menu_category_id, si.status as status_type, 
                      si.price as price ")
           .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + 
                " LEFT JOIN menu_categories mc ON mc.id = menu_items.menu_category_id" +
diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
index 3f27205a..f614fbb9 100755
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -58,14 +58,14 @@
 								<% total_qty = 0 %>
 
 								<% @sale_data.each do |sale| %>
-										<% grand_total += sale.grand_total %>
-										<% if sale.status_type != "Discount" && sale.status_type != "foc"
-											total_qty += sale.total_item
-										end %>
-										<% if sale.status_type == "foc" && sale.price > 0
-											total_qty += sale.total_item
-										end %>
-
+									<% grand_total += sale.grand_total %>
+									<% if sale.status_type != "Discount" && sale.status_type != "foc"
+										total_qty += sale.total_item
+									end %>
+									<% if sale.status_type == "foc" && sale.price > 0
+										total_qty += sale.total_item
+									end %>
+									<% if !sale.status_type %>
 										<tr>
 											<td>&nbsp;</td>
 											<% if !cate_arr.include?(sale.menu_category_id) %>	
@@ -81,8 +81,9 @@
 											<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 											<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
 										</tr>
-									<!-- sub total -->
-								<!-- end sub total -->
+										<!-- sub total -->
+									<!-- end sub total -->
+									<% end %>
 								<% end %>
 							<tr>
 								<td colspan="3"></td>
diff --git a/app/views/reports/product_sale/index.xls.erb b/app/views/reports/product_sale/index.xls.erb
index f0410810..eb7f50f8 100755
--- a/app/views/reports/product_sale/index.xls.erb
+++ b/app/views/reports/product_sale/index.xls.erb
@@ -23,31 +23,40 @@
 								<% total_qty = 0 %>
 
 								<% @sale_data.each do |sale| %>
+									<% grand_total += sale.grand_total %>
 									<% if sale.status_type != "Discount" && sale.status_type != "foc"
 										total_qty += sale.total_item
-										grand_total += sale.grand_total
 									end %>
 									<% if sale.status_type == "foc" && sale.price > 0
 										total_qty += sale.total_item
-										grand_total += sale.grand_total
 									end %>
 
-									<tr>
-										<td>&nbsp;</td>
-										<td><%= sale.menu_category_name %></td>
-										<td><%= sale.item_code rescue '-' %></td>
-										<td><%= sale.product_name rescue '-' %></td>
-										<td><%= sale.total_item rescue '-' %></td>
-										<td><%= sale.unit_price rescue '-' %></td>
-										<td><%= sale.grand_total rescue '-' %></td>
-									</tr>
+									<% if !sale.status_type %>
+										<tr>
+											<td>&nbsp;</td>
+											<% if !cate_arr.include?(sale.menu_category_id) %>	
+											<td><%= sale.menu_category_name %></td>
+											<% cate_arr.push(sale.menu_category_id) %>
+											<% else %>
+											<% cate_arr = Array.new %>
+											<td>&nbsp;</td>
+											<% end %>
+											<td><%= sale.item_code rescue '-' %></td>
+											<td><%= sale.product_name rescue '-' %></td>
+											<td><%= sale.total_item rescue ' ' %></td>
+											<td><%= sale.unit_price rescue ' ' %></td>
+											<td><%= sale.grand_total rescue ' ' %></td>
+										</tr>
+										<!-- sub total -->
+									<!-- end sub total -->
+									<% end %>
 								<% end %>
 								<tr>
 									<td colspan="3"></td>
 									<td><strong>Total</strong></td>
-									<td><strong><%= total_qty %></strong></td>
+									<td><strong><%= total_qty rescue ' ' %></strong></td>
 									<td></td>
-									<td><strong><%= grand_total rescue '-' %></strong></td>
+									<td><strong><%= grand_total rescue ' ' %></strong></td>
 								</tr>								
 							<% end %>		
 						</tbody>

From 850c134ed2c9dfd7f77fe59747c5b53408269d69 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 29 Mar 2018 11:17:35 +0630
Subject: [PATCH 495/651] check product sale

---
 app/models/ability.rb | 5 +++++
 app/models/sale.rb    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 0b1edcc3..b1930e1b 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -179,6 +179,11 @@ class Ability
         can :remove_all_discount, :discount
         can :member_discount, :discount
 
+        can :move_dining, :movetable 
+        can :moving, :movetable
+
+        can :move_dining, :moveroom
+
         can :manage, Customer
         can :manage, DiningQueue
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 970896bf..ebb32ec3 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -950,7 +950,7 @@ def self.get_menu_item_query(order_by)
                " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
                " LEFT JOIN sales s ON s.sale_id = si.sale_id")
           .where("(CASE WHEN s.sale_status IS NOT NULL THEN s.sale_status='completed' ELSE 1 END)")
-          .group("mc.id, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE mii.item_instance_name END)")
+          .group("mc.id, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE CONCAT(menu_items.name,' - ',mii.item_instance_name) END)")
           .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
 end
 #product sale report query

From c54441c391570419522cf5bd590a3e37b68082b7 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 29 Mar 2018 15:07:46 +0630
Subject: [PATCH 496/651] Add UI view for Promotion Code

---
 app/views/origami/discounts/index.html.erb | 47 ++++++++++++++++------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index af96f813..3c1f402e 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -116,25 +116,23 @@
 			<div class="card-title">
 				<div class="form-horizontal">
 					<div class="col-md-12">	
-						<div class="form-group">											
+						<div class="form-group">								
 							<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
 							<span id="discount-amountErr" style="color:red;"></span>
 						</div>
 						<br>
 						<div class="form-group">			
-							<%
-							@accounts.each do |acc|								
-								%>
+							<% @accounts.each do |acc| %>
 								<button id="account-<%= acc.id %>" class="accounts-type btn bg-default"><%= acc.title %></button>
-								<% end %>
-							</div>
-						</div>					
-					</div>
+							<% end %>
+						</div>
+					</div>					
 				</div>
+			</div>
 
-				<hr />
-				<div class="p-l-20">
-					<div class="row">
+			<hr />
+			<div class="p-l-20">
+				<div class="row">
 					<div class="col-md-8">
 						<div class="row bottom">
 							<div class="col-md-3">
@@ -208,12 +206,35 @@
 							<button id="remove-item" class="btn bg-default fluid action-btn">Clear Discount</button>
 						</div>
 					</div>
-					</div>	
-				</div>
+				</div>	
 			</div>
 		</div>
 	</div>
 
+	<div class="card">
+		<div class="card-header">
+			<div><strong id="order-title">Promo Code</strong></div>
+		</div>
+		<div class="card-block">
+			<div class="card-title">
+				<div class="form-horizontal">
+					<div class="p-l-20">
+						<div class="row">
+							<div class="col-md-8 form-group">	
+								<div class="form-group">
+									<input type="text" id="promo-code" name="promo-code" value="" class="form-control" /></span>
+								</div>
+							</div>
+							<div class="col-md-4">
+								<button id="" class="btn bg-primary btn-block action-btn">Promo</button>
+							</div>
+						</div>	
+					</div>
+				</div>		
+			</div>
+		</div>	
+	</div>
+</div>
 	<!-- Column Three -->
 	<div class="col-lg-1 col-md-1 col-sm-1">
 		<!-- Action Panel -->

From 386c5291a120c63313d7b39328cf414b75cc25dc Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 29 Mar 2018 16:16:19 +0630
Subject: [PATCH 497/651] update waste and spoile

---
 .../origami/waste_spoile_controller .rb       | 130 ++++++++++++++++++
 app/models/sale_item.rb                       |   3 +-
 app/views/origami/home/show.html.erb          |  87 ++++++++++--
 config/routes.rb                              |   6 +
 4 files changed, 213 insertions(+), 13 deletions(-)
 create mode 100755 app/controllers/origami/waste_spoile_controller .rb

diff --git a/app/controllers/origami/waste_spoile_controller .rb b/app/controllers/origami/waste_spoile_controller .rb
new file mode 100755
index 00000000..72180786
--- /dev/null
+++ b/app/controllers/origami/waste_spoile_controller .rb	
@@ -0,0 +1,130 @@
+class Origami::WasteSpoileController < BaseOrigamiController
+  def index
+    
+  end
+  def waste_and_spoile
+
+    sale_id = params[:sale_id]
+    remark  = params[:remark]
+    order_source = params[:type] #tax profile source
+    if Sale.exists?(sale_id)
+      sale = Sale.find_by_sale_id(sale_id)
+
+      if sale.discount_type == "member_discount"
+        sale.update_attributes(total_discount: 0)
+        sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
+      end
+            
+      sale.payment_status = remark
+      sale.sale_status = remark
+      sale.save
+
+       # add to sale item with foc
+      sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null")
+      
+      sale_items.each do|item|
+        SaleItem.update_existing_item(item.qty, item, sale_id, remark, item.unit_price, item.price)
+      end
+
+      if sale.bookings[0].dining_facility_id.to_i > 0
+        table_avaliable = true
+        table_count = 0
+        table = sale.bookings[0].dining_facility
+        table.bookings.each do |booking|
+          if booking.booking_status != 'moved'
+            if booking.sale_id
+              if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+                table_avaliable = false
+                table_count += 1
+              else
+                table_avaliable = true
+              end
+            else
+              table_avaliable = false
+              table_count += 1
+            end
+          end
+        end
+
+        if table_avaliable && table_count == 0
+          table.status = 'available'
+          table.save
+        end
+      else
+        table = nil
+      end
+
+      # FOr Sale Audit 
+      action_by = current_user.name
+      # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
+      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,remark )
+
+      # For Print 
+
+      member_info   = nil
+      rebate_amount = nil
+      current_balance = nil
+
+      # For Cashier by Zone
+      bookings = Booking.where("sale_id='#{sale_id}'")
+      if bookings.count > 1 
+        # for Multiple Booking
+        if bookings[0].dining_facility_id.to_i>0
+          table = DiningFacility.find(bookings[0].dining_facility_id)
+        end
+      end
+
+      if bookings[0].dining_facility_id.to_i > 0
+        cashier_zone     = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+        cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+      else
+        shift = ShiftSale.find(sale.shift_sale_id)
+        cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+      end
+      
+
+      # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        unique_code = "ReceiptBillPdf"
+        customer= Customer.find(sale.customer_id)
+        
+         #shop detail
+        shop_details = Shop.find(1)
+         # get member information
+        rebate = MembershipSetting.find_by_rebate(1)
+        if customer.membership_id != nil && rebate
+          member_info = Customer.get_member_account(customer)
+          rebate_amount  = Customer.get_membership_transactions(customer,sale.receipt_no)
+          current_balance = SaleAudit.paymal_search(sale_id)
+        end
+
+        # 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(sale.sale_items)
+        discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
+
+        printer = Printer::ReceiptPrinter.new(print_settings)                                    
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
+        result = { 
+              :filepath => filename, 
+              :printer_model => print_settings.brand_name, 
+              :printer_url => print_settings.api_settings 
+            }
+
+        # Mobile Print
+        render :json => result.to_json
+      # end
+      
+      #end print
+
+      # update complete order items in oqs
+      SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr|        
+        AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi|
+          aoi.delivery_status = 1
+          aoi.save
+        end
+      end
+    end
+  end 
+ 
+end
\ No newline at end of file
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index 64e0ec73..fc32098f 100755
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -38,7 +38,8 @@ class SaleItem < ApplicationRecord
       sale_item.product_alt_name = item.product_alt_name
       sale_item.account_id = item.account_id
       sale_item.status = type
-      if type == "foc" || type == "promotion" || type == "void"
+      sale_item.remark = type
+      if type == "foc" || type == "promotion" || type == "void" || type == "waste" || type == "spoile"
         sale_item.qty = qty * (-1)
       else
         sale_item.qty = qty
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 7afa2769..8ffe8964 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -488,6 +488,11 @@
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
                 <% end %>
+
+                <% if current_login_employee.role != "waiter" %>
+                  <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button>
+                <% end %>
+
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
                 
@@ -569,6 +574,32 @@
           </div>
         </div>
         
+      </div>
+    </div>
+  </div>
+</div>
+<div class="modal fade" id="waste_spoileModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="waste_spoileModalLabel">Are you sure Waste or Spoile ?</h4>
+      </div>
+      <div class="modal-body"> 
+      <div class="row p-r-20">
+          <div class="col-md-3">
+            <button type="button" class="btn btn-lg bg-red waves-effect " data-status="waste" value="waste" id="btn_waste" onclick="waste_and_spoilage('waste')"><strong>Waste</strong></button>
+          </div>
+          <div class="col-md-3">
+              <button type="button" class="btn btn-lg bg-red waves-effect " data-status="spoile" value="spoile" id="btn_spoile" onclick="waste_and_spoilage('spoile')"><strong>Spoile</strong></button>
+          </div>
+          <div class="col-md-3">
+            <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>CLOSE</strong></button>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer ">
+        
+        
       </div>
     </div>
   </div>
@@ -737,19 +768,19 @@
     });
 
     // click select option icon for add 
-  $(document).on('click', '.payment_btn', function(event){ 
-    active     = $(this).hasClass('selected-payment');
-    value      = $(this).data('value');
-    type       = $(this).data('type');
-    group      = $(this).data('group');
-    payments    = $(".payment_btn");
+    $(document).on('click', '.payment_btn', function(event){ 
+      active     = $(this).hasClass('selected-payment');
+      value      = $(this).data('value');
+      type       = $(this).data('type');
+      group      = $(this).data('group');
+      payments    = $(".payment_btn");
 
-    if (active) {      
-      $(this).removeClass('selected-payment');
-    }else{      
-      $(this).addClass('selected-payment');
-    }
-  }); //End selecct attribute buttom
+      if (active) {      
+        $(this).removeClass('selected-payment');
+      }else{      
+        $(this).addClass('selected-payment');
+      }
+    }); //End selecct attribute buttom
 
     $(".choose_payment").on('click', function () {
       $( "#loading_wrapper").show();
@@ -1014,4 +1045,36 @@
       });
       return attribute_arr;
     }
+
+    function waste_and_spoilage(remark) {
+        swal({
+            title: "Alert",
+            text: "Are you sure want to " + remark +" ?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, " +remark+ " it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
+
+console.log(url)
+            $.ajax({
+                type: 'POST',
+                url: url,
+                data: "remark="+ remark + "&sale_id=" + sale_id,
+                success: function (result) {
+                  console.log(result)
+                   // For Server Print - from jade
+                // if ($("#server_mode").val() == "cloud") {
+                //   code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                // }
+                // window.location.href = '/origami/';
+                }
+            });
+          }
+        }); 
+    }
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 4293a341..233d7e04 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,6 +78,8 @@ scope "(:locale)", locale: /en|mm/ do
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
       post "call_waiter" => "call_waiters#index"
+       #---------Waste and Spoile --------------#
+    post 'sale/:sale_id/:type/waste_and_spoilage' => 'waste_spoile#waste_and_spoilage'
     end
 
     
@@ -85,6 +87,7 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- Cashier ------------#
   namespace :origami do
+
     get "dashboard" => "dashboard#index" 
 
     get "quick_service" => "quick_service#index"
@@ -192,6 +195,8 @@ scope "(:locale)", locale: /en|mm/ do
     #---------Void --------------#
     post 'sale/:sale_id/:type/void' => 'void#overall_void'
 
+    
+
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
     get 'table/:table_id/table_invoice/:invoice_id' => "table_invoices#show", :as => "table_invoice_show"
@@ -245,6 +250,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :second_display #second display routes
 
     post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
+
   end
 
   #--------- Waiter/Ordering Station ------------#

From 15f0abac21857e053db239666ff60ef2e50f4052 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 29 Mar 2018 16:18:48 +0630
Subject: [PATCH 498/651] update tax migrate

---
 db/migrate/20170403183755_create_tax_profiles.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20170403183755_create_tax_profiles.rb b/db/migrate/20170403183755_create_tax_profiles.rb
index f5210bbb..2c96fd0d 100755
--- a/db/migrate/20170403183755_create_tax_profiles.rb
+++ b/db/migrate/20170403183755_create_tax_profiles.rb
@@ -2,7 +2,7 @@ class CreateTaxProfiles < ActiveRecord::Migration[5.1]
   def change
     create_table :tax_profiles do |t|
       t.string :name, :null => false
-      t.string :group_type, :null => false
+      t.string :group_type
       t.decimal :rate, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.boolean :inclusive, :null => false, :default => false
       t.integer :order_by, :null => false, :default => 1

From 6b83cf5230d62d83b510200a3017f5f3c81e6e44 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 29 Mar 2018 16:30:59 +0630
Subject: [PATCH 499/651] edit for cloud print

---
 app/views/origami/home/show.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index da3c6e55..3f31faa1 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -726,9 +726,9 @@
                 createReceiptNoInFirstBillData(receipt_no,"");
 
                 // For Server Print - from jade
-                if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile("/home/yan/workspace/sxrestaurant/" + result.filepath, result.printer_url);
-                }
+                //if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+               // }
                             
               // console.log(result);
               // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);

From 75f3377d75648b290975f908b176700a86fe2647 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 29 Mar 2018 19:39:29 +0630
Subject: [PATCH 500/651] change product sale report

---
 app/views/reports/product_sale/index.html.erb | 38 +++++++++++++------
 app/views/reports/product_sale/index.xls.erb  | 30 +++++++++++----
 2 files changed, 50 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 app/views/reports/product_sale/index.html.erb
 mode change 100755 => 100644 app/views/reports/product_sale/index.xls.erb

diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb
old mode 100755
new mode 100644
index f614fbb9..4670f6b3
--- a/app/views/reports/product_sale/index.html.erb
+++ b/app/views/reports/product_sale/index.html.erb
@@ -45,41 +45,58 @@
 								<th><%= t("views.right_panel.detail.code") %></th>
 								<th><%= t("views.right_panel.detail.product") %></th>
 								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
-								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<!-- <th><%= t("views.right_panel.detail.unit_price") %></th> -->
 								<th><%= t("views.right_panel.detail.total") %></th>
 							</tr>	
 						</thead>
 						<tbody id="tbd_data">
 							<% unless @sale_data.blank? %>
 								<% acc_arr = Array.new %>
-								<% cate_arr = Array.new %>	
-
+								<% cate_arr = Array.new %>
 								<% grand_total = 0 %>
 								<% total_qty = 0 %>
+								<% total_item = {} %>
+								<% total_data = {} %>
+								<% @sale_data.each do |sale| 
+									if !total_item.has_key?(sale.item_code)
+										total_item[sale.item_code] = sale.total_item
+										total_data[sale.item_code] = sale.grand_total
+									else
+										if sale.status_type == "void"
+											total_item[sale.item_code] += sale.total_item
+										end
+										if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc" 
+											total_data[sale.item_code] += sale.grand_total
+										end 
+									end 
+								end %>
 
 								<% @sale_data.each do |sale| %>
 									<% grand_total += sale.grand_total %>
 									<% if sale.status_type != "Discount" && sale.status_type != "foc"
-										total_qty += sale.total_item
+										total_qty += sale.total_item 
 									end %>
 									<% if sale.status_type == "foc" && sale.price > 0
 										total_qty += sale.total_item
 									end %>
-									<% if !sale.status_type %>
+									
+									<% if sale.status_type != "Discount" && sale.price.to_f >= 0 %>
 										<tr>
 											<td>&nbsp;</td>
 											<% if !cate_arr.include?(sale.menu_category_id) %>	
 											<td><%= sale.menu_category_name %></td>
-											<% cate_arr.push(sale.menu_category_id) %>
+												<% cate_arr.push(sale.menu_category_id) %>
 											<% else %>
-											<% cate_arr = Array.new %>
+												<% if sale.total_item > 0 %>
+													<% cate_arr = Array.new %>
+												<% end %>
 											<td>&nbsp;</td>
 											<% end %>
 											<td><%= sale.item_code rescue '-' %></td>
 											<td><%= sale.product_name rescue '-' %></td>
-											<td><%= sale.total_item rescue '-' %></td>
-											<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-											<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
+											<td><%= total_item[sale.item_code] rescue '-' %></td>
+											<!-- <td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td> -->
+											<td><%= number_with_precision(total_data[sale.item_code] ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
 										</tr>
 										<!-- sub total -->
 									<!-- end sub total -->
@@ -89,7 +106,6 @@
 								<td colspan="3"></td>
 								<td><strong>Total</strong></td>
 								<td><strong><%= total_qty %></strong></td>
-								<td></td>
 								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
 							</tr>
 							
diff --git a/app/views/reports/product_sale/index.xls.erb b/app/views/reports/product_sale/index.xls.erb
old mode 100755
new mode 100644
index eb7f50f8..0ff60964
--- a/app/views/reports/product_sale/index.xls.erb
+++ b/app/views/reports/product_sale/index.xls.erb
@@ -11,7 +11,7 @@
 								<th><%= t("views.right_panel.detail.code") %></th>
 								<th><%= t("views.right_panel.detail.product") %></th>
 								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
-								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<!-- <th><%= t("views.right_panel.detail.unit_price") %></th> -->
 								<th><%= t("views.right_panel.detail.total") %></th>
 							</tr>	
 						</thead>
@@ -21,6 +21,21 @@
 								<% cate_arr = Array.new %>	
 								<% grand_total = 0 %>
 								<% total_qty = 0 %>
+								<% total_item = {} %>
+								<% total_data = {} %>
+								<% @sale_data.each do |sale| 
+									if !total_item.has_key?(sale.item_code)
+										total_item[sale.item_code] = sale.total_item
+										total_data[sale.item_code] = sale.grand_total
+									else
+										if sale.status_type == "void"
+											total_item[sale.item_code] += sale.total_item
+										end
+										if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc" 
+											total_data[sale.item_code] += sale.grand_total
+										end 
+									end 
+								end %>
 
 								<% @sale_data.each do |sale| %>
 									<% grand_total += sale.grand_total %>
@@ -31,21 +46,23 @@
 										total_qty += sale.total_item
 									end %>
 
-									<% if !sale.status_type %>
+									<% if sale.status_type != "Discount" && sale.price.to_f >= 0 %>
 										<tr>
 											<td>&nbsp;</td>
 											<% if !cate_arr.include?(sale.menu_category_id) %>	
 											<td><%= sale.menu_category_name %></td>
 											<% cate_arr.push(sale.menu_category_id) %>
 											<% else %>
-											<% cate_arr = Array.new %>
+												<% if sale.total_item > 0 %>
+													<% cate_arr = Array.new %>
+												<% end %>
 											<td>&nbsp;</td>
 											<% end %>
 											<td><%= sale.item_code rescue '-' %></td>
 											<td><%= sale.product_name rescue '-' %></td>
-											<td><%= sale.total_item rescue ' ' %></td>
-											<td><%= sale.unit_price rescue ' ' %></td>
-											<td><%= sale.grand_total rescue ' ' %></td>
+											<td><%= total_item[sale.item_code] rescue ' ' %></td>
+											<!-- <td><%= sale.unit_price rescue ' ' %></td> -->
+											<td><%= total_data[sale.item_code] rescue ' ' %></td>
 										</tr>
 										<!-- sub total -->
 									<!-- end sub total -->
@@ -55,7 +72,6 @@
 									<td colspan="3"></td>
 									<td><strong>Total</strong></td>
 									<td><strong><%= total_qty rescue ' ' %></strong></td>
-									<td></td>
 									<td><strong><%= grand_total rescue ' ' %></strong></td>
 								</tr>								
 							<% end %>		

From 5588f40753ec81eec5415c5fa0c524885532c971 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 30 Mar 2018 14:20:47 +0630
Subject: [PATCH 501/651] update waste and spoilage

---
 app/controllers/origami/home_controller.rb    |   2 +-
 .../origami/payments_controller.rb            |   2 -
 app/controllers/origami/rooms_controller.rb   |   3 +-
 app/controllers/origami/void_controller.rb    |   2 +-
 ...troller .rb => waste_spoile_controller.rb} |  28 +++--
 .../reports/waste_and_spoilage_controller.rb  |  19 ++++
 app/models/sale.rb                            |  10 ++
 app/models/sale_payment.rb                    |   2 +-
 app/views/layouts/_left_sidebar.html.erb      |   3 +
 app/views/origami/customers/index.html.erb    |   2 +-
 app/views/origami/home/show.html.erb          |  12 +-
 app/views/origami/rooms/show.html.erb         |  65 ++++++++++-
 .../_shift_sale_report_filter.html.erb        |  73 ++++++++++++
 .../reports/waste_and_spoilage/index.html.erb |  83 ++++++++++++++
 .../reports/waste_and_spoilage/index.xls.erb  | 106 ++++++++++++++++++
 config/routes.rb                              |   7 +-
 16 files changed, 380 insertions(+), 39 deletions(-)
 rename app/controllers/origami/{waste_spoile_controller .rb => waste_spoile_controller.rb} (83%)
 create mode 100755 app/controllers/reports/waste_and_spoilage_controller.rb
 create mode 100755 app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb
 create mode 100755 app/views/reports/waste_and_spoilage/index.html.erb
 create mode 100755 app/views/reports/waste_and_spoilage/index.xls.erb

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index a8e2818c..759cb1b6 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -95,7 +95,7 @@ class Origami::HomeController < BaseOrigamiController
          @status_order = 'order'
        else
         sale = Sale.find(booking.sale_id)
-         if sale.sale_status != "completed" && sale.sale_status != 'void'
+         if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste'
            @sale_array.push(sale)
            if @status_order == 'order'
              @status_order = 'sale'
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 5397c7f0..16a79d33 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -113,8 +113,6 @@ class Origami::PaymentsController < BaseOrigamiController
         end
       end
       #end rounding adjustment
-      puts "sale"
-      puts saleObj.to_json
       
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 11a7f93d..5c0cd454 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -79,8 +79,7 @@ class Origami::RoomsController < BaseOrigamiController
            @status_order = 'order'
          else
           sale = Sale.find(booking.sale_id)
-           if sale.sale_status != "completed" && sale.sale_status != 'void'
-             puts "enter"
+           if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste'
              @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 74e495ca..83dce707 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -48,7 +48,7 @@ class Origami::VoidController < BaseOrigamiController
         table.bookings.each do |booking|
           if booking.booking_status != 'moved'
             if booking.sale_id
-              if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+              if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' && booking.sale.sale_status != 'spoile' && booking.sale.sale_status != 'waste'
                 table_avaliable = false
                 table_count += 1
               else
diff --git a/app/controllers/origami/waste_spoile_controller .rb b/app/controllers/origami/waste_spoile_controller.rb
similarity index 83%
rename from app/controllers/origami/waste_spoile_controller .rb
rename to app/controllers/origami/waste_spoile_controller.rb
index 72180786..c94b33bb 100755
--- a/app/controllers/origami/waste_spoile_controller .rb	
+++ b/app/controllers/origami/waste_spoile_controller.rb
@@ -1,29 +1,28 @@
 class Origami::WasteSpoileController < BaseOrigamiController
-  def index
-    
-  end
-  def waste_and_spoile
+  def waste_and_spoilage
 
     sale_id = params[:sale_id]
     remark  = params[:remark]
     order_source = params[:type] #tax profile source
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
-
-      if sale.discount_type == "member_discount"
-        sale.update_attributes(total_discount: 0)
-        sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
+      SaleTax.where("sale_id='#{sale_id}'").find_each do |existing_tax|
+        existing_tax.delete
       end
-            
+      sale.update_attributes(total_discount: 0,total_tax: 0,grand_total: sale.total_amount,rounding_adjustment:0)
       sale.payment_status = remark
       sale.sale_status = remark
       sale.save
 
+      # sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
        # add to sale item with foc
-      sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null")
+      # sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null")
       
-      sale_items.each do|item|
-        SaleItem.update_existing_item(item.qty, item, sale_id, remark, item.unit_price, item.price)
+      sale.sale_items.each do|item|
+        # SaleItem.update_existing_item(item.qty, item, sale_id, remark, item.unit_price, item.price)
+        item.status = remark
+        item.remark = remark
+        item.save
       end
 
       if sale.bookings[0].dining_facility_id.to_i > 0
@@ -33,7 +32,7 @@ class Origami::WasteSpoileController < BaseOrigamiController
         table.bookings.each do |booking|
           if booking.booking_status != 'moved'
             if booking.sale_id
-              if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+              if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' && booking.sale.sale_status != 'spoile' && booking.sale.sale_status != 'waste'
                 table_avaliable = false
                 table_count += 1
               else
@@ -45,7 +44,6 @@ class Origami::WasteSpoileController < BaseOrigamiController
             end
           end
         end
-
         if table_avaliable && table_count == 0
           table.status = 'available'
           table.save
@@ -104,7 +102,7 @@ class Origami::WasteSpoileController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
         printer = Printer::ReceiptPrinter.new(print_settings)                                    
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil)   
         result = { 
               :filepath => filename, 
               :printer_model => print_settings.brand_name, 
diff --git a/app/controllers/reports/waste_and_spoilage_controller.rb b/app/controllers/reports/waste_and_spoilage_controller.rb
new file mode 100755
index 00000000..369c6860
--- /dev/null
+++ b/app/controllers/reports/waste_and_spoilage_controller.rb
@@ -0,0 +1,19 @@
+class Reports::WasteAndSpoilageController < BaseReportController	  
+authorize_resource :class => false
+	def index
+		from, to     = get_date_range_from_params
+		@sale_type   = params[:sale_type]
+        @sale_data   = Sale.get_wastes_and_spoilages(from,to,@sale_type) 
+        @from        = from
+        @to          = to
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
+
+		respond_to do |format|
+	      format.html
+	      format.xls
+	    end
+	end
+
+	
+end
\ No newline at end of file
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 970896bf..e25589dc 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1109,6 +1109,16 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type
     return all_total,sale_type
 end
 
+def self.get_wastes_and_spoilages(from,to,status)
+  if status == "spoile"
+    type = "and sales.sale_status = 'spoile'"
+  else
+    type = "and sales.sale_status = 'waste'"
+  end
+  query = Sale.all.where("sales.receipt_date between ? and ? #{type}",from,to)
+                  .group("sales.receipt_no")
+end
+
 # def self.get_separate_tax(from,to,payment_method=nil)
 
 #     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 3ff4697e..5a0b22b2 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -418,7 +418,7 @@ class SalePayment < ApplicationRecord
         bookings.each do |tablebooking|
           if tablebooking.booking_status != 'moved'
             if tablebooking.sale_id
-              if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' 
+              if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' && tablebooking.sale.sale_status != 'spoile' && tablebooking.sale.sale_status != 'waste' 
                 status = false
                 sale_count += 1
               else
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 63067ec0..ea3a7b61 100644
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -144,6 +144,9 @@
 					<li>
 						<a href="<%= reports_void_sale_index_path %>">Void Sales</a>
 					</li>
+					<li>
+						<a href="<%= reports_waste_and_spoilage_index_path %>">Wastes & Spoilages</a>
+					</li>
 					<li>
 						<a href="<%= reports_payment_method_index_path %>">Payment Method</a>
 					</li>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 2600f3fe..f36ca636 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -26,7 +26,7 @@
               </div>
             <% end %>
             <button id="member_acc_no" class="btn btn-success btn-sm"><span class="fa fa-credit-card"></span> Member Card</button> -->
-              <% path ="/origami/#{@sale_id}/customers" %>
+              <% path ="/origami/#{@sale_id}/#{@cashier_type}/customers/#{@page}" %>
               <%= form_tag path, :id => "filter_form", :method => :get do %>
               <div class="row clearfix">
                 <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8ffe8964..4810cf13 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -598,8 +598,6 @@
         </div>
       </div>
       <div class="modal-footer ">
-        
-        
       </div>
     </div>
   </div>
@@ -1059,8 +1057,6 @@
           if (isConfirm) {
             var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
             var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
-
-console.log(url)
             $.ajax({
                 type: 'POST',
                 url: url,
@@ -1068,10 +1064,10 @@ console.log(url)
                 success: function (result) {
                   console.log(result)
                    // For Server Print - from jade
-                // if ($("#server_mode").val() == "cloud") {
-                //   code2lab.printFile(result.filepath.substr(6), result.printer_url);
-                // }
-                // window.location.href = '/origami/';
+                if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                }
+                window.location.href = '/origami/';
                 }
             });
           }
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 424690ff..e2f04018 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -450,10 +450,11 @@
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
         <% if current_login_employee.role != "waiter" %>
-        <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
-        <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-        <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
-        <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
+          <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
+          <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
+          <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
+          <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
+          <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button>
         <% end %>
         <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
@@ -512,6 +513,32 @@
  </div>
 </div>
 </div>
+
+<div class="modal fade" id="waste_spoileModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="waste_spoileModalLabel">Are you sure Waste or Spoile ?</h4>
+      </div>
+      <div class="modal-body"> 
+      <div class="row p-r-20">
+          <div class="col-md-3">
+            <button type="button" class="btn btn-lg bg-red waves-effect " data-status="waste" value="waste" id="btn_waste" onclick="waste_and_spoilage('waste')"><strong>Waste</strong></button>
+          </div>
+          <div class="col-md-3">
+              <button type="button" class="btn btn-lg bg-red waves-effect " data-status="spoile" value="spoile" id="btn_spoile" onclick="waste_and_spoilage('spoile')"><strong>Spoile</strong></button>
+          </div>
+          <div class="col-md-3">
+            <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>CLOSE</strong></button>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer ">
+      </div>
+    </div>
+  </div>
+</div>
+
 <script>
 var cashier_type = "cashier";
 $(document).ready(function(){
@@ -979,4 +1006,34 @@ $('#add_invoice').on('click',function(){
       });
       return attribute_arr;
     }
+
+    function waste_and_spoilage(remark) {
+        swal({
+            title: "Alert",
+            text: "Are you sure want to " + remark +" ?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, " +remark+ " it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
+            $.ajax({
+                type: 'POST',
+                url: url,
+                data: "remark="+ remark + "&sale_id=" + sale_id,
+                success: function (result) {
+                  console.log(result)
+                   // For Server Print - from jade
+                if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                }
+                window.location.href = '/origami/';
+                }
+            });
+          }
+        }); 
+    }
 </script>
diff --git a/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb
new file mode 100755
index 00000000..3d89a376
--- /dev/null
+++ b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb
@@ -0,0 +1,73 @@
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+	<div class="row">
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Type</label>
+			<select name="sale_type" id="sel_sale_type" class="form-control">
+			    <%if @sale_type=="waste" %>		 
+					<option value="waste" selected>Waste</option>
+			   <% else %>
+			    	<option value="waste">Waste</option>
+			   <% end %>
+			   <%if @sale_type=="spoile" %>		 
+					<option value="spoile" selected>Spoilage</option>	
+			   <% else %>
+			    	<option value="spoile">Spoilage</option>	
+			   <% end %>
+			</select>		
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
+			<select name="period" id="sel_period" class="form-control">
+				<option value=""><%= t("views.right_panel.detail.select_period") %></option>
+				<option value="0">Today</option>
+				<option value="1">Yesterday</option>
+				<option value="2">This week</option>
+				<option value="3">Last week</option>
+				<option value="4">Last 7 days</option>
+				<option value="5">This month</option>
+				<option value="6">Last month</option>
+				<option value="7">Last 30 days</option>
+				<option value="8">This year</option>
+				<option value="9">Last year</option>
+			</select>
+		</div>
+		
+		<div class="col-lg-2 col-md-2 col-sm-2">					
+			<!-- <label class="">Select Shift Period</label> -->
+			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
+		</div>
+	
+		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
+			<br>
+			<input type="submit" value="Generate Report" class='btn btn-primary'>
+		</div>							
+	</div>													
+	<% end %>
+
+	<% end %>	
+</div>	
+
+<script type="text/javascript">
+
+	<% if params[:shift_name].to_i > 0%>
+	shift_id = '<%= params[:shift_name] %>'
+	local_date = '<%= @shift_from %> - <%= @shift_to %> '
+	var shift = $('#shift_name');
+	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+	shift.append(str);
+	<% end %>
+
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+
+
+</script>
diff --git a/app/views/reports/waste_and_spoilage/index.html.erb b/app/views/reports/waste_and_spoilage/index.html.erb
new file mode 100755
index 00000000..9b279c83
--- /dev/null
+++ b/app/views/reports/waste_and_spoilage/index.html.erb
@@ -0,0 +1,83 @@
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.waste_spoilage_report") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
+</div>
+<div class="row">
+	<div class="col-md-12">
+
+		<!-- <div class="container"> -->
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %>
+		<hr />
+		<!-- </div> -->
+
+		<!-- <div class="container"> -->
+		<!-- <div class="row"> -->
+			<div class="text-right">
+				<a href="javascript:export_to('<%=reports_waste_and_spoilage_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
+			</div>	  			
+		<!-- </div> -->
+		<!-- </div> --> 
+
+		<div class="margin-top-20">
+			<div class="card">
+			    
+				<table class="table table-striped" border="0">
+				<h5 class="p-l-10 p-t-10">Report For <%= @sale_type? @sale_type : 'Waste' %></h5>
+					<% @sale_data.each do |sale| %>
+				    <% waste_and_spoil_item_count = 0%>
+						  <thead>	  		  		  
+							<tr>
+							    <td >
+							    	<strong>Receipt No :<%= sale.receipt_no %></strong>
+							    </td>			    
+								 <td></td>   
+							    <td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td>
+							</tr>
+						  </thead>
+						  <tbody>
+						  	<tr>
+						  		<td ><strong>Product</strong></td>
+						  		<td ><strong>Code</strong></td>
+						  		<td><strong>Qty</strong></td>
+						  		<td><strong>Price</strong></td>
+						  		<td><strong>Total Price</strong></td>		  		 
+						  	</tr>
+						  	
+						  	<% sale.sale_items.each do |item| %> 
+						  	    <% if !item.item_instance_code.nil?%> 
+						  			<% waste_and_spoil_item_count += item.qty.to_i%>
+							  		<tr>
+							  			<td><%= item.product_name %></td>
+							  			<td><%= item.product_code %></td>
+							  			<td><%= item.qty %></td>
+							  			<td><%= item.price %></td>
+							  			<td><%= item.price %></td>
+							  		</tr>		  		
+						  	    <% end %>
+						  	<% end %>
+						  	<tr>
+						  		<td colspan="2" style="text-align:right"> <strong>Total Qty: </strong></td> 
+						  		<td><span class="underline" style="text-align:right">
+						  				<strong><%= waste_and_spoil_item_count %></strong>
+						  			</span></td>
+						  		<td style="text-align:right"> <strong>Grand Total: </strong></td> 
+						  		<td > 
+						  			<span class="underline" style="text-align:right">
+						  				<strong><%= sale.grand_total %></strong>
+						  			</span>
+						  		 </td>
+						  	</tr>
+						  	 	    
+						  </tbody>		 
+				  <% end %>
+				</table>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/app/views/reports/waste_and_spoilage/index.xls.erb b/app/views/reports/waste_and_spoilage/index.xls.erb
new file mode 100755
index 00000000..c8521b0d
--- /dev/null
+++ b/app/views/reports/waste_and_spoilage/index.xls.erb
@@ -0,0 +1,106 @@
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="margin-top-20">
+			<div class="card">
+				<table class="table table-striped" border="0">
+					<thead>
+						<tr>
+							<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+						</tr>
+						<% if @shift_from %>
+						<tr>
+							<% if @shift_data.employee %>		
+							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+							<% end %>			
+							<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+						</tr>
+						<% end %>	 
+
+						<tr>
+							<th><%= t("views.right_panel.detail.receipt_no") %></th>
+							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
+							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
+							<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
+							<% @tax_profiles.each do |tax| %>
+							<th><%= tax.name %></th>		
+							<% end %>
+							<!-- <th>Other Amount</th> -->
+							<th><%= t("views.right_panel.detail.grand_total") %></th>
+							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
+							<th><%= t("views.right_panel.detail.grand_total") %> +<br/>
+								<%= t("views.right_panel.detail.rnd_adj_sh") %>
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% grand_total = 0 %>
+						<% old_grand_total = 0 %>
+						<% total_tax = 0 %>
+						<% guest_count = 0 %>
+						<% total_sum = 0 %>	
+						<% discount_amt = 0 %>		    
+						<% other_amt = 0 %>
+						<% total_nett = 0 %>	 
+						<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
+						<%if @sale_data %> 
+						<% @sale_data.each do |result| %>
+
+						<% grand_total = grand_total.to_f + result.grand_total.to_f %>
+						<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+						<% total_tax += result.total_tax.to_f %>
+						<% total_sum += result.total_amount.to_f %>	
+						<% discount_amt += result.total_discount.to_f %>
+						<% rounding_adj += result.rounding_adjustment.to_f %>
+
+						<tr>
+
+							<td><%= result.receipt_no rescue '-' %> </td>
+							<td><%= result.cashier_name rescue '-' %></td>
+							<td><%= result.total_amount rescue '-' %></td>
+							<td><%= result.total_discount rescue '-' %></td>
+							<%if result.customer.customer_type == "Takeaway"%>
+							    <td>0.0</td>
+							<%end%>
+							<% result.sale_taxes.each do |tax| %>
+							<td><%= tax.tax_payable_amount rescue '-' %></td>
+							<%end%>
+
+							<td><%= result.grand_total %></td>			
+							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
+							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+						</tr>
+
+						<% end %>
+						<tr style="border-top:4px double #666;">
+							<td colspan="2">&nbsp;</td>
+							<td><b><%= total_sum  rescue '-'%></b></td>
+							<td><b><%= discount_amt  rescue '-'%></b></td>
+							<% @sale_taxes.each do |tax| %>
+							<td><b><%= tax.st_amount.round(2) %></b></td>
+							<% end %>
+							<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
+							<td><b><%= rounding_adj  rescue '-'%></b></td>		
+							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
+						</tr>
+						<tr>
+							<td colspan="2">&nbsp;</td>
+							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+							
+							<% @tax_profiles.each do |tax| %>
+								<td><%= tax.name %></td>
+							<% end %>
+							<td><%= t("views.right_panel.detail.grand_total") %></td>
+							<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>
+							<td><%= t("views.right_panel.detail.grand_total") %> +<br/>
+								<%= t("views.right_panel.detail.rnd_adj_sh") %>
+							</td>
+						</tr>
+						<%end%>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 233d7e04..4448b75f 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,15 +78,13 @@ scope "(:locale)", locale: /en|mm/ do
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
       post "call_waiter" => "call_waiters#index"
-       #---------Waste and Spoile --------------#
-    post 'sale/:sale_id/:type/waste_and_spoilage' => 'waste_spoile#waste_and_spoilage'
     end
 
     
   end
 
   #--------- Cashier ------------#
-  namespace :origami do
+  namespace :origami do    
 
     get "dashboard" => "dashboard#index" 
 
@@ -195,7 +193,7 @@ scope "(:locale)", locale: /en|mm/ do
     #---------Void --------------#
     post 'sale/:sale_id/:type/void' => 'void#overall_void'
 
-    
+    post 'sale/:sale_id/:type/waste_and_spoilage' => "waste_spoile#waste_and_spoilage"
 
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
@@ -404,6 +402,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :shiftsale, :only => [:index, :show]
     resources :credit_payment, :only => [:index, :show]
     resources :void_sale, :only => [:index, :show]
+    resources :waste_and_spoilage, :only => [:index, :show]
     resources :commission, :only => [:index, :show]
     resources :stock_check, :only => [:index, :show]
     resources :payment_method

From 4faf1083d1a6bc6dc9be3453cd5c30561a49f1f2 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 30 Mar 2018 14:42:58 +0630
Subject: [PATCH 502/651] update waste and spoilage

---
 .../_shift_sale_report_filter.html.erb        |   4 +-
 .../reports/waste_and_spoilage/index.html.erb | 148 +++++++++---------
 .../reports/waste_and_spoilage/index.xls.erb  | 126 +++++----------
 3 files changed, 111 insertions(+), 167 deletions(-)

diff --git a/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb
index 3d89a376..1c403afc 100755
--- a/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb
@@ -34,12 +34,12 @@
 			</select>
 		</div>
 		
-		<div class="col-lg-2 col-md-2 col-sm-2">					
+		<div class="col-lg-3 col-md-3 col-sm-3">					
 			<!-- <label class="">Select Shift Period</label> -->
 			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
 			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 		</div>
-		<div class="col-lg-2 col-md-2 col-sm-2">
+		<div class="col-lg-3 col-md-3 col-sm-3">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
 			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 		</div>
diff --git a/app/views/reports/waste_and_spoilage/index.html.erb b/app/views/reports/waste_and_spoilage/index.html.erb
index 9b279c83..f74f99e0 100755
--- a/app/views/reports/waste_and_spoilage/index.html.erb
+++ b/app/views/reports/waste_and_spoilage/index.html.erb
@@ -1,83 +1,75 @@
-<div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.waste_spoilage_report") %></li>
-    <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
-    </span>
-  </ol>
-</div>
-<div class="row">
-	<div class="col-md-12">
-
-		<!-- <div class="container"> -->
-		<%= render :partial=>'shift_sale_report_filter',
-		:locals=>{ 	:period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %>
-		<hr />
-		<!-- </div> -->
-
-		<!-- <div class="container"> -->
-		<!-- <div class="row"> -->
+<div class="container-fluid">
+	<div class="page-header">
+	  <ol class="breadcrumb">
+	    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+	    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.waste_spoilage_report") %></li>
+	    <span class="float-right">
+	      <%= link_to 'Back', dashboard_path %>
+	    </span>
+	  </ol>
+	</div>
+	<div class="row">
+		<div class="col-md-12">
+			<%= render :partial=>'shift_sale_report_filter',
+			:locals=>{ 	:period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %>
+			<hr />
 			<div class="text-right">
 				<a href="javascript:export_to('<%=reports_waste_and_spoilage_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
-			</div>	  			
-		<!-- </div> -->
-		<!-- </div> --> 
-
-		<div class="margin-top-20">
-			<div class="card">
-			    
-				<table class="table table-striped" border="0">
-				<h5 class="p-l-10 p-t-10">Report For <%= @sale_type? @sale_type : 'Waste' %></h5>
-					<% @sale_data.each do |sale| %>
-				    <% waste_and_spoil_item_count = 0%>
-						  <thead>	  		  		  
-							<tr>
-							    <td >
-							    	<strong>Receipt No :<%= sale.receipt_no %></strong>
-							    </td>			    
-								 <td></td>   
-							    <td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td>
-							</tr>
-						  </thead>
-						  <tbody>
-						  	<tr>
-						  		<td ><strong>Product</strong></td>
-						  		<td ><strong>Code</strong></td>
-						  		<td><strong>Qty</strong></td>
-						  		<td><strong>Price</strong></td>
-						  		<td><strong>Total Price</strong></td>		  		 
-						  	</tr>
-						  	
-						  	<% sale.sale_items.each do |item| %> 
-						  	    <% if !item.item_instance_code.nil?%> 
-						  			<% waste_and_spoil_item_count += item.qty.to_i%>
-							  		<tr>
-							  			<td><%= item.product_name %></td>
-							  			<td><%= item.product_code %></td>
-							  			<td><%= item.qty %></td>
-							  			<td><%= item.price %></td>
-							  			<td><%= item.price %></td>
-							  		</tr>		  		
-						  	    <% end %>
-						  	<% end %>
-						  	<tr>
-						  		<td colspan="2" style="text-align:right"> <strong>Total Qty: </strong></td> 
-						  		<td><span class="underline" style="text-align:right">
-						  				<strong><%= waste_and_spoil_item_count %></strong>
-						  			</span></td>
-						  		<td style="text-align:right"> <strong>Grand Total: </strong></td> 
-						  		<td > 
-						  			<span class="underline" style="text-align:right">
-						  				<strong><%= sale.grand_total %></strong>
-						  			</span>
-						  		 </td>
-						  	</tr>
-						  	 	    
-						  </tbody>		 
-				  <% end %>
-				</table>
+			</div>
+			<div class="margin-top-20">
+				<div class="card">
+				    
+					<table class="table table-striped" border="0">
+					<h5 class="p-l-10 p-t-10">Report For <%= @sale_type? @sale_type : 'Waste' %></h5>
+						<% @sale_data.each do |sale| %>
+					    <% waste_and_spoil_item_count = 0%>
+							  <thead>	  		  		  
+								<tr>
+								    <td >
+								    	<strong>Receipt No :<%= sale.receipt_no %></strong>
+								    </td>			    
+									 <td></td>   
+								    <td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td>
+								</tr>
+							  </thead>
+							  <tbody>
+							  	<tr>
+							  		<td ><strong>Item Name</strong></td>
+							  		<td ><strong>Item Code</strong></td>
+							  		<td><strong>Qty</strong></td>
+							  		<td><strong>Price</strong></td>
+							  		<td><strong>Total Price</strong></td>		  		 
+							  	</tr>
+							  	
+							  	<% sale.sale_items.each do |item| %> 
+							  	    <% if !item.item_instance_code.nil?%> 
+							  			<% waste_and_spoil_item_count += item.qty.to_i%>
+								  		<tr>
+								  			<td><%= item.product_name %></td>
+								  			<td><%= item.product_code %></td>
+								  			<td><%= item.qty %></td>
+								  			<td><%= item.price %></td>
+								  			<td><%= item.price %></td>
+								  		</tr>		  		
+							  	    <% end %>
+							  	<% end %>
+							  	<tr>
+							  		<td colspan="2" style="text-align:right"> <strong>Total Qty: </strong></td> 
+							  		<td><span class="underline" style="text-align:right">
+							  				<strong><%= waste_and_spoil_item_count %></strong>
+							  			</span></td>
+							  		<td style="text-align:right"> <strong>Grand Total: </strong></td> 
+							  		<td > 
+							  			<span class="underline" style="text-align:right">
+							  				<strong><%= sale.grand_total %></strong>
+							  			</span>
+							  		 </td>
+							  	</tr>   
+							  </tbody>		 
+					  <% end %>
+					</table>
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/reports/waste_and_spoilage/index.xls.erb b/app/views/reports/waste_and_spoilage/index.xls.erb
index c8521b0d..4b4fa0a3 100755
--- a/app/views/reports/waste_and_spoilage/index.xls.erb
+++ b/app/views/reports/waste_and_spoilage/index.xls.erb
@@ -1,104 +1,56 @@
-
 <div class="row">
 	<div class="col-md-12">
 		<div class="margin-top-20">
 			<div class="card">
+				
 				<table class="table table-striped" border="0">
-					<thead>
+					<h5 class="p-l-10 p-t-10">Report For <%= @sale_type? @sale_type : 'Waste' %></h5>
+					<% @sale_data.each do |sale| %>
+					<% waste_and_spoil_item_count = 0%>
+					<thead>	  		  		  
 						<tr>
-							<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-						</tr>
-						<% if @shift_from %>
-						<tr>
-							<% if @shift_data.employee %>		
-							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-							<% end %>			
-							<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
-						</tr>
-						<% end %>	 
-
-						<tr>
-							<th><%= t("views.right_panel.detail.receipt_no") %></th>
-							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
-							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
-							<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
-							<% @tax_profiles.each do |tax| %>
-							<th><%= tax.name %></th>		
-							<% end %>
-							<!-- <th>Other Amount</th> -->
-							<th><%= t("views.right_panel.detail.grand_total") %></th>
-							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-							<th><%= t("views.right_panel.detail.grand_total") %> +<br/>
-								<%= t("views.right_panel.detail.rnd_adj_sh") %>
-							</th>
+							<td >
+								<strong>Receipt No :<%= sale.receipt_no %></strong>
+							</td>			    
+							<td></td>   
+							<td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td>
 						</tr>
 					</thead>
 					<tbody>
-						<% grand_total = 0 %>
-						<% old_grand_total = 0 %>
-						<% total_tax = 0 %>
-						<% guest_count = 0 %>
-						<% total_sum = 0 %>	
-						<% discount_amt = 0 %>		    
-						<% other_amt = 0 %>
-						<% total_nett = 0 %>	 
-						<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
-						<%if @sale_data %> 
-						<% @sale_data.each do |result| %>
-
-						<% grand_total = grand_total.to_f + result.grand_total.to_f %>
-						<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
-						<% total_tax += result.total_tax.to_f %>
-						<% total_sum += result.total_amount.to_f %>	
-						<% discount_amt += result.total_discount.to_f %>
-						<% rounding_adj += result.rounding_adjustment.to_f %>
-
 						<tr>
-
-							<td><%= result.receipt_no rescue '-' %> </td>
-							<td><%= result.cashier_name rescue '-' %></td>
-							<td><%= result.total_amount rescue '-' %></td>
-							<td><%= result.total_discount rescue '-' %></td>
-							<%if result.customer.customer_type == "Takeaway"%>
-							    <td>0.0</td>
-							<%end%>
-							<% result.sale_taxes.each do |tax| %>
-							<td><%= tax.tax_payable_amount rescue '-' %></td>
-							<%end%>
-
-							<td><%= result.grand_total %></td>			
-							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+							<td ><strong>Item Name</strong></td>
+							<td ><strong>Item Code</strong></td>
+							<td><strong>Qty</strong></td>
+							<td><strong>Price</strong></td>
+							<td><strong>Total Price</strong></td>		  		 
 						</tr>
-
+						
+						<% sale.sale_items.each do |item| %> 
+						<% if !item.item_instance_code.nil?%> 
+						<% waste_and_spoil_item_count += item.qty.to_i%>
+						<tr>
+							<td><%= item.product_name %></td>
+							<td><%= item.product_code %></td>
+							<td><%= item.qty %></td>
+							<td><%= item.price %></td>
+							<td><%= item.price %></td>
+						</tr>		  		
+						<% end %>
 						<% end %>
-						<tr style="border-top:4px double #666;">
-							<td colspan="2">&nbsp;</td>
-							<td><b><%= total_sum  rescue '-'%></b></td>
-							<td><b><%= discount_amt  rescue '-'%></b></td>
-							<% @sale_taxes.each do |tax| %>
-							<td><b><%= tax.st_amount.round(2) %></b></td>
-							<% end %>
-							<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
-							<td><b><%= rounding_adj  rescue '-'%></b></td>		
-							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
-						</tr>
 						<tr>
-							<td colspan="2">&nbsp;</td>
-							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-							
-							<% @tax_profiles.each do |tax| %>
-								<td><%= tax.name %></td>
-							<% end %>
-							<td><%= t("views.right_panel.detail.grand_total") %></td>
-							<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>
-							<td><%= t("views.right_panel.detail.grand_total") %> +<br/>
-								<%= t("views.right_panel.detail.rnd_adj_sh") %>
+							<td colspan="2" style="text-align:right"> <strong>Total Qty: </strong></td> 
+							<td><span class="underline" style="text-align:right">
+								<strong><%= waste_and_spoil_item_count %></strong>
+							</span></td>
+							<td style="text-align:right"> <strong>Grand Total: </strong></td> 
+							<td > 
+								<span class="underline" style="text-align:right">
+									<strong><%= sale.grand_total %></strong>
+								</span>
 							</td>
-						</tr>
-						<%end%>
-					</tbody>
+						</tr>   
+					</tbody>		 
+					<% end %>
 				</table>
 			</div>
 		</div>

From 37f3ef7a0d088c2ea2a703e0914c536f98e54e82 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 30 Mar 2018 15:07:48 +0630
Subject: [PATCH 503/651] update customer assign redirect

---
 app/controllers/origami/quick_service_controller.rb |  2 +-
 app/views/origami/customers/index.html.erb          | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 8abcfcc8..d2194bb5 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -12,7 +12,7 @@ class Origami::QuickServiceController < ApplicationController
     day = Date.today.wday
     @menus    = Menu.all
     @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-    @zone   = Zone.all
+    @zone     = Zone.all
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index f36ca636..ab67d9fb 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -119,11 +119,13 @@
           <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
           <input type="hidden" id="page" name="page" value="<%= @page %>" />
           <%if !@dining_facility.nil?%>
-          <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
-          <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
+           <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
+           <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
+           <input type="hidden" id="table_type" name="table_type" value="<%= @dining_facility.type %>" />
           <%else%>
             <input type="hidden" id="table_id" name="table_id" value="" />
-          <input type="hidden" id="type" name="type" value="" />
+            <input type="hidden" id="type" name="type" value="" />
+           <input type="hidden" id="table_type" name="table_type" value="" />
           <%end%>
           <%= f.error_notification %>
           <%= f.hidden_field :id, :class => "form-control col-md-6 " %>    
@@ -469,7 +471,7 @@
           if(data.status == true)
           {
             var id       = $("#table_id").val();
-            var type     = $("#type").val();
+            var type     = $("#table_type").val();
             var booking_id = "";
             <% if !@booking_order.nil? %>
               booking_id = "<%= @booking_order.booking_id %>";
@@ -502,7 +504,7 @@
 
   $('#back').on('click',function(){
     var id       = $("#table_id").val();
-    var type     = $("#type").val();
+    var type     = $("#table_type").val();
     var sale_id  = $("#sale_id").val();
     if (cashier_type == "quick_service") {
       window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';

From 6a9fd67bff40d8fd8489f127e0da05d0009efc9a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 30 Mar 2018 15:24:51 +0630
Subject: [PATCH 504/651] check payment method

---
 app/assets/javascripts/origami.js             |   2 +-
 app/controllers/api/payments_controller.rb    |  11 +
 app/controllers/origami/alipay_controller.rb  |  77 ++++++
 app/controllers/origami/jcb_controller.rb     |   3 +-
 app/controllers/origami/master_controller.rb  |   3 +-
 app/controllers/origami/mpu_controller.rb     |   3 +-
 .../origami/payments_controller.rb            |   3 +
 .../origami/unionpay_controller.rb            |   3 +-
 app/controllers/origami/visa_controller.rb    |   3 +-
 app/models/sale_payment.rb                    |   4 +-
 app/views/origami/alipay/create.json.jbuilder |   5 +
 app/views/origami/alipay/index.html.erb       | 258 ++++++++++++++++++
 app/views/origami/payments/show.html.erb      | 119 ++++----
 config/locales/en.yml                         |   3 +
 config/locales/mm.yml                         |   3 +
 config/routes.rb                              |   4 +
 .../origami/alipay_controller_spec.rb         |   5 +
 17 files changed, 456 insertions(+), 53 deletions(-)
 create mode 100644 app/controllers/origami/alipay_controller.rb
 create mode 100755 app/views/origami/alipay/create.json.jbuilder
 create mode 100755 app/views/origami/alipay/index.html.erb
 create mode 100644 spec/controllers/origami/alipay_controller_spec.rb

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 7388529b..f2219711 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -323,7 +323,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
     if(jobj.STATUS == "Approved"){
         $.ajax({type: "POST",
          	url: "/origami/payment/"+payment_type,
-         	data: "amount="+ bnk_bill_amount + "&sale_id="+ sale_id,
+         	data: "amount="+ bnk_bill_amount + "&sale_id="+ sale_id + "&ref_no=" + jobj.REFNUM,
          	success:function(result){
          		if(result){
          			swal({
diff --git a/app/controllers/api/payments_controller.rb b/app/controllers/api/payments_controller.rb
index 39219c6b..459589ed 100755
--- a/app/controllers/api/payments_controller.rb
+++ b/app/controllers/api/payments_controller.rb
@@ -84,6 +84,17 @@ class Api::PaymentsController < ActionController::API
         sale_payment.payment_reference = params[:payment_reference]
         #TODO: implement paypar implementation
         @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
+      when "JunctionPay"
+        sale_payment.payment_method = "JunctionPay"
+        sale_payment.received_amount = params[:amount]
+        sale_payment.customer_id = params[:customer_id]
+        sale_payment.payment_reference = params[:vochure_no]
+        @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
+      when "alipay"
+        sale_payment.payment_method = "alipay"
+        sale_payment.received_amount = params[:amount]
+        sale_payment.payment_reference = params[:payment_reference]
+        @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
     end
   end
 end
diff --git a/app/controllers/origami/alipay_controller.rb b/app/controllers/origami/alipay_controller.rb
new file mode 100644
index 00000000..3f449856
--- /dev/null
+++ b/app/controllers/origami/alipay_controller.rb
@@ -0,0 +1,77 @@
+class Origami::AlipayController < BaseOrigamiController
+	def index
+    @sale_id = params[:sale_id]
+    @cashier_type   = params[:type]
+    # limit alipay_amount
+    sale_data = Sale.find_by_sale_id(@sale_id)
+    total = 0
+    @alipaycount = 0
+    @shop        = Shop::ShopDetail 
+    @rounding_adj = 0
+    @can_alipay = 0
+    @member_discount = 0
+    @sub_total = 0
+    @membership_id = nil
+    @receipt_no = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      
+      others    = 0
+      
+      if @shop.is_rounding_adj
+           new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+      else
+          new_total    = sale_data.grand_total
+      end
+      @rounding_adj = new_total-sale_data.grand_total  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "alipay"
+            @alipaycount = @alipaycount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_alipay = total - @alipaycount - others
+
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
+    end
+
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
+  end
+
+  def create
+    cash = params[:amount]
+    sale_id = params[:sale_id]
+    ref_no = params[:ref_no]
+    if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
+
+      # saleObj = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "alipay",ref_no)
+    end
+  end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
+end
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index 5c06f9fe..315af34a 100644
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -52,6 +52,7 @@ class Origami::JcbController < BaseOrigamiController
   def create
     cash = params[:amount]
     sale_id = params[:sale_id]
+    ref_no  = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
@@ -65,7 +66,7 @@ class Origami::JcbController < BaseOrigamiController
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb")
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb",ref_no)
     end
   end
 
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 858d0125..dc3a83d9 100644
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -50,6 +50,7 @@ class Origami::MasterController < BaseOrigamiController
   def create
     cash = params[:amount]
     sale_id = params[:sale_id]
+    ref_no = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
@@ -63,7 +64,7 @@ class Origami::MasterController < BaseOrigamiController
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master")
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master",ref_no)
     end
   end
 
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 1b125bda..7d3ded34 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -51,6 +51,7 @@ class Origami::MpuController < BaseOrigamiController
   def create
     cash = params[:amount]
     sale_id = params[:sale_id]
+    ref_no  = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
@@ -64,7 +65,7 @@ class Origami::MpuController < BaseOrigamiController
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu")
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "alipay",ref_no)
     end
   end
 
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 5397c7f0..c31dd44d 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -226,6 +226,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @jcbcount= 0.0
       @mastercount = 0.0
       @unionpaycount = 0.0
+      @alipaycount = 0.0
       @junctionpaycount = 0.0
       @credit = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
@@ -346,6 +347,8 @@ class Origami::PaymentsController < BaseOrigamiController
           @junctionpaycount += spay.payment_amount
          elsif spay.payment_method == "creditnote"
            @credit += spay.payment_amount
+         elsif spay.payment_method == "alipay"
+           @alipaycount += spay.payment_amount
          end
       end
     end
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index 7213af6d..ec941a20 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -48,6 +48,7 @@ class Origami::UnionpayController < BaseOrigamiController
   def create
     cash = params[:amount]
     sale_id = params[:sale_id]
+    ref_no = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
@@ -62,7 +63,7 @@ class Origami::UnionpayController < BaseOrigamiController
       # saleObj = Sale.find(sale_id)
       #end rounding adjustment
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay")
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay",ref_no)
     end
   end
 
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 346b66d1..8cc2bbe3 100644
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -48,6 +48,7 @@ class Origami::VisaController < BaseOrigamiController
   def create
     cash = params[:amount]
     sale_id = params[:sale_id]
+    ref_no = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
@@ -62,7 +63,7 @@ class Origami::VisaController < BaseOrigamiController
       # saleObj = Sale.find(sale_id)
       #end rounding adjustment
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa")
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa",ref_no)
     end
   end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 3ff4697e..6b08a9fa 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -51,6 +51,8 @@ class SalePayment < ApplicationRecord
           payment_status = foc_payment
         when "JunctionPay"
           payment_status = junction_pay_payment
+        when "alipay"
+          payment_status = external_terminal_card_payment(:alipay)
       else
          puts "it was something else"
       end
@@ -230,7 +232,7 @@ class SalePayment < ApplicationRecord
     payment_status = false
     self.payment_method = method
     self.payment_amount = self.received_amount
-    self.payment_reference  = self.card_payment_reference
+    # self.payment_reference  = self.card_payment_reference
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
diff --git a/app/views/origami/alipay/create.json.jbuilder b/app/views/origami/alipay/create.json.jbuilder
new file mode 100755
index 00000000..9767a7d8
--- /dev/null
+++ b/app/views/origami/alipay/create.json.jbuilder
@@ -0,0 +1,5 @@
+if(@status)
+  json.status @status
+else
+  json.status false
+end
diff --git a/app/views/origami/alipay/index.html.erb b/app/views/origami/alipay/index.html.erb
new file mode 100755
index 00000000..a9959512
--- /dev/null
+++ b/app/views/origami/alipay/index.html.erb
@@ -0,0 +1,258 @@
+<div class="container-fluid">
+	<div id="loading_wrapper" style="display:none;">
+		<div id="loading"></div>
+	</div>
+	<!-- <div class="page-header">
+		<ol class="breadcrumb">
+			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+			<li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+			<li class="breadcrumb-item active"><%= t("views.btn.alipay") %></li>
+			<span class="float-right">
+				<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+			</span>
+		</ol>
+	</div> -->
+	<div class="row">
+		<div class="col-lg-5 col-md-5 col-sm-5">
+			<span class="hidden" id="membership_id"><%= @membership_id%></span>
+			<span class="hidden" id="member_discount"><%= @member_discount%></span>
+			<span class="hidden" id="sub-total"><%= @sub_total%></span>
+			<div class="card" style="margin-top:10px;padding:20px;">
+				<div class="card-block">
+					<div class="rebate-form">
+						<% if @bank_integration == '1' %>
+						<div class="row">
+							<div class="form-group col-lg-12 col-md-12 col-sm-12">
+								<label for="com_port_name">Select Device</label>
+								<select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+									
+								</select>
+							</div>
+							<hr>
+						</div>
+						<% end %>
+						<div class="row">
+							<div class="form-group col-lg-12 col-md-12 col-sm-12">
+								<label>You can pay up to </label>
+								<%@can_alipay = @can_alipay +@rounding_adj%>
+								<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%= @can_alipay %>" data-member-value="">
+							</div>
+							<hr>
+						</div>
+						<% if @alipaycount != 0 %>
+						<div class="row">
+							<div class="form-group col-lg-12 col-md-12 col-sm-12">
+								<label>Recent Alipay paid amount </label>
+								<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@alipaycount %>" data-member-value="">
+							</div>
+							<hr>
+						</div>
+						<% end %>
+						<div class="row">
+							<div class="form-group col-lg-12 col-md-12 col-sm-12">
+								<label>Reference Number</label>
+								<input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+								<br><span id="reference_no_Err" style="color:red;"></span>	
+							</div>
+							<hr>
+						</div>
+						<div class="row">
+							<div class="form-group col-lg-12 col-md-12 col-sm-12">
+								<label>Amount</label>
+								<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+							</div>
+							<hr>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:;">
+			<div class=" m-t-10 p-l-20">
+				<div class="row">
+					<div class="col-lg-6 col-md-6 col-sm-6">
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="1" data-type="num">1</div>
+							<div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+							<div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="4" data-type="num">4</div>
+							<div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+							<div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="7" data-type="num">7</div>
+							<div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+							<div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="0" data-type="num">0</div>
+							<div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+							<div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left green" data-type="nett" >Nett</div>
+							<div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+							<div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+						</div>
+					</div>
+					<div class="col-lg-6 col-md-6 col-sm-6">
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+							<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+							<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="pay purple left" id="alipay_pay">Pay</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="col-md-1 col-lg-1 col-sm-1">
+			 <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+
+		</div>
+	</div>
+</div>
+<script>
+	var cashier_type = "<%= @cashier_type %>";
+	$(document).ready(function() {
+		var sale_id = "<%= @sale_id %>";
+		var bank_integration = "<%= @bank_integration %>";
+		
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+			else {
+				$('#validamount').attr("value",parseFloat("<%= @can_alipay %>") - parseFloat(localStorage.getItem("cash")));
+			}
+		
+		if(bank_integration == '1'){
+			if(typeof code2lab != 'undefined'){
+				code2lab.getCommPorts(); //get comportlists from jade
+			}else{
+				swal({
+				  title: 'Oops',
+				  text: 'Alipay is not available in here!',
+				  type: 'error',
+				  html: true,
+				  closeOnConfirm: false,
+				  closeOnCancel: false,
+				  allowOutsideClick: false
+				}, function () {
+					window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment/others_payment";
+				});
+			}
+		}
+	});
+		
+	$(document).on('click', '.cashier_number', function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		if(event.handled !== true) {
+			var original_value;
+			original_value = $('#amount').text();
+
+			var input_value = $(this).attr("data-value");
+
+			var input_type = $(this).attr("data-type");
+			switch (input_type) {
+				case 'num':
+				if (original_value == "0.0"){
+					$('#amount').text(input_value);
+				}else{
+					$('#amount').append(input_value);
+				}
+				break;
+
+				case 'add':
+				var input_value = $(this).attr("data-value");
+				amount = parseInt(input_value) + parseInt(original_value);
+				$('#amount').html(amount);
+
+				break;
+				case 'clr':
+				$('#amount').html("0.0");
+				break;
+				case 'del' :
+				var cash=$('#amount').text();
+				$('#amount').text(cash.substr(0,cash.length-1));
+				break;
+				case 'nett':
+				var remain_amount = $('#validamount').val();
+				$('#amount').text(remain_amount);
+				break;
+
+			}
+			event.handled = true;
+		} else {
+			return false;
+		}
+	});
+	
+	$('#alipay_pay').on('click',function(){
+		var amount = $('#amount').text();
+		var reference_no = $('#reference_no').val();
+		var sale_id = "<%= @sale_id %>";
+		var receipt_no = "<%= @receipt_no %>";
+		var bank_integration = "<%= @bank_integration %>";
+		var cashier_type = "<%= @cashier_type %>";
+		$("#reference_no_Err").html("");
+		if(reference_no.length > 0){
+			if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+				$(this).off("click");
+			//start member discount 5% by pay card	
+				// var sub_total = $('#sub-total').text();
+				// var member_id = $('#membership_id').text();
+				// var member_discount = $('#member_discount').text();
+				// if (member_id && member_discount) {
+				// 	$.ajax({
+				// 		type: "POST",
+				// 		url: "/origami/" + sale_id + "/member_discount",
+				// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+			    //              success:function(result){           
+			    //              }
+			    //          });
+				// }
+		    //end member discount
+	    	if(bank_integration == '1'){
+	      		pay_withBank("SALE", "alipay", amount, sale_id, receipt_no,cashier_type);
+	      	}else{
+	      		$.ajax({type: "POST",
+		          url: "<%= origami_payment_alipay_path %>",
+		          data: "amount="+ amount + "&sale_id="+ sale_id,
+		          success:function(result){
+		            if(result){
+		              swal({
+		                title: "Information!",
+		                text: "Payment Successfully",
+		                html: true,
+		            closeOnConfirm: false,
+		            closeOnCancel: false,
+		            allowOutsideClick: false
+		              }, function () {
+		                window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment";
+		              });
+		            }
+		          }
+		        });
+	      	}
+
+	     }else{
+		     	if (amount>0) {
+		        	swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+			    }else{
+			        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+			    }
+		 	}
+		}else{
+		 	$("#reference_no_Err").html("can't be blank");
+		}
+	})
+</script>
+
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index eb3eefe3..c33b6493 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -182,103 +182,125 @@
       <div class="card-title m-l-5 m-r-5">
         <!-- mpu -->
         <% if @other != 0.0 %>
-        <div class="row payment others-color">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">MPU</div>
-          <div class="col-md-4 mpu is_card" id="others"><%= number_with_precision(@other, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
+          <div class="row payment others-color">
         <% else %>
-        <div class="row hidden">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">MPU</div>
-          <div class="col-md-4" id="others"><%= number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
+          <div class="row hidden">
         <% end %>
+            <div class="col-md-5"></div>
+            <div class="col-md-3">MPU</div>
+          <% if @other != 0.0 %>
+            <div class="col-md-4 mpu is_card" id="others"><%= number_with_precision(@other, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="others"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
+          </div>
         <!-- paypar -->
         <% if @ppamount != 0.0 %>
         <div class="row payment others-color">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">Redeem</div>
-          <div class="col-md-4" id="ppamount"><%= number_with_precision(@ppamount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
         <% else %>
         <div class="row hidden">
+        <% end %>
           <div class="col-md-5"></div>
           <div class="col-md-3">Redeem</div>
+          <% if @ppamount != 0.0 %>
+          <div class="col-md-4" id="ppamount"><%= number_with_precision(@ppamount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
           <div class="col-md-4" id="ppamount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
         </div>
-        <% end %>
+
         <!-- Visa -->
         <% if @visacount != 0.0 %>
         <div class="row payment others-color">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">VISA</div>
-          <div class="col-md-4 visa is_card" id="visacount"><%= number_with_precision(@visacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
         <% else %>
         <div class="row hidden">
+        <% end %>
           <div class="col-md-5"></div>
           <div class="col-md-3">VISA</div>
-          <div class="col-md-4" id="visacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% if @visacount != 0.0 %>
+            <div class="col-md-4 visa is_card" id="visacount"><%= number_with_precision(@visacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="visacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
         </div>
-        <% end %>
+
         <!-- JCB -->
         <% if @jcbcount != 0.0 %>
         <div class="row payment others-color">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">JCB</div>
-          <div class="col-md-4 jcb is_card" id="jcbcount"><%= number_with_precision(@jcbcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
         <% else %>
         <div class="row hidden">
+        <% end %>
           <div class="col-md-5"></div>
           <div class="col-md-3">JCB</div>
-          <div class="col-md-4" id="jcbcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% if @jcbcount != 0.0 %>
+            <div class="col-md-4 jcb is_card" id="jcbcount"><%= number_with_precision(@jcbcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="jcbcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
         </div>
-        <% end %>
+
         <!-- Master -->
         <% if @mastercount != 0.0 %>
         <div class="row payment others-color">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">MASTER</div>
-          <div class="col-md-4 master is_card" id="mastercount"><%= number_with_precision(@mastercount, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
         <% else %>
         <div class="row hidden">
+        <% end %>
           <div class="col-md-5"></div>
           <div class="col-md-3">MASTER</div>
-          <div class="col-md-4" id="mastercount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% if @mastercount != 0.0 %>
+            <div class="col-md-4 master is_card" id="mastercount"><%= number_with_precision(@mastercount, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="mastercount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
         </div>
-        <% end %>
         <!-- <br> -->
+
         <!-- UNIONPAY -->
         <% if @unionpaycount != 0.0 %>
         <div class="row payment others-color">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">UNIONPAY</div>
-          <div class="col-md-4 master is_card" id="unionpaycount"><%= number_with_precision(@unionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
         <% else %>
         <div class="row hidden">
+        <% end %>
           <div class="col-md-5"></div>
           <div class="col-md-3">UNIONPAY</div>
-          <div class="col-md-4" id="unionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% if @unionpaycount != 0.0 %>
+            <div class="col-md-4 master is_card" id="unionpaycount"><%= number_with_precision(@unionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="unionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
         </div>
+
+        <!-- Alipay -->
+        <% if @alipaycount != 0.0 %>
+        <div class="row payment others-color">
+        <% else %>
+        <div class="row hidden">
         <% end %>
+          <div class="col-md-5"></div>
+          <div class="col-md-3">Alipay</div>
+          <% if @alipaycount != 0.0 %>
+            <div class="col-md-4 alipay is_card" id="alipaycount"><%= number_with_precision(@alipaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="alipaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
+        </div>
+
         <!-- Junction Pay -->
         <% if @junctionpaycount != 0.0 %>
         <div class="row payment others-color">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">JUNCTION PAY</div>
-          <div class="col-md-4 master is_card" id="junctionpaycount"><%= number_with_precision(@junctionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-        </div>
         <% else %>
         <div class="row hidden">
+        <% end %>
           <div class="col-md-5"></div>
           <div class="col-md-3">JUNCTION PAY</div>
-          <div class="col-md-4" id="junctionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% if @junctionpaycount != 0.0 %>
+            <div class="col-md-4 master is_card" id="junctionpaycount"><%= number_with_precision(@junctionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="junctionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
         </div>
-        <% end %>
+
+
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
           <div class="col-md-4"><strong><span id='balance'><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong></div>
@@ -584,6 +606,9 @@ var customer_name = "<%= @customer.name %>";
       else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){
           swal("Oops","Please Pay with UNIONPAY Payment","warning");
       }
+      else if(payment_type == "Alipay" && $('#alipaycount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with Alipay Payment","warning");
+      }
       else if(payment_type == "JUNCTIONPAY" && $('#junctionpaycount').text()==0 && sub_total != 0.0){
           swal("Oops","Please Pay with JUNCTIONPAY Payment","warning");
       }
@@ -866,8 +891,9 @@ var customer_name = "<%= @customer.name %>";
           var jcb1 = $('#jcbcount').text();
           var master1 = $('#mastercount').text();
           var unionpay1 = $('#unionpaycount').text();
+          var alipay1 = $('#alipaycount').text();
           var junctionpay1 = $('#junctionpaycount').text();
-          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(junctionpay1);
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(alipay1) + parseFloat(junctionpay1);
           var total = $('#amount_due').text();
           var amt = 0;
           <% if precision.to_i > 0 %>;
@@ -895,9 +921,10 @@ var customer_name = "<%= @customer.name %>";
     var jcb = $('#jcbcount').text();
     var master = $('#mastercount').text();
     var unionpay = $('#unionpaycount').text();
+    var alipay = $('#alipaycount').text();
     var junctionpay = $('#junctionpaycount').text();
     var amount_due = $('#amount_due').text();
-    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(junctionpay)
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(alipay) + parseFloat(junctionpay)
     var result = parseFloat(amount_due) - parseFloat(total);
     <% if precision.to_i > 0 %>
       $('#balance').text(parseFloat(result).toFixed(<%= precision %>));
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 84a7b03a..dba88aee 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -122,6 +122,8 @@ en:
       mpu: "MPU"
       jcb: "JCB"
       visa: "VISA"
+      master: "MASTER"
+      alipay: "Alipay"
       credit: "CREDIT"
       other_payment: "Other Payment"
       percentage: "PERCENTAGE"
@@ -412,6 +414,7 @@ en:
         redeem_sales: "Redeem Sales"
         cash_sales: "Cash Sales"
         credit_sales: "Credit Sales"
+        alipay_sales: "Alipay Sales"
         foc_sales: "FOC Sales"
         foc_item: "Item FOC"
         net_amount: "Net Amount"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index f18136c4..e06733e9 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -117,6 +117,8 @@ mm:
       mpu: "MPU"
       jcb: "JCB"
       visa: "VISA"
+      master: "MASTER"
+      alipay: "Alipay"
       credit: "အကြွေး"
       other_payment: "အ�ြားငွေပေးဆောင်မှုများ"
       percentage: "ရာ�ိုင်နှုန်း"
@@ -404,6 +406,7 @@ mm:
         master_sales: "Master ရောင်းရငွေ"
         visa_sales: "Visa ရောင်းရငွေ"
         jcb_sales: "JCB ရောင်းရငွေ"
+        alipay_sales: "Alipay ရောင်းရငွေ"
         redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ"
         cash_sales: "ငွေသား ရောင်းရငွေ"
         credit_sales: "အကြွေး ရောင်းရငွေ"
diff --git a/config/routes.rb b/config/routes.rb
index 233d7e04..6416f236 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -181,6 +181,8 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
+    post 'payment/alipay' => 'alipay#create'
+    post 'payment/junctionpay' => 'junctionpay#create'
 
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
@@ -191,6 +193,8 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
     get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
+    get 'sale/:sale_id/:type/payment/others_payment/JunctionPay' => "junction_pay#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Alipay' => "alipay#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/:type/void' => 'void#overall_void'
diff --git a/spec/controllers/origami/alipay_controller_spec.rb b/spec/controllers/origami/alipay_controller_spec.rb
new file mode 100644
index 00000000..5994c9fa
--- /dev/null
+++ b/spec/controllers/origami/alipay_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::AlipayController, type: :controller do
+
+end

From 40175d64cdd9dc54ee77d645fdcaa6b63383c6bc Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 30 Mar 2018 15:38:48 +0630
Subject: [PATCH 505/651] remove puma backup

---
 config/puma.rb.backup | 48 -------------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100755 config/puma.rb.backup

diff --git a/config/puma.rb.backup b/config/puma.rb.backup
deleted file mode 100755
index c8e0145e..00000000
--- a/config/puma.rb.backup
+++ /dev/null
@@ -1,48 +0,0 @@
-# Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers a minimum and maximum.
-# Any libraries that use thread pools should be configured to match
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum, this matches the default thread size of Active Record.
-#
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
-threads threads_count, threads_count
-
-# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
-#
-port        ENV.fetch("PORT") { 3000 }
-
-# Specifies the `environment` that Puma will run in.
-#
-environment ENV.fetch("RAILS_ENV") { "development" }
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
-#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory. If you use this option
-# you need to make sure to reconnect any threads in the `on_worker_boot`
-# block.
-#
-# preload_app!
-
-# The code in the `on_worker_boot` will be called if you are using
-# clustered mode by specifying a number of `workers`. After each worker
-# process is booted this block will be run, if you are using `preload_app!`
-# option you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, Ruby
-# cannot share connections between processes.
-#
-# on_worker_boot do
-#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-# end
-
-# Allow puma to be restarted by `rails restart` command.
-
-plugin :tmp_restart

From 298fc9a3f078bde7a449a58c0f742b28c4412321 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 30 Mar 2018 15:48:55 +0630
Subject: [PATCH 506/651] merge with second display

---
 app/assets/javascripts/origami.js             |  3 +++
 app/views/origami/alipay/index.html.erb       |  1 +
 app/views/origami/junction_pay/index.html.erb |  1 +
 config/initializers/action_controller.rb      | 10 +++++-----
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 1cbc63ed..42fca385 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -24,6 +24,9 @@ _IN_DUTIES_			= "/&nbsp;&nbsp;&nbsp;IN DUTIES";
 _JCB_				= "/&nbsp;&nbsp;&nbsp;JCB PAYMENT";
 _MASTER_			= "/&nbsp;&nbsp;&nbsp;MASTER PAYMENT";
 _MPU_				= "/&nbsp;&nbsp;&nbsp;MPU PAYMENT";
+_ALIPAY_			= "/&nbsp;&nbsp;&nbsp;Alipay";
+_JUNCTIONPAY_		= "/&nbsp;&nbsp;&nbsp;JunctionPay";
+_PAYMAL_			= "/&nbsp;&nbsp;&nbsp;Paymal";
 _OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;CHARGES";
 _OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENT";
 _PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENT";
diff --git a/app/views/origami/alipay/index.html.erb b/app/views/origami/alipay/index.html.erb
index a9959512..abd065fb 100755
--- a/app/views/origami/alipay/index.html.erb
+++ b/app/views/origami/alipay/index.html.erb
@@ -124,6 +124,7 @@
 <script>
 	var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function() {
+		setHeaderBreadCrumb(_ALIPAY_);
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
 		
diff --git a/app/views/origami/junction_pay/index.html.erb b/app/views/origami/junction_pay/index.html.erb
index cdbdc47d..76be5380 100755
--- a/app/views/origami/junction_pay/index.html.erb
+++ b/app/views/origami/junction_pay/index.html.erb
@@ -120,6 +120,7 @@
 <script>
 	var cashier_type = "<%= @cashier_type %>";  
 	$(document).ready(function() {
+		setHeaderBreadCrumb(_JUNCTIONPAY_);
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 20c5624c..dcfcfed5 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

From c2063b06a01bc058761290030a52ae032fdba186 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 30 Mar 2018 16:37:48 +0630
Subject: [PATCH 507/651] add route for display image

---
 config/routes.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 43c3d885..b7e1cf7e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -298,7 +298,9 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- System Settings ------------#
   namespace :settings do
-    resources :shops
+    resources :shops do
+      resources :display_images
+    end
     #employees
     resources :employees
     #menu

From fc8d8eea4ab7bebc7978c0bc72238c20515930b9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 30 Mar 2018 16:53:38 +0630
Subject: [PATCH 508/651] add paymal payment

---
 Gemfile                                      |  4 +-
 Gemfile.lock                                 |  0
 app/assets/javascripts/origami.js            |  2 +-
 app/controllers/origami/paymal_controller.rb | 76 ++++++++++----------
 app/models/sale_payment.rb                   | 12 ++--
 app/views/origami/paymal/index.html.erb      | 11 +--
 6 files changed, 51 insertions(+), 54 deletions(-)
 mode change 100755 => 100644 Gemfile
 mode change 100755 => 100644 Gemfile.lock

diff --git a/Gemfile b/Gemfile
old mode 100755
new mode 100644
index fe3610b0..41682d12
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.4.0'
+ruby '2.4.1'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
@@ -131,4 +131,4 @@ gem 'momentjs-rails' # for date-range selector
 # gem 'bootstrap-datepicker-rails' # date picker
 # gem 'jquery-datetimepicker-rails'
 # gem 'select2-rails' # for multi-select and auto-complete select box
-gem "chartkick" #chart lib
+gem "chartkick" #chart lib
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 42fca385..573f7c9e 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -26,7 +26,7 @@ _MASTER_			= "/&nbsp;&nbsp;&nbsp;MASTER PAYMENT";
 _MPU_				= "/&nbsp;&nbsp;&nbsp;MPU PAYMENT";
 _ALIPAY_			= "/&nbsp;&nbsp;&nbsp;Alipay";
 _JUNCTIONPAY_		= "/&nbsp;&nbsp;&nbsp;JunctionPay";
-_PAYMAL_			= "/&nbsp;&nbsp;&nbsp;Paymal";
+_PAYMAL_			= "/&nbsp;&nbsp;&nbsp;PAYMAL";
 _OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;CHARGES";
 _OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENT";
 _PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENT";
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index bdcee917..3db34a1c 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -27,46 +27,46 @@ class Origami::PaymalController < BaseOrigamiController
         @payment_prices = sale_data.grand_total - @payparcount -others
 
 
-     		if sale_data
-     			if sale_data.customer_id
-     				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
-     				if customer_data
-     					@membership_id = customer_data.membership_id
-     					if !@membership_id.nil?
-     						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-     						if membership_setting.gateway_url
-     							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
-     							if member_actions.gateway_url
-     								@campaign_type_id = nil
-     								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
-     								merchant_uid= member_actions.merchant_account_id
-     								auth_token = member_actions.auth_token.to_s
-    		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
-    		 						if membership_data["status"]==true
-    		 							@membership_rebate_balance=membership_data["balance"]
-    		 							@out = true, @membership_rebate_balance,@membership_id
-    		 						end
-    		 					else
-    		 						@out =false,0
-     							end
-     						else
-     							@out = false,0
-     						end
+ 		if sale_data
+ 			if sale_data.customer_id
+ 				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+ 				if customer_data
+ 					@membership_id = customer_data.membership_id
+ 					if !@membership_id.nil?
+ 						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+ 						if membership_setting.gateway_url
+ 							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+ 							if member_actions.gateway_url
+ 								@campaign_type_id = nil
+ 								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+ 								merchant_uid= member_actions.merchant_account_id
+ 								auth_token = member_actions.auth_token.to_s
+		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+		 						if membership_data["status"]==true
+		 							@membership_rebate_balance=membership_data["balance"]
+		 							@out = true, @membership_rebate_balance,@membership_id
+		 						end
+		 					else
+		 						@out =false,0
+ 							end
+ 						else
+ 							@out = false,0
+ 						end
 
 
-     					else
-     						@out = false, 0
-     					end
-     				else
-     					@out = false, 0
-     				end
-     			else
-     				@out = false, 0
-     			end
-     		else
-     			@out = false, 0
-     		end
-     		@out = false, 0
+ 					else
+ 						@out = false, 0
+ 					end
+ 				else
+ 					@out = false, 0
+ 				end
+ 			else
+ 				@out = false, 0
+ 			end
+ 		else
+ 			@out = false, 0
+ 		end
+ 		@out = false, 0
     end
   	def create
 	    cash = params[:payment_amount]
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index d4b549bb..e43414b8 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -49,15 +49,12 @@ class SalePayment < ApplicationRecord
           payment_status = paypar_payment
         when "foc"
           payment_status = foc_payment
-<<<<<<< HEAD
         when "paymal"
           payment_status = paymal_payment
-=======
         when "JunctionPay"
           payment_status = junction_pay_payment
         when "alipay"
           payment_status = external_terminal_card_payment(:alipay)
->>>>>>> 996392a041cb5f92a3b2985cbd0379210132d829
       else
          puts "it was something else"
       end
@@ -360,7 +357,6 @@ class SalePayment < ApplicationRecord
 
   end
 
-<<<<<<< HEAD
   def paymal_payment
     payment_status = false
 
@@ -386,7 +382,10 @@ class SalePayment < ApplicationRecord
     else
       sale_update_payment_status(0)
     end
-=======
+
+    return payment_status
+  end
+
   def junction_pay_payment
     payment_status = false
 
@@ -398,10 +397,7 @@ class SalePayment < ApplicationRecord
     self.payment_status = "paid"
     payment_method = self.save!
     sale_update_payment_status(self.received_amount)
-
->>>>>>> 996392a041cb5f92a3b2985cbd0379210132d829
     return payment_status
-
   end
 
   def sale_update_payment_status(paid_amount,check_foc = false)    
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index 81684256..627f9085 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -9,7 +9,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>PayMal Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-5">
 			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">
@@ -110,11 +109,13 @@
 <script type="text/javascript">
     var cashier_type = "<%= @cashier_type %>"; 
 	$(document).ready(function() {
+		setHeaderBreadCrumb(_PAYMAL_);
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-			else {
-				$('#paymentamt').attr("value",parseFloat("<%= @payment_prices %>") - parseFloat(localStorage.getItem("cash")));
-			}
-		});
+		else {
+			$('#paymentamt').attr("value",parseFloat("<%= @payment_prices %>") - parseFloat(localStorage.getItem("cash")));
+		}
+	});
+
 	$(document).on('click', '.cashier_number', function(event){
 		event.stopPropagation();
 		event.preventDefault();

From 2dec217bccb1adf26d2be58bdc6f1b6d1154259d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 30 Mar 2018 17:23:59 +0630
Subject: [PATCH 509/651] update waste and spoile

---
 app/views/origami/home/show.html.erb     |  9 +++---
 app/views/origami/payments/show.html.erb | 38 ++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 4810cf13..b108c46d 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -488,11 +488,6 @@
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
                 <% end %>
-
-                <% if current_login_employee.role != "waiter" %>
-                  <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button>
-                <% end %>
-
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
                 
@@ -511,6 +506,10 @@
                     <%end%> 
                  
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
+
+                   <% if current_login_employee.role != "waiter" %>
+                  <button type="button" class="btn action-btn bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button>
+                <% end %>
               <% end %>
             <% end %>
               <!-- Cashier Buttons -->
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index eb3eefe3..e1d35375 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -340,6 +340,8 @@
   </button>
     <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
     <button type="button" class="btn bg-red btn-block" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
+    <button type="button" class="btn btn-block bg-deep-purple waves-effect " data-status="waste" value="waste" id="btn_waste" onclick="waste_and_spoilage('waste')">Waste</button>
+<button type="button" class="btn btn-block bg-deep-purple waves-effect " data-status="spoile" value="spoile" id="btn_spoile" onclick="waste_and_spoilage('spoile')">Spoile</button>
   <% if @cashier_type=="quick_service" %>
 <hr>
 
@@ -1160,4 +1162,40 @@ var customer_name = "<%= @customer.name %>";
     var sale_id     = $("#sale_id").text() || 0;
     update_sale("", customer_id, customer_name, sale_id);
   });
+
+  function waste_and_spoilage(remark) {
+        var sale_id = $('#sale_id').text();
+        console.log(sale_id)
+        swal({
+            title: "Alert",
+            text: "Are you sure want to " + remark +" ?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, " +remark+ " it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+            var url = "/origami/sale/" + sale_id +'/'+cashier_type+'/waste_and_spoilage';
+            $.ajax({
+                type: 'POST',
+                url: url,
+                data: "remark="+ remark + "&sale_id=" + sale_id,
+                success: function (result) {
+                  console.log(result)
+                   // For Server Print - from jade
+                  if ($("#server_mode").val() == "cloud") {
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
+                  if (cashier_type=="cashier") {
+                    window.location.href = '/origami';
+                  }else{
+                    window.location.href = '/origami/quick_service';
+                    customer_display_view(null,"reload");
+                  } 
+                }
+            });
+          }
+        }); 
+    }
 </script>
\ No newline at end of file

From e6d11644bbb32c524302d84ac8fe845d946a0b3d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 2 Apr 2018 11:40:18 +0630
Subject: [PATCH 510/651] update menu astron for no option

---
 app/assets/javascripts/addorder.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 47c6cd4f..31209c99 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -381,16 +381,18 @@ $(function() {
 
       item = get_set_item(items);
       customer_display_view(item,"set_add");
-      var option = ''
+      var option = []
       attribute_arr = []
 
       var rowCount = $('.summary-items tbody tr').length+1;
         code          = $('.set-item').attr('data-code');
         name          = $('.set-item').attr('data-name');
         price         = $('.set-item').attr('data-price');
-        option        = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
+        option_name     = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
+        option        = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options');
         parent        = $('.set-item').attr('data-parent');
         total         = qty * price ;
+
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -398,7 +400,7 @@ $(function() {
               +attribute_arr+"' data-options ='"
               +option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option_name +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)
@@ -406,15 +408,16 @@ $(function() {
           +'</tr>';
           $(".summary-items tbody").append(row);
       var rowCount = $('.summary-items tbody tr').length+1;
-      var set_option = ''
+      var set_option = []
       $(items).each(function(i){
         code          = $(items[i]).attr('data-code');
         name          = $(items[i]).attr('data-name');
         price         = $(items[i]).attr('data-price');
-        set_option    = ($(items[i]).attr('data-options')  === 'undefined') ? ' ' :$(items[i]).attr('data-options');
-        
+        set_option_name   = ($(items[i]).attr('data-options')  === 'undefined') ? ' ' :$(items[i]).attr('data-options');
+        set_option= ($(items[i]).attr('data-options')  === '') ? '[]' :$(items[i]).attr('data-options');
         sub_item      = $(items[i]).attr('data-sub-item');
         total         = qty * price ;
+
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -422,7 +425,7 @@ $(function() {
               +attribute_arr+"' data-options ='"
               +set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option_name +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)

From d59ff8c6eb7669d82c14294405460920f6072574 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 2 Apr 2018 12:50:02 +0630
Subject: [PATCH 511/651] update show table for instance set

---
 app/views/origami/home/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b108c46d..494decbe 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -300,7 +300,7 @@
                                           <% end %>
                                         <% end %>
 
-                                        <% if !order_item.set_menu_items.nil?  
+                                        <% if !order_item.set_menu_items.nil?  && order_item.set_menu_items != '[]'
                                           JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
                                           <br><span class="font-13">
                                             <%= item_instance["item_instance_name"] %>

From 5155fd5221e866fc02c06a4a3c13c34ceea48495 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 2 Apr 2018 13:09:16 +0630
Subject: [PATCH 512/651] update show table for instance set

---
 app/views/origami/rooms/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index e2f04018..5bc46c84 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -370,7 +370,7 @@
                           <% end %>
                         <% end %>
 
-                        <% if !order_item.set_menu_items.nil?  
+                       <% if !order_item.set_menu_items.nil?  && order_item.set_menu_items != '[]'
                           JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>

From 3e0742c66073b8f264678d59f70943beea9191a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 2 Apr 2018 14:06:22 +0630
Subject: [PATCH 513/651] reduce scroll speed in wIter app

---
 app/assets/javascripts/custom.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 778de553..c6e6a47b 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
 
   $('#order-detail-slimscroll').slimScroll({
@@ -20,7 +20,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
 
   $('#menu-slimscroll').slimScroll({
@@ -30,7 +30,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
   
   // $('.delete').click(function(){

From c176b41e79f53d39c6f4acacec1668ef3525cb51 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 2 Apr 2018 15:59:36 +0630
Subject: [PATCH 514/651] menu import and exp update

---
 Main Menu.xlsx                               | Bin 0 -> 3997 bytes
 app/controllers/settings/menus_controller.rb | 107 ++++++++-
 app/models/menu.rb                           | 217 +++++++++++--------
 app/models/menu_category.rb                  |   2 +-
 app/models/menu_item.rb                      |  48 ++--
 app/views/layouts/_header.html.erb           |   4 +-
 app/views/settings/menus/export.html.erb     |   0
 app/views/settings/menus/index.html.erb      |  27 ++-
 config/routes.rb                             |   6 +-
 9 files changed, 291 insertions(+), 120 deletions(-)
 create mode 100644 Main Menu.xlsx
 create mode 100644 app/views/settings/menus/export.html.erb

diff --git a/Main Menu.xlsx b/Main Menu.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..94c703382ba6733020ef9e02db8febb2b38c130b
GIT binary patch
literal 3997
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

literal 0
HcmV?d00001

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index b7e02fb5..d1180e40 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -62,7 +62,8 @@ class Settings::MenusController < ApplicationController
   def destroy
     # @settings_menu.destroy
     abc = Menu.destroyMenu(@settings_menu)
-    @settings_menu_item_set.destroy
+    
+    # @settings_menu_item_set.destroy
     flash[:notice] = 'Menu was successfully destroyed.'
     render :json => {:status=> "Success", :url => settings_menus_path }.to_json
     # respond_to do |format|
@@ -71,12 +72,108 @@ class Settings::MenusController < ApplicationController
     # end
   end
 
+  def export    
+    @settings_menus = Menu.all.page(params[:page]).per(10)
+    menu = Menu.find(params[:id])
+
+    p = Axlsx::Package.new
+    wb = p.workbook
+    wb.styles do |s|
+      time_format = wb.styles.add_style :format_code => 'hh:mm:ss'
+      title = s.add_style :fg_color => "004586"
+      wrap_text = s.add_style :sz => 11,
+                              :alignment =>  { :horizontal => :left,:vertical => :center ,
+                              :wrap_text => true}
+      header_text = s.add_style :fg_color=> "a7a7a7",
+                              :b => true,
+                              :sz => 12,
+                              :border => { :style => :thin, :color => "00" },
+                              :alignment => { :horizontal => :left,
+                                              :vertical => :center ,
+                                              :header_text => true}
+      
+      # Menu Sheet
+      wb.add_worksheet(name: menu.name) do |sheet|
+        sheet.add_row ["Name",menu.name], :style=>title                
+        sheet.add_row
+
+        sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Item AltName", "Taxable", "Instance Code", "Instance Name", "Price"], :style=>header_text  
+        menu.menu_categories.each do |mc|
+          mc.menu_items.each do |mi|
+            mi.menu_item_instances.each do |mii|
+              sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.alt_name, mi.taxable, mii.item_instance_code, mii.item_instance_name, mii.price], :style=>wrap_text
+            end
+          end
+        end
+
+
+        # # Category              
+        #   menu.menu_categories.each do |mc|
+        #     sheet.add_row ["Category"], :style=>wrap_text  
+        #     sheet.add_row %w(id menu_id code name alt_name order_by created_by menu_category_id is_available), :style=>header_text
+        #     sheet.add_row [mc.id, mc.menu_id, mc.code, mc.name, mc.alt_name, mc.order_by, mc.created_by, mc.menu_category_id, mc.is_available], :style=>wrap_text
+        #     sheet.add_row
+
+        #     # Menu Item            
+        #       mc.menu_items.each do |mi|
+        #         sheet.add_row ["Menu Item"], :style=>wrap_text
+        #         sheet.add_row %w(id item_code name alt_name image_path description information unit type menu_category_id item_attributes item_options account_id min_qty taxable is_sub_item is_available created_by), :style=>header_text
+        #         sheet.add_row [mi.id,mi.item_code, mi.name, mi.alt_name, mi.image_path, mi.description, mi.information, mi.unit, mi.type, mi.menu_category_id, mi.item_attributes, mi.item_options, mi.account_id, mi.min_qty, mi.taxable, mi.is_sub_item, mi.is_available, mi.created_by], :style=>wrap_text
+        #         sheet.add_row
+
+        #         # Menu Item Instance
+        #         sheet.add_row ["Menu Item Instance"], :style=>wrap_text
+        #         sheet.add_row %w(id menu_item_id item_instance_code item_instance_name item_attributes price is_on_promotion promotion_price is_available is_default), :style=>header_text
+        #           mi.menu_item_instances.each do |mii|
+        #             sheet.add_row [mii.id, mii.menu_item_id, mii.item_instance_code, mii.item_instance_name, mii.item_attributes, mii.price, mii.is_on_promotion, mii.promotion_price, mii.is_available, mii.is_default], :style=>wrap_text                    
+        #           end
+        #         sheet.add_row
+        #       end
+        #   end        
+      end
+
+      # # Account
+      # wb.add_worksheet(name: "Account") do |sheet|
+      #   sheet.add_row %w(id title account_type discount point bonus rebate), :style=>header_text
+      #   Account.all.each do |acc|
+      #     sheet.add_row [acc.id, acc.title,acc.account_type,acc.discount,acc.point,acc.bonus,acc.rebate], :style=>wrap_text
+      #   end
+      # end
+
+      # # Item set
+      # wb.add_worksheet(name: "Item Set") do |sheet|
+      #   sheet.add_row %w(id name alt_name min_selectable_qty max_selectable_qty), :style=>header_text
+      #   ItemSet.all.each do |set|
+      #     sheet.add_row [set.id,set.name, set.alt_name, set.min_selectable_qty, set.max_selectable_qty], :style=>wrap_text
+      #   end
+      # end
+
+      # # Item Options
+      # wb.add_worksheet(name: "Menu Item Options") do |sheet|
+      #   sheet.add_row %w(id option_type name value), :style=>header_text
+      #   MenuItemOption.all.each do |option|
+      #     sheet.add_row [option.id, option.option_type, option.name, option.value], :style=>wrap_text
+      #   end
+      # end
+
+      # # Item Attributes
+      # wb.add_worksheet(name: "Menu Item Attributes") do |sheet|
+      #   sheet.add_row %w(id attribute_type name value), :style=>header_text
+      #   MenuItemAttribute.all.each do |attr|
+      #     sheet.add_row [attr.id, attr.attribute_type,attr.name,attr.value], :style=>wrap_text
+      #   end
+      # end
+    end
+
+    p.serialize("tmp/menus/" + menu.name + ".xlsx")
+    render :json => {status: true}
+  end
+
   def import
     if params[:file]
-      Menu.import(params[:file])
-      redirect_to settings_menus_path, notice: "Menu was successfully Imported"
-    end
-    
+      status = Menu.import(params[:file], current_user.name)
+      redirect_to settings_menus_path, notice: status
+    end  
   end
 
   private
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 9f4e6b14..d81079bd 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -45,99 +45,142 @@ class Menu < ApplicationRecord
     end
   end
 
-  def self.import(file)
-   
+  def self.import(file, created_by) 
+    status = ""   
     spreadsheet = open_spreadsheet(file)
-    sheet_count = spreadsheet.sheets.count-1
-    for i in 0..sheet_count do
-      header      = spreadsheet.sheet(i).row(1)
-      sheet_name = spreadsheet.sheets[i]
+    if spreadsheet.sheets.count > 1
+      sheet_count = spreadsheet.sheets.count-1
+      for i in 0..sheet_count do
+        header      = spreadsheet.sheet(i).row(1)
+        sheet_name = spreadsheet.sheets[i]
 
-      (2..spreadsheet.sheet(i).last_row).each do |ii|
-        row = Hash[[header,spreadsheet.sheet(i).row(ii)].transpose]
-        if sheet_name == "Account"
-           # Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
-           account = Account.find_by_id(row["id"]) 
-          if account
-            Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
-          else
-            Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
-          end
-        elsif sheet_name == "Item Set"
-           # ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
-           item_set = ItemSet.find_by_id(row["id"]) 
-          if item_set
-            ItemSet.create( name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
-          else
-            ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
-          end
-        elsif sheet_name == "Menu Item Options"
-           # MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
-           item_options = MenuItemOption.find_by_id(row["id"])
-          if item_options
-            MenuItemOption.create( option_type: row["option_type"],name: row["name"],value: row["value"])
-          else
-            MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
-          end
-        elsif sheet_name == "Menu Item Attributes"
-           # MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
-           item_attributes = MenuItemAttribute.find_by_id(row["id"])
-          if item_attributes
-            MenuItemAttribute.create( attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
-          else
-            MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
-          end
-        elsif sheet_name == "Menu"
-          menu = Menu.find_by_id(row["id"])
-          if menu
-            Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
-          else
-            Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
-          end
-        elsif sheet_name == "Menu Category"
-           # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
-           menu_category = MenuCategory.find_by_id(row["id"])
-          if menu_category
-            MenuCategory.create(menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
-          else
-            MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
-          end
-        elsif sheet_name == "Menu Item"
-           # MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: row["item_attributes"], item_options: row["item_options"], account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
-           menu_item = MenuItem.find_by_id(row["id"])
-          if menu_item
-            MenuItem.create(item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
-          else
-            MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
-          end
-        elsif sheet_name == "Menu Item Instance"
-           # MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: row["item_attributes"], price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
-           item_instance = MenuItemInstance.find_by_id(row["id"])
-          if item_instance
-            MenuItemInstance.create(menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
-          else
-            MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
-          end
-        elsif sheet_name == "Menu Instance Item Set"
-           # MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
-           menu_instance_set = MenuInstanceItemSet.find_by_id(row["id"])
-          if menu_instance_set
-            MenuInstanceItemSet.create(item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
-          else
-            MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
-          end
-        elsif sheet_name == "Menu Item Set" 
-           # MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
-           menu_item_set = MenuItemSet.find_by_id(row["id"])
-          if menu_item_set
-            MenuItemSet.create(item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
-          else
-            MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+        (2..spreadsheet.sheet(i).last_row).each do |ii|
+          row = Hash[[header,spreadsheet.sheet(i).row(ii)].transpose]
+          if sheet_name == "Account"
+             # Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+             account = Account.find_by_id(row["id"]) 
+            if account
+              Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+            else
+              Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+            end
+          elsif sheet_name == "Item Set"
+             # ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
+             item_set = ItemSet.find_by_id(row["id"]) 
+            if item_set
+              ItemSet.create( name: row["name"], alt_name: row["alt_name"], min_selectable_qty: row["min_selectable_qty"], max_selectable_qty: row["max_selectable_qty"])
+            else
+              ItemSet.create(id:row["id"], name: row["name"], alt_name: row["alt_name"], min_selectable_qty: row["min_selectable_qty"], max_selectable_qty: row["max_selectable_qty"])
+            end
+          elsif sheet_name == "Menu Item Options"
+             # MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
+             item_options = MenuItemOption.find_by_id(row["id"])
+            if item_options
+              MenuItemOption.create( option_type: row["option_type"],name: row["name"],value: row["value"])
+            else
+              MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
+            end
+          elsif sheet_name == "Menu Item Attributes"
+             # MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+             item_attributes = MenuItemAttribute.find_by_id(row["id"])
+            if item_attributes
+              MenuItemAttribute.create( attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+            else
+              MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+            end
+          elsif sheet_name == "Menu"
+            menu = Menu.find_by_id(row["id"])
+            if menu
+              Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+            else
+              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+            end
+          elsif sheet_name == "Menu Category"
+             # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+             menu_category = MenuCategory.find_by_id(row["id"])
+            if menu_category
+              MenuCategory.create(menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+            else
+              MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+            end
+          elsif sheet_name == "Menu Item"
+             # MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: row["item_attributes"], item_options: row["item_options"], account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+             menu_item = MenuItem.find_by_id(row["id"])
+            if menu_item
+              MenuItem.create(item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+            else
+              MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+            end
+          elsif sheet_name == "Menu Item Instance"
+             # MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: row["item_attributes"], price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+             item_instance = MenuItemInstance.find_by_id(row["id"])
+            if item_instance
+              MenuItemInstance.create(menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+            else
+              MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+            end
+          elsif sheet_name == "Menu Instance Item Set"
+             # MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+             menu_instance_set = MenuInstanceItemSet.find_by_id(row["id"])
+            if menu_instance_set
+              MenuInstanceItemSet.create(item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+            else
+              MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+            end
+          elsif sheet_name == "Menu Item Set" 
+             # MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+             menu_item_set = MenuItemSet.find_by_id(row["id"])
+            if menu_item_set
+              MenuItemSet.create(item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+            else
+              MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+            end
           end
         end
       end
+    else
+      # Menu by Menu Import
+      accs = Account.all      
+      account_id = 1
+      if accs.length > 0
+        account_id = accs[0].id
+      else 
+        status = "No Account Created."
+      end
+
+      sheet = spreadsheet.sheet(0) 
+      menu = sheet.row(1)[1]
+      imported_menu = Menu.create({name: menu, is_active: true, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by}) 
+
+      (4..sheet.last_row).each do |ii|             
+          row = Hash[[sheet.row(3),sheet.row(ii)].transpose]   
+          menu_cat = MenuCategory.find_by_code(row["Category Code"])  
+          if !menu_cat
+            menu_cat = MenuCategory.create({menu_id: imported_menu.id, code: row["Category Code"], name: row["Category Name"], alt_name: '', order_by: (ii - 3), created_by: created_by, menu_category_id: nil, is_available: 1})
+          # else
+          #   status = status + "Category Code already exists."
+          end
+
+          menu_itm = MenuItem.find_by_item_code(row["Item Code"]) 
+          if !menu_itm
+            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by)
+          # else
+          #   status = status + "Item Code already exists for " + row["Item Name"] + "."
+          end
+
+          menu_inst = MenuItemInstance.find_by_item_instance_code(row["Instance Code"]) 
+          if !menu_inst
+            imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: "[]", price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: false)
+          # else
+          #   status = status + "Instance Code already exists for " + row["Instance Name"] + "."
+          end
+      end        
     end
- 
+    # if status == ''
+      status="Menu Imported!"
+    # end
+
+    return status
   end
 
   def self.open_spreadsheet(file)
diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 666f251a..7fb23647 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -33,7 +33,7 @@ class MenuCategory < ApplicationRecord
         abc = MenuItem.deleteRecursive(item)
       end
       menu_category.destroy
-      return false
+      return true
     end
   end
 
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 836e0caf..03e90011 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -55,27 +55,35 @@ class MenuItem < ApplicationRecord
 
   def self.deleteRecursive(menu_item)
     # find the sub menu item of current item
-    sub_menu_items = MenuItem.where("id=?",menu_item.id)
-    if sub_menu_items.length != 0
-      sub_menu_items.each do |subitem|
-        # if deleteRecursive(subitem)
-        # end
-      end
-      # find the instances of current menu item
-      instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
-      instances.each do |instance|
-        instance.destroy
-      end
-      menu_item.destroy
-      return true
-    else
-      instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
-      instances.each do |instance|
-        instance.destroy
-      end
-      menu_item.destroy
-      return false
+    # sub_menu_items = MenuItem.where("id=?",menu_item.id)
+    # if sub_menu_items.length != 0
+    #   # sub_menu_items.each do |subitem|
+    #   #   # if deleteRecursive(subitem)
+    #   #   # end
+    #   # end
+    #   # find the instances of current menu item
+    #   instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
+    #   instances.each do |instance|
+    #     instance.menu_instance_item_sets.destroy_all
+    #   end
+    #   menu_item.menu_item_sets.destroy_all
+    #   return true
+    # else
+    #   instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
+    #   instances.each do |instance|
+    #     instance.menu_instance_item_sets.destroy_all
+    #   end
+    #   menu_item.menu_item_sets.destroy_all
+    #   return true
+    # end
+    instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
+    instances.each do |instance|
+      instance.menu_instance_item_sets.destroy_all
+      instance.destroy
     end
+    menu_item.menu_item_sets.destroy_all
+    menu_item.destroy
+    return true
 
   end
   # private
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 11d62573..1c60c569 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -107,8 +107,8 @@
                   $.ajax({
                     type: method,
                     url: url ,            
-                    success: function(data) {              
-                      location.href = data.url;
+                    success: function(data) {             
+                        location.href = data.url;
                     }
                  });          
                 } else {
diff --git a/app/views/settings/menus/export.html.erb b/app/views/settings/menus/export.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 5fafa5db..42eca334 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -62,9 +62,12 @@
             <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
             <td>
               <%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %>
-              </td>
-            </tr>
-            <% end %>
+              <a href="#" id="export-xlsx" data-attr="<%= settings_menu.id %>" class="btn btn-primary btn-sm waves-effect" style="height: 33px;">
+                <i class="material-icons" style="top: 0px;">backup</i>
+              </a>
+            </td>
+          </tr>
+          <% end %>
           </tbody>
         </table>
       </div>
@@ -101,3 +104,21 @@
       </div>  
     </div>
   </div>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      $("#export-xlsx").on('click', function(){
+        var menu_id= $(this).attr('data-attr');
+        console.log(menu_id);
+        $.ajax({
+          type: "GET",
+          url: "/settings/menus/" + menu_id + "/export",
+          success: function(result){
+            if(result.status){
+              swal("Success", "Export Success...", "success");
+            }
+          }
+        });
+      });
+    });
+  </script>
diff --git a/config/routes.rb b/config/routes.rb
index 233d7e04..38d26a7a 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -304,8 +304,10 @@ scope "(:locale)", locale: /en|mm/ do
       collection do
         post :import
       end
-      resources :menu_categories, only: [:new, :create, :edit, :delete]
-    end
+      resources :menu_categories, only: [:new, :create, :edit, :delete]      
+    end    
+
+    get '/menus/:id/export' => 'menus#export'
 
     resources :item_sets
 

From c8755106ef92e99b35dc301b1eaeb078d5885444 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 2 Apr 2018 16:56:23 +0630
Subject: [PATCH 515/651] menu export ui update

---
 app/controllers/settings/menus_controller.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index d1180e40..c7de4df8 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -62,7 +62,7 @@ class Settings::MenusController < ApplicationController
   def destroy
     # @settings_menu.destroy
     abc = Menu.destroyMenu(@settings_menu)
-    
+
     # @settings_menu_item_set.destroy
     flash[:notice] = 'Menu was successfully destroyed.'
     render :json => {:status=> "Success", :url => settings_menus_path }.to_json
@@ -80,11 +80,13 @@ class Settings::MenusController < ApplicationController
     wb = p.workbook
     wb.styles do |s|
       time_format = wb.styles.add_style :format_code => 'hh:mm:ss'
-      title = s.add_style :fg_color => "004586"
+      title = s.add_style :fg_color => "004586",
+                          :b => true,
+                          :sz => 12
       wrap_text = s.add_style :sz => 11,
                               :alignment =>  { :horizontal => :left,:vertical => :center ,
                               :wrap_text => true}
-      header_text = s.add_style :fg_color=> "a7a7a7",
+      header_text = s.add_style :fg_color=> "090909",
                               :b => true,
                               :sz => 12,
                               :border => { :style => :thin, :color => "00" },

From c53276f21cd93f03e16512df7385db865488bb47 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 2 Apr 2018 18:09:36 +0630
Subject: [PATCH 516/651] Add survey's fieldset

---
 app/views/origami/surveys/_form.html.erb    | 157 +++++++++++++-------
 app/views/settings/employees/index.html.erb |  32 ++--
 config/initializers/action_controller.rb    |   2 +-
 3 files changed, 126 insertions(+), 65 deletions(-)

diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 68c3f59b..1322f677 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -6,73 +6,120 @@
         <%= f.error_notification %>
         <div class="form-inputs p-l-10">
           <% if !@survey_data.nil? %>
-            <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10' }%>
-            <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10' }%>
-            <%= f.input :male , input_html: { value: @survey_data.male, class: 'col-md-10' }%>
-            <%= f.input :female , input_html: { value: @survey_data.female, class: 'col-md-10' }%>
-            <%= f.input :total_customer, input_html: { value: @survey_data.total_customer, class: 'col-md-10'} %>
-            <%= f.input :local , input_html: { value: @survey_data.local, class: 'col-md-10' }%>
-
             <div class="row clearfix">
-              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                 <label class="p-l-10">Foreigner</label>
-                 <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
-                 <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
-                  <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
-                  <option value="<%= ct.value %>">
-                    <%= ct.name %></option>
-                    <%end %>
-                  </select>
+                  <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10' }%>
                 </div>
               </div>
-              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <label class="p-l-10">Number</label>
-                  <input type="number"  name="survey[foreigner][]" class="form-control">
+                  <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10' }%>
                 </div>
               </div>
-              <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
-               <br>
-               <button type="button" class="btn btn-success" id="addForeigner">Add</button>
-             </div>
-           </div>
+            </div>  
+            <div class="row clearfix">
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
+                <div class="form-group p-l-10 p-r-10">
+                  <%= f.input :male , input_html: { value: @survey_data.male, class: 'col-md-10' }%>
+                </div>
+              </div>
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
+                <div class="form-group p-l-10 p-r-10">
+                  <%= f.input :female , input_html: { value: @survey_data.female, class: 'col-md-10' }%>
+                </div>
+              </div>
+            </div>   
+            <%= f.input :total_customer, input_html: { value: @survey_data.total_customer, class: 'col-md-11'} %>
+            <%= f.input :local , input_html: { value: @survey_data.local, class: 'col-md-11' }%>
+            <fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;">
+              <legend style="font-size: 1.2em !important;font-weight: bold !important;text-align: left !important;border:none;width:100px;">Foreigner</legend>
+              <div class="row clearfix">
+                <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5">
+                  <div class="form-group p-l-10 p-r-10">
+                   <label class="p-l-10">Foreigner</label>
+                   <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
+                   <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
+                    <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
+                    <option value="<%= ct.value %>">
+                      <%= ct.name %></option>
+                      <%end %>
+                    </select>
+                  </div>
+                </div>
+                <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">
+                  <div class="form-group p-l-10 p-r-10">
+                    <label class="p-l-10">Number</label>
+                    <input type="number"  name="survey[foreigner][]" class="form-control">
+                  </div>
+                </div>
+                <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
+                  <br>
+                  <button type="button" class="btn btn-success" id="addForeigner">Add</button>
+                </div>
+              </div>
+              <div class="hidden" id="newTemplate" >
+              </div>
+            </fieldset>
           <% else %>
-            <%= f.input :child , input_html: { class: 'col-md-10' }%>
-            <%= f.input :adult , input_html: { class: 'col-md-10' }%>
-            <%= f.input :male , input_html: { class: 'col-md-10' }%>
-            <%= f.input :female , input_html: { class: 'col-md-10' }%>
-            <%= f.input :total_customer, input_html: { class: 'col-md-10'} %>
-            <%= f.input :local , input_html: { class: 'col-md-10' }%>
-
             <div class="row clearfix">
-              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                 <label class="p-l-10">Foreigner</label>
-                 <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
-                 <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
-                  <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
-                  <option value="<%= ct.value %>">
-                    <%= ct.name %></option>
-                    <%end %>
-                  </select>
+                  <%= f.input :child , input_html: { class: 'col-md-10' }%>
                 </div>
               </div>
-              <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <label class="p-l-10">Number</label>
-                  <input type="number"  name="survey[foreigner][]" class="form-control">
+                  <%= f.input :adult , input_html: { class: 'col-md-10' }%>     
                 </div>
               </div>
-              <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
-               <br>
-               <button type="button" class="btn btn-success" id="addForeigner">Add</button>
-             </div>
-           </div>
-          <% end %>
-         <div class="hidden" id="newTemplate" >
+            </div>  
+            <div class="row clearfix">
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
+                <div class="form-group p-l-10 p-r-10">
+                  <%= f.input :male , input_html: { class: 'col-md-10' }%>
+                </div>
+              </div>
+              <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
+                <div class="form-group p-l-10 p-r-10">
+                  <%= f.input :female , input_html: { class: 'col-md-10' }%>   
+                </div>
+              </div>
+            </div>
+            <%= f.input :total_customer, input_html: { class: 'col-md-11'} %>
+            <%= f.input :local , input_html: { class: 'col-md-11' }%>
 
-         </div>
+            <fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;">
+              <legend style="font-size: 1.2em !important;font-weight: bold !important;text-align: left !important;border:none;width:100px;">Foreigner</legend>
+              <div class="row clearfix">
+                <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">
+                  <div class="form-group p-l-10 p-r-10">
+                   <label class="p-l-10">Foreigner</label>
+                   <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
+                   <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
+                    <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
+                    <option value="<%= ct.value %>">
+                      <%= ct.name %></option>
+                      <%end %>
+                    </select>
+                  </div>
+                </div>
+                <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">
+                  <div class="form-group p-l-10 p-r-10">
+                    <label class="p-l-10">Number</label>
+                    <input type="number"  name="survey[foreigner][]" class="form-control">
+                  </div>
+                </div>
+                <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
+                  <br>
+                  <button type="button" class="btn btn-success" id="addForeigner">Add</button>
+                </div>
+              </div> 
+              <div class="hidden" id="newTemplate" >
+              </div>
+            </fieldset>
+          <% end %>
+         
           <%if !@dining_facility.nil? %>
              <input type="hidden" name="table_id" id="table_id" value="<%= @dining_facility.id %>">
              <input type="hidden" name="table_type" id="table_type" value="<%= @table_type %>">
@@ -95,8 +142,8 @@
          <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %>
          <%= f.input :receipt_no, :as => :hidden, :input_html => { :value => @receipt_no} %>
          <%= f.input :total_amount, :as => :hidden, :input_html => { :value => @grand_total } %>
-       </div>
-       <div class="form-actions">
+      </div>
+      <div class="form-actions form-inputs p-l-10">
         <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
       <% end %>
@@ -202,7 +249,7 @@ var cashier_type = "<%= @cashier_type %>";
         $('#newTemplate').removeClass('hidden');
 
         var text_box = '<div id="newRow" class="row clearfix">'
-                          +'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">'
+                          +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
                             +'<div class="form-group p-l-10 p-r-10">'
                              +' <select class="form-control col-md-12 selectpicker  show-tick" '
                                 +' name="survey[foreigner][]" style="height: " >'
@@ -213,7 +260,7 @@ var cashier_type = "<%= @cashier_type %>";
                                 +'</select>'
                             +'</div>'
                           +'</div>'
-                          +'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">'
+                          +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
                             +'<div class="form-group p-l-10 p-r-10">'
                              +'<input type="number"  name="survey[foreigner][]" class="form-control">'
                             +'</div>'
diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb
index 7aeee2ec..f47cc8e5 100755
--- a/app/views/settings/employees/index.html.erb
+++ b/app/views/settings/employees/index.html.erb
@@ -27,15 +27,29 @@
 
         <tbody>
           <% @employees.each do |employee| %>
-          <tr>
-            <td><%= link_to employee.name,settings_employee_path(employee)  %></td>
-            <td><%= employee.role %></td>
-            <td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td>
-            <%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-sm waves-effect' %>
-            </td>
-          </tr>
+            <% if current_login_employee.role == "administrator" %>
+            <tr>
+              <td><%= link_to employee.name,settings_employee_path(employee)  %></td>
+              <td><%= employee.role %></td>
+              <td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+              <td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+              <td>
+              <%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-sm waves-effect' %>
+              </td>
+            </tr>
+            <% else %>
+              <% if employee.role != "administrator" %>
+                <tr>
+                  <td><%= link_to employee.name,settings_employee_path(employee)  %></td>
+                  <td><%= employee.role %></td>
+                  <td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+                  <td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+                  <td>
+                  <%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-sm waves-effect' %>
+                  </td>
+                </tr>
+              <% end %>
+            <% end %>
           <% end %>
         </tbody>
       </table>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index dcfcfed5..b063f28e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -12,7 +12,7 @@ class ActionController::Base
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else
+      else8
         # reconnect_default_db
         logger.info 'License is nil'
         # redirect_to root_url(:host => request.domain) + "store_error"

From 650eb53f5109a7a2bc5e4542fb37c8bb2ff328ec Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 2 Apr 2018 18:10:47 +0630
Subject: [PATCH 517/651] Pull from master

---
 Main Menu.xlsx                                | Bin 0 -> 3997 bytes
 app/assets/javascripts/addorder.js            |  17 +-
 app/assets/javascripts/custom.js              |   6 +-
 app/controllers/oqs/edit_controller.rb        |  50 ++--
 app/controllers/oqs/print_controller.rb       |   2 +-
 .../origami/payments_controller.rb            |  10 +-
 app/controllers/settings/menus_controller.rb  | 109 ++++++++-
 app/models/menu.rb                            | 217 +++++++++++-------
 app/models/menu_category.rb                   |   2 +-
 app/models/menu_item.rb                       |  48 ++--
 app/models/sale.rb                            |   4 +-
 app/models/sale_payment.rb                    |   6 +-
 app/views/layouts/_header.html.erb            |   4 +-
 app/views/origami/home/show.html.erb          |   2 +-
 app/views/origami/rooms/show.html.erb         |   2 +-
 app/views/settings/menus/export.html.erb      |   0
 app/views/settings/menus/index.html.erb       |  27 ++-
 config/routes.rb                              |   6 +-
 lib/tasks/clear_data.rake                     |   2 +-
 19 files changed, 351 insertions(+), 163 deletions(-)
 create mode 100644 Main Menu.xlsx
 create mode 100644 app/views/settings/menus/export.html.erb

diff --git a/Main Menu.xlsx b/Main Menu.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..94c703382ba6733020ef9e02db8febb2b38c130b
GIT binary patch
literal 3997
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

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 47c6cd4f..31209c99 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -381,16 +381,18 @@ $(function() {
 
       item = get_set_item(items);
       customer_display_view(item,"set_add");
-      var option = ''
+      var option = []
       attribute_arr = []
 
       var rowCount = $('.summary-items tbody tr').length+1;
         code          = $('.set-item').attr('data-code');
         name          = $('.set-item').attr('data-name');
         price         = $('.set-item').attr('data-price');
-        option        = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
+        option_name     = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
+        option        = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options');
         parent        = $('.set-item').attr('data-parent');
         total         = qty * price ;
+
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -398,7 +400,7 @@ $(function() {
               +attribute_arr+"' data-options ='"
               +option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option_name +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)
@@ -406,15 +408,16 @@ $(function() {
           +'</tr>';
           $(".summary-items tbody").append(row);
       var rowCount = $('.summary-items tbody tr').length+1;
-      var set_option = ''
+      var set_option = []
       $(items).each(function(i){
         code          = $(items[i]).attr('data-code');
         name          = $(items[i]).attr('data-name');
         price         = $(items[i]).attr('data-price');
-        set_option    = ($(items[i]).attr('data-options')  === 'undefined') ? ' ' :$(items[i]).attr('data-options');
-        
+        set_option_name   = ($(items[i]).attr('data-options')  === 'undefined') ? ' ' :$(items[i]).attr('data-options');
+        set_option= ($(items[i]).attr('data-options')  === '') ? '[]' :$(items[i]).attr('data-options');
         sub_item      = $(items[i]).attr('data-sub-item');
         total         = qty * price ;
+
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -422,7 +425,7 @@ $(function() {
               +attribute_arr+"' data-options ='"
               +set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
           +'<td class="item-cell-no">'+rowCount+'</td>'
-          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option +'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option_name +'</td>'
           +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
           +'<td class="item-cell-price" id="item_price">' 
           + parseFloat(total).toFixed(2)
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 778de553..c6e6a47b 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
 
   $('#order-detail-slimscroll').slimScroll({
@@ -20,7 +20,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
 
   $('#menu-slimscroll').slimScroll({
@@ -30,7 +30,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
   
   // $('.delete').click(function(){
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index ccef4e4a..049bbda6 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -36,33 +36,39 @@ class Oqs::EditController < BaseOqsController
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       # print
       assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
-      # order queue stations
-      oqs = assigned_item.order_queue_station
-
-      order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
       
-      unique_code="OrderItemPdf"
-      if !order_slim_pdf.empty?
-        order_slim_pdf.each do |order_item_slim|
-          if order_item_slim[0] == 'OrderSlimPdf' 
-            if order_item_slim[1] == '1'
-              unique_code="OrderItemSlimPdf"
-            else
-              unique_code="OrderItemPdf"
-            end
-          elsif order_item_slim[0] == 'OrderSetPdf' 
-            if order_item_slim[1] == '1'
-              unique_code="OrderSetItemPdf"
-            else
-              unique_code="OrderItemPdf"
+      if !assigned_items.nil?
+        assigned_items.each do |assign_item|
+          # order queue stations
+          oqs = assign_item.order_queue_station
+
+          order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
+          
+          unique_code="OrderItemPdf"
+          if !order_slim_pdf.empty?
+            order_slim_pdf.each do |order_item_slim|
+              if order_item_slim[0] == 'OrderSlimPdf' 
+                if order_item_slim[1] == '1'
+                  unique_code="OrderItemSlimPdf"
+                else
+                  unique_code="OrderItemPdf"
+                end
+              elsif order_item_slim[0] == 'OrderSetPdf' 
+                if order_item_slim[1] == '1'
+                  unique_code="OrderSetItemPdf"
+                else
+                  unique_code="OrderItemPdf"
+                end
+              end
             end
           end
+
+          print_settings=PrintSetting.find_by_unique_code(unique_code)
+          order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+          order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
         end
       end
-
-      print_settings=PrintSetting.find_by_unique_code(unique_code)
-      order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
     end
   end
 
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index baa4af40..930d3d5c 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -26,7 +26,7 @@ class Oqs::PrintController < ApplicationController
       assigned_item_id = params[:id]
       options = params[:options]
       assigned_item = AssignedOrderItem.find(assigned_item_id) 
-      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
 
       # order queue stations
       oqs = assigned_item.order_queue_station
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index da5f216b..943fc3e9 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -431,13 +431,17 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
+      #calculate cash acmount
+      cash = saleObj.total_amount
+
       if saleObj.discount_type == "member_discount"
-        saleObj.update_attributes(rounding_adjustment: 0)
+        saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source)
       end
       
-      saleObj.update_attributes(rounding_adjustment: 0)
-      
+      saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
+      puts "FOC"
+      puts saleObj.to_json
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
       # For Cashier by Zone
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index b7e02fb5..c7de4df8 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -62,7 +62,8 @@ class Settings::MenusController < ApplicationController
   def destroy
     # @settings_menu.destroy
     abc = Menu.destroyMenu(@settings_menu)
-    @settings_menu_item_set.destroy
+
+    # @settings_menu_item_set.destroy
     flash[:notice] = 'Menu was successfully destroyed.'
     render :json => {:status=> "Success", :url => settings_menus_path }.to_json
     # respond_to do |format|
@@ -71,12 +72,110 @@ class Settings::MenusController < ApplicationController
     # end
   end
 
+  def export    
+    @settings_menus = Menu.all.page(params[:page]).per(10)
+    menu = Menu.find(params[:id])
+
+    p = Axlsx::Package.new
+    wb = p.workbook
+    wb.styles do |s|
+      time_format = wb.styles.add_style :format_code => 'hh:mm:ss'
+      title = s.add_style :fg_color => "004586",
+                          :b => true,
+                          :sz => 12
+      wrap_text = s.add_style :sz => 11,
+                              :alignment =>  { :horizontal => :left,:vertical => :center ,
+                              :wrap_text => true}
+      header_text = s.add_style :fg_color=> "090909",
+                              :b => true,
+                              :sz => 12,
+                              :border => { :style => :thin, :color => "00" },
+                              :alignment => { :horizontal => :left,
+                                              :vertical => :center ,
+                                              :header_text => true}
+      
+      # Menu Sheet
+      wb.add_worksheet(name: menu.name) do |sheet|
+        sheet.add_row ["Name",menu.name], :style=>title                
+        sheet.add_row
+
+        sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Item AltName", "Taxable", "Instance Code", "Instance Name", "Price"], :style=>header_text  
+        menu.menu_categories.each do |mc|
+          mc.menu_items.each do |mi|
+            mi.menu_item_instances.each do |mii|
+              sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.alt_name, mi.taxable, mii.item_instance_code, mii.item_instance_name, mii.price], :style=>wrap_text
+            end
+          end
+        end
+
+
+        # # Category              
+        #   menu.menu_categories.each do |mc|
+        #     sheet.add_row ["Category"], :style=>wrap_text  
+        #     sheet.add_row %w(id menu_id code name alt_name order_by created_by menu_category_id is_available), :style=>header_text
+        #     sheet.add_row [mc.id, mc.menu_id, mc.code, mc.name, mc.alt_name, mc.order_by, mc.created_by, mc.menu_category_id, mc.is_available], :style=>wrap_text
+        #     sheet.add_row
+
+        #     # Menu Item            
+        #       mc.menu_items.each do |mi|
+        #         sheet.add_row ["Menu Item"], :style=>wrap_text
+        #         sheet.add_row %w(id item_code name alt_name image_path description information unit type menu_category_id item_attributes item_options account_id min_qty taxable is_sub_item is_available created_by), :style=>header_text
+        #         sheet.add_row [mi.id,mi.item_code, mi.name, mi.alt_name, mi.image_path, mi.description, mi.information, mi.unit, mi.type, mi.menu_category_id, mi.item_attributes, mi.item_options, mi.account_id, mi.min_qty, mi.taxable, mi.is_sub_item, mi.is_available, mi.created_by], :style=>wrap_text
+        #         sheet.add_row
+
+        #         # Menu Item Instance
+        #         sheet.add_row ["Menu Item Instance"], :style=>wrap_text
+        #         sheet.add_row %w(id menu_item_id item_instance_code item_instance_name item_attributes price is_on_promotion promotion_price is_available is_default), :style=>header_text
+        #           mi.menu_item_instances.each do |mii|
+        #             sheet.add_row [mii.id, mii.menu_item_id, mii.item_instance_code, mii.item_instance_name, mii.item_attributes, mii.price, mii.is_on_promotion, mii.promotion_price, mii.is_available, mii.is_default], :style=>wrap_text                    
+        #           end
+        #         sheet.add_row
+        #       end
+        #   end        
+      end
+
+      # # Account
+      # wb.add_worksheet(name: "Account") do |sheet|
+      #   sheet.add_row %w(id title account_type discount point bonus rebate), :style=>header_text
+      #   Account.all.each do |acc|
+      #     sheet.add_row [acc.id, acc.title,acc.account_type,acc.discount,acc.point,acc.bonus,acc.rebate], :style=>wrap_text
+      #   end
+      # end
+
+      # # Item set
+      # wb.add_worksheet(name: "Item Set") do |sheet|
+      #   sheet.add_row %w(id name alt_name min_selectable_qty max_selectable_qty), :style=>header_text
+      #   ItemSet.all.each do |set|
+      #     sheet.add_row [set.id,set.name, set.alt_name, set.min_selectable_qty, set.max_selectable_qty], :style=>wrap_text
+      #   end
+      # end
+
+      # # Item Options
+      # wb.add_worksheet(name: "Menu Item Options") do |sheet|
+      #   sheet.add_row %w(id option_type name value), :style=>header_text
+      #   MenuItemOption.all.each do |option|
+      #     sheet.add_row [option.id, option.option_type, option.name, option.value], :style=>wrap_text
+      #   end
+      # end
+
+      # # Item Attributes
+      # wb.add_worksheet(name: "Menu Item Attributes") do |sheet|
+      #   sheet.add_row %w(id attribute_type name value), :style=>header_text
+      #   MenuItemAttribute.all.each do |attr|
+      #     sheet.add_row [attr.id, attr.attribute_type,attr.name,attr.value], :style=>wrap_text
+      #   end
+      # end
+    end
+
+    p.serialize("tmp/menus/" + menu.name + ".xlsx")
+    render :json => {status: true}
+  end
+
   def import
     if params[:file]
-      Menu.import(params[:file])
-      redirect_to settings_menus_path, notice: "Menu was successfully Imported"
-    end
-    
+      status = Menu.import(params[:file], current_user.name)
+      redirect_to settings_menus_path, notice: status
+    end  
   end
 
   private
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 9f4e6b14..d81079bd 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -45,99 +45,142 @@ class Menu < ApplicationRecord
     end
   end
 
-  def self.import(file)
-   
+  def self.import(file, created_by) 
+    status = ""   
     spreadsheet = open_spreadsheet(file)
-    sheet_count = spreadsheet.sheets.count-1
-    for i in 0..sheet_count do
-      header      = spreadsheet.sheet(i).row(1)
-      sheet_name = spreadsheet.sheets[i]
+    if spreadsheet.sheets.count > 1
+      sheet_count = spreadsheet.sheets.count-1
+      for i in 0..sheet_count do
+        header      = spreadsheet.sheet(i).row(1)
+        sheet_name = spreadsheet.sheets[i]
 
-      (2..spreadsheet.sheet(i).last_row).each do |ii|
-        row = Hash[[header,spreadsheet.sheet(i).row(ii)].transpose]
-        if sheet_name == "Account"
-           # Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
-           account = Account.find_by_id(row["id"]) 
-          if account
-            Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
-          else
-            Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
-          end
-        elsif sheet_name == "Item Set"
-           # ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
-           item_set = ItemSet.find_by_id(row["id"]) 
-          if item_set
-            ItemSet.create( name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
-          else
-            ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
-          end
-        elsif sheet_name == "Menu Item Options"
-           # MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
-           item_options = MenuItemOption.find_by_id(row["id"])
-          if item_options
-            MenuItemOption.create( option_type: row["option_type"],name: row["name"],value: row["value"])
-          else
-            MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
-          end
-        elsif sheet_name == "Menu Item Attributes"
-           # MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
-           item_attributes = MenuItemAttribute.find_by_id(row["id"])
-          if item_attributes
-            MenuItemAttribute.create( attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
-          else
-            MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
-          end
-        elsif sheet_name == "Menu"
-          menu = Menu.find_by_id(row["id"])
-          if menu
-            Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
-          else
-            Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
-          end
-        elsif sheet_name == "Menu Category"
-           # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
-           menu_category = MenuCategory.find_by_id(row["id"])
-          if menu_category
-            MenuCategory.create(menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
-          else
-            MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
-          end
-        elsif sheet_name == "Menu Item"
-           # MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: row["item_attributes"], item_options: row["item_options"], account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
-           menu_item = MenuItem.find_by_id(row["id"])
-          if menu_item
-            MenuItem.create(item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
-          else
-            MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
-          end
-        elsif sheet_name == "Menu Item Instance"
-           # MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: row["item_attributes"], price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
-           item_instance = MenuItemInstance.find_by_id(row["id"])
-          if item_instance
-            MenuItemInstance.create(menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
-          else
-            MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
-          end
-        elsif sheet_name == "Menu Instance Item Set"
-           # MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
-           menu_instance_set = MenuInstanceItemSet.find_by_id(row["id"])
-          if menu_instance_set
-            MenuInstanceItemSet.create(item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
-          else
-            MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
-          end
-        elsif sheet_name == "Menu Item Set" 
-           # MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
-           menu_item_set = MenuItemSet.find_by_id(row["id"])
-          if menu_item_set
-            MenuItemSet.create(item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
-          else
-            MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+        (2..spreadsheet.sheet(i).last_row).each do |ii|
+          row = Hash[[header,spreadsheet.sheet(i).row(ii)].transpose]
+          if sheet_name == "Account"
+             # Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+             account = Account.find_by_id(row["id"]) 
+            if account
+              Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+            else
+              Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
+            end
+          elsif sheet_name == "Item Set"
+             # ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
+             item_set = ItemSet.find_by_id(row["id"]) 
+            if item_set
+              ItemSet.create( name: row["name"], alt_name: row["alt_name"], min_selectable_qty: row["min_selectable_qty"], max_selectable_qty: row["max_selectable_qty"])
+            else
+              ItemSet.create(id:row["id"], name: row["name"], alt_name: row["alt_name"], min_selectable_qty: row["min_selectable_qty"], max_selectable_qty: row["max_selectable_qty"])
+            end
+          elsif sheet_name == "Menu Item Options"
+             # MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
+             item_options = MenuItemOption.find_by_id(row["id"])
+            if item_options
+              MenuItemOption.create( option_type: row["option_type"],name: row["name"],value: row["value"])
+            else
+              MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
+            end
+          elsif sheet_name == "Menu Item Attributes"
+             # MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+             item_attributes = MenuItemAttribute.find_by_id(row["id"])
+            if item_attributes
+              MenuItemAttribute.create( attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+            else
+              MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
+            end
+          elsif sheet_name == "Menu"
+            menu = Menu.find_by_id(row["id"])
+            if menu
+              Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+            else
+              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+            end
+          elsif sheet_name == "Menu Category"
+             # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+             menu_category = MenuCategory.find_by_id(row["id"])
+            if menu_category
+              MenuCategory.create(menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+            else
+              MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
+            end
+          elsif sheet_name == "Menu Item"
+             # MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: row["item_attributes"], item_options: row["item_options"], account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+             menu_item = MenuItem.find_by_id(row["id"])
+            if menu_item
+              MenuItem.create(item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+            else
+              MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
+            end
+          elsif sheet_name == "Menu Item Instance"
+             # MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: row["item_attributes"], price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+             item_instance = MenuItemInstance.find_by_id(row["id"])
+            if item_instance
+              MenuItemInstance.create(menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+            else
+              MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
+            end
+          elsif sheet_name == "Menu Instance Item Set"
+             # MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+             menu_instance_set = MenuInstanceItemSet.find_by_id(row["id"])
+            if menu_instance_set
+              MenuInstanceItemSet.create(item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+            else
+              MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
+            end
+          elsif sheet_name == "Menu Item Set" 
+             # MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+             menu_item_set = MenuItemSet.find_by_id(row["id"])
+            if menu_item_set
+              MenuItemSet.create(item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+            else
+              MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
+            end
           end
         end
       end
+    else
+      # Menu by Menu Import
+      accs = Account.all      
+      account_id = 1
+      if accs.length > 0
+        account_id = accs[0].id
+      else 
+        status = "No Account Created."
+      end
+
+      sheet = spreadsheet.sheet(0) 
+      menu = sheet.row(1)[1]
+      imported_menu = Menu.create({name: menu, is_active: true, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by}) 
+
+      (4..sheet.last_row).each do |ii|             
+          row = Hash[[sheet.row(3),sheet.row(ii)].transpose]   
+          menu_cat = MenuCategory.find_by_code(row["Category Code"])  
+          if !menu_cat
+            menu_cat = MenuCategory.create({menu_id: imported_menu.id, code: row["Category Code"], name: row["Category Name"], alt_name: '', order_by: (ii - 3), created_by: created_by, menu_category_id: nil, is_available: 1})
+          # else
+          #   status = status + "Category Code already exists."
+          end
+
+          menu_itm = MenuItem.find_by_item_code(row["Item Code"]) 
+          if !menu_itm
+            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by)
+          # else
+          #   status = status + "Item Code already exists for " + row["Item Name"] + "."
+          end
+
+          menu_inst = MenuItemInstance.find_by_item_instance_code(row["Instance Code"]) 
+          if !menu_inst
+            imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: "[]", price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: false)
+          # else
+          #   status = status + "Instance Code already exists for " + row["Instance Name"] + "."
+          end
+      end        
     end
- 
+    # if status == ''
+      status="Menu Imported!"
+    # end
+
+    return status
   end
 
   def self.open_spreadsheet(file)
diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 666f251a..7fb23647 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -33,7 +33,7 @@ class MenuCategory < ApplicationRecord
         abc = MenuItem.deleteRecursive(item)
       end
       menu_category.destroy
-      return false
+      return true
     end
   end
 
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 836e0caf..03e90011 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -55,27 +55,35 @@ class MenuItem < ApplicationRecord
 
   def self.deleteRecursive(menu_item)
     # find the sub menu item of current item
-    sub_menu_items = MenuItem.where("id=?",menu_item.id)
-    if sub_menu_items.length != 0
-      sub_menu_items.each do |subitem|
-        # if deleteRecursive(subitem)
-        # end
-      end
-      # find the instances of current menu item
-      instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
-      instances.each do |instance|
-        instance.destroy
-      end
-      menu_item.destroy
-      return true
-    else
-      instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
-      instances.each do |instance|
-        instance.destroy
-      end
-      menu_item.destroy
-      return false
+    # sub_menu_items = MenuItem.where("id=?",menu_item.id)
+    # if sub_menu_items.length != 0
+    #   # sub_menu_items.each do |subitem|
+    #   #   # if deleteRecursive(subitem)
+    #   #   # end
+    #   # end
+    #   # find the instances of current menu item
+    #   instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
+    #   instances.each do |instance|
+    #     instance.menu_instance_item_sets.destroy_all
+    #   end
+    #   menu_item.menu_item_sets.destroy_all
+    #   return true
+    # else
+    #   instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
+    #   instances.each do |instance|
+    #     instance.menu_instance_item_sets.destroy_all
+    #   end
+    #   menu_item.menu_item_sets.destroy_all
+    #   return true
+    # end
+    instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
+    instances.each do |instance|
+      instance.menu_instance_item_sets.destroy_all
+      instance.destroy
     end
+    menu_item.menu_item_sets.destroy_all
+    menu_item.destroy
+    return true
 
   end
   # private
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 883fbad4..49c27448 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -361,6 +361,8 @@ class Sale < ApplicationRecord
       end
     end
 
+    compute_tax(sale, total_taxable, total_discount, order_source)
+
     sale.total_amount = subtotal_price
     sale.total_discount = total_discount
     sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
@@ -371,8 +373,6 @@ class Sale < ApplicationRecord
     # adjust_rounding
     sale.rounding_adjustment = compute_adjust_rounding(sale.grand_total)
 
-    compute_tax(sale, total_taxable, total_discount, order_source)
-
     sale.save!
   end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index e43414b8..4621adba 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -263,10 +263,12 @@ class SalePayment < ApplicationRecord
 
     self.payment_method = "foc"
     self.payment_amount = self.received_amount
-    self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
+    # self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
+    self.outstanding_amount = 0.00
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)  
+    # sale_update_payment_status(self.received_amount)  
+    sale_update_payment_status(0)  
     return payment_status
   end
   
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index e42f33ec..d6a2d2f1 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -100,8 +100,8 @@
                   $.ajax({
                     type: method,
                     url: url ,            
-                    success: function(data) {              
-                      location.href = data.url;
+                    success: function(data) {             
+                        location.href = data.url;
                     }
                  });          
                 } else {
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index ec935f04..f28e291f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -300,7 +300,7 @@
                                           <% end %>
                                         <% end %>
 
-                                        <% if !order_item.set_menu_items.nil?  
+                                        <% if !order_item.set_menu_items.nil?  && order_item.set_menu_items != '[]'
                                           JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
                                           <br><span class="font-13">
                                             <%= item_instance["item_instance_name"] %>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 43c4d5e7..565abcf7 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -370,7 +370,7 @@
                           <% end %>
                         <% end %>
 
-                        <% if !order_item.set_menu_items.nil?  
+                       <% if !order_item.set_menu_items.nil?  && order_item.set_menu_items != '[]'
                           JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>
diff --git a/app/views/settings/menus/export.html.erb b/app/views/settings/menus/export.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 5fafa5db..42eca334 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -62,9 +62,12 @@
             <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
             <td>
               <%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %>
-              </td>
-            </tr>
-            <% end %>
+              <a href="#" id="export-xlsx" data-attr="<%= settings_menu.id %>" class="btn btn-primary btn-sm waves-effect" style="height: 33px;">
+                <i class="material-icons" style="top: 0px;">backup</i>
+              </a>
+            </td>
+          </tr>
+          <% end %>
           </tbody>
         </table>
       </div>
@@ -101,3 +104,21 @@
       </div>  
     </div>
   </div>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      $("#export-xlsx").on('click', function(){
+        var menu_id= $(this).attr('data-attr');
+        console.log(menu_id);
+        $.ajax({
+          type: "GET",
+          url: "/settings/menus/" + menu_id + "/export",
+          success: function(result){
+            if(result.status){
+              swal("Success", "Export Success...", "success");
+            }
+          }
+        });
+      });
+    });
+  </script>
diff --git a/config/routes.rb b/config/routes.rb
index 0c0f47a9..94db2ebd 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -310,8 +310,10 @@ scope "(:locale)", locale: /en|mm/ do
       collection do
         post :import
       end
-      resources :menu_categories, only: [:new, :create, :edit, :delete]
-    end
+      resources :menu_categories, only: [:new, :create, :edit, :delete]      
+    end    
+
+    get '/menus/:id/export' => 'menus#export'
 
     resources :item_sets
 
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 9d476d67..247992be 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -17,7 +17,7 @@ namespace :clear do
     Survey.delete_all
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
-    SeedGenerator.where("id > 1").update(:current => 0, :next => 1)
+    SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
     puts "Clear Data Done."
   end
 

From 2cb6427aa1b78d1015dff4f7b7f38468323d6b5c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 3 Apr 2018 10:54:06 +0630
Subject: [PATCH 518/651] update license check

---
 app/models/license.rb | 33 +++++++++++++++++----------------
 config/license.yml    | 15 +++++++++++++++
 2 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 config/license.yml

diff --git a/app/models/license.rb b/app/models/license.rb
index ac82721c..132585d8 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -134,21 +134,23 @@ class License
   def verify_license    
     api_token = read_license_no_decrypt("api_token")    
     @params = { query: {lookup_type: "application", api_token: api_token} }
-    response = self.class.get("/verify", @params)
-
-    rescue SocketError => e
-      Rails.logger.debug  "In Socket errror"
-      return true
-    rescue => e
-      @varified = response.parsed_response
-      Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-      if (@varified["status"])
-        if (!check_expired(@varified["renewable_date"]))
-          return true
-        end
-      else
-        delete_license_file
-      end  
+    
+    begin
+        response = self.class.get("/verify", @params)
+        @varified = response.parsed_response
+        Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+        if (@varified["status"])
+           
+          if (!check_expired(@varified["renewable_date"]))
+            return true
+          end
+        else
+          delete_license_file
+        end 
+      rescue SocketError => e
+        Rails.logger.debug  "In SocketError No Internet connection ! "
+        return true
+    end 
     return false  
   end
 
@@ -164,7 +166,6 @@ class License
   def check_expired(renewal_date_str)    
     expired_date_str = read_license("renewable_date")
     renewal_date = DateTime.parse(renewal_date_str)
-   
     if(renewal_date_str != expired_date_str)
       update_license("renewable_date", renewal_date_str)
     end
diff --git a/config/license.yml b/config/license.yml
new file mode 100644
index 00000000..9f4d1542
--- /dev/null
+++ b/config/license.yml
@@ -0,0 +1,15 @@
+iv_key: rwOZKWcQho6fE4V+A2zFuQ==
+shop_name: AMZ_Test
+email: aungmyo.zaw@code2lab.com
+telephone: 
+fax: 
+address: 
+dbhost: dNzh66R80remB694OEds96OpuyZ4wmHeHFdQh0KwjYFvTInK6+pCN/y6HdbyIlqqjcBHkqPjkjzw45PznLn7hA==
+dbschema: 4vooJDxgWdFv/8V7Qx8tzR/8B8T2c5U4XvYcF+2KOoA=
+dbusername: Xc8ELRsW7N/f8KsVikMBlg==
+dbpassword: HMg+TbLxmfYrDFI4IIAd4g==
+api_token: bisryXiEnbTJlZwghAnIByQpiRUMouu
+app_token: LycQXJYBZGeCygjIEKdlBXnjIGMiMzgmt
+plan_sku: 84hdnSCgkfhvItY7uB/pPQ==
+renewable_date: 8E6Ecz8QXAMSlKZnIzn0pQ==
+plan_name: 4cMIO0n/JzGFPIccXM6u5A==

From 9d9a07b100c33bb465686b875cd22c0c7a2770b2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 3 Apr 2018 12:59:33 +0630
Subject: [PATCH 519/651] change clear data

---
 lib/tasks/clear_data.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 9d476d67..247992be 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -17,7 +17,7 @@ namespace :clear do
     Survey.delete_all
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
-    SeedGenerator.where("id > 1").update(:current => 0, :next => 1)
+    SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
     puts "Clear Data Done."
   end
 

From d29b7a9d498933dbd2822c2c0514568d966a0d00 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 3 Apr 2018 14:15:35 +0630
Subject: [PATCH 520/651] change update order item func:

---
 app/controllers/oqs/edit_controller.rb  | 50 ++++++++++++++-----------
 app/controllers/oqs/print_controller.rb |  2 +-
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index ccef4e4a..049bbda6 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -36,33 +36,39 @@ class Oqs::EditController < BaseOqsController
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       # print
       assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
-      # order queue stations
-      oqs = assigned_item.order_queue_station
-
-      order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
       
-      unique_code="OrderItemPdf"
-      if !order_slim_pdf.empty?
-        order_slim_pdf.each do |order_item_slim|
-          if order_item_slim[0] == 'OrderSlimPdf' 
-            if order_item_slim[1] == '1'
-              unique_code="OrderItemSlimPdf"
-            else
-              unique_code="OrderItemPdf"
-            end
-          elsif order_item_slim[0] == 'OrderSetPdf' 
-            if order_item_slim[1] == '1'
-              unique_code="OrderSetItemPdf"
-            else
-              unique_code="OrderItemPdf"
+      if !assigned_items.nil?
+        assigned_items.each do |assign_item|
+          # order queue stations
+          oqs = assign_item.order_queue_station
+
+          order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
+          
+          unique_code="OrderItemPdf"
+          if !order_slim_pdf.empty?
+            order_slim_pdf.each do |order_item_slim|
+              if order_item_slim[0] == 'OrderSlimPdf' 
+                if order_item_slim[1] == '1'
+                  unique_code="OrderItemSlimPdf"
+                else
+                  unique_code="OrderItemPdf"
+                end
+              elsif order_item_slim[0] == 'OrderSetPdf' 
+                if order_item_slim[1] == '1'
+                  unique_code="OrderSetItemPdf"
+                else
+                  unique_code="OrderItemPdf"
+                end
+              end
             end
           end
+
+          print_settings=PrintSetting.find_by_unique_code(unique_code)
+          order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+          order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
         end
       end
-
-      print_settings=PrintSetting.find_by_unique_code(unique_code)
-      order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
     end
   end
 
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index baa4af40..930d3d5c 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -26,7 +26,7 @@ class Oqs::PrintController < ApplicationController
       assigned_item_id = params[:id]
       options = params[:options]
       assigned_item = AssignedOrderItem.find(assigned_item_id) 
-      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
 
       # order queue stations
       oqs = assigned_item.order_queue_station

From b0d7c3b1b8ece45d63386e8b21ec44e522f906b5 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 3 Apr 2018 15:01:54 +0630
Subject: [PATCH 521/651] update sale item report

---
 app/controllers/reports/saleitem_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 24c812eb..e2823d93 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -3,10 +3,14 @@ class Reports::SaleitemController < BaseReportController
   def index
       
     from, to  = get_date_range_from_params
-    shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
+    shift_sale_range = ''
 
     shift = ''
     if params[:shift_name].to_i != 0
+
+      shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
       shift_sale = ShiftSale.find(params[:shift_name])
       if to.blank?        
         shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
@@ -14,6 +18,7 @@ class Reports::SaleitemController < BaseReportController
 
         shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
       end
+
     end
     @type = params[:sale_type]
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)

From 8e07cd5f4e655c52b70d82d340378c340ea28068 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 3 Apr 2018 18:06:18 +0630
Subject: [PATCH 522/651] check FOC payment issue

---
 app/controllers/origami/payments_controller.rb | 10 +++++++---
 app/models/sale.rb                             |  4 ++--
 app/models/sale_payment.rb                     |  6 ++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index da5f216b..943fc3e9 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -431,13 +431,17 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
+      #calculate cash acmount
+      cash = saleObj.total_amount
+
       if saleObj.discount_type == "member_discount"
-        saleObj.update_attributes(rounding_adjustment: 0)
+        saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source)
       end
       
-      saleObj.update_attributes(rounding_adjustment: 0)
-      
+      saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
+      puts "FOC"
+      puts saleObj.to_json
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
       # For Cashier by Zone
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 883fbad4..49c27448 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -361,6 +361,8 @@ class Sale < ApplicationRecord
       end
     end
 
+    compute_tax(sale, total_taxable, total_discount, order_source)
+
     sale.total_amount = subtotal_price
     sale.total_discount = total_discount
     sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
@@ -371,8 +373,6 @@ class Sale < ApplicationRecord
     # adjust_rounding
     sale.rounding_adjustment = compute_adjust_rounding(sale.grand_total)
 
-    compute_tax(sale, total_taxable, total_discount, order_source)
-
     sale.save!
   end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index e43414b8..4621adba 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -263,10 +263,12 @@ class SalePayment < ApplicationRecord
 
     self.payment_method = "foc"
     self.payment_amount = self.received_amount
-    self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
+    # self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
+    self.outstanding_amount = 0.00
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)  
+    # sale_update_payment_status(self.received_amount)  
+    sale_update_payment_status(0)  
     return payment_status
   end
   

From 17562f6fcf6a75ef9f9c4e11c5cd19d7c872795d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 4 Apr 2018 09:43:02 +0630
Subject: [PATCH 523/651] update license and login dashboard

---
 app/models/license.rb                      | 12 +++++++++++-
 app/views/layouts/login_dashboard.html.erb |  4 ++--
 config/initializers/action_controller.rb   | 10 +++++-----
 config/secrets.yml                         |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/models/license.rb b/app/models/license.rb
index 132585d8..ed8e3eb8 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -140,20 +140,30 @@ class License
         @varified = response.parsed_response
         Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
         if (@varified["status"])
-           
           if (!check_expired(@varified["renewable_date"]))
             return true
           end
         else
           delete_license_file
         end 
+
       rescue SocketError => e
         Rails.logger.debug  "In SocketError No Internet connection ! "
         return true
+      rescue HTTParty::Error
+        Rails.logger.debug  "Server Error HTTParty"
+        return true
+      rescue Net::OpenTimeout
+         Rails.logger.debug  "connection Timeout"
+        return true
+      rescue OpenURI::HTTPError
+        Rails.logger.debug  "Can't connect server"
+        return true
     end 
     return false  
   end
 
+
   # Check Expired before 30 days
   def check_expiring(renewal_date_str)        
     if !renewal_date_str.empty?
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index f2f6f958..04fe8ded 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -11,8 +11,8 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
     <!-- Google Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+   <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">-->
 
     <%= stylesheet_link_tag    'login', media: 'all', 'data-turbolinks-track': 'reload' %>
     
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 02e35bb8..8f310dab 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 
diff --git a/config/secrets.yml b/config/secrets.yml
index 076b6691..0282c5fc 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From 907fd671c8054b7c28d7a4b859914224355f219a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 4 Apr 2018 11:55:45 +0630
Subject: [PATCH 524/651] check foreigner lists

---
 app/views/origami/surveys/_form.html.erb      | 128 +++++++++++++++++-
 app/views/transactions/surveys/index.html.erb |   9 +-
 2 files changed, 128 insertions(+), 9 deletions(-)

diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 1322f677..967a5837 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -32,17 +32,19 @@
             </div>   
             <%= f.input :total_customer, input_html: { value: @survey_data.total_customer, class: 'col-md-11'} %>
             <%= f.input :local , input_html: { value: @survey_data.local, class: 'col-md-11' }%>
-            <fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;">
-              <legend style="font-size: 1.2em !important;font-weight: bold !important;text-align: left !important;border:none;width:100px;">Foreigner</legend>
-              <div class="row clearfix">
+            <!--<fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;"> -->
+              <!-- <legend style="font-size: 1.2em !important;font-weight: bold !important;text-align: left !important;border:none;width:100px;">Foreigner</legend> -->
+            <fieldset class="form-group">
+              <label class="bmd-label-static">Foreigner Lists</label>
+              <div class="row clearfix foreignerDiv">
                 <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5">
                   <div class="form-group p-l-10 p-r-10">
                    <label class="p-l-10">Foreigner</label>
                    <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
-                   <select class="form-control col-md-12 selectpicker  show-tick" name="survey[foreigner][]" style="height: " >
-                    <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
-                    <option value="<%= ct.value %>">
-                      <%= ct.name %></option>
+                   <select class="form-control col-md-12 selectpicker show-tick" name="survey[foreigner][]" style="height: " >
+                      <%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
+                        <option value="<%= ct.value %>">
+                        <%= ct.name %></option>
                       <%end %>
                     </select>
                   </div>
@@ -243,7 +245,11 @@
 <script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
+    $('.foreignerDiv').removeClass("hidden");
     setHeaderBreadCrumb(_SURVEY_);
+    <% if !@survey_data.nil? %>
+      addSurveyForeignerLists(<%= @survey_data.foreigner.to_json.html_safe %>);
+    <% end %>
     //click add button for new row
     $('#addForeigner').on('click',function(){
         $('#newTemplate').removeClass('hidden');
@@ -272,6 +278,34 @@ var cashier_type = "<%= @cashier_type %>";
         $('#newTemplate').append(text_box);
     });
 
+    //click add button for new row
+    $('#newTemplate').on('click','#addForeigner',function(){
+        $('#newTemplate').removeClass('hidden');
+
+        var text_box = '<div id="newRow" class="row clearfix">'
+                          +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
+                            +'<div class="form-group p-l-10 p-r-10">'
+                             +' <select class="form-control col-md-12 selectpicker  show-tick" '
+                                +' name="survey[foreigner][]" style="height: " >'
+                                +'<%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>'
+                                +'<option value="<%= ct.value %>">'
+                                  +'<%= ct.name %></option>'
+                                  +'<%end %>'
+                                +'</select>'
+                            +'</div>'
+                          +'</div>'
+                          +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
+                            +'<div class="form-group p-l-10 p-r-10">'
+                             +'<input type="number"  name="survey[foreigner][]" class="form-control">'
+                            +'</div>'
+                          +'</div>'
+                          +'<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">'
+                            +'<button type="button" class="btn btn-danger" id="removeRow">Remove</button>'
+                          +'</div>'
+                         +'</div>';
+        $('#newTemplate').append(text_box);
+    });
+
     //click remove buttom 
     $('#newTemplate').on('click','#removeRow', function(){
       $(this).parent().parent().remove()
@@ -339,4 +373,84 @@ var cashier_type = "<%= @cashier_type %>";
     });
 
   });
+
+  function addSurveyForeignerLists(foreigner_lists){
+    if((foreigner_lists != undefined) && (foreigner_lists != null) && (foreigner_lists != "")){
+      $('.foreignerDiv').remove();
+      $('#newTemplate').removeClass('hidden');
+      foreigner_lists = foreigner_lists.substring(1, (foreigner_lists.length - 1)).replace(new RegExp('"', "g"),'').split(",");
+      var arr_foreigner = {};
+      $.each(foreigner_lists,function(key,value){
+        if(!value.match(/^[0-9]+$/)){
+          arr_foreigner[value] = 0;
+        }else{
+          $.each(arr_foreigner,function(k,val){
+            if(arr_foreigner[k] == 0){
+              arr_foreigner[k] = value;
+            }
+          });
+        }
+      });
+
+      // console.log(foreigner_lists);
+      // console.log(arr_foreigner);
+      $.each(arr_foreigner, function(key,value){
+        if(Object.keys(arr_foreigner)[0] == key){
+          var fgn_template = '<div id="newRow" class="row clearfix">'
+          +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
+            +'<div class="form-group p-l-10 p-r-10">'
+             +' <select class="form-control col-md-12 selectpicker  show-tick" '
+                +' name="survey[foreigner][]" style="height: " >'
+                +'<%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>'
+                  // if (key.toString() == '<%= ct.value.to_s %>')
+                  //   var selected = "selected"; 
+                  // else 
+                    // var selected = "";
+                +'<option value="<%= ct.value %>">'
+                  +'<%= ct.name %></option>'
+                  +'<%end %>'
+                +'</select>'
+            +'</div>'
+            +'</div>'
+            +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
+              +'<div class="form-group p-l-10 p-r-10">'
+               +'<input type="number"  name="survey[foreigner][]" class="form-control" value="'+value+'">'
+              +'</div>'
+            +'</div>'
+            +'<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">'
+              +'<button type="button" class="btn btn-success" id="addForeigner">Add</button>'
+            +'</div>'
+           +'</div>';
+        }else{
+          var fgn_template = '<div id="newRow" class="row clearfix">'
+                            +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
+                              +'<div class="form-group p-l-10 p-r-10">'
+                               +' <select class="form-control col-md-12 selectpicker  show-tick" '
+                                  +' name="survey[foreigner][]" style="height: " >'
+                                  +'<%  Lookup.where("lookup_type = ?", "country" ).each do |ct| %>'
+                                    // if (key.toString() == '<%= ct.value.to_s %>')
+                                    //   var selected = "selected"; 
+                                    // else 
+                                      // var selected = "";
+                                  +'<option value="<%= ct.value %>">'
+                                    +'<%= ct.name %></option>'
+                                    +'<%end %>'
+                                  +'</select>'
+                              +'</div>'
+                            +'</div>'
+                            +'<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 ">'
+                              +'<div class="form-group p-l-10 p-r-10">'
+                               +'<input type="number"  name="survey[foreigner][]" class="form-control" value="'+value+'">'
+                              +'</div>'
+                            +'</div>'
+                            +'<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">'
+                              +'<button type="button" class="btn btn-danger" id="removeRow">Remove</button>'
+                            +'</div>'
+                           +'</div>';
+        }
+        
+        $('#newTemplate').append(fgn_template);
+      });
+    }
+  }
 </script>
\ No newline at end of file
diff --git a/app/views/transactions/surveys/index.html.erb b/app/views/transactions/surveys/index.html.erb
index 66defdc0..7e750faa 100644
--- a/app/views/transactions/surveys/index.html.erb
+++ b/app/views/transactions/surveys/index.html.erb
@@ -56,6 +56,7 @@
 	            	<% total_female = 0 %>
 	            	<% total_local = 0 %>
 	            	<% total_customer = 0 %>
+	            	<% total_foreigner = 0 %>
 	              <% if !@surveys.nil? %>
 	              	<% @surveys.each do |survey| %>
 	              		<% total_child = total_child.to_i + survey.child.to_i %>
@@ -80,8 +81,11 @@
 		              					<% foreigner_lists = foreign.split(",") %>
 		              					<% if !foreigner_lists.empty? %>
 			              					<% foreigner_lists.each do |fgn| %>
+			              						<% unless fgn.match(/[^[:digit:]]+/) 
+			              							total_foreigner = total_foreigner.to_i + fgn.to_i 
+			              						end %>
 	              								<% if !fgn.scan(/\D/).empty? %>
-			              								<%= fgn %> :<% end %> <%= fgn.to_i unless fgn.match(/[^[:digit:]]+/) %><br>
+			              							<%= fgn %> :<% end %> <%= fgn.to_i unless fgn.match(/[^[:digit:]]+/) %><br>
 		              						<% end %>
 	              						<% end %>
 	              					<% end %>
@@ -97,7 +101,8 @@
 	              	<td><strong><%= total_male %></strong></td>
 	              	<td><strong><%= total_female %></strong></td>
 	              	<td><strong><%= total_customer %></strong></td>
-	              	<td colspan="2"><strong><%= total_local %></strong></td>
+	              	<td><strong><%= total_local %></strong></td>
+	              	<td><strong><%= total_foreigner %></strong></td>
 	              </tr>
 	            </tbody>
 	          </table>

From 9bf4047548d782fd6236587296412069bc2e4121 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 4 Apr 2018 10:33:31 +0630
Subject: [PATCH 525/651] Add MoveTablePdf with multiple printer

---
 .../origami/movetable_controller.rb           | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 09d9669e..20aaf0c5 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -56,19 +56,19 @@ class Origami::MovetableController < BaseOrigamiController
     end
   end
 
-   def moving
-     change_to = params[:change_to] #new
-     change_from = params[:change_from] #original
-     bookings = Booking.where('dining_facility_id=?',change_from)
+  def moving
+    change_to = params[:change_to] #new
+    change_from = params[:change_from] #original
+    bookings = Booking.where('dining_facility_id=?',change_from)
 
-     booking_array = Array.new
-     bookings.each do | booking |
-       if booking.sale_id.nil? && booking.booking_status != 'moved'
-         booking_array.push(booking)
-       end
-     end
+    booking_array = Array.new
+    bookings.each do | booking |
+      if booking.sale_id.nil? && booking.booking_status != 'moved'
+        booking_array.push(booking)
+      end
+    end
 
-     @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
+    @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
 
     # get printer info
     @from          = (DiningFacility.find(change_from)).name
@@ -78,9 +78,16 @@ class Origami::MovetableController < BaseOrigamiController
     @date          = DateTime.now
     @shop          = Shop::ShopDetail
     unique_code    = "MoveTablePdf" 
-    print_settings = PrintSetting.find_by_unique_code(unique_code)
-    printer        = Printer::ReceiptPrinter.new(print_settings)   
-    printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by)
-   end
-      
+    pdf_no        = PrintSetting.where(:unique_code => unique_code).count
+    #print_settings = PrintSetting.find_by_unique_code(unique_code)
+    printer_array = []
+    printer_array = PrintSetting.where(:unique_code => unique_code)
+    for i in 0..pdf_no
+      if i != pdf_no
+        print_settings = printer_array[i]
+        printer        = Printer::ReceiptPrinter.new(print_settings)   
+        printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by)
+      end  
+    end  
+  end    
 end

From 8c9b0f756d86b6588a8b269090f520cd13d6ac9c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 4 Apr 2018 14:09:35 +0630
Subject: [PATCH 526/651] update sale item report

---
 .../reports/saleitem_controller.rb            | 21 +++++++++++--------
 app/models/sale.rb                            |  9 ++++++++
 app/views/reports/saleitem/index.html.erb     |  3 ++-
 config/routes.rb                              |  3 ++-
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index e2823d93..92604b04 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -9,17 +9,20 @@ class Reports::SaleitemController < BaseReportController
     shift = ''
     if params[:shift_name].to_i != 0
 
-      shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+      shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
 
       shift_sale = ShiftSale.find(params[:shift_name])
-      if to.blank?        
+      if to.blank?  
         shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
       else
-
-        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
+        if shift_sale.shift_closed_at.blank?
+          shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at)
+        else
+          shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)
+        end
       end
-
     end
+
     @type = params[:sale_type]
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)
 
@@ -59,8 +62,8 @@ class Reports::SaleitemController < BaseReportController
 
   def show
     from, to, report_type  = get_date_range_from_params
-
-      @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+puts "aaaaaaaaaaaaaaaaaaaaaaaaaa"
+      @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
 
       date_arr = Array.new
       @sale_data.each do |sale|
@@ -73,8 +76,8 @@ class Reports::SaleitemController < BaseReportController
         date_arr.push(str)
       end
 
-      @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
-      @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+      # @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+      # @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
 
       out = {:status => 'ok', :message => date_arr}
       
diff --git a/app/models/sale.rb b/app/models/sale.rb
index e25589dc..9306b0eb 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -806,6 +806,15 @@ def self.get_by_shift_sale(from,to,status)
   return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
+def self.get_by_shift_sale_by_item(from,to,status)
+  query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,
+                          shift_closed_at As closing_date," +
+                          " grand_total AS grand_total, cash_sales AS cash," +
+                          "total_taxes AS total_tax,total_discounts As total_discount")
+                          .order("shift_sales.id DESC")
+  return query = query.where("shift_sales.shift_started_at >= ?" , from)
+end
+
 def self.get_item_query(type)
 
   if type == "revenue" || type.nil?
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index a972443f..a3937ec2 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -325,7 +325,8 @@
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
 			
-			url = '<%= reports_get_shift_by_date_path %>';
+			url = '<%= reports_get_shift_by_sale_item_path %>';
+			console.log(url)
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)
 
diff --git a/config/routes.rb b/config/routes.rb
index 4448b75f..5f0d21ba 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -407,8 +407,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
     resources :product_sale, :only => [:index, :show]
-
+    get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
+
   end
 
   # ----------- Inventory ---------------------------

From 2e81de1ea7551035678f2525853429bc5505c40b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 4 Apr 2018 16:37:10 +0630
Subject: [PATCH 527/651] bill channel for request bill and creditnote payment
 duoble amt

---
 app/controllers/origami/request_bills_controller.rb | 4 +++-
 app/models/sale_payment.rb                          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index e2553a83..cdd1f442 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -16,7 +16,7 @@ class Origami::RequestBillsController < ApplicationController
       bk_order = BookingOrder.find_by_order_id(order_id)
       order = Order.find(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
-      
+      table = DiningFacility.find(check_booking.dining_facility_id)
       if check_booking.sale_id.nil?
         # Create Sale if it doesn't exist
         @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
@@ -33,6 +33,8 @@ class Origami::RequestBillsController < ApplicationController
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
+      #bill channel
+      ActionCable.server.broadcast "bill_channel",table: table
       if order.source == "quick_service"
         result = {:status=> @status, :data => @sale.sale_id }
           render :json => result.to_json
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 4621adba..5cd7ea40 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -472,7 +472,7 @@ class SalePayment < ApplicationRecord
       elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
         table_update_status(sObj)
         update_shift
-      elsif method_status && paid_amount.to_f == 0
+      elsif method_status && paid_amount.to_f == 0 && is_credit == 0
         table_update_status(sObj)
         update_shift
       end

From 03e8ba99a62ad894fde3535cf1aa5d7dc21a3f0d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 4 Apr 2018 17:20:49 +0630
Subject: [PATCH 528/651] update add

---
 app/assets/javascripts/custom.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index c6e6a47b..043fbb03 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -32,6 +32,26 @@ $(document).ready(function() {
     railBorderRadius: '0',
     touchScrollStep : 50
   });
+
+  $('#modal-slimscroll').slimScroll({
+    height: height-$('#modal-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 45
+  });
+
+  $('#modal-set-slimscroll').slimScroll({
+    height: height-$('#modal-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 45
+  });
   
   // $('.delete').click(function(){
   //   var method    = $(this).attr('data-method');

From 9136e9de07278f0a8d0315aec5556990adf6a812 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 4 Apr 2018 17:51:51 +0630
Subject: [PATCH 529/651] update addorder set multiple

---
 app/assets/javascripts/addorder.js          | 92 +++++++++++++++------
 app/views/origami/addorders/detail.html.erb |  8 +-
 2 files changed, 76 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 31209c99..a8de44b1 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -315,6 +315,7 @@ $(function() {
       $(".options-list").empty();
 
       rowCount     = $('.selected-instance');
+      setCount     = $('.selected-set');
       item_options = $(this).data('option');
 
       min_qty      = $(this).data('min-qty');
@@ -335,19 +336,19 @@ $(function() {
             $(".options-list").append(row); 
         }
       }
-        if($(this).hasClass('selected-instance') == true){
-          sub_total       = $('#set_total_price').text();
-          name            = $(this).data('name');
-          price           = $(this).data('price');
-          // qty             = $('#set_change_qty').val();
-          qty             = document.getElementById("set_count").value;
-          total           = qty*price;
-          var total_price = +sub_total - +total;
-          $(this).removeClass('selected-instance');
-          $(".options-list").empty();
-          $(this).removeAttr('data-options');
-          $('#instance_option').text('')
-        }else {
+        // if($(this).hasClass('selected-instance') == true){
+        //   sub_total       = $('#set_total_price').text();
+        //   name            = $(this).data('name');
+        //   price           = $(this).data('price');
+        //   // qty             = $('#set_change_qty').val();
+        //   qty             = document.getElementById("set_count").value;
+        //   total           = qty*price;
+        //   var total_price = +sub_total - +total;
+        //   $(this).removeClass('selected-instance');
+        //   $(".options-list").empty();
+        //   $(this).removeAttr('data-options');
+        //   $('#instance_option').text('')
+        // }else {
           if (rowCount.length+1 <= max_qty) {
             sub_total       = $('#set_total_price').text();
             name            = $(this).data('name');
@@ -358,12 +359,55 @@ $(function() {
             total           = qty*price;
             var total_price = +sub_total + +total;
             $(this).addClass('selected-instance');
+
+            set = "<div class='selected-set card custom-card' style='margin-bottom:10px !important'" 
+                            +"' data-name='"+$(this).data('name')
+                            +"' data-code='"+code
+                            +"' data-price='"+$(this).data('price')
+                            +"' data-option='"+JSON.stringify($(this).data('option'))
+                            +"' data-min-qty='"+$(this).data('min-qty')
+                            +"' data-max-qty='"+$(this).data('max-qty')
+                            +"' data-parent-code='"+$(this).data('parent-code')
+                            +"' data-parent-id='"+$(this).data('parent-id')
+                            +"' data-sub-item='true"
+                            +"'>"
+
+                          +'<div class="card-block" style="background-color:#54A5AF;">'
+                          +' <button type="button" class="close" id="remove_set" style="font-size: 20px;">&times;</button>'
+                             +'<span style="color:#fff">'+$(this).data('name')+'</span>'
+                          +'</div>'
+                          +'<div class="card-block custom-card-block">'
+                           
+                            +' <small style="float:" id="instance_option"></small>'
+                          +'</div>'
+                          // +'<div class="card-footer custom-card-footer">'
+                          //    +' <span>'+$(this).data('price')+'</span>'
+                          //    // +' <small style="float:right" id="instance_option"></small>'
+                          // +'</div>'
+                        +'</div>'
+              $(".selected-set-list").append(set);
+          }else{
+             swal("Alert !", 'Maximum Qty is  ' + max_qty + "  items", "warning");
           }
-        }
+        // }
         $('#set_unit_price').text(price);
         $('#set_total_price').text(total_price);
     
   }); //End selecct attribute buttom
+  
+  // click add order 
+  $(document).on('click', '#remove_set', function(event){ 
+    code = $(this).parent().parent('.selected-set').attr('data-code');
+     instance    = $(".selected-instance");
+     console.log(code)
+       $(instance).each(function(i){
+         if ($(instance[i]).attr('data-code')==code){
+           console.log($(instance[i]))
+           $(instance[i]).removeClass("selected-instance")
+        }
+       });
+       $(this).parent().parent('.selected-set').remove();
+  });
 
   // click add order 
   $(document).on('click', '.set_order', function(event){ 
@@ -637,15 +681,17 @@ $(function() {
     
 
     if(group == "set_menu"){
-
-      instance    = $(".selected-instance");
-      $(instance).each(function(i){
-        if ($(instance[i]).attr('data-code')==code){
-          option_arr    = get_selected_attributes('selected-option');
-          $(instance[i]).attr('data-options',JSON.stringify(option_arr));
-          $(instance[i]).children().children('#instance_option').text(option_arr);
-        }
-      });
+      option_arr    = get_selected_attributes('selected-option');
+          $(".selected-set:last").attr('data-options',JSON.stringify(option_arr));
+          $(".selected-set:last").children().children('#instance_option').text(option_arr);
+      // instance    = $(".selected-instance");
+      // $(instance).each(function(i){
+      //   if ($(instance[i]).attr('data-code')==code){
+          // option_arr    = get_selected_attributes('selected-option');
+          // $(instance[i]).attr('data-options',JSON.stringify(option_arr));
+          // $(instance[i]).children().children('#instance_option').text(option_arr);
+      //   }
+      // });
     }
 
     if(group == "set_menu_default"){
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 607f4c0e..93569170 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -405,9 +405,15 @@
                         <p class="hidden" id="set_item_code"></p>
                         <p></p>
 
-                        <div class="options-list">
+                        <div class="" id="modal-slimscroll" data-height="250">
+                        <div class="options-list" style="margin-top:-5px">
                         </div>
 
+                        <div class='selected-set-list'>
+
+                        </div>
+                      </div>
+
                   </div>
                   <div class="col-md-8">       
                      <div class="instance-list row"></div>

From fc8b2d3b731f52b8c17d2795a02e0e9624de0a1c Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 5 Apr 2018 11:49:42 +0630
Subject: [PATCH 530/651] Pull from master

---
 app/assets/javascripts/addorder.js            | 92 ++++++++++++++-----
 app/assets/javascripts/custom.js              | 20 ++++
 app/controllers/api/survey_controller.rb      | 47 ++++++++++
 .../origami/request_bills_controller.rb       |  4 +-
 .../reports/saleitem_controller.rb            | 24 +++--
 app/models/license.rb                         | 41 ++++++---
 app/models/sale.rb                            |  9 ++
 app/models/sale_payment.rb                    |  2 +-
 app/views/layouts/login_dashboard.html.erb    |  4 +-
 app/views/origami/addorders/detail.html.erb   |  8 +-
 app/views/reports/saleitem/index.html.erb     |  3 +-
 config/license.yml                            | 15 +++
 config/routes.rb                              |  5 +-
 config/secrets.yml                            |  2 +-
 14 files changed, 222 insertions(+), 54 deletions(-)
 create mode 100644 app/controllers/api/survey_controller.rb
 create mode 100644 config/license.yml

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 31209c99..a8de44b1 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -315,6 +315,7 @@ $(function() {
       $(".options-list").empty();
 
       rowCount     = $('.selected-instance');
+      setCount     = $('.selected-set');
       item_options = $(this).data('option');
 
       min_qty      = $(this).data('min-qty');
@@ -335,19 +336,19 @@ $(function() {
             $(".options-list").append(row); 
         }
       }
-        if($(this).hasClass('selected-instance') == true){
-          sub_total       = $('#set_total_price').text();
-          name            = $(this).data('name');
-          price           = $(this).data('price');
-          // qty             = $('#set_change_qty').val();
-          qty             = document.getElementById("set_count").value;
-          total           = qty*price;
-          var total_price = +sub_total - +total;
-          $(this).removeClass('selected-instance');
-          $(".options-list").empty();
-          $(this).removeAttr('data-options');
-          $('#instance_option').text('')
-        }else {
+        // if($(this).hasClass('selected-instance') == true){
+        //   sub_total       = $('#set_total_price').text();
+        //   name            = $(this).data('name');
+        //   price           = $(this).data('price');
+        //   // qty             = $('#set_change_qty').val();
+        //   qty             = document.getElementById("set_count").value;
+        //   total           = qty*price;
+        //   var total_price = +sub_total - +total;
+        //   $(this).removeClass('selected-instance');
+        //   $(".options-list").empty();
+        //   $(this).removeAttr('data-options');
+        //   $('#instance_option').text('')
+        // }else {
           if (rowCount.length+1 <= max_qty) {
             sub_total       = $('#set_total_price').text();
             name            = $(this).data('name');
@@ -358,12 +359,55 @@ $(function() {
             total           = qty*price;
             var total_price = +sub_total + +total;
             $(this).addClass('selected-instance');
+
+            set = "<div class='selected-set card custom-card' style='margin-bottom:10px !important'" 
+                            +"' data-name='"+$(this).data('name')
+                            +"' data-code='"+code
+                            +"' data-price='"+$(this).data('price')
+                            +"' data-option='"+JSON.stringify($(this).data('option'))
+                            +"' data-min-qty='"+$(this).data('min-qty')
+                            +"' data-max-qty='"+$(this).data('max-qty')
+                            +"' data-parent-code='"+$(this).data('parent-code')
+                            +"' data-parent-id='"+$(this).data('parent-id')
+                            +"' data-sub-item='true"
+                            +"'>"
+
+                          +'<div class="card-block" style="background-color:#54A5AF;">'
+                          +' <button type="button" class="close" id="remove_set" style="font-size: 20px;">&times;</button>'
+                             +'<span style="color:#fff">'+$(this).data('name')+'</span>'
+                          +'</div>'
+                          +'<div class="card-block custom-card-block">'
+                           
+                            +' <small style="float:" id="instance_option"></small>'
+                          +'</div>'
+                          // +'<div class="card-footer custom-card-footer">'
+                          //    +' <span>'+$(this).data('price')+'</span>'
+                          //    // +' <small style="float:right" id="instance_option"></small>'
+                          // +'</div>'
+                        +'</div>'
+              $(".selected-set-list").append(set);
+          }else{
+             swal("Alert !", 'Maximum Qty is  ' + max_qty + "  items", "warning");
           }
-        }
+        // }
         $('#set_unit_price').text(price);
         $('#set_total_price').text(total_price);
     
   }); //End selecct attribute buttom
+  
+  // click add order 
+  $(document).on('click', '#remove_set', function(event){ 
+    code = $(this).parent().parent('.selected-set').attr('data-code');
+     instance    = $(".selected-instance");
+     console.log(code)
+       $(instance).each(function(i){
+         if ($(instance[i]).attr('data-code')==code){
+           console.log($(instance[i]))
+           $(instance[i]).removeClass("selected-instance")
+        }
+       });
+       $(this).parent().parent('.selected-set').remove();
+  });
 
   // click add order 
   $(document).on('click', '.set_order', function(event){ 
@@ -637,15 +681,17 @@ $(function() {
     
 
     if(group == "set_menu"){
-
-      instance    = $(".selected-instance");
-      $(instance).each(function(i){
-        if ($(instance[i]).attr('data-code')==code){
-          option_arr    = get_selected_attributes('selected-option');
-          $(instance[i]).attr('data-options',JSON.stringify(option_arr));
-          $(instance[i]).children().children('#instance_option').text(option_arr);
-        }
-      });
+      option_arr    = get_selected_attributes('selected-option');
+          $(".selected-set:last").attr('data-options',JSON.stringify(option_arr));
+          $(".selected-set:last").children().children('#instance_option').text(option_arr);
+      // instance    = $(".selected-instance");
+      // $(instance).each(function(i){
+      //   if ($(instance[i]).attr('data-code')==code){
+          // option_arr    = get_selected_attributes('selected-option');
+          // $(instance[i]).attr('data-options',JSON.stringify(option_arr));
+          // $(instance[i]).children().children('#instance_option').text(option_arr);
+      //   }
+      // });
     }
 
     if(group == "set_menu_default"){
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index c6e6a47b..043fbb03 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -32,6 +32,26 @@ $(document).ready(function() {
     railBorderRadius: '0',
     touchScrollStep : 50
   });
+
+  $('#modal-slimscroll').slimScroll({
+    height: height-$('#modal-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 45
+  });
+
+  $('#modal-set-slimscroll').slimScroll({
+    height: height-$('#modal-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 45
+  });
   
   // $('.delete').click(function(){
   //   var method    = $(this).attr('data-method');
diff --git a/app/controllers/api/survey_controller.rb b/app/controllers/api/survey_controller.rb
new file mode 100644
index 00000000..879c9ea7
--- /dev/null
+++ b/app/controllers/api/survey_controller.rb
@@ -0,0 +1,47 @@
+class Api::SurveyController < Api::ApiController
+	skip_before_action  :authenticate
+
+	def index
+       	dining_facility = DiningFacility.find(params[:id])
+       	survey_data  	= Survey.find_by_dining_name(dining_facility.name)
+       	countries		= Lookup.collection_of("country")
+       	if !countries.nil? || !survey_data.nil?
+       		render :json => { :status => true, :data => { :countries => countries, :survey_data => survey_data} }
+       	else
+       		render :json => { :status => true, :error_message => "There is no data" }
+       	end
+	end
+
+	def create
+		dining_facility  = DiningFacility.find(params[:id])
+		cashier_zone      = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
+		shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+		
+		if params[:survey_id]
+			survey = Survey.find(params[:survey_id])
+		else
+			survey = Survey.new
+		end
+		survey.dining_name 		= dining_facility.name
+		survey.shift_id 		= shift_by_terminal.id
+		survey.child 			= params[:child]
+		survey.adult 			= params[:adult]
+		survey.male 			= params[:male]
+		survey.female 			= params[:female]
+		survey.local 			= params[:local]
+		survey.created_by 		= current_login_employee.name
+		survey.total_customer 	= params[:total_customer]
+		survey.total_amount 	= params[:total_amount]
+		survey.foreigner 		= params[:foreigner].to_json
+		survey.save!
+
+		render :json => { :status => true }
+	end
+
+	# private
+	#     def survey_params
+	#       params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, 
+	#       	:dining_name,:created_by,:total_customer,:total_amount)
+	#     end
+
+end
\ No newline at end of file
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index e2553a83..cdd1f442 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -16,7 +16,7 @@ class Origami::RequestBillsController < ApplicationController
       bk_order = BookingOrder.find_by_order_id(order_id)
       order = Order.find(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
-      
+      table = DiningFacility.find(check_booking.dining_facility_id)
       if check_booking.sale_id.nil?
         # Create Sale if it doesn't exist
         @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
@@ -33,6 +33,8 @@ class Origami::RequestBillsController < ApplicationController
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
+      #bill channel
+      ActionCable.server.broadcast "bill_channel",table: table
       if order.source == "quick_service"
         result = {:status=> @status, :data => @sale.sale_id }
           render :json => result.to_json
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 24c812eb..92604b04 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -3,18 +3,26 @@ class Reports::SaleitemController < BaseReportController
   def index
       
     from, to  = get_date_range_from_params
-    shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
+    shift_sale_range = ''
 
     shift = ''
     if params[:shift_name].to_i != 0
+
+      shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
+
       shift_sale = ShiftSale.find(params[:shift_name])
-      if to.blank?        
+      if to.blank?  
         shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
       else
-
-        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
+        if shift_sale.shift_closed_at.blank?
+          shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at)
+        else
+          shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)
+        end
       end
     end
+
     @type = params[:sale_type]
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)
 
@@ -54,8 +62,8 @@ class Reports::SaleitemController < BaseReportController
 
   def show
     from, to, report_type  = get_date_range_from_params
-
-      @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+puts "aaaaaaaaaaaaaaaaaaaaaaaaaa"
+      @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
 
       date_arr = Array.new
       @sale_data.each do |sale|
@@ -68,8 +76,8 @@ class Reports::SaleitemController < BaseReportController
         date_arr.push(str)
       end
 
-      @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
-      @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+      # @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+      # @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
 
       out = {:status => 'ok', :message => date_arr}
       
diff --git a/app/models/license.rb b/app/models/license.rb
index ac82721c..ed8e3eb8 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -134,24 +134,36 @@ class License
   def verify_license    
     api_token = read_license_no_decrypt("api_token")    
     @params = { query: {lookup_type: "application", api_token: api_token} }
-    response = self.class.get("/verify", @params)
+    
+    begin
+        response = self.class.get("/verify", @params)
+        @varified = response.parsed_response
+        Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+        if (@varified["status"])
+          if (!check_expired(@varified["renewable_date"]))
+            return true
+          end
+        else
+          delete_license_file
+        end 
 
-    rescue SocketError => e
-      Rails.logger.debug  "In Socket errror"
-      return true
-    rescue => e
-      @varified = response.parsed_response
-      Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-      if (@varified["status"])
-        if (!check_expired(@varified["renewable_date"]))
-          return true
-        end
-      else
-        delete_license_file
-      end  
+      rescue SocketError => e
+        Rails.logger.debug  "In SocketError No Internet connection ! "
+        return true
+      rescue HTTParty::Error
+        Rails.logger.debug  "Server Error HTTParty"
+        return true
+      rescue Net::OpenTimeout
+         Rails.logger.debug  "connection Timeout"
+        return true
+      rescue OpenURI::HTTPError
+        Rails.logger.debug  "Can't connect server"
+        return true
+    end 
     return false  
   end
 
+
   # Check Expired before 30 days
   def check_expiring(renewal_date_str)        
     if !renewal_date_str.empty?
@@ -164,7 +176,6 @@ class License
   def check_expired(renewal_date_str)    
     expired_date_str = read_license("renewable_date")
     renewal_date = DateTime.parse(renewal_date_str)
-   
     if(renewal_date_str != expired_date_str)
       update_license("renewable_date", renewal_date_str)
     end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 49c27448..363ff77b 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -806,6 +806,15 @@ def self.get_by_shift_sale(from,to,status)
   return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
+def self.get_by_shift_sale_by_item(from,to,status)
+  query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,
+                          shift_closed_at As closing_date," +
+                          " grand_total AS grand_total, cash_sales AS cash," +
+                          "total_taxes AS total_tax,total_discounts As total_discount")
+                          .order("shift_sales.id DESC")
+  return query = query.where("shift_sales.shift_started_at >= ?" , from)
+end
+
 def self.get_item_query(type)
 
   if type == "revenue" || type.nil?
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 4621adba..5cd7ea40 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -472,7 +472,7 @@ class SalePayment < ApplicationRecord
       elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
         table_update_status(sObj)
         update_shift
-      elsif method_status && paid_amount.to_f == 0
+      elsif method_status && paid_amount.to_f == 0 && is_credit == 0
         table_update_status(sObj)
         update_shift
       end
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index d3e4729d..ec0469fe 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -11,8 +11,8 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
     <!-- Google Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+   <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">-->
 
     <%= stylesheet_link_tag    'login', media: 'all', 'data-turbolinks-track': 'reload' %>
     
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 607f4c0e..93569170 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -405,9 +405,15 @@
                         <p class="hidden" id="set_item_code"></p>
                         <p></p>
 
-                        <div class="options-list">
+                        <div class="" id="modal-slimscroll" data-height="250">
+                        <div class="options-list" style="margin-top:-5px">
                         </div>
 
+                        <div class='selected-set-list'>
+
+                        </div>
+                      </div>
+
                   </div>
                   <div class="col-md-8">       
                      <div class="instance-list row"></div>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index a972443f..a3937ec2 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -325,7 +325,8 @@
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
 			
-			url = '<%= reports_get_shift_by_date_path %>';
+			url = '<%= reports_get_shift_by_sale_item_path %>';
+			console.log(url)
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)
 
diff --git a/config/license.yml b/config/license.yml
new file mode 100644
index 00000000..9f4d1542
--- /dev/null
+++ b/config/license.yml
@@ -0,0 +1,15 @@
+iv_key: rwOZKWcQho6fE4V+A2zFuQ==
+shop_name: AMZ_Test
+email: aungmyo.zaw@code2lab.com
+telephone: 
+fax: 
+address: 
+dbhost: dNzh66R80remB694OEds96OpuyZ4wmHeHFdQh0KwjYFvTInK6+pCN/y6HdbyIlqqjcBHkqPjkjzw45PznLn7hA==
+dbschema: 4vooJDxgWdFv/8V7Qx8tzR/8B8T2c5U4XvYcF+2KOoA=
+dbusername: Xc8ELRsW7N/f8KsVikMBlg==
+dbpassword: HMg+TbLxmfYrDFI4IIAd4g==
+api_token: bisryXiEnbTJlZwghAnIByQpiRUMouu
+app_token: LycQXJYBZGeCygjIEKdlBXnjIGMiMzgmt
+plan_sku: 84hdnSCgkfhvItY7uB/pPQ==
+renewable_date: 8E6Ecz8QXAMSlKZnIzn0pQ==
+plan_name: 4cMIO0n/JzGFPIccXM6u5A==
diff --git a/config/routes.rb b/config/routes.rb
index 94db2ebd..2c25db97 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,6 +78,8 @@ scope "(:locale)", locale: /en|mm/ do
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
       post "call_waiter" => "call_waiters#index"
+      get "survey/:id" => "survey#index"
+      post "survey/:id" => "survey#create"
     end
 
     
@@ -417,8 +419,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
     resources :product_sale, :only => [:index, :show]
-
+    get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
+
   end
 
   # ----------- Inventory ---------------------------
diff --git a/config/secrets.yml b/config/secrets.yml
index 076b6691..0282c5fc 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L

From e607fea8a3a1d037c3c5aa731a788d0453179625 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 5 Apr 2018 13:30:29 +0630
Subject: [PATCH 531/651] Modified in all pdf can access Header & Item Font
 Size from Database

---
 README.md                              |  7 ++++++-
 app/pdf/call_waiter_pdf.rb             |  7 +++----
 app/pdf/close_cashier_customise_pdf.rb |  4 ++--
 app/pdf/close_cashier_pdf.rb           |  4 ++--
 app/pdf/crm_order_pdf.rb               |  5 ++---
 app/pdf/move_table_pdf.rb              |  7 +++----
 app/pdf/order_item_pdf.rb              | 10 +++-------
 app/pdf/order_item_slim_pdf.rb         | 10 +++-------
 app/pdf/order_set_item_pdf.rb          | 10 +++-------
 app/pdf/order_summary_pdf.rb           | 10 +++-------
 app/pdf/order_summary_set_pdf.rb       |  8 ++------
 app/pdf/order_summary_slim_pdf.rb      |  8 ++------
 app/pdf/queue_no_pdf.rb                |  5 ++---
 app/pdf/receipt_bill_a5_pdf.rb         |  4 ++--
 app/pdf/receipt_bill_pdf.rb            |  4 ++--
 app/pdf/stock_result_pdf.rb            |  6 +++---
 16 files changed, 43 insertions(+), 66 deletions(-)

diff --git a/README.md b/README.md
index e19f7a51..ce5402ac 100755
--- a/README.md
+++ b/README.md
@@ -42,6 +42,8 @@ For Extra Time
 For Order Item & Order Summary Slim
 	*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
 	1) settings/print_settings
+		(a) Font is present => {Header font size:11, Item Font Size:9}
+		(b) Font is blank   => {Header font size:12, Item Font Size:10}
 	2) settings/lookups => { type:print_settings, name:OrderSlimPdf, value:1 }
 	* no need to change these files
 	{ app/controllers/oqs/edit_controller.rb
@@ -53,7 +55,7 @@ For Order Item & Order Summary Slim
 
 For ReceiptBillA5Pdf
 	*** change ReceiptBillPdf to ReceiptBillA5Pdf
-	1) settings/print_settings , width:680, height:1450
+	1) settings/print_settings , width:680, height:1450, Header font Size:16, Item font size:14
 	2) settings/lookups => { type:print_settings, name:ReceiptBillA5Pdf, value:1 }
 
 For ReceiptBillAltName options
@@ -62,6 +64,9 @@ For ReceiptBillAltName options
 For OrderSetPdf options
 	*** change OrderItemPdf to OrderSetItemPdf and OrderSummaryPdf to OrderSummarySetPdf
 	1) settings/lookups => { type:print_settings, name:OrderSetPdf, value:1 }
+	2) settings/print_settings
+		(a) Font is present => {Header font size:11, Item Font Size:9}
+		(b) Font is blank   => {Header font size:12, Item Font Size:10}
 
 For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
diff --git a/app/pdf/call_waiter_pdf.rb b/app/pdf/call_waiter_pdf.rb
index a1ea756b..314d0c33 100644
--- a/app/pdf/call_waiter_pdf.rb
+++ b/app/pdf/call_waiter_pdf.rb
@@ -3,6 +3,8 @@ class CallWaiterPdf < Prawn::Document
   def initialize(printer_settings, table,time,shop_detail)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 5
     self.price_width = 35
     self.qty_width = 20
@@ -27,9 +29,6 @@ class CallWaiterPdf < Prawn::Document
         fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
     end
 
-    self.header_font_size = 10
-    self.item_font_size = 8
-
     header( shop_detail.name, printer_settings.name)
 
     call_waiter(table)
@@ -68,4 +67,4 @@ class CallWaiterPdf < Prawn::Document
         
   # end
 
-end
+end
\ No newline at end of file
diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index bcc27724..0080373c 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -5,6 +5,8 @@ class CloseCashierCustomisePdf < Prawn::Document
   def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges)
     self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 5
     self.price_width = 60
     self.qty_width = 20
@@ -36,8 +38,6 @@ class CloseCashierCustomisePdf < Prawn::Document
     end
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    self.header_font_size = 10
-    self.item_font_size = 8
 
     #precision checked
     if printer_settings.precision.to_i > 2
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 7ac7a130..04bbdcf8 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -5,6 +5,8 @@ class CloseCashierPdf < Prawn::Document
   def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
     self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 5
     self.price_width = 60
     self.qty_width = 20
@@ -36,8 +38,6 @@ class CloseCashierPdf < Prawn::Document
     end
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    self.header_font_size = 10
-    self.item_font_size = 8
 
     #precision checked
     if printer_settings.precision.to_i > 2
diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb
index a33b5fce..070f5654 100755
--- a/app/pdf/crm_order_pdf.rb
+++ b/app/pdf/crm_order_pdf.rb
@@ -3,6 +3,8 @@ class CrmOrderPdf < Prawn::Document
    def initialize(booking,order_items,printer_settings)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 10
     # self.price_width = self.p_width / 2
     self.price_width=80
@@ -31,9 +33,6 @@ class CrmOrderPdf < Prawn::Document
         font "#{printer_settings.font}"
         fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
     end
-    
-    self.header_font_size = 10
-    self.item_font_size = 9
 
     header( printer_settings.printer_name, printer_settings.name)
         stroke_horizontal_rule
diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb
index 7b4ad8e4..954f88e9 100644
--- a/app/pdf/move_table_pdf.rb
+++ b/app/pdf/move_table_pdf.rb
@@ -3,6 +3,8 @@ class MoveTablePdf < Prawn::Document
   def initialize(printer_settings,to,from,shop_detail,date,type,moved_by)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 5
     self.price_width = 35
     self.qty_width = 20
@@ -27,9 +29,6 @@ class MoveTablePdf < Prawn::Document
         fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
     end
 
-    self.header_font_size = 10
-    self.item_font_size = 8
-
     header(printer_settings.name,type)
 
     call_move_table(to,from,date,type,moved_by)
@@ -56,4 +55,4 @@ class MoveTablePdf < Prawn::Document
   end
 
 
-end
\ No newline at end of file
+end
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 58682d8a..89ddcdb6 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -4,6 +4,8 @@ class OrderItemPdf < Prawn::Document
   def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
@@ -26,13 +28,7 @@ class OrderItemPdf < Prawn::Document
         })
 
         font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]  
-
-        self.header_font_size = 11
-        self.item_font_size = 9
-    else
-        self.header_font_size = 12
-        self.item_font_size = 10       
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]      
     end
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 05add2c9..607adf14 100755
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -4,6 +4,8 @@ class OrderItemSlimPdf < Prawn::Document
   def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
@@ -26,13 +28,7 @@ class OrderItemSlimPdf < Prawn::Document
         })
 
         font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]  
-
-        self.header_font_size = 11
-        self.item_font_size = 9
-    else
-        self.header_font_size = 12
-        self.item_font_size = 10       
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]       
     end
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index ce06081f..9668a0f5 100755
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -4,6 +4,8 @@ class OrderSetItemPdf < Prawn::Document
   def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
@@ -26,13 +28,7 @@ class OrderSetItemPdf < Prawn::Document
         })
 
         font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]  
-
-        self.header_font_size = 11
-        self.item_font_size = 9
-    else
-        self.header_font_size = 12
-        self.item_font_size = 10       
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]     
     end
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 17cf905c..5d5b9da8 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -4,6 +4,8 @@ class OrderSummaryPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
@@ -25,13 +27,7 @@ class OrderSummaryPdf < Prawn::Document
         })
 
         font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
-
-        self.header_font_size = 11
-        self.item_font_size = 9 
-    else
-        self.header_font_size = 12
-        self.item_font_size = 10       
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]      
     end
 
     # font "public/fonts/Zawgyi-One.ttf"
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index 14b2f796..a16265d2 100755
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -4,6 +4,8 @@ class OrderSummarySetPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
@@ -26,12 +28,6 @@ class OrderSummarySetPdf < Prawn::Document
 
         font "#{print_settings.font}"
         fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
-
-        self.header_font_size = 11
-        self.item_font_size = 9 
-    else
-        self.header_font_size = 12
-        self.item_font_size = 10       
     end
 
     # font "public/fonts/Zawgyi-One.ttf"
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
index c88061ea..e082203f 100755
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -4,6 +4,8 @@ class OrderSummarySlimPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
@@ -26,12 +28,6 @@ class OrderSummarySlimPdf < Prawn::Document
 
         font "#{print_settings.font}"
         fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
-
-        self.header_font_size = 11
-        self.item_font_size = 9 
-    else
-        self.header_font_size = 12
-        self.item_font_size = 10       
     end
 
     # font "public/fonts/Zawgyi-One.ttf"
diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb
index cce7eb94..adf824eb 100755
--- a/app/pdf/queue_no_pdf.rb
+++ b/app/pdf/queue_no_pdf.rb
@@ -3,6 +3,8 @@ class QueueNoPdf < Prawn::Document
   def initialize(printer_settings, queue)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 5
     self.price_width = 35
     self.qty_width = 20
@@ -27,9 +29,6 @@ class QueueNoPdf < Prawn::Document
         fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
     end
 
-    self.header_font_size = 10
-    self.item_font_size = 8
-
     header( "Beauty In the Pot", printer_settings.name)
 
     queue_no(queue)
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 604d99dd..a7cf21e2 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -5,6 +5,8 @@ class ReceiptBillA5Pdf < Prawn::Document
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 15
     self.price_width = 120
     self.qty_width = 50
@@ -43,8 +45,6 @@ class ReceiptBillA5Pdf < Prawn::Document
     end
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    self.header_font_size = 16
-    self.item_font_size = 14
 
     if printer_settings.delimiter
         delimiter = ","
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index c0299033..8bae5f60 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -6,6 +6,8 @@ class ReceiptBillPdf < Prawn::Document
     def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
         self.page_width = printer_settings.page_width
         self.page_height = printer_settings.page_height
+        self.header_font_size = printer_settings.header_font_size
+        self.item_font_size = printer_settings.item_font_size
         self.margin = 0
         self.price_width = 60
         self.qty_width = 25
@@ -44,8 +46,6 @@ class ReceiptBillPdf < Prawn::Document
         end
         # font "public/fonts/Zawgyi-One.ttf"
         # font "public/fonts/padauk.ttf"
-        self.header_font_size = 10
-        self.item_font_size = 8
 
         if printer_settings.delimiter
             delimiter = ","
diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb
index 510ab317..dec667f7 100755
--- a/app/pdf/stock_result_pdf.rb
+++ b/app/pdf/stock_result_pdf.rb
@@ -4,6 +4,8 @@ class StockResultPdf < Prawn::Document
   def initialize(printer_settings, stockcheck, stockcheck_items, checker_name, shop_details)
     self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
+    self.header_font_size = printer_settings.header_font_size
+    self.item_font_size = printer_settings.item_font_size
     self.margin = 5
     self.price_width = 40
     self.qty_width = 20
@@ -35,9 +37,7 @@ class StockResultPdf < Prawn::Document
     end
     
     # font "public/fonts/Zawgyi-One.ttf"
-    # font "public/fonts/padauk.ttf"
-    self.header_font_size = 10
-    self.item_font_size = 8
+# font "public/fonts/padauk.ttf"
 
     header(shop_details)
 

From 866746db70cfdf086a38b84512650bb7a660f51e Mon Sep 17 00:00:00 2001
From: Jueli Moon Aung <julion@code2lab.com>
Date: Thu, 5 Apr 2018 07:01:40 +0000
Subject: [PATCH 532/651] license.rb edited by Julian (Enabled Rest API for
 SymmetricDS)

---
 app/models/license.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/license.rb b/app/models/license.rb
index ed8e3eb8..13931376 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -356,7 +356,8 @@ class License
         f.write("job.push.period.time.ms=10000\n")  
         f.write("job.pull.period.time.ms=10000\n")  
         f.write("initial.load.create.first=true\n")  
-        f.write("initial.load.use.extract.job.enabled=true\n")         
+        f.write("initial.load.use.extract.job.enabled=true\n")
+        f.write("rest.api.enable=true\n")
         f.close 
 
         # read from license file 
@@ -379,7 +380,8 @@ class License
         f.write("external.id=001\n")
         f.write("job.routing.period.time.ms=5000\n")  
         f.write("job.push.period.time.ms=10000\n")  
-        f.write("job.pull.period.time.ms=10000\n")  
+        f.write("job.pull.period.time.ms=10000\n")
+        f.write("rest.api.enable=true\n")
         # f.write("initial.load.create.first=true\n")  
         # f.write("initial.load.use.extract.job.enabled=true\n")         
         f.close

From 39e887c7a55d73f52ef49902761c718761c75052 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 5 Apr 2018 14:30:43 +0630
Subject: [PATCH 533/651] Pull from master

---
 app/models/license.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/license.rb b/app/models/license.rb
index ed8e3eb8..13931376 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -356,7 +356,8 @@ class License
         f.write("job.push.period.time.ms=10000\n")  
         f.write("job.pull.period.time.ms=10000\n")  
         f.write("initial.load.create.first=true\n")  
-        f.write("initial.load.use.extract.job.enabled=true\n")         
+        f.write("initial.load.use.extract.job.enabled=true\n")
+        f.write("rest.api.enable=true\n")
         f.close 
 
         # read from license file 
@@ -379,7 +380,8 @@ class License
         f.write("external.id=001\n")
         f.write("job.routing.period.time.ms=5000\n")  
         f.write("job.push.period.time.ms=10000\n")  
-        f.write("job.pull.period.time.ms=10000\n")  
+        f.write("job.pull.period.time.ms=10000\n")
+        f.write("rest.api.enable=true\n")
         # f.write("initial.load.create.first=true\n")  
         # f.write("initial.load.use.extract.job.enabled=true\n")         
         f.close

From 5b155f729f54f55649babcb31abda7d4a12720d4 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 5 Apr 2018 14:55:32 +0630
Subject: [PATCH 534/651] update addorder

---
 app/assets/javascripts/addorder.js          | 88 ++++++++++++---------
 app/views/origami/addorders/detail.html.erb |  2 +-
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index a8de44b1..d918265c 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -12,6 +12,17 @@ $(function() {
 
     var menu_list = $('.menu_items_list');
     menu_list.empty();
+
+     type = window.location.href.indexOf("quick_service");
+     modify_order = window.location.href.indexOf("modify_order");
+      if (type != -1 && modify_order != -1) {
+        url_item = '../../../addorders/'+url_item;
+      }if(modify_order == -1 && type != -1){
+        url_item = 'addorders/'+url_item;
+      }
+      if (type ==-1 && modify_order == -1){
+        url_item = url_item
+      }
     //Start Ajax
     $.ajax({      
       type: "GET",         
@@ -36,32 +47,34 @@ $(function() {
               image_path = "/image/logo.png";
             }
 
-            row = '<div class="card custom-card testimonial-card fadeInRight" style="">'
+            row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                      +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
                       +'<div class="col-md-9">'+ product[field].name +'</div>'
-                      +"<div class='col-md-3 add_icon' data-item-code='"
-                        + product[field].item_code +"' data-name='"
-                        + product[field].name +"' data-qty = '"+ qty +"' data-price = '"
-                        + product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
-                        + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
-                        + JSON.stringify(item_attributes) +"' data-options = '"
-                        + options +"' data-image='"+image_path+"'>"
+                      +"<div class='col-md-3 menu_item_box' data-item-code='"
+                    + product[field].item_code +"' data-instance = '"
+                    +JSON.stringify(item_attributes)+"' data-id = '"
+                    +JSON.stringify(item_attributes)+"' data-item = '"
+                    +JSON.stringify(item_attributes)+"' data-option = '"
+                    +JSON.stringify(menu_items[field].options)+"'data-opt = '"
+                    +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
+                    +JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
                       +"<i class='fa fa-bars material-icons'>"
                       +'view_list</i>'
                       +'</div>'
                      +'</div>'
 
-                  +"<div class='menu_item_box'  data-item-code='"
-                    + product[field].item_code +"' data-instance = '"
-                    +JSON.stringify(item_attributes)+"' data-id = '"
-                    +JSON.stringify(item_attributes)+"' data-item = '"
-                    +JSON.stringify(item_attributes)+"' data-option = '"
-                    +JSON.stringify(item_attributes)+"' data-item-sets = '"
-                    +JSON.stringify(item_attributes)+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
+                  +"<div class='add_icon'  data-item-code='"
+                        + product[field].item_code +"' data-name='"
+                        + product[field].name +"' data-qty = '"+ qty +"' data-price = '"
+                        + product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
+                        + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
+                        + JSON.stringify(item_attributes) +"' data-options = '"
+                          + JSON.stringify(menu_items[field].options) +"' data-opt = '"
+                          + JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"'>"
 
-                    +"<div class='card-block custom-card-block'>"
-                      +"<img id='logo' height='125px' src='"+image_path+"'>"
-                    +"</div>"
+                    // +"<div class='card-block custom-card-block'>"
+                    //   +"<img id='logo' height='125px' src='"+image_path+"'>"
+                    // +"</div>"
 
                     +'<div class="card-footer custom-card-footer">'
                       +'<span>'+ product[field].unit_price +'</span>'
@@ -231,6 +244,7 @@ $(function() {
   $(document).on('click', '.set_item_box', function(event){ 
     $(".instance-list").empty();
     $(".options-list").empty();
+    $(".selected-set-list").empty();
     $('.set_change_qty').val(1);
     change_qty_plus_minus("set_count","set_plus","set_minus");
     data =  $(this).parent().children().children('.add_icon');
@@ -353,7 +367,7 @@ $(function() {
             sub_total       = $('#set_total_price').text();
             name            = $(this).data('name');
             price           = $(this).data('price');
-            options         = $(this).attr('data-options','');
+            options         = $(this).attr('data-options','[]');
             // qty             = $('#set_change_qty').val();
             qty             = document.getElementById("set_count").value;
             total           = qty*price;
@@ -364,7 +378,8 @@ $(function() {
                             +"' data-name='"+$(this).data('name')
                             +"' data-code='"+code
                             +"' data-price='"+$(this).data('price')
-                            +"' data-option='"+JSON.stringify($(this).data('option'))
+                            +"' data-option='[]"
+                            +"' data-options='"+JSON.stringify($(this).data('options'))
                             +"' data-min-qty='"+$(this).data('min-qty')
                             +"' data-max-qty='"+$(this).data('max-qty')
                             +"' data-parent-code='"+$(this).data('parent-code')
@@ -387,7 +402,7 @@ $(function() {
                         +'</div>'
               $(".selected-set-list").append(set);
           }else{
-             swal("Alert !", 'Maximum Qty is  ' + max_qty + "  items", "warning");
+             swal("Alert !", 'Maximum Select is  ' + max_qty + "  items", "warning");
           }
         // }
         $('#set_unit_price').text(price);
@@ -419,8 +434,7 @@ $(function() {
 
     default_instance = $('.set-item');
 
-    var items  = $('.selected-instance');
-
+    var items  = $('.selected-set');
     if (items.length >= min_qty) {
 
       item = get_set_item(items);
@@ -432,11 +446,10 @@ $(function() {
         code          = $('.set-item').attr('data-code');
         name          = $('.set-item').attr('data-name');
         price         = $('.set-item').attr('data-price');
-        option_name     = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
+        option_name   = ($('.set-item').attr('data-options') === 'undefined') ? ' ' :$('.set-item').attr('data-options');
         option        = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options');
         parent        = $('.set-item').attr('data-parent');
         total         = qty * price ;
-
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
               +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -454,13 +467,14 @@ $(function() {
       var rowCount = $('.summary-items tbody tr').length+1;
       var set_option = []
       $(items).each(function(i){
-        code          = $(items[i]).attr('data-code');
-        name          = $(items[i]).attr('data-name');
-        price         = $(items[i]).attr('data-price');
-        set_option_name   = ($(items[i]).attr('data-options')  === 'undefined') ? ' ' :$(items[i]).attr('data-options');
-        set_option= ($(items[i]).attr('data-options')  === '') ? '[]' :$(items[i]).attr('data-options');
-        sub_item      = $(items[i]).attr('data-sub-item');
-        total         = qty * price ;
+        console.log($(items[0]).attr('data-name'))
+        code              = $(items[i]).attr('data-code');
+        name              = $(items[i]).attr('data-name');
+        price             = $(items[i]).attr('data-price');
+        set_option_name   = ($(items[i]).attr('data-options') === 'undefined') ? '' :$(items[i]).attr('data-options');
+        set_option        = ($(items[i]).attr('data-options') === 'undefined') ? '[]' :$(items[i]).attr('data-options');
+        sub_item          = $(items[i]).attr('data-sub-item');
+        total             = qty * price ;
 
         row ="<tr class='item_box' data-price ='"
               +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
@@ -711,6 +725,7 @@ $(function() {
 
     attribute_arr = get_selected_attributes('selected-attribute');
     option_arr    = get_selected_attributes('selected-option');
+    console.log(option_arr)
     if (item_row.length>0) {
       var instances = jQuery.parseJSON(item_row.attr('data-instances'));
       
@@ -748,6 +763,7 @@ $(function() {
     $('.add_to_order').attr('data-name',$('#title_name').text());
     $('.add_to_order').attr('data-attributes',JSON.stringify(attribute_arr));
     $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
+    $('.add_to_order').attr('data-opt',JSON.stringify(option_arr));
     var item_data = $(this);
     item = get_item(item_data,"add_to_order");
     customer_display_view(item,"add");
@@ -785,8 +801,7 @@ $(function() {
       option_name = ' ';
       data_option = '[]';
     }
-
-
+console.log(d_option)
     var rowCount = $('.summary-items tbody tr').length+1;
     var item_row = $('.summary-items tbody tr');
     
@@ -794,7 +809,8 @@ $(function() {
       item_code = $(item_row[i]).attr('data-code');
       instance_code = $(item_row[i]).attr('data-instance-code');
       r_option = $(item_row[i]).attr('data-opt');
-      if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) {
+      console.log(r_option)
+      if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) {        
         if (qty > 1) {            
           qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty;
         }else{            
@@ -804,7 +820,7 @@ $(function() {
         $(item_row[i]).children('#item_qty').text(qty);
         parseFloat($(item_row[i]).children('#item_price').text(parseFloat(price*qty).toFixed(2)));
         append =1;
-      }else{
+      }else{        
         if (qty > 1) {            
           qty = qty;
         }else{            
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 93569170..d88cce17 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -405,7 +405,7 @@
                         <p class="hidden" id="set_item_code"></p>
                         <p></p>
 
-                        <div class="" id="modal-slimscroll" data-height="250">
+                        <div class="" id="modal-slimscroll" data-height="100">
                         <div class="options-list" style="margin-top:-5px">
                         </div>
 

From 1fd6414886152a2eb27a5d6ef017562837eb547e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 15:06:55 +0630
Subject: [PATCH 535/651] add api for survey

---
 app/controllers/api/survey_controller.rb | 47 ++++++++++++++++++++++++
 config/routes.rb                         |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 app/controllers/api/survey_controller.rb

diff --git a/app/controllers/api/survey_controller.rb b/app/controllers/api/survey_controller.rb
new file mode 100644
index 00000000..879c9ea7
--- /dev/null
+++ b/app/controllers/api/survey_controller.rb
@@ -0,0 +1,47 @@
+class Api::SurveyController < Api::ApiController
+	skip_before_action  :authenticate
+
+	def index
+       	dining_facility = DiningFacility.find(params[:id])
+       	survey_data  	= Survey.find_by_dining_name(dining_facility.name)
+       	countries		= Lookup.collection_of("country")
+       	if !countries.nil? || !survey_data.nil?
+       		render :json => { :status => true, :data => { :countries => countries, :survey_data => survey_data} }
+       	else
+       		render :json => { :status => true, :error_message => "There is no data" }
+       	end
+	end
+
+	def create
+		dining_facility  = DiningFacility.find(params[:id])
+		cashier_zone      = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
+		shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
+		
+		if params[:survey_id]
+			survey = Survey.find(params[:survey_id])
+		else
+			survey = Survey.new
+		end
+		survey.dining_name 		= dining_facility.name
+		survey.shift_id 		= shift_by_terminal.id
+		survey.child 			= params[:child]
+		survey.adult 			= params[:adult]
+		survey.male 			= params[:male]
+		survey.female 			= params[:female]
+		survey.local 			= params[:local]
+		survey.created_by 		= current_login_employee.name
+		survey.total_customer 	= params[:total_customer]
+		survey.total_amount 	= params[:total_amount]
+		survey.foreigner 		= params[:foreigner].to_json
+		survey.save!
+
+		render :json => { :status => true }
+	end
+
+	# private
+	#     def survey_params
+	#       params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, 
+	#       	:dining_name,:created_by,:total_customer,:total_amount)
+	#     end
+
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 94db2ebd..ace0f946 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,6 +78,8 @@ scope "(:locale)", locale: /en|mm/ do
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
       post "call_waiter" => "call_waiters#index"
+      get "survey/:id" => "survey#index"
+      post "survey/:id" => "survey#create"
     end
 
     

From 09594f83f22bec4db4dfc5d999ae85c48074d3d5 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 5 Apr 2018 16:08:20 +0630
Subject: [PATCH 536/651] print setting for jade print

---
 app/assets/javascripts/OQS.js                |  3 +-
 app/controllers/print_settings_controller.rb |  2 +
 app/views/layouts/login_dashboard.html.erb   |  4 +-
 app/views/print_settings/_form.html.erb      | 54 +++++++++++++++-----
 config/secrets.yml                           |  2 +-
 5 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 2bbf07bb..1409c829 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -93,8 +93,7 @@ $(document).on('turbolinks:load', function() {
 	     var oqs_append = $('.oqs_append');
 	     oqs_append.empty();
 	     var filter = $('.filter').text();
-
-	     console.log(table_id)
+	     
 	    //Start Ajax
 	    $.ajax({      
 	      type: "GET",         
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index f12778af..991f4ad2 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -18,10 +18,12 @@ class PrintSettingsController < ApplicationController
   # GET /print_settings/new
   def new
     @print_setting = PrintSetting.new
+    @server_mode = ENV["SERVER_MODE"]
   end
 
   # GET /print_settings/1/edit
   def edit
+    @server_mode = ENV["SERVER_MODE"]
   end
 
   # POST /print_settings
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index d3e4729d..329e9240 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -11,8 +11,8 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
     <!-- Google Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+    <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> -->
 
     <%= stylesheet_link_tag    'login', media: 'all', 'data-turbolinks-track': 'reload' %>
     
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index bec1b931..18ed2ab3 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -1,4 +1,3 @@
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <div class="card">
@@ -11,7 +10,16 @@
           <%= f.input :unique_code %>
           <%= f.input :template %>
           <%= f.input :font %>
-          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
+          <%
+            if(@server_mode != 'cloud')
+          %>
+            <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
+          <%
+             else              
+          %>
+            <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %>
+          <% end %>
+
           <%= f.input :brand_name %>
           <%= f.input :printer_type %>
           <%= f.input :api_settings %>
@@ -64,20 +72,38 @@
 
 <script type="text/javascript">
   $(document).ready(function(){
+    var serverMode = "<%= @server_mode %>";    
+    if(serverMode == 'cloud'){
+      var printers = code2lab.getPrinters();      
+      var printerInfo = JSON.parse([printers]); 
+      var select = $("#print_setting_printer_name"); 
+
+      $.each(printerInfo, function(key, value) {      
+       $('#print_setting_printer_name')
+           .append($("<option></option>")
+                      .attr("value",value.target)
+                      .text(value.deviceName)); 
+      }); 
+    } 
 
       // if selected printer change call and bind 
-      $("#print_setting_printer_name").on("change", function(){
-        var printer_name = $(this).val();        
-        $.ajax({
-          type: "GET",
-          url: "/get_printer_options/"+printer_name,          
-          success:function(result){             
-            $("#print_setting_brand_name").val(result.model);
-            $("#print_setting_api_settings").val(result.url);
-          }
-        });
-      });
-  });
+      $("#print_setting_printer_name").on("change", function(){        
+        if(serverMode != 'cloud'){
+          var printer_name = $(this).val();        
+          $.ajax({
+            type: "GET",
+            url: "/get_printer_options/"+printer_name,          
+            success:function(result){             
+              $("#print_setting_brand_name").val(result.model);
+              $("#print_setting_api_settings").val(result.url);
+            }
+          });
+        }
+        else {
+          $("#print_setting_api_settings").val($(this).val());
+        }
+      });    
+  });  
 
   function isNumberKey(evt) {
       var charCode = (evt.which) ? evt.which : event.keyCode;
diff --git a/config/secrets.yml b/config/secrets.yml
index 076b6691..111e1843 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From 7c15dac2aaacb02c3555b8694fbac189300e170c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 17:30:44 +0630
Subject: [PATCH 537/651] webview

---
 app/assets/javascripts/origami.js          | 12 +++++++++
 app/controllers/api/survey_controller.rb   |  2 +-
 app/controllers/base_origami_controller.rb | 29 ++++++++++++++++++++++
 app/controllers/origami/home_controller.rb |  7 ++++++
 app/views/origami/dashboard/index.html.erb |  2 +-
 app/views/origami/home/index.html.erb      |  3 +++
 config/locales/en.yml                      |  2 +-
 config/locales/mm.yml                      |  2 +-
 8 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 573f7c9e..7e91163f 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -387,3 +387,15 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 function setHeaderBreadCrumb(params){
 	$("#others_payment").html(params);
 }
+
+//show hide nav bar for webview
+function showHideNavbar(webview,page){
+	// if(webview){
+		$("nav.navbar").hide();
+		// if(page=="index"){
+		// 	$(".btn-lists").hide();
+		// }
+	// }else{
+	// 	$("nav.navbar").show();
+	// }
+}
diff --git a/app/controllers/api/survey_controller.rb b/app/controllers/api/survey_controller.rb
index 879c9ea7..23f9c699 100644
--- a/app/controllers/api/survey_controller.rb
+++ b/app/controllers/api/survey_controller.rb
@@ -1,5 +1,5 @@
 class Api::SurveyController < Api::ApiController
-	skip_before_action  :authenticate
+	# before_action  :authenticate
 
 	def index
        	dining_facility = DiningFacility.find(params[:id])
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index e14a6959..45b9434d 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -33,5 +33,34 @@ class BaseOrigamiController < ActionController::Base
   def shop_detail
     @shop = Shop.first
   end
+
+  #check webview
+  def check_mobile
+    status = false
+    if request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
+        status = true
+    end
+    return status
+  end
   
+  # protected
+  #   # Authenticate the user with token based authentication
+  #   def authenticate
+  #     authenticate_token || render_unauthorized
+  #   end
+
+  #   def authenticate_token
+  #     authenticate_with_http_token do |token, options| 
+  #       Rails.logger.debug "token - " + token.to_s
+  #       @user = Employee.authenticate_by_token(token)
+  #       if @user
+  #         return true
+  #       end
+  #     end
+  #   end
+
+  #   def render_unauthorized(realm = "Application")
+  #     request.headers["WWW-Authenticate"] = %(Token realm="#{realm.gsub(/"/, "")}")
+  #     render json: 'Bad credentials', status: :unauthorized
+  #   end
 end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 759cb1b6..2d19c9c5 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -3,6 +3,13 @@ class Origami::HomeController < BaseOrigamiController
  before_action :set_dining, only: [:show]
 
   def index
+    @webview = false
+    if check_mobile
+        puts "request data"
+      @webview = true  
+    end
+    puts @webview == false
+
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index c50b92f9..2d7657f5 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -31,7 +31,7 @@
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
           </div>
-          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_order %></div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
         </div>
       </div>
     </div>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index aa000aab..5c0a51cd 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -139,6 +139,9 @@
  <!-- Column One -->
 <script>
 $(document).ready(function(){
+  var webview = <%= @webview %>;
+  showHideNavbar(webview,"index");
+
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dba88aee..0e787751 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -72,7 +72,7 @@ en:
   payment: "Payment"
   backend: "Backend"
   date_time: "DateTime"
-  dine_in_order: "Dine In Order"
+  dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
 
   views:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index e06733e9..406bcaf4 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -67,7 +67,7 @@ mm:
   payment: "ငွေပေး�ျေမှု"
   backend: "နောက်ကွယ်"
   date_time: "ရက်စွဲအ�ျိန်"
-  dine_in_order: "Dine In Order"
+  dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   
   views:

From d1bd0764d81ef554ce46c644dfeeb78f0da39b64 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 17:44:07 +0630
Subject: [PATCH 538/651] check click event when add invoice

---
 app/views/origami/home/show.html.erb  | 4 ++++
 app/views/origami/rooms/show.html.erb | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f28e291f..a1af9a4d 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -870,6 +870,8 @@
     })
 
     $('#add_invoice').on('click', function () {
+        $("#first_bill").prop('disabled',true);
+        $("#pay").prop('disabled',true);
         var dining_id = "<%= @dining.id %>";
         var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
         var ajax_url = "/origami/sale/append_order";
@@ -886,6 +888,8 @@
                 closeOnCancel: false,
                 allowOutsideClick: false
               }, function () {
+                $("#first_bill").removeAttr('disabled');
+                $("#pay").removeAttr('disabled');
                 window.location.reload();
               });
             }
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 565abcf7..05889d32 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -838,6 +838,8 @@ $('#back').on('click',function(){
 })
 
 $('#add_invoice').on('click',function(){
+  $("#first_bill").prop('disabled',true);
+  $("#pay").prop('disabled',true);
   var dining_id = "<%= @room.id %>"
   var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
   var ajax_url = "/origami/sale/append_order";
@@ -854,6 +856,8 @@ $('#add_invoice').on('click',function(){
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
+          $("#first_bill").removeAttr('disabled');
+          $("#pay").removeAttr('disabled');
           window.location.reload();
         });
       }

From dac1a58b646fcfafb52ee82066269b41a1c6ccd2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 10:45:14 +0630
Subject: [PATCH 539/651] print settings

---
 app/assets/stylesheets/origami.scss                | 7 ++++++-
 app/models/print_setting.rb                        | 2 +-
 app/views/print_settings/_form.html.erb            | 2 ++
 db/migrate/20170628103624_create_print_settings.rb | 4 +++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index f882e526..792eb4bd 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -431,4 +431,9 @@ iframe {
 	width: 150%;
 	height: 100%;
 }
-/* End iframe */
\ No newline at end of file
+/* End iframe */
+
+/* section class for webview */
+.section-margin {
+	
+}
\ No newline at end of file
diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb
index a3cfc597..0760b59f 100755
--- a/app/models/print_setting.rb
+++ b/app/models/print_setting.rb
@@ -1,6 +1,6 @@
 class PrintSetting < ApplicationRecord
 	# validations
-	validates_presence_of :name, :unique_code, :printer_name, :brand_name, :api_settings, :page_width, :page_height, :print_copies
+	validates_presence_of :name, :unique_code, :printer_name, :brand_name, :api_settings, :page_width, :page_height, :print_copies, :header_font_size, :item_font_size
 
 	def self.get_precision_delimiter
 		PrintSetting.find_by_unique_code("ReceiptBillPdf")
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index bec1b931..4f88df50 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -11,6 +11,8 @@
           <%= f.input :unique_code %>
           <%= f.input :template %>
           <%= f.input :font %>
+          <%= f.input :header_font_size %>
+          <%= f.input :item_font_size %>
           <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
           <%= f.input :brand_name %>
           <%= f.input :printer_type %>
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index b95e4d2f..a5bb3000 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -4,7 +4,9 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :name, :null => false
       t.string  :unique_code, :null => false
       t.string  :template  
-      t.string  :font, :default => ""    
+      t.string  :font, :default => ""
+      t.integer :header_font_size, :null => false, :default => 11    
+      t.integer :item_font_size, :null => false, :default => 9    
       t.string  :printer_name, :null => false
       t.string  :api_settings
       t.string  :brand_name

From a2e4863c9df5e244501cfeeb35fd333fdb617de8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 15:36:08 +0630
Subject: [PATCH 540/651] check user agent and token when webview is loaded

---
 app/assets/javascripts/origami.js             | 25 ++++++++++------
 app/assets/stylesheets/origami.scss           |  2 +-
 app/controllers/base_origami_controller.rb    | 30 +++++--------------
 .../origami/addorders_controller.rb           | 18 ++++++++---
 .../origami/customers_controller.rb           |  7 +++--
 .../origami/discounts_controller.rb           |  5 ++++
 app/controllers/origami/home_controller.rb    |  7 +++--
 app/controllers/origami/orders_controller.rb  |  5 ++++
 .../origami/other_charges_controller.rb       |  5 ++++
 app/controllers/origami/rooms_controller.rb   |  9 ++++++
 .../origami/split_bill_controller.rb          |  5 ++++
 app/controllers/origami/surveys_controller.rb |  6 +++-
 app/views/origami/addorders/detail.html.erb   |  7 +++++
 app/views/origami/customers/index.html.erb    |  3 ++
 app/views/origami/discounts/index.html.erb    |  3 ++
 app/views/origami/home/index.html.erb         |  5 ++--
 app/views/origami/home/show.html.erb          |  3 ++
 app/views/origami/orders/show.html.erb        |  4 +++
 .../origami/other_charges/index.html.erb      |  4 +++
 app/views/origami/rooms/show.html.erb         |  3 ++
 app/views/origami/split_bill/index.html.erb   |  4 +++
 app/views/origami/surveys/_form.html.erb      |  4 +++
 22 files changed, 119 insertions(+), 45 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 7e91163f..a75779c3 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -389,13 +389,20 @@ function setHeaderBreadCrumb(params){
 }
 
 //show hide nav bar for webview
-function showHideNavbar(webview,page){
-	// if(webview){
-		$("nav.navbar").hide();
-		// if(page=="index"){
-		// 	$(".btn-lists").hide();
-		// }
-	// }else{
-	// 	$("nav.navbar").show();
-	// }
+function showHideNavbar(webview,page=""){
+	if(webview){
+		$("nav.navbar").addClass("hidden");
+		$("section").addClass("section-margin");
+		$(".page-loader-wrapper").addClass("hidden");
+		if(page!=""){
+			$("#back").hide();
+		}
+	}else{
+		$("nav.navbar").removeClass("hidden");
+		$("section").removeClass("section-margin");
+		$(".page-loader-wrapper").removeClass("hidden");
+		if(page!=""){
+			$("#back").show();
+		}
+	}
 }
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 792eb4bd..601b8f89 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -435,5 +435,5 @@ iframe {
 
 /* section class for webview */
 .section-margin {
-	
+	margin-top: -50px;
 }
\ No newline at end of file
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 45b9434d..ddcdc9e2 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -7,7 +7,8 @@ class BaseOrigamiController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
-  helper_method :shop_detail
+  helper_method :shop_detail, :current_token
+
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     # redirect_to origami_root_path
@@ -37,30 +38,13 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
-    if request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
+    authenticate_with_http_token do |token, options|   
+      session[:session_token] = token
+    end
+
+    if session[:session_token] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
         status = true
     end
     return status
   end
-  
-  # protected
-  #   # Authenticate the user with token based authentication
-  #   def authenticate
-  #     authenticate_token || render_unauthorized
-  #   end
-
-  #   def authenticate_token
-  #     authenticate_with_http_token do |token, options| 
-  #       Rails.logger.debug "token - " + token.to_s
-  #       @user = Employee.authenticate_by_token(token)
-  #       if @user
-  #         return true
-  #       end
-  #     end
-  #   end
-
-  #   def render_unauthorized(realm = "Application")
-  #     request.headers["WWW-Authenticate"] = %(Token realm="#{realm.gsub(/"/, "")}")
-  #     render json: 'Bad credentials', status: :unauthorized
-  #   end
 end
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 0e905724..4abab9c8 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -2,13 +2,23 @@ class Origami::AddordersController < BaseOrigamiController
   # before_action :set_dining, only: [:detail]
   
   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')
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
+
+    @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 detail
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
+    
   	today = DateTime.now
     day = Date.today.wday
     @menus    = Menu.all
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index c3a3d3b9..70e5260f 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -9,7 +9,6 @@ class Origami::CustomersController < BaseOrigamiController
   end
 
   def get_customer
-
     filter = params[:filter]
     type   = params[:type]
 
@@ -47,7 +46,11 @@ class Origami::CustomersController < BaseOrigamiController
   end
 
   def add_customer
-
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
+    
     @sale_id             = params[:sale_id]
     @cashier_type        = params[:type]
     @page                = params[:page]
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 6add4a12..0d3899bd 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -3,6 +3,11 @@ class Origami::DiscountsController < BaseOrigamiController
 
   #discount page show from origami index with selected order
   def index
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
+    
 	  sale_id = params[:id]
     @cashier_type = params[:type]
     if Sale.exists?(sale_id)
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 2d19c9c5..427d2a86 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -5,10 +5,8 @@ class Origami::HomeController < BaseOrigamiController
   def index
     @webview = false
     if check_mobile
-        puts "request data"
       @webview = true  
     end
-    puts @webview == false
 
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
@@ -21,6 +19,11 @@ class Origami::HomeController < BaseOrigamiController
 
  # origami table detail
   def show
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
+
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 3181d470..2a600294 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -1,5 +1,10 @@
 class Origami::OrdersController < BaseOrigamiController
   def show
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
+    
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index def94a1f..28ab2c06 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -2,6 +2,11 @@ class Origami::OtherChargesController < BaseOrigamiController
 	authorize_resource :class => false
 
 	def index
+		@webview = false
+	    if check_mobile
+	      @webview = true  
+	    end
+	    
 		sale_id = params[:sale_id]
 		@cashier_type = params[:type]
 	    if Sale.exists?(sale_id)
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 5c0cd454..505d747c 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -5,9 +5,18 @@ class Origami::RoomsController < BaseOrigamiController
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
   end
 
   def show
+    @webview = false
+    if check_mobile
+      @webview = true  
+    end
+    
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index e18828fc..8cd68d9c 100755
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -2,6 +2,11 @@ class Origami::SplitBillController < BaseOrigamiController
 	authorize_resource :class => false
 
 	def index
+		@webview = false
+	    if check_mobile
+	      @webview = true  
+	    end
+	    
 		dining_id = params[:dining_id]
 		@cashier_type = params[:type]
 		@table = DiningFacility.find(dining_id) 
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index b30ff1b0..663fa805 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -1,6 +1,10 @@
 class Origami::SurveysController < BaseOrigamiController
 	def new
-
+		@webview = false
+	    if check_mobile
+	      @webview = true  
+	    end
+    
 		@survey = Survey.new
 		@id             = params[:id]
 		@cashier_type   = params[:type]
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 93569170..6681a7f2 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -591,5 +591,12 @@
       //end Ajax 
     }
     //end show list function
+
+    /* check webview loaded*/
+    var webview = '';
+    <%if @webview %>
+      var webview = <%= @webview %>;
+      showHideNavbar(webview);
+    <% end %>
   });
 </script>
\ No newline at end of file
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 181319b9..59badabe 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -274,6 +274,9 @@
   var cashier_type = "<%= @cashier_type %>";
   var page     = "<%= @page %>"; 
   $(function() {
+    /* check webview loaded*/
+    var webview = <%= @webview %>;
+    showHideNavbar(webview);
       /*$('.datepicker').datepicker({
        setDate: '12-12-1999',
        format : 'dd-mm-yyyy',
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index fc05b630..59341bcb 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -257,6 +257,9 @@
 var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function(){
     	setHeaderBreadCrumb(_DISCOUNTS_);
+    	/* check webview loaded*/
+		var webview = <%= @webview %>;
+		showHideNavbar(webview);
 
 		$('#back').on('click',function(){
 		    var id       = $("#table_id").text();
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 5c0a51cd..38f0cc79 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
  <!-- Column One -->
- <div class="col-lg-10 col-md-10 col-sm-10">
+ <div class="<%= @webview==true ? 'col-lg-12 col-md-12 col-sm-12' : 'col-lg-10 col-md-10 col-sm-10' %>">
 
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist">
@@ -116,7 +116,7 @@
    </div>
    <!-- tabs - End -->
  </div>
- <div class="col-lg-2 col-md-2 col-sm-2">
+ <div class="<%= @webview==true ? 'hidden' : 'col-lg-2 col-md-2 col-sm-2' %>">
    <!-- <button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button> -->
    <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
             <i class="material-icons">reply</i>
@@ -141,7 +141,6 @@
 $(document).ready(function(){
   var webview = <%= @webview %>;
   showHideNavbar(webview,"index");
-
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index a1af9a4d..a10d15ba 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -604,6 +604,9 @@
 <script>
   var cashier_type = "cashier";
     $(document).ready(function () {
+      /* check webview loaded*/
+      var webview = <%= @webview %>;
+      showHideNavbar(webview);
       /* start check first bill or not*/
         var receipt_no = "";
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index fe3a62ef..4a5158ef 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -253,6 +253,10 @@
 </div>
 <script>
   $(document).ready(function(){
+    /* check webview loaded*/
+    var webview = <%= @webview %>;
+    showHideNavbar(webview);
+    
     $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index 1423d1a6..b9dbbc60 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -212,6 +212,10 @@ var cashier_type = "<%= @cashier_type %>";
 
 	$(document).ready(function(){   
     setHeaderBreadCrumb(_OTHER_CHARGES_);
+    /* check webview loaded*/
+    var webview = <%= @webview %>;
+    showHideNavbar(webview);
+      
 		$(".cashier_number").on('click', function(event){
 			if(event.handled !== true) {
 				var original_value=0;
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 05889d32..1df94a0c 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -542,6 +542,9 @@
 <script>
 var cashier_type = "cashier";
 $(document).ready(function(){
+   /* check webview loaded*/
+    var webview = <%= @webview %>;
+    showHideNavbar(webview);
   // $(".tables").on('click', function(){
   //     var customer_id=$(".customer-id").text();
   //     show_customer_details(customer_id);
diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb
index ff698bbc..6189f466 100644
--- a/app/views/origami/split_bill/index.html.erb
+++ b/app/views/origami/split_bill/index.html.erb
@@ -336,6 +336,10 @@
  	var cashier_type = '<%= @cashier_type %>';
  	$(document).ready(function(){
 	  setHeaderBreadCrumb(_SPLIT_BILL_);
+	  /* check webview loaded*/
+      var webview = <%= @webview %>;
+      showHideNavbar(webview);
+      
  		$('#back').on('click',function(){
  			backToOrigami();
  		})
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 967a5837..5640b549 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -245,6 +245,10 @@
 <script type="text/javascript">
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
+    /* check webview loaded*/
+    var webview = <%= @webview %>;
+    showHideNavbar(webview);
+      
     $('.foreignerDiv').removeClass("hidden");
     setHeaderBreadCrumb(_SURVEY_);
     <% if !@survey_data.nil? %>

From 4bea58805a28fc38074556059ab3916d03e9820b Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 5 Apr 2018 17:18:02 +0630
Subject: [PATCH 541/651] merge edit for master

---
 config/secrets.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index eaac38a9..111e1843 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,13 +12,8 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-<<<<<<< HEAD
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: cloud
-=======
-  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
->>>>>>> fe01948dd322688f7d59acd0d002b569dbbd40e2
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From 2acbade78955c0b930976ad30a9dbe2a65c387a8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 17:50:13 +0630
Subject: [PATCH 542/651] remove conflict in secret

---
 config/secrets.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index eaac38a9..111e1843 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,13 +12,8 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-<<<<<<< HEAD
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: cloud
-=======
-  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
->>>>>>> fe01948dd322688f7d59acd0d002b569dbbd40e2
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From 85b92fd3a7581e3a87f78f45faef10b9f11d52ff Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 5 Apr 2018 17:52:33 +0630
Subject: [PATCH 543/651] addorder js for product

---
 app/assets/javascripts/addorder.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index d918265c..e49f7446 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -13,16 +13,15 @@ $(function() {
     var menu_list = $('.menu_items_list');
     menu_list.empty();
 
-     type = window.location.href.indexOf("quick_service");
-     modify_order = window.location.href.indexOf("modify_order");
-      if (type != -1 && modify_order != -1) {
-        url_item = '../../../addorders/'+url_item;
-      }if(modify_order == -1 && type != -1){
-        url_item = 'addorders/'+url_item;
-      }
-      if (type ==-1 && modify_order == -1){
-        url_item = url_item
-      }
+        if (type != -1 && modify_order != -1) {
+          url_item = '../../../../../'+url_item;
+        }
+        if(modify_order == -1 && type != -1){
+          url_item = '../../../../'+url_item;
+        }
+        if (type ==-1 && modify_order == -1){
+          url_item = url_item
+        }
     //Start Ajax
     $.ajax({      
       type: "GET",         
@@ -42,7 +41,15 @@ $(function() {
             item_attributes = [];
 
             if (product[field].image_path) {
-              image_path = product[field].image_path.url;
+              if (type != -1 && modify_order != -1) {
+                image_path = '../../'+product[field].image_path.url;
+              }
+              if(modify_order == -1 && type != -1){
+               image_path = '../../../../'+product[field].image_path.url;
+              }
+              if (type ==-1 && modify_order == -1){
+                image_path = product[field].image_path.url;
+              }
             }else{
               image_path = "/image/logo.png";
             }

From 769698e09e0c73555314eca27561a94189309d79 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 5 Apr 2018 18:23:29 +0630
Subject: [PATCH 544/651] Add MoveTablePdf and FOC update error

---
 .../origami/movetable_controller.rb           | 23 ++++--
 app/models/printer/receipt_printer.rb         |  4 +-
 app/models/sale_payment.rb                    |  2 +-
 app/pdf/move_table_pdf.rb                     | 79 ++++++++++++++++---
 app/pdf/order_item_pdf.rb                     |  4 +-
 app/pdf/order_summary_pdf.rb                  |  4 +-
 6 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 20aaf0c5..3844293e 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -62,9 +62,19 @@ class Origami::MovetableController < BaseOrigamiController
     bookings = Booking.where('dining_facility_id=?',change_from)
 
     booking_array = Array.new
-    bookings.each do | booking |
-      if booking.sale_id.nil? && booking.booking_status != 'moved'
-        booking_array.push(booking)
+    order_items = Array.new
+    if !bookings.nil?
+      bookings.each do | booking |
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          booking_array.push(booking)
+        end
+
+        booking.booking_orders.each do |booking_order|
+          order = Order.find(booking_order.order_id)
+          order.order_items.each do |order_item|
+            order_items.push(order_item)
+          end
+        end
       end
     end
 
@@ -82,12 +92,13 @@ class Origami::MovetableController < BaseOrigamiController
     #print_settings = PrintSetting.find_by_unique_code(unique_code)
     printer_array = []
     printer_array = PrintSetting.where(:unique_code => unique_code)
+
     for i in 0..pdf_no
       if i != pdf_no
         print_settings = printer_array[i]
-        printer        = Printer::ReceiptPrinter.new(print_settings)   
-        printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by)
+        printer        = Printer::ReceiptPrinter.new(print_settings)  
+        printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items)
       end  
     end  
-  end    
+  end
 end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 447543f2..26c31c6f 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -239,11 +239,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Move Table Print
-  def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by)
+  def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
     #Use CUPS service
     #Generate PDF
     #Print
-    pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by)
+    pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
     pdf.render_file "tmp/print_move_table.pdf"
     self.print("tmp/print_move_table.pdf")
   end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 5cd7ea40..beb478fb 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -255,7 +255,7 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     # add to sale item with foc
-    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and status is null")
+    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }'")
     
     sale_items.each do|item|
       SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)
diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb
index 954f88e9..f3f05572 100644
--- a/app/pdf/move_table_pdf.rb
+++ b/app/pdf/move_table_pdf.rb
@@ -1,18 +1,19 @@
 class MoveTablePdf < Prawn::Document
-  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(printer_settings,to,from,shop_detail,date,type,moved_by)
+    include ActionView::Helpers::NumberHelper
+    attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+    def initialize(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.header_font_size = printer_settings.header_font_size
     self.item_font_size = printer_settings.item_font_size
-    self.margin = 5
-    self.price_width = 35
-    self.qty_width = 20
-    self.total_width = 35
-    self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
-    self.item_height = 15
-    self.item_description_width = (self.page_width-20) / 2
-    self.label_width = 100
+    self.margin = 0
+    self.price_width = 40 # No Need for item
+    self.qty_width = 40
+    self.total_width = 40  # No Need for item
+    self.item_width = self.page_width - (self.qty_width - self.margin)
+    self.item_height = 15   
+    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90  
 
     super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
@@ -37,6 +38,12 @@ class MoveTablePdf < Prawn::Document
     stroke_horizontal_rule
     move_down 5
 
+    add_lining_item(order_items, printer_settings.precision)
+
+    move_down 5
+    stroke_horizontal_rule
+    move_down 5
+
   end
 
   def header (name,type)
@@ -54,5 +61,57 @@ class MoveTablePdf < Prawn::Document
     text "Moved By  : #{moved_by}", :left_margin => -10, :size => self.header_font_size
   end
 
+  def add_lining_item(order_items, precision)
+    y_position = cursor
+
+    bounding_box([0,y_position], :width => self.item_width) do
+        text "Item", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width) do
+        text "Qty", :size => self.item_font_size,:align => :left
+    end
+
+    stroke_horizontal_rule
+    move_down 5
+
+    add_item(order_items, precision)
+  end
+
+    # Add order items under order info
+    def add_item(order_items, precision)
+        y_position = cursor
+
+        move_down 5
+
+        order_items.each do|odi|
+          # check for item not to show 
+          # if odi.price != 0
+            y_position = cursor
+
+            # bounding_box([0,y_position], :width => self.item_width + 60, :height => self.item_height) do
+            #     text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
+            # end
+            bounding_box([0,y_position], :width => self.item_width) do
+                text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
+            end
+
+            bounding_box([self.item_width,y_position], :width => self.qty_width) do
+                text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+            end
+
+            bounding_box([0,y_position], :width => self.item_width) do
+              text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
+            end
+            
+            if !(odi.alt_name).empty?
+                move_down 4
+                font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+                  text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+                end
+            end
+                 
+        end        
+    end
 
 end
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 89ddcdb6..717a0665 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -4,8 +4,8 @@ class OrderItemPdf < Prawn::Document
   def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = print_settings.header_font_size
+    self.item_font_size = print_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 5d5b9da8..9bf30615 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -4,8 +4,8 @@ class OrderSummaryPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = print_settings.header_font_size
+    self.item_font_size = print_settings.item_font_size
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40

From a44e86ed21faf27542bcd72d67d504ee2d17d1d4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 19:00:13 +0630
Subject: [PATCH 545/651] check orgami js

---
 app/assets/javascripts/origami.js          |  6 +++---
 app/controllers/base_origami_controller.rb | 11 ++++++++---
 app/controllers/origami/home_controller.rb |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index a75779c3..8319dc10 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -389,19 +389,19 @@ function setHeaderBreadCrumb(params){
 }
 
 //show hide nav bar for webview
-function showHideNavbar(webview,page=""){
+function showHideNavbar(webview,page){
 	if(webview){
 		$("nav.navbar").addClass("hidden");
 		$("section").addClass("section-margin");
 		$(".page-loader-wrapper").addClass("hidden");
-		if(page!=""){
+		if(page!=undefined){
 			$("#back").hide();
 		}
 	}else{
 		$("nav.navbar").removeClass("hidden");
 		$("section").removeClass("section-margin");
 		$(".page-loader-wrapper").removeClass("hidden");
-		if(page!=""){
+		if(page!=undefined){
 			$("#back").show();
 		}
 	}
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index ddcdc9e2..828d0787 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -38,13 +38,18 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
+    token_status = false
     authenticate_with_http_token do |token, options|   
+      if token
+        token_status = true 
+      end
       session[:session_token] = token
     end
-
-    if session[:session_token] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
-        status = true
+    
+    if token_status && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
+      status = true
     end
+
     return status
   end
 end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 427d2a86..5ed006a1 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -1,6 +1,6 @@
 class Origami::HomeController < BaseOrigamiController
   authorize_resource :class => false
- before_action :set_dining, only: [:show]
+  before_action :set_dining, only: [:show]
 
   def index
     @webview = false

From 8217b7c2f27f5b38b27425929d01b789da0583fd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 19:22:52 +0630
Subject: [PATCH 546/651] check mobile user

---
 app/controllers/base_origami_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 828d0787..b627ae01 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -38,15 +38,14 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
-    token_status = false
     authenticate_with_http_token do |token, options|   
       if token
-        token_status = true 
+        session[:webview] = true
       end
       session[:session_token] = token
     end
     
-    if token_status && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
+    if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
       status = true
     end
 

From 0b869ccb89547f066cf7cfaceddb83f5419b396c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 12:00:45 +0630
Subject: [PATCH 547/651] cehck mobile

---
 app/controllers/base_origami_controller.rb | 29 +++++++++++++++-------
 app/controllers/origami/home_controller.rb |  1 -
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index b627ae01..64441590 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -16,8 +16,23 @@ class BaseOrigamiController < ActionController::Base
   end
 
   def check_user
-    if current_user.nil?
-      redirect_to root_path
+    token_status = false
+    authenticate_with_http_token do |token, options|   
+      if token
+        token_status = true
+        session[:webview] = true
+        session[:session_token] = token
+      end
+    end
+
+    if token_status
+      if current_user.nil?
+        redirect_to root_path
+      end
+    else
+      if current_user.nil?
+        redirect_to root_path
+      end
     end
   end
 
@@ -38,13 +53,9 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
-    authenticate_with_http_token do |token, options|   
-      if token
-        session[:webview] = true
-      end
-      session[:session_token] = token
-    end
-    
+    puts "check mobile"
+    puts session[:session_token]
+    puts session[:webview]
     if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
       status = true
     end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 5ed006a1..79a86ea9 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -7,7 +7,6 @@ class Origami::HomeController < BaseOrigamiController
     if check_mobile
       @webview = true  
     end
-
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))

From 818f441529e41959d2e118fa1a6efbe4f1c23213 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 13:15:32 +0630
Subject: [PATCH 548/651] check mobile

---
 app/controllers/base_origami_controller.rb |  6 +-----
 app/controllers/origami/home_controller.rb | 10 ++--------
 app/views/origami/home/index.html.erb      |  4 ++++
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 64441590..86fb4ec3 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -25,11 +25,7 @@ class BaseOrigamiController < ActionController::Base
       end
     end
 
-    if token_status
-      if current_user.nil?
-        redirect_to root_path
-      end
-    else
+    if !token_status
       if current_user.nil?
         redirect_to root_path
       end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 79a86ea9..8e00ef80 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -3,10 +3,7 @@ class Origami::HomeController < BaseOrigamiController
   before_action :set_dining, only: [:show]
 
   def index
-    @webview = false
-    if check_mobile
-      @webview = true  
-    end
+    @webview = check_mobile
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@@ -18,10 +15,7 @@ class Origami::HomeController < BaseOrigamiController
 
  # origami table detail
   def show
-    @webview = false
-    if check_mobile
-      @webview = true  
-    end
+    @webview = check_mobile
 
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 38f0cc79..5e280697 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -140,7 +140,11 @@
 <script>
 $(document).ready(function(){
   var webview = <%= @webview %>;
+  if(webview){
+    code2lab.checkMobile(webview); //js func: for mobile login
+  }
   showHideNavbar(webview,"index");
+
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;

From 57ff3e8a65239b6923ec7d900ba8913a9eb6fe65 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Fri, 6 Apr 2018 13:47:59 +0630
Subject: [PATCH 549/651] Edit Print_setting

---
 app/controllers/print_settings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index 991f4ad2..3bf37ae8 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -85,7 +85,7 @@ class PrintSettingsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def print_setting_params
-      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :brand_name, :printer_type, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
+      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :font,:header_font_size, :item_font_size, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
     end
 
   #Shop Name in Navbor

From 38a5ec2bd40364de1b6bbafaa7ad132d2576db6e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 6 Apr 2018 14:07:43 +0630
Subject: [PATCH 550/651] update self.print for cloud

---
 app/models/printer/cashier_station_printer.rb | 10 ++-
 app/models/printer/order_queue_printer.rb     | 56 ++++++++++----
 app/models/printer/receipt_printer.rb         | 75 ++++++++++++++-----
 3 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index d4817346..63239cdc 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -8,7 +8,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     #Print
     pdf = CashierStationOpening.new
     pdf.render_file "tmp/cashier_station_#{order_id}_closing_#{time}.pdf"
-    self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud" 
+      self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf")
+    end
   end
 
   # def print_close_cashier(receipt_no)
@@ -59,7 +62,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     end
     pdf.render_file filename
 
-    self.print(filename, cashier_terminal.printer_name)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud" 
+      self.print(filename, cashier_terminal.printer_name)
+    end
   end
   #sqa
 end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 4a8b1653..62e6f0a7 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -39,14 +39,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       pdf.render_file filename    
 
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)        
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud"
+          self.print(filename, oqs.printer_name)
+        end        
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud"
+          self.print(filename, oqs.printer_name)
+        end
       end 
     # end   
   end
@@ -96,13 +102,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
           end
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
-          if oqs.print_copy               
-            self.print(filename, oqs.printer_name)
-            # self.print(filename.gsub(".","-copy."), oqs.printer_name)
+          if oqs.print_copy  
+             #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud"             
+              self.print(filename, oqs.printer_name)
+              # self.print(filename.gsub(".","-copy."), oqs.printer_name)
+            end
           else
             print_settings.print_copies = 1
             print_settings.save!
-            self.print(filename, oqs.printer_name)
+             #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud"
+              self.print(filename, oqs.printer_name)
+            end
           end
         #end 
       end
@@ -130,14 +142,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
       pdf.render_file filename
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)        
+        #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)   
+        end     
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
       end
     end
   end
@@ -183,15 +201,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
           pdf.render_file filename               
 
           if oqs.print_copy
-            self.print(filename, oqs.printer_name)
-
+            #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud" 
+              self.print(filename, oqs.printer_name)
+            end
             #For print copy
             # pdf.render_file filename.gsub(".","-copy.")
             # self.print(filename.gsub(".","-copy."), oqs.printer_name)
           else
             print_settings.print_copies = 1
             print_settings.save!
-            self.print(filename, oqs.printer_name)
+            #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud" 
+              self.print(filename, oqs.printer_name)
+            end
           end 
         #end
       end
@@ -219,15 +242,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
       pdf.render_file filename
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)
-
+        #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
       end
     end
   end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index a5482b31..1b4e2698 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -24,7 +24,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf"
-    self.print("tmp/receipt.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/receipt.pdf")
+    end
   end
 
   def print_receipt_payment_by_card(booking_id)
@@ -52,8 +55,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_account(sale_id)
@@ -81,8 +86,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_vochure(sale_id)
@@ -110,8 +117,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+     self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_giftcard(sale_id)
@@ -139,8 +148,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_foc(sale_id)
@@ -168,8 +179,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   #Bill Receipt Print
@@ -205,13 +218,19 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
         filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
         pdf.render_file filename
         if printed_status != 'Paid'
-          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+          end
         end
       else
         filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
         pdf.render_file filename
         if printed_status != 'Paid'
-          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+          end
         end
       end
 
@@ -225,7 +244,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    def print_stock_check_result(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
      pdf = StockResultPdf.new(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
      pdf.render_file "tmp/print_stock_check_result.pdf"
-     self.print("tmp/print_stock_check_result.pdf")
+     #no print in cloud server
+     if ENV["SERVER_MODE"] != "cloud"
+       self.print("tmp/print_stock_check_result.pdf")
+      end
    end
 
   #Queue No Print
@@ -235,7 +257,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = QueueNoPdf.new(printer_settings,queue)
     pdf.render_file "tmp/print_queue_no.pdf"
-    self.print("tmp/print_queue_no.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_queue_no.pdf")
+    end
   end
 
   #Bill Receipt Print
@@ -245,7 +270,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = CrmOrderPdf.new(booking,order_items,setting)
     pdf.render_file "tmp/print_crm_order.pdf"
-    self.print("tmp/print_crm_order.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_crm_order.pdf")
+    end
   end
 
   #Queue No Print
@@ -255,7 +283,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = CallWaiterPdf.new(printer_settings,table,time,shop_detail)
     pdf.render_file "tmp/print_call_waiter.pdf"
-    self.print("tmp/print_call_waiter.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_call_waiter.pdf")
+    end
   end
 
   #print receipt pdf from js
@@ -266,10 +297,16 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     # else
       begin
         if count == 1
-          self.print(filename, printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(filename, printer_name)
+          end
         else
           filename = "public/receipts/receipt_bill_#{receipt_no}_#{count}.pdf"
-          self.print(filename, printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(filename, printer_name)
+          end
         end
 
         count -= 1

From 973482bdab6fb151bd3d7370ba39b65ea269436e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 15:14:29 +0630
Subject: [PATCH 551/651] new tables

---
 ...0180406080240_create_order_reservations.rb | 19 +++++++++++++++++++
 ...06080359_create_order_reservation_items.rb | 11 +++++++++++
 .../20180406080436_create_deliveries.rb       |  6 ++++++
 3 files changed, 36 insertions(+)
 create mode 100644 db/migrate/20180406080240_create_order_reservations.rb
 create mode 100644 db/migrate/20180406080359_create_order_reservation_items.rb
 create mode 100644 db/migrate/20180406080436_create_deliveries.rb

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
new file mode 100644
index 00000000..443a1ba6
--- /dev/null
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -0,0 +1,19 @@
+class CreateOrderReservations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :order_reservations do |t|
+      t.string  :
+    	t.string 	:order_type, :null => false
+    	t.string 	:customer_id, :null => false
+    	t.string 	:request_date, :null => false
+    	t.string 	:reserved_date, :null => false
+    	t.integer :item_count, :null => false, :default => 0
+    	t.string 	:payment_type, :null => false
+    	t.string 	:payment_status, :null => false
+    	t.string 	:status, :null => false, :default => "new"
+    end
+  end
+
+  def down
+  	drop_table :order_reservations
+  end
+end
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
new file mode 100644
index 00000000..23531c4d
--- /dev/null
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -0,0 +1,11 @@
+class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
+  def change
+    create_table :order_reservation_items do |t|
+    	
+    end
+  end
+
+  def down
+  	drop_table :order_reservation_items
+  end
+end
diff --git a/db/migrate/20180406080436_create_deliveries.rb b/db/migrate/20180406080436_create_deliveries.rb
new file mode 100644
index 00000000..ef50504d
--- /dev/null
+++ b/db/migrate/20180406080436_create_deliveries.rb
@@ -0,0 +1,6 @@
+class CreateDeliveries < ActiveRecord::Migration[5.1]
+  def change
+    create_table :deliveries do |t|
+    end
+  end
+end

From 3c1be9a185306234e5325212f7d9a36d3fe00edb Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Fri, 6 Apr 2018 15:19:08 +0630
Subject: [PATCH 552/651] Edit From_time & To_time filter in dashboard

---
 app/models/sale.rb | 128 ++++++++++++++++++++++-----------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 363ff77b..f96d3ca1 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -50,7 +50,7 @@ class Sale < ApplicationRecord
       charges = DiningCharge.where('dining_facility_id=?',booking.dining_facility_id).take
       if !charges.nil?        
         block_count, diningprice = DiningCharge.amount_calculate(charges, booking.checkin_at, booking.checkout_at)
-        dining_time = booking.checkin_at.strftime('%H:%M %p').to_s + " - " + booking.checkout_at.strftime('%H:%M %p').to_s
+        dining_time = booking.checkin_at.strftime('%H:%i %p').to_s + " - " + booking.checkout_at.strftime('%H:%i %p').to_s
         create_saleitem_diningcharges(charges, block_count, diningprice, booking.dining_facility.name, dining_time)
       end
 
@@ -1189,7 +1189,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                   else
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                         " and sale_status= 'completed'")
@@ -1203,7 +1203,7 @@ end
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 if !from_time.nil? && !to_time.nil?
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                     else
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                           " and sale_status= 'completed'")
@@ -1218,7 +1218,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
                       else
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                             " and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
@@ -1270,7 +1270,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                   else
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                         " and sale_status= 'completed'")
@@ -1284,7 +1284,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                     else
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                           " and sale_status= 'completed'")
@@ -1299,7 +1299,7 @@ end
                     .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                     if !from_time.nil? && !to_time.nil?
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
                       else
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30') between '#{from}' and '#{to}'"+
                             " and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
@@ -1348,7 +1348,7 @@ end
       if current_user.nil?
         query = Sale.select("grand_total")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               else
                 query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
               end
@@ -1358,7 +1358,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("grand_total")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
             else
               query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
             end
@@ -1369,7 +1369,7 @@ end
           if !shift.nil?
             query = Sale.select("grand_total")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
               else
                 query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',from,to,shift.id)
               end
@@ -1409,7 +1409,7 @@ end
         query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                   .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                   if !from_time.nil? && !to_time.nil?
-        query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
+        query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'")
                   else
         query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                   end
@@ -1420,7 +1420,7 @@ end
           query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                     if !from_time.nil? && !to_time.nil?
-          query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
+          query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'")
                     else
           query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                     end
@@ -1432,7 +1432,7 @@ end
             query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                   .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                       if !from_time.nil? && !to_time.nil?
-            query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and shift_sale_id='#{shift.id}'")
+            query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and shift_sale_id='#{shift.id}'")
                       else
             query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and shift_sale_id='#{shift.id}'")
                       end
@@ -1473,14 +1473,14 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).sum("grand_total")
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).sum("grand_total")
         else
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to).sum("grand_total")
         end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).sum("grand_total")
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).sum("grand_total")
           else
             total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to).sum("grand_total")
           end
@@ -1488,7 +1488,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                   .sum("grand_total")
             else
               total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',from,to,shift.id)
@@ -1518,14 +1518,14 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).count
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).count
         else
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to).count
         end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).count
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).count
           else
             total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to).count
           end
@@ -1533,7 +1533,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and shift_sale_id = ?',from,to,from_time,to_time,shift.id).count
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and shift_sale_id = ?',from,to,from_time,to_time,shift.id).count
             else
               total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id = ?',from,to,shift.id).count
             end
@@ -1560,7 +1560,7 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         else
@@ -1571,7 +1571,7 @@ end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
           else
@@ -1583,7 +1583,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
             else
@@ -1620,7 +1620,7 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
         else
@@ -1631,7 +1631,7 @@ end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
                 .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
                 .sum("payment_amount")
           else
@@ -1643,7 +1643,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and s.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and s.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
                 .sum("payment_amount")
             else
@@ -1681,7 +1681,7 @@ end
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+            .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
             .first()
         else
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
@@ -1692,7 +1692,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
             query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-              .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
@@ -1704,7 +1704,7 @@ end
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
               query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-                .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .first()
             else
               query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
@@ -1741,7 +1741,7 @@ end
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("distinct sp.payment_method")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
         else
           query = Sale.select("distinct sp.payment_method")
@@ -1752,7 +1752,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
           else
             query = Sale.select("distinct sp.payment_method")
@@ -1764,7 +1764,7 @@ end
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
               query = Sale.select("distinct sp.payment_method")
-                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             else
               query = Sale.select("distinct sp.payment_method")
@@ -1799,16 +1799,16 @@ end
   def self.payment_sale(payment_method, today, current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     time_query = ''
     if !from_time.nil? && !to_time.nil?
-      time_query = " and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'"
+      time_query = " and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'"
     end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
             else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
         else
@@ -1825,9 +1825,9 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
               if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
               else
-                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
               end
               query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
           else
@@ -1845,9 +1845,9 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
                 if payment_method == 'card'
-                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 else
-                  query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                  query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                 end
                 query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
             else
@@ -1915,7 +1915,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
             .first()
         else
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
@@ -1928,7 +1928,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select("count(sales.customer_id) as total_dinein_cus")
@@ -1942,7 +1942,7 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.select("count(sales.customer_id) as total_dinein_cus")
                 .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .first()
             else
               query = Sale.select("count(sales.customer_id) as total_dinein_cus")
@@ -1984,7 +1984,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZsales.receipt_date,"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZsales.receipt_date,"%H:%i") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
               .first()
         else
           query = Sale.select("count(sales.customer_id) as total_take_cus")
@@ -1997,7 +1997,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select("count(sales.customer_id) as total_take_cus")
@@ -2011,7 +2011,7 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.select("count(sales.customer_id) as total_take_cus")
                 .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .first()
             else
               query = Sale.select("count(sales.customer_id) as total_take_cus")
@@ -2053,7 +2053,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
             .first()
         else
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
@@ -2066,7 +2066,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
@@ -2080,7 +2080,7 @@ end
             query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id).first()
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id).first()
               else 
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id).first()
               end
@@ -2118,7 +2118,7 @@ end
         query = Sale.select("count(sales.customer_id) as total_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
                             .first()
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
@@ -2129,7 +2129,7 @@ end
           query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
                           .first()
             else
               query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
@@ -2141,7 +2141,7 @@ end
             query = Sale.select("count(sales.customer_id) as total_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                       .first()
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
@@ -2182,7 +2182,7 @@ end
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
                     .first()
             else
                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
@@ -2194,7 +2194,7 @@ end
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
                           .first()
             else
               query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
@@ -2207,7 +2207,7 @@ end
               .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
               .joins("JOIN orders as b ON b.order_id = a.order_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                           .first()
               else
                 query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
@@ -2261,7 +2261,7 @@ end
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
               end
@@ -2272,7 +2272,7 @@ end
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
               end
@@ -2310,7 +2310,7 @@ end
         query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                         .first()
             else
               query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2321,7 +2321,7 @@ end
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                           .first()
               else
                 query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2333,7 +2333,7 @@ end
             query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                           .first()
               else
                 query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
@@ -2373,7 +2373,7 @@ end
         query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
             else  
               query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
             end
@@ -2385,7 +2385,7 @@ end
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
               else  
                 query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
               end
@@ -2398,7 +2398,7 @@ end
             query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
               else
                 query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
               end
@@ -2444,7 +2444,7 @@ end
       if current_user.nil?
         query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
           if !from_time.nil? && !to_time.nil?
-            query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+            query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                         .sum("a.qty")
           else
             query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2454,7 +2454,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                           .sum("a.qty")
             else
               query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2465,7 +2465,7 @@ end
           if !shift.nil?
             query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
                 if !from_time.nil? && !to_time.nil?
-                  query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                  query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                             .sum("a.qty")
                 else
                   query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)

From 4ddb83b03561c012917b1c0d2b1472b177128e69 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 15:51:12 +0630
Subject: [PATCH 553/651] add order and reservation table

---
 .../20180406080240_create_order_reservations.rb | 17 ++++++++++-------
 ...0406080359_create_order_reservation_items.rb | 15 ++++++++++++++-
 db/migrate/20180406080436_create_deliveries.rb  | 12 ++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index 443a1ba6..04a9b5f6 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -1,15 +1,18 @@
 class CreateOrderReservations < ActiveRecord::Migration[5.1]
   def change
     create_table :order_reservations do |t|
-      t.string  :
-    	t.string 	:order_type, :null => false
-    	t.string 	:customer_id, :null => false
-    	t.string 	:request_date, :null => false
-    	t.string 	:reserved_date, :null => false
+      t.string     :order_reservation_id, :limit => 16, :primary_key => true
+    	t.string 	   :order_reservation_type, :null => false
+    	t.string 	   :customer_id, :null => false
+    	t.datetime 	 :requested_time, :null => false
     	t.integer :item_count, :null => false, :default => 0
-    	t.string 	:payment_type, :null => false
-    	t.string 	:payment_status, :null => false
+      t.integer :total_customer
+    	t.string 	:payment_type
+    	t.string 	:payment_status
+      t.string  :payment_ref
     	t.string 	:status, :null => false, :default => "new"
+      t.string  :order_remark
+      t.string  :reservation_remark
     end
   end
 
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
index 23531c4d..aaf8383b 100644
--- a/db/migrate/20180406080359_create_order_reservation_items.rb
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -1,7 +1,20 @@
 class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
   def change
     create_table :order_reservation_items do |t|
-    	
+    	t.string :order_reservation_items_id, :limit => 16, :primary_key => true
+    	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
+    	t.string :item_status, :null => false, :default => "new"
+		t.string :item_code, :null => false
+		t.string :item_instance_code
+		t.string :item_name, :null => false
+		t.string :alt_name, :null => false
+		t.integer :account_id, :limit => 8, :null => false, :default => 1
+		t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.string :remark
+		t.string :options,
+		t.boolean :taxable, :null => false, :default => true
     end
   end
 
diff --git a/db/migrate/20180406080436_create_deliveries.rb b/db/migrate/20180406080436_create_deliveries.rb
index ef50504d..6b4e6487 100644
--- a/db/migrate/20180406080436_create_deliveries.rb
+++ b/db/migrate/20180406080436_create_deliveries.rb
@@ -1,6 +1,18 @@
 class CreateDeliveries < ActiveRecord::Migration[5.1]
   def change
     create_table :deliveries do |t|
+    	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
+    	t.string :provider, :null => false
+    	t.string :delivery_type, :null => false
+    	t.string :township
+    	t.string :address
+    	t.string :direction_address
+    	t.string :delivery_fee
+    	t.string :remark
     end
   end
+
+  def down
+  	drop_table :deliveries
+  end
 end

From 5acc063f806005700f88f82d9898e4b767c609bb Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 16:44:13 +0630
Subject: [PATCH 554/651] table for doemal

---
 db/migrate/20180406080240_create_order_reservations.rb      | 2 +-
 db/migrate/20180406080359_create_order_reservation_items.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index 04a9b5f6..dae5622f 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -1,6 +1,6 @@
 class CreateOrderReservations < ActiveRecord::Migration[5.1]
   def change
-    create_table :order_reservations do |t|
+    create_table :order_reservations, :id => false do  |t|
       t.string     :order_reservation_id, :limit => 16, :primary_key => true
     	t.string 	   :order_reservation_type, :null => false
     	t.string 	   :customer_id, :null => false
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
index aaf8383b..9d320f77 100644
--- a/db/migrate/20180406080359_create_order_reservation_items.rb
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -1,6 +1,6 @@
 class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
   def change
-    create_table :order_reservation_items do |t|
+    create_table :order_reservation_items, :id => false do |t|
     	t.string :order_reservation_items_id, :limit => 16, :primary_key => true
     	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
     	t.string :item_status, :null => false, :default => "new"
@@ -8,12 +8,13 @@ class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
 		t.string :item_instance_code
 		t.string :item_name, :null => false
 		t.string :alt_name, :null => false
+		t.json   :set_menu_items
 		t.integer :account_id, :limit => 8, :null => false, :default => 1
 		t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
 		t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00
 		t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
 		t.string :remark
-		t.string :options,
+		t.string :options
 		t.boolean :taxable, :null => false, :default => true
     end
   end

From eaf33fc7bfdce35ff5e7b252598e76db3203d150 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 17:03:38 +0630
Subject: [PATCH 555/651] add amount in order reservation

---
 db/migrate/20180406080240_create_order_reservations.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index dae5622f..7f044ff0 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -10,6 +10,10 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
     	t.string 	:payment_type
     	t.string 	:payment_status
       t.string  :payment_ref
+      t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :discount_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00
     	t.string 	:status, :null => false, :default => "new"
       t.string  :order_remark
       t.string  :reservation_remark

From 30da4f37b32109520a6698f73715f2dbf4447de7 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Fri, 6 Apr 2018 17:51:00 +0630
Subject: [PATCH 556/651] Add Shop Name in Login Page

---
 app/assets/stylesheets/login.scss          | 8 ++++++++
 app/views/layouts/login_dashboard.html.erb | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index ed0b36f9..aa743e4b 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -101,3 +101,11 @@
   font-size: 111px;
   padding : 20px 0 20px 0;
 }
+
+/* Shop Name in Login Page */
+.current-shop-name{
+  color : #FFFFFF;
+  font-size: 25px;
+  font-weight: bold;
+  margin : 0 0 25px 0;
+}
\ No newline at end of file
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 329e9240..c660d906 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -65,6 +65,13 @@
                 </p> 
             </div>
         </div>
+        <div class="row">
+            <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
+            <div class="current-shop-name">
+                <span><%= shop_detail.name %></span> 
+                </div>
+            </div>
+        </div>
         <div class="row bg-white">   
             <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
                 <div class="row justify-content-center form-group">                    

From 460ed991af0008b6fafcd7c390ec785226b73a87 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Fri, 6 Apr 2018 18:16:20 +0630
Subject: [PATCH 557/651] Edit Addorder.js and Shop name

---
 app/assets/javascripts/addorder.js         | 4 ----
 app/assets/stylesheets/login.scss          | 4 ++--
 app/views/layouts/login.html.erb           | 7 +++++++
 app/views/layouts/login_dashboard.html.erb | 4 ++--
 config/secrets.yml                         | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 9563131d..e49f7446 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -409,11 +409,7 @@ $(function() {
                         +'</div>'
               $(".selected-set-list").append(set);
           }else{
-<<<<<<< HEAD
-             swal("Alert !", 'Maximum Qty is  ' + max_qty + "  items", "warning");
-=======
              swal("Alert !", 'Maximum Select is  ' + max_qty + "  items", "warning");
->>>>>>> 8217b7c2f27f5b38b27425929d01b789da0583fd
           }
         // }
         $('#set_unit_price').text(price);
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index aa743e4b..a1058d25 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -105,7 +105,7 @@
 /* Shop Name in Login Page */
 .current-shop-name{
   color : #FFFFFF;
-  font-size: 25px;
+  font-size: 21px;
   font-weight: bold;
-  margin : 0 0 25px 0;
+  margin : 0 0 20px 0;
 }
\ No newline at end of file
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index e83a11d0..d6c6c955 100755
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -79,6 +79,13 @@
           <small>Version - 1.0.1</small>
         </p> 
       </div>
+      <div class="row">
+          <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
+            <div class="current-shop-name">
+                <span><%= shop_detail.name %></span> 
+              </div>
+          </div>
+        </div>
       <%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
       <div class="card padding-10">
         <div class="card-header m-l-">
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index c660d906..5db72f79 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -67,8 +67,8 @@
         </div>
         <div class="row">
             <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
-            <div class="current-shop-name">
-                <span><%= shop_detail.name %></span> 
+                <div class="current-shop-name">
+                    <span><%= shop_detail.name %></span> 
                 </div>
             </div>
         </div>
diff --git a/config/secrets.yml b/config/secrets.yml
index 111e1843..076b6691 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From 74aa6caaab0d11b21b88350d8dd5e319d9d8b679 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Fri, 6 Apr 2018 18:19:47 +0630
Subject: [PATCH 558/651] For pull

---
 app/controllers/base_origami_controller.rb    | 25 ++++---
 app/controllers/origami/home_controller.rb    | 11 +--
 app/models/printer/cashier_station_printer.rb | 10 ++-
 app/models/printer/order_queue_printer.rb     | 56 ++++++++++----
 app/models/printer/receipt_printer.rb         | 75 ++++++++++++++-----
 app/views/origami/home/index.html.erb         |  4 +
 ...0180406080240_create_order_reservations.rb | 26 +++++++
 ...06080359_create_order_reservation_items.rb | 25 +++++++
 .../20180406080436_create_deliveries.rb       | 18 +++++
 9 files changed, 197 insertions(+), 53 deletions(-)
 create mode 100644 db/migrate/20180406080240_create_order_reservations.rb
 create mode 100644 db/migrate/20180406080359_create_order_reservation_items.rb
 create mode 100644 db/migrate/20180406080436_create_deliveries.rb

diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index b627ae01..86fb4ec3 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -16,8 +16,19 @@ class BaseOrigamiController < ActionController::Base
   end
 
   def check_user
-    if current_user.nil?
-      redirect_to root_path
+    token_status = false
+    authenticate_with_http_token do |token, options|   
+      if token
+        token_status = true
+        session[:webview] = true
+        session[:session_token] = token
+      end
+    end
+
+    if !token_status
+      if current_user.nil?
+        redirect_to root_path
+      end
     end
   end
 
@@ -38,13 +49,9 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
-    authenticate_with_http_token do |token, options|   
-      if token
-        session[:webview] = true
-      end
-      session[:session_token] = token
-    end
-    
+    puts "check mobile"
+    puts session[:session_token]
+    puts session[:webview]
     if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
       status = true
     end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 5ed006a1..8e00ef80 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -3,11 +3,7 @@ class Origami::HomeController < BaseOrigamiController
   before_action :set_dining, only: [:show]
 
   def index
-    @webview = false
-    if check_mobile
-      @webview = true  
-    end
-
+    @webview = check_mobile
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@@ -19,10 +15,7 @@ class Origami::HomeController < BaseOrigamiController
 
  # origami table detail
   def show
-    @webview = false
-    if check_mobile
-      @webview = true  
-    end
+    @webview = check_mobile
 
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index d4817346..63239cdc 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -8,7 +8,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     #Print
     pdf = CashierStationOpening.new
     pdf.render_file "tmp/cashier_station_#{order_id}_closing_#{time}.pdf"
-    self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud" 
+      self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf")
+    end
   end
 
   # def print_close_cashier(receipt_no)
@@ -59,7 +62,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     end
     pdf.render_file filename
 
-    self.print(filename, cashier_terminal.printer_name)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud" 
+      self.print(filename, cashier_terminal.printer_name)
+    end
   end
   #sqa
 end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 4a8b1653..62e6f0a7 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -39,14 +39,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       pdf.render_file filename    
 
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)        
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud"
+          self.print(filename, oqs.printer_name)
+        end        
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud"
+          self.print(filename, oqs.printer_name)
+        end
       end 
     # end   
   end
@@ -96,13 +102,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
           end
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
-          if oqs.print_copy               
-            self.print(filename, oqs.printer_name)
-            # self.print(filename.gsub(".","-copy."), oqs.printer_name)
+          if oqs.print_copy  
+             #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud"             
+              self.print(filename, oqs.printer_name)
+              # self.print(filename.gsub(".","-copy."), oqs.printer_name)
+            end
           else
             print_settings.print_copies = 1
             print_settings.save!
-            self.print(filename, oqs.printer_name)
+             #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud"
+              self.print(filename, oqs.printer_name)
+            end
           end
         #end 
       end
@@ -130,14 +142,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
       pdf.render_file filename
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)        
+        #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)   
+        end     
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
       end
     end
   end
@@ -183,15 +201,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
           pdf.render_file filename               
 
           if oqs.print_copy
-            self.print(filename, oqs.printer_name)
-
+            #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud" 
+              self.print(filename, oqs.printer_name)
+            end
             #For print copy
             # pdf.render_file filename.gsub(".","-copy.")
             # self.print(filename.gsub(".","-copy."), oqs.printer_name)
           else
             print_settings.print_copies = 1
             print_settings.save!
-            self.print(filename, oqs.printer_name)
+            #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud" 
+              self.print(filename, oqs.printer_name)
+            end
           end 
         #end
       end
@@ -219,15 +242,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
       pdf.render_file filename
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)
-
+        #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
       end
     end
   end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 26c31c6f..8562fca6 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -24,7 +24,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf"
-    self.print("tmp/receipt.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/receipt.pdf")
+    end
   end
 
   def print_receipt_payment_by_card(booking_id)
@@ -52,8 +55,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_account(sale_id)
@@ -81,8 +86,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_vochure(sale_id)
@@ -110,8 +117,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+     self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_giftcard(sale_id)
@@ -139,8 +148,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_foc(sale_id)
@@ -168,8 +179,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   #Bill Receipt Print
@@ -205,13 +218,19 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
         filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
         pdf.render_file filename
         if printed_status != 'Paid'
-          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+          end
         end
       else
         filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
         pdf.render_file filename
         if printed_status != 'Paid'
-          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+          end
         end
       end
 
@@ -225,7 +244,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    def print_stock_check_result(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
      pdf = StockResultPdf.new(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
      pdf.render_file "tmp/print_stock_check_result.pdf"
-     self.print("tmp/print_stock_check_result.pdf")
+     #no print in cloud server
+     if ENV["SERVER_MODE"] != "cloud"
+       self.print("tmp/print_stock_check_result.pdf")
+      end
    end
 
   #Queue No Print
@@ -235,7 +257,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = QueueNoPdf.new(printer_settings,queue)
     pdf.render_file "tmp/print_queue_no.pdf"
-    self.print("tmp/print_queue_no.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_queue_no.pdf")
+    end
   end
 
   #Move Table Print
@@ -255,7 +280,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = CrmOrderPdf.new(booking,order_items,setting)
     pdf.render_file "tmp/print_crm_order.pdf"
-    self.print("tmp/print_crm_order.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_crm_order.pdf")
+    end
   end
 
   #Queue No Print
@@ -265,7 +293,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = CallWaiterPdf.new(printer_settings,table,time,shop_detail)
     pdf.render_file "tmp/print_call_waiter.pdf"
-    self.print("tmp/print_call_waiter.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_call_waiter.pdf")
+    end
   end
 
   #print receipt pdf from js
@@ -276,10 +307,16 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     # else
       begin
         if count == 1
-          self.print(filename, printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(filename, printer_name)
+          end
         else
           filename = "public/receipts/receipt_bill_#{receipt_no}_#{count}.pdf"
-          self.print(filename, printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(filename, printer_name)
+          end
         end
 
         count -= 1
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 38f0cc79..5e280697 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -140,7 +140,11 @@
 <script>
 $(document).ready(function(){
   var webview = <%= @webview %>;
+  if(webview){
+    code2lab.checkMobile(webview); //js func: for mobile login
+  }
   showHideNavbar(webview,"index");
+
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
new file mode 100644
index 00000000..7f044ff0
--- /dev/null
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -0,0 +1,26 @@
+class CreateOrderReservations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :order_reservations, :id => false do  |t|
+      t.string     :order_reservation_id, :limit => 16, :primary_key => true
+    	t.string 	   :order_reservation_type, :null => false
+    	t.string 	   :customer_id, :null => false
+    	t.datetime 	 :requested_time, :null => false
+    	t.integer :item_count, :null => false, :default => 0
+      t.integer :total_customer
+    	t.string 	:payment_type
+    	t.string 	:payment_status
+      t.string  :payment_ref
+      t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :discount_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00
+    	t.string 	:status, :null => false, :default => "new"
+      t.string  :order_remark
+      t.string  :reservation_remark
+    end
+  end
+
+  def down
+  	drop_table :order_reservations
+  end
+end
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
new file mode 100644
index 00000000..9d320f77
--- /dev/null
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -0,0 +1,25 @@
+class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
+  def change
+    create_table :order_reservation_items, :id => false do |t|
+    	t.string :order_reservation_items_id, :limit => 16, :primary_key => true
+    	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
+    	t.string :item_status, :null => false, :default => "new"
+		t.string :item_code, :null => false
+		t.string :item_instance_code
+		t.string :item_name, :null => false
+		t.string :alt_name, :null => false
+		t.json   :set_menu_items
+		t.integer :account_id, :limit => 8, :null => false, :default => 1
+		t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.string :remark
+		t.string :options
+		t.boolean :taxable, :null => false, :default => true
+    end
+  end
+
+  def down
+  	drop_table :order_reservation_items
+  end
+end
diff --git a/db/migrate/20180406080436_create_deliveries.rb b/db/migrate/20180406080436_create_deliveries.rb
new file mode 100644
index 00000000..6b4e6487
--- /dev/null
+++ b/db/migrate/20180406080436_create_deliveries.rb
@@ -0,0 +1,18 @@
+class CreateDeliveries < ActiveRecord::Migration[5.1]
+  def change
+    create_table :deliveries do |t|
+    	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
+    	t.string :provider, :null => false
+    	t.string :delivery_type, :null => false
+    	t.string :township
+    	t.string :address
+    	t.string :direction_address
+    	t.string :delivery_fee
+    	t.string :remark
+    end
+  end
+
+  def down
+  	drop_table :deliveries
+  end
+end

From 37694fd47de1544e0b97949a0b04614595eea7a2 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sat, 7 Apr 2018 12:43:29 +0630
Subject: [PATCH 559/651] =?UTF-8?q?-=E1=80=93=20=03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/origami/dashboard/index.html.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 228da935..d7722e16 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -192,8 +192,6 @@
  <button type="button" data-href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect second_view hidden" style="height: 45px">Customer View</button>
 <script>
 
-
-
   $(".cashier_view").on('click', function() {
     window.location.href = '/origami';
   });

From 7b28d56738bf2a7d9a1fe5e6d0f553b2df862e77 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sat, 7 Apr 2018 14:23:11 +0630
Subject: [PATCH 560/651] update addorder js after git issuse fixed

---
 app/assets/javascripts/addorder.js | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index e49f7446..30ed8af2 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -266,11 +266,22 @@ $(function() {
       $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
 
       value = item_sets[field]["instances"];
-
       $(value).each(function(i){
+        if (type != -1 && modify_order != -1) {
+          url = '../../../../api/restaurant/menu_item_instances/'+value[i]["id"];
+          console.log("ssssssss")
+        }
+        if(modify_order == -1 && type != -1){
+          url = '../../api/restaurant/menu_item_instances/'+value[i]["id"] ;  
+          console.log("aaaaaa")       
+        }
+        if (type ==-1 && modify_order == -1){
+          url   = '../../api/restaurant/menu_item_instances/'+value[i]["id"];
+          console.log("cccccccccc")
+        }
         $.ajax({
           type: "GET",
-            url: '../../api/restaurant/menu_item_instances/'+value[i]["id"],
+            url: url,
             data: {id:value[i]},
             success:function(result){
 
@@ -370,7 +381,7 @@ $(function() {
         //   $(this).removeAttr('data-options');
         //   $('#instance_option').text('')
         // }else {
-          if (rowCount.length+1 <= max_qty) {
+          if (setCount.length+1 <= max_qty) {
             sub_total       = $('#set_total_price').text();
             name            = $(this).data('name');
             price           = $(this).data('price');
@@ -1317,9 +1328,18 @@ console.log(d_option)
  }
 
  function customer_display_view(data,status) {
+  if (type != -1 && modify_order != -1) {
+    url = '../../../../origami/customer_view';
+  }
+  if(modify_order == -1 && type != -1){
+    url = '../../origami/customer_view';           
+  }
+  if (type ==-1 && modify_order == -1){
+    url = '../../origami/customer_view';
+  }
    $.ajax({
           type: "POST",
-          url: '../../origami/customer_view',
+          url: url,
           data: {"data":data,"status":status},
           dataType: "json",
            success:function(result){         

From 14b33a6f8d73bc201d47db22ce1b8b372a2957c4 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sat, 7 Apr 2018 15:53:24 +0630
Subject: [PATCH 561/651] add kitchen role for oqs

---
 README.md                               |  3 +
 app/controllers/home_controller.rb      |  3 +
 app/controllers/oqs/edit_controller.rb  |  1 +
 app/controllers/oqs/home_controller.rb  |  4 +-
 app/controllers/oqs/print_controller.rb |  1 +
 app/models/ability.rb                   | 83 +++++++++++++++++++++++++
 6 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 18eaed7b..6aab5a8a 100755
--- a/README.md
+++ b/README.md
@@ -164,6 +164,9 @@ For CloseCashierCustomisePdf in lookups
 3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal }
 /* Tax Profile Group Types in lookups */
 
+Add Kitchen Role of  Employee 
+   => 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen }
+
 * ToDo list
 
 1. Migration
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d2b0ad36..e720444f 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -70,6 +70,9 @@ class HomeController < ApplicationController
       elsif @employee.role == "account"
         session[:session_token] = @employee.token_session
         redirect_to reports_dailysale_index_path
+      elsif @employee.role == "kitchen"
+        session[:session_token] = @employee.token_session
+        redirect_to oqs_root_path
       else
          render :index
       end
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index ccef4e4a..3da6c31e 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -1,4 +1,5 @@
 class Oqs::EditController < BaseOqsController
+  authorize_resource :class => false
   def index
   	assigned_item_id = params[:id]
     @link_type = params[:type]
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 19d4c17f..23d6341e 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -1,8 +1,6 @@
 class Oqs::HomeController < BaseOqsController
+  authorize_resource :class => false
   def index
-
-  	
-
     # Query for OQS with delivery status false
   	# @queue_items_details = queue_items_query(false)
 
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index baa4af40..d4218666 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -1,4 +1,5 @@
 class Oqs::PrintController < ApplicationController
+  authorize_resource :class => false
   # Print Order Item
   def print
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 0b1edcc3..801b501b 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -98,6 +98,22 @@ class Ability
         can :create, :split_bill
         can :update_sale, :split_bill
 
+        #oqs Home
+        can :index, :home
+        can :index, :show
+        can :get_order_items, :home
+        can :get_items_by_oqs, :home
+        can :update_delivery_status, :home
+        can :queue_items_query, :home
+        can :completed_order, :home
+        can :queue_items_count_query, :home
+
+        can :index, :edit
+        can :update, :edit
+
+        can :print, :print
+        can :print_order_summary, :print
+
     elsif user.role == "cashier"
         
         # can :overall_void, :void
@@ -144,6 +160,22 @@ class Ability
         can :index, :split_bill
         can :create, :split_bill
         can :update_sale, :split_bill
+
+        #oqs Home
+        can :index, :home
+        can :index, :show
+        can :get_order_items, :home
+        can :get_items_by_oqs, :home
+        can :update_delivery_status, :home
+        can :queue_items_query, :home
+        can :completed_order, :home
+        can :queue_items_count_query, :home
+
+        can :index, :edit
+        can :update, :edit
+
+        can :print, :print
+        can :print_order_summary, :print
                                                
     elsif user.role == "account"
 
@@ -201,6 +233,23 @@ class Ability
         can :index, :split_bill
         can :create, :split_bill
         can :update_sale, :split_bill
+
+        #oqs Home
+        can :index, :home
+        can :index, :show
+        can :get_order_items, :home
+        can :get_items_by_oqs, :home
+        can :update_delivery_status, :home
+        can :queue_items_query, :home
+        can :completed_order, :home
+        can :queue_items_count_query, :home
+
+        can :index, :edit
+        can :update, :edit
+
+        can :print, :print
+        can :print_order_summary, :print
+
      elsif user.role == "waiter"
         can :index, :home
         can :show, :home  
@@ -227,6 +276,40 @@ class Ability
         #ability for split_bill
         can :index, :split_bill
         can :create, :split_bill
+
+        #oqs Home
+        can :index, :home
+        can :index, :show
+        can :get_order_items, :home
+        can :get_items_by_oqs, :home
+        can :update_delivery_status, :home
+        can :queue_items_query, :home
+        can :completed_order, :home
+        can :queue_items_count_query, :home
+
+        can :index, :edit
+        can :update, :edit
+
+        can :print, :print
+        can :print_order_summary, :print
+
+    elsif user.role == "kitchen"
+    
+    #oqs Home
+        can :index, :home
+        can :index, :show
+        can :get_order_items, :home
+        can :get_items_by_oqs, :home
+        can :update_delivery_status, :home
+        can :queue_items_query, :home
+        can :completed_order, :home
+        can :queue_items_count_query, :home
+
+        can :index, :edit
+        can :update, :edit
+
+        can :print, :print
+        can :print_order_summary, :print
     end
   end
 end

From 2e19d34ced8f6c422338edccd4614fde324502e9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 09:40:08 +0630
Subject: [PATCH 562/651] add dinga payment and new payment type in report

---
 app/assets/javascripts/origami.js             |   1 +
 app/controllers/home_controller.rb            |   2 +-
 app/controllers/origami/dinga_controller.rb   | 102 +++++++++
 app/controllers/origami/mpu_controller.rb     |   2 +-
 .../origami/payments_controller.rb            |  45 ++--
 .../reports/payment_method_controller.rb      |   4 +-
 app/models/sale.rb                            |  72 ++++---
 app/models/sale_payment.rb                    |  35 ++-
 app/views/origami/dinga/create.json.jbuilder  |   2 +
 app/views/origami/dinga/index.html.erb        | 202 ++++++++++++++++++
 .../origami/others_payments/index.html.erb    |  12 +-
 app/views/origami/payments/show.html.erb      | 106 ++++-----
 app/views/reports/dailysale/index.html.erb    |  29 ++-
 app/views/reports/dailysale/index.xls.erb     |  20 ++
 .../reports/payment_method/index.html.erb     |  10 +
 .../reports/payment_method/index.xls.erb      |  10 +
 config/locales/en.yml                         |   5 +
 config/locales/mm.yml                         |   4 +
 config/routes.rb                              |   2 +
 19 files changed, 543 insertions(+), 122 deletions(-)
 create mode 100644 app/controllers/origami/dinga_controller.rb
 create mode 100644 app/views/origami/dinga/create.json.jbuilder
 create mode 100644 app/views/origami/dinga/index.html.erb

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 8319dc10..fb3f966b 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -27,6 +27,7 @@ _MPU_				= "/&nbsp;&nbsp;&nbsp;MPU PAYMENT";
 _ALIPAY_			= "/&nbsp;&nbsp;&nbsp;Alipay";
 _JUNCTIONPAY_		= "/&nbsp;&nbsp;&nbsp;JunctionPay";
 _PAYMAL_			= "/&nbsp;&nbsp;&nbsp;PAYMAL";
+_DINGA_				= "/&nbsp;&nbsp;&nbsp;DINGA PAYMENT";
 _OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;CHARGES";
 _OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENT";
 _PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENT";
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d2b0ad36..66993577 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -122,7 +122,7 @@ class HomeController < ApplicationController
 
     if !@total_payment_methods.nil?
       @total_payment_methods.each do |payment|
-        if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" || payment.payment_method == "unionpay"
+        if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" || payment.payment_method == "unionpay" || payment.payment_method == "alipay" || payment.payment_method == "paymal" || payment.payment_method == "dinga" || payment.payment_method == "JunctionPay"
           pay = Sale.payment_sale('card', today, current_user,@from,@to,@from_time,@to_time)
           @sale_data.push({'card' => pay.payment_amount})
         else 
diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
new file mode 100644
index 00000000..9126556a
--- /dev/null
+++ b/app/controllers/origami/dinga_controller.rb
@@ -0,0 +1,102 @@
+class Origami::DingaController < BaseOrigamiController
+  	def index
+ 		@sale_id = params[:sale_id]
+ 		payment_method = params[:payment_method]
+        @cashier_type   = params[:type]
+ 		@membership_rebate_balance=0
+ 		sale_data = Sale.find_by_sale_id(@sale_id)
+
+        @shop        = Shop::ShopDetail 
+        # if @shop.is_rounding_adj
+        #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+        # else
+        #     new_total    = sale_data.grand_total
+        # end
+        # @rounding_adj = new_total-sale_data.grand_total  
+        @rounding_adj = sale_data.rounding_adjustment  
+
+        @payparcount = 0
+        others = 0
+        sale_data.sale_payments.each do |sale_payment|
+            if sale_payment.payment_method == "paypar"
+              @payparcount = @payparcount + sale_payment.payment_amount
+            else
+              others = others + sale_payment.payment_amount
+            end
+        end
+        @payment_prices = sale_data.grand_total - @payparcount -others
+
+
+ 		if sale_data
+ 			if sale_data.customer_id
+ 				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+ 				if customer_data
+ 					@membership_id = customer_data.membership_id
+ 					if !@membership_id.nil?
+ 						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+ 						if membership_setting.gateway_url
+ 							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+ 							if member_actions.gateway_url
+ 								@campaign_type_id = nil
+ 								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+ 								merchant_uid= member_actions.merchant_account_id
+ 								auth_token = member_actions.auth_token.to_s
+		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+		 						if membership_data["status"]==true
+		 							@membership_rebate_balance=membership_data["balance"]
+		 							@out = true, @membership_rebate_balance,@membership_id
+		 						end
+		 					else
+		 						@out =false,0
+ 							end
+ 						else
+ 							@out = false,0
+ 						end
+
+
+ 					else
+ 						@out = false, 0
+ 					end
+ 				else
+ 					@out = false, 0
+ 				end
+ 			else
+ 				@out = false, 0
+ 			end
+ 		else
+ 			@out = false, 0
+ 		end
+ 		@out = false, 0
+    end
+    
+  	def create
+	    cash = params[:payment_amount]
+	    sale_id = params[:sale_id]
+	    if(Sale.exists?(sale_id))
+	      saleObj = Sale.find(sale_id)
+	      shop_details =  Shop::ShopDetail 
+	      
+	      # rounding adjustment
+	      # if shop_details.is_rounding_adj
+	      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+	      #   rounding_adj = new_total-saleObj.grand_total
+	      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+	      # end
+
+	      # saleObj = Sale.find(sale_id)
+	      sale_payment = SalePayment.new
+	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga")
+          if status == true
+                @out = true, "Success!"
+            else
+                @out =false, "Please try again payment!"
+            end
+	    end
+  	end
+
+	#Shop Name in Navbor
+	helper_method :shop_detail
+		def shop_detail
+		    @shop = Shop.first
+		end
+end
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 7d3ded34..6bd06b5a 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -65,7 +65,7 @@ class Origami::MpuController < BaseOrigamiController
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "alipay",ref_no)
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu",ref_no)
     end
   end
 
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 943fc3e9..baa5d2ec 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -230,11 +230,13 @@ class Origami::PaymentsController < BaseOrigamiController
       @junctionpaycount = 0.0
       @credit = 0.0
       @paymalcount = 0.0
+      @dingacount = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
       @balance = 0
       @accountable_type = ''
       @table_no = ''
       @dining  = ''
+      @other_payment = 0.0
 
       @shop        =  Shop::ShopDetail  #show shop info 
 
@@ -332,26 +334,29 @@ class Origami::PaymentsController < BaseOrigamiController
          if spay.payment_method == "cash"
            @cash = spay.payment_amount
          end
-         if spay.payment_method == "mpu"
-           @other += spay.payment_amount
-         elsif spay.payment_method == "paypar"
-           @ppamount += spay.payment_amount
-         elsif spay.payment_method == "visa"
-           @visacount += spay.payment_amount
-         elsif spay.payment_method == "jcb"
-           @jcbcount += spay.payment_amount
-         elsif spay.payment_method == "master"
-           @mastercount += spay.payment_amount
-         elsif spay.payment_method == "unionpay"
-          @unionpaycount += spay.payment_amount
-         elsif spay.payment_method == "JunctionPay"
-          @junctionpaycount += spay.payment_amount
-         elsif spay.payment_method == "creditnote"
-           @credit += spay.payment_amount
-         elsif spay.payment_method == "paymal"
-           @paymalcount += spay.payment_amount
-         elsif spay.payment_method == "alipay"
-           @alipaycount += spay.payment_amount
+          @other_payment += spay.payment_amount
+          if spay.payment_method == "mpu"
+            @other += spay.payment_amount
+          elsif spay.payment_method == "paypar"
+            @ppamount += spay.payment_amount
+          elsif spay.payment_method == "visa"
+            @visacount += spay.payment_amount
+          elsif spay.payment_method == "jcb"
+            @jcbcount += spay.payment_amount
+          elsif spay.payment_method == "master"
+            @mastercount += spay.payment_amount
+          elsif spay.payment_method == "unionpay"
+            @unionpaycount += spay.payment_amount
+          elsif spay.payment_method == "JunctionPay"
+            @junctionpaycount += spay.payment_amount
+          elsif spay.payment_method == "creditnote"
+            @credit += spay.payment_amount
+          elsif spay.payment_method == "paymal"
+            @paymalcount += spay.payment_amount
+          elsif spay.payment_method == "alipay"
+            @alipaycount += spay.payment_amount
+          elsif spay.payment_method == "dinga"
+            @dingacount += spay.payment_amount
          end
       end
     end
diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index 928f17d6..97965167 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -4,7 +4,9 @@ class Reports::PaymentMethodController < BaseReportController
 
 		@payments = [["All Payment",''],["Cash Payment","cash"], ["Credit Payment","creditnote"],
 		            ["FOC Payment","foc"], ["MPU Payment","mpu"], ["Visa Payment","visa"], 
-		            ["Master Payment","master"], ["JCB Payment","jcb"], ["Redeem Payment","paypar"]]
+		            ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], 
+		            ["Alipay Payment","alipay"],["Paymal Payment", "paymal"],["Dinga Payment","dinga"],
+		            ["JunctionPay","junctionpay"],["Redeem Payment","paypar"]]
 
 		from, to  = get_date_range_from_params
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 363ff77b..f612f7b4 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -687,6 +687,10 @@ def self.daily_sales_list(from,to)
      SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
      SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
      SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,
+     SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,
+     SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,
+     SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,
+     SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,
      SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
      SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
      SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
@@ -724,6 +728,10 @@ def self.daily_sales_list(from,to)
                  :jcb_amount => pay.jcb_amount,
                  :paypar_amount => pay.paypar_amount,
                  :unionpay_amount => pay.unionpay_amount,
+                 :alipay_amount => pay.alipay_amount,
+                 :paymal_amount => pay.paymal_amount,
+                 :dinga_amount => pay.dinga_amount,
+                 :junctionpay_amount => pay.junctionpay_amount,
                  :cash_amount => pay.cash_amount,
                  :credit_amount => pay.credit_amount,
                  :foc_amount => pay.foc_amount,
@@ -882,7 +890,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type)
       other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
       discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)
       change_amount  = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -902,7 +910,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type)
       other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
       discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
       change_amount  = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -922,7 +930,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type)
       other_charges  = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
       discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount)
       change_amount  = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -970,7 +978,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
       payment_type = ''
     else
       if payment_type == 'card'
-        payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay'"
+        payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay'"
       else
         payment_type = " and sale_payments.payment_method = '#{payment_type}'"
       end
@@ -1034,7 +1042,7 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
   #   payment_type = ''
   # else
   #   if payment_type == 'card'
-  #     payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar'"
+  #     payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay'"
   #   else
   #     payment_type = " and sale_payments.payment_method = '#{payment_type}'"
   #   end
@@ -1075,6 +1083,10 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type
                        SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
                        SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
                        SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,
+                       SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,
+                       SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,
+                       SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,
+                       SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,
                        SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
                        SUM(case when (sale_payments.payment_method='cash') then sales.amount_changed else 0 end) as total_change_amount,
                       SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
@@ -1413,7 +1425,7 @@ end
                   else
         query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                   end
-        query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+        query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                   .order("e.name")
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
@@ -1424,7 +1436,7 @@ end
                     else
           query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                     end
-          query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+          query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                     .order("e.name")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1436,7 +1448,7 @@ end
                       else
             query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and shift_sale_id='#{shift.id}'")
                       end
-            query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+            query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                       .order("e.name")
           end
         end
@@ -1446,14 +1458,14 @@ end
         query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1461,7 +1473,7 @@ end
             query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}' and shift_sale_id='#{shift.id}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
           end
         end
@@ -1560,22 +1572,22 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         else
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
           else
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
           end
@@ -1583,11 +1595,11 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
             else
-              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',from,to,shift.id)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
             end
@@ -1596,18 +1608,18 @@ end
       end
     else
       if current_user.nil?
-        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',today,shift.id)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
           end
@@ -1806,7 +1818,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method="alipay" or sp.payment_method="paymal" or sp.payment_method="dinga" or sp.payment_method="JunctionPay")',from,to,from_time,to_time)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
             end
@@ -1814,7 +1826,7 @@ end
         else
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ?",from,to)
             end
@@ -1825,7 +1837,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
               if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
               else
                 query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
               end
@@ -1845,7 +1857,7 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
                 if payment_method == 'card'
-                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 else
                   query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                 end
@@ -1853,7 +1865,7 @@ end
             else
               query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
                 if payment_method == 'card'
-                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',from,to,shift.id)
                 else
                   query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
                 end
@@ -1866,7 +1878,7 @@ end
       if current_user.nil?
         query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             end
@@ -1875,7 +1887,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             end
@@ -1885,7 +1897,7 @@ end
           if !shift.nil?
             query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
               if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',today,shift.id)
               else
                 query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
               end
@@ -2598,6 +2610,10 @@ end
                           SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
                           SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,     
                           SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,     
+                          SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,     
+                          SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,     
+                          SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,     
+                          SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,     
                           SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
                           SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount,
                           SUM(case when (sale_items.status='foc') then sale_items.price else 0 end) as item_foc,
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 5cd7ea40..d8c1519a 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -41,6 +41,8 @@ class SalePayment < ApplicationRecord
            payment_status = external_terminal_card_payment(:mpu)
         when "unionpay"
            payment_status = external_terminal_card_payment(:unionpay)
+        when "alipay"
+          payment_status = external_terminal_card_payment(:alipay)
         when "vochure"
            payment_status = vochure_payment
         when "giftcard"
@@ -53,8 +55,8 @@ class SalePayment < ApplicationRecord
           payment_status = paymal_payment
         when "JunctionPay"
           payment_status = junction_pay_payment
-        when "alipay"
-          payment_status = external_terminal_card_payment(:alipay)
+        when "dinga"
+          payment_status = dinga_payment
       else
          puts "it was something else"
       end
@@ -402,6 +404,35 @@ class SalePayment < ApplicationRecord
     return payment_status
   end
 
+  def dinga_payment
+    payment_status = false
+
+    #Next time - validate if the vochure number is valid - within
+    customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+    membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+
+     #record an payment in sale-audit
+      remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
+      sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+
+    if membership_data["status"]==true
+      self.payment_method = "dinga"
+      self.payment_amount = self.received_amount
+      self.payment_reference  = self.voucher_no
+      self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
+      self.payment_status = "pending"
+      payment_method = self.save!
+      SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
+      sale_update_payment_status(self.received_amount.to_f)
+
+    else
+      sale_update_payment_status(0)
+    end
+
+    return payment_status
+  end
+
   def sale_update_payment_status(paid_amount,check_foc = false)    
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
diff --git a/app/views/origami/dinga/create.json.jbuilder b/app/views/origami/dinga/create.json.jbuilder
new file mode 100644
index 00000000..f352b148
--- /dev/null
+++ b/app/views/origami/dinga/create.json.jbuilder
@@ -0,0 +1,2 @@
+json.set! :status, @out[0]
+json.set! :message, @out[1]
\ No newline at end of file
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
new file mode 100644
index 00000000..bf9d5049
--- /dev/null
+++ b/app/views/origami/dinga/index.html.erb
@@ -0,0 +1,202 @@
+<div class="container-fluid">
+	<!-- <div class="page-header">
+		<ol class="breadcrumb">
+			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+			<li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+			<li class="breadcrumb-item active"><%= t("views.right_panel.details.redeem") %></li>
+			<span class="float-right">
+				<%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+			</span>
+		</ol>
+	</div> -->
+	<div class="row">
+		<div class="col-lg-5 col-md-5 col-sm-5">
+			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">
+				<div class="rebate-form">
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">You can pay up to </label>
+							<%@payment_prices = @payment_prices +@rounding_adj%>
+							<input type="text" name="" id="paymentamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payment_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+						</div>
+						<hr>
+					</div>
+					<% if @payparcount > 0 %>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">Recent Payment Amount </label>
+							<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payparcount %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+						</div>
+						<hr>
+					</div>
+					<% end %>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">Available Balance </label>
+							<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+						</div>
+						<hr>
+					</div>
+					<div class="row">
+						<div class="form-group col-lg-12 col-md-12 col-sm-12">
+							<label class="">Payment Balance</label>
+							<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+						</div>
+						<hr>
+					</div>
+				</div>
+			</div>
+			<!-- <% if @payparcount > 0 %>
+				<p class="">Last time rebate amount is <%= @payparcount %></p>
+			<% end %>
+			<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @payment_prices %></span></p> -->
+		</div>
+
+		<div class="col-lg-6 col-md-6 col-sm-6">
+			<div class="m-t-10 p-l-20">
+				<div class="row">
+					<div class="col-lg-6 col-md-1 col-sm-1">
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="1" data-type="num">1</div>
+							<div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+							<div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="4" data-type="num">4</div>
+							<div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+							<div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="7" data-type="num">7</div>
+							<div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+							<div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number border-left" data-value="0" data-type="num">0</div>
+							<div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+							<div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+						</div>
+						<div class="row bottom">
+							<div class="col-md-4 cashier_number green border-left" data-type="nett">Nett</div>
+							<div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+							<div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+						</div>
+					</div>
+					<div class="col-lg-6 col-md-6 col-sm-6">
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+							<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+							<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+						</div>
+						<div class="row bottom m-l-5">
+							<div class="pay purple left" id="dinga_payment">Pay</div>
+						</div>
+					</div>
+
+				</div>
+			</div>
+
+
+		</div>
+		<div class="col-lg-1 col-md-1 col-sm-1">
+		 <button type="button" class="btn bg-default m-t-10 btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+    var cashier_type = "<%= @cashier_type %>"; 
+	$(document).ready(function() {
+		setHeaderBreadCrumb(_DINGA_);
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+		else {
+			$('#paymentamt').attr("value",parseFloat("<%= @payment_prices %>") - parseFloat(localStorage.getItem("cash")));
+		}
+	});
+
+	$(document).on('click', '.cashier_number', function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		if(event.handled !== true) {
+			var original_value;
+			original_value = $('#used_amount').text();
+
+			var input_value = $(this).attr("data-value");
+
+			var input_type = $(this).attr("data-type");
+			switch (input_type) {
+				case 'num':
+				if (original_value == "0.0"){
+					$('#used_amount').text(input_value);
+				}else{
+					$('#used_amount').append(input_value);
+				}
+				break;
+
+				case 'add':
+				var input_value = $(this).attr("data-value");
+				amount = parseInt(input_value) + parseInt(original_value);
+				$('#used_amount').html(amount);
+
+				break;
+				case 'clr':
+				$('#used_amount').html("0.0");
+				break;
+				case 'del' :
+				var cash=$('#used_amount').text();
+				$('#used_amount').text(cash.substr(0,cash.length-1));
+				break;
+				case 'nett':
+				var remain_amount = $('#paymentamt').val();
+				$('#used_amount').text(remain_amount);
+				break;
+
+			}
+			event.handled = true;
+		} else {
+			return false;
+		}
+	});
+
+	$("#dinga_payment").click(function(){
+		valid_amount = $("#valid_amount").val();
+		sale_id = $("#valid_amount").attr('data-value');
+		membership_id = $("#valid_amount").attr('data-member-value');
+		payment_amount = parseFloat($("#used_amount").text());
+		if(payment_amount<=0 ){
+			swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
+		}else if(valid_amount< payment_amount){
+			swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
+		}else{
+			if(payment_amount <= "<%= @payment_prices %>"){
+				$(this).off("click");
+				$.ajax({
+					type: "POST",
+					url:  "<%=origami_payment_dinga_path%>",
+					data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id},
+					success: function(result){
+						if(result.status == true){
+							swal({
+								title: "Information!",
+								text: result.message,
+								html: true,
+								closeOnConfirm: false,
+								closeOnCancel: false,
+								allowOutsideClick: false
+							}, function () {
+								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
+							});
+
+						}else{
+							swal ( "Information" , result.message);
+						}
+					}
+				})
+			}else {
+				swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+			}
+		}
+	});
+</script>
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 3e20fe8c..83f866fa 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -10,14 +10,12 @@
 		</ol>
 	</div> -->
 	<div class="row">
-		<div class="col-lg-11col-md-11 col-sm-11">
-			<div >
-				<div >
+		<div class="col-lg-11 col-md-11 col-sm-11">
+			<div class="">
 				<span id="receipt_no" class="hidden"><%=@sale_data.receipt_no rescue ' '%></span>
-					<% @payment_method_setting.where("is_active = true").each do |payment_method|%>
-					<div class="purple others-payment bottom left m-l-30 <%= payment_method.payment_method %>" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
-					<% end %>
-				</div>
+				<% @payment_method_setting.where("is_active = true").each do |payment_method|%>
+				<div class="purple others-payment bottom left m-l-30 <%= payment_method.payment_method %>" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
+				<% end %>
 			</div>
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1 m-t-10">
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 965f1814..044d42f3 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -167,25 +167,22 @@
         <div class="col-md-8">Credit</div>
         <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
       </div>
-      <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%>
+      <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0 && @unionpaycount == 0.0 && @alipaycount == 0.0 && @paymalcount == 0.0 && @junctionpaycount == 0.0 && @dingacount == 0.0 %>
       <div class="row payment other-payment-color" id="card_payment" >
         <div class="col-md-8">Other Payments</div>
         <div class="col-md-4" id="others"><%= number_with_precision(@other, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
       </div>
       <% else %>
       <div class="row payment other-payment-color" id="card_payment"  >
-        <div class="col-md-12">Other Payments</div>
+        <div class="col-md-8">Other Payments</div>
+        <div class="col-md-4" id=""><%= number_with_precision(@other_payment, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
       </div>
       <% end %>
     </div>
     <div class="card-block">
       <div class="card-title m-l-5 m-r-5">
         <!-- mpu -->
-        <% if @other != 0.0 %>
-          <div class="row payment others-color">
-        <% else %>
-          <div class="row hidden">
-        <% end %>
+          <div class="row <%= @other!=0.0 ? 'payment others-color' : 'hidden' %>">
             <div class="col-md-5"></div>
             <div class="col-md-3">MPU</div>
           <% if @other != 0.0 %>
@@ -194,12 +191,9 @@
             <div class="col-md-4" id="others"><%= number_with_precision(0, precision: precision.to_i ) %></div>
           <% end %>
           </div>
+
         <!-- paypar -->
-        <% if @ppamount != 0.0 %>
-        <div class="row payment others-color">
-        <% else %>
-        <div class="row hidden">
-        <% end %>
+        <div class="row <%= @ppamount!=0.0 ? 'payment others-color' : 'hidden' %>">
           <div class="col-md-5"></div>
           <div class="col-md-3">Redeem</div>
           <% if @ppamount != 0.0 %>
@@ -210,11 +204,7 @@
         </div>
 
         <!-- Visa -->
-        <% if @visacount != 0.0 %>
-        <div class="row payment others-color">
-        <% else %>
-        <div class="row hidden">
-        <% end %>
+        <div class="row <%= @visacount!=0.0 ? 'payment others-color' : 'hidden' %>">
           <div class="col-md-5"></div>
           <div class="col-md-3">VISA</div>
           <% if @visacount != 0.0 %>
@@ -225,11 +215,7 @@
         </div>
 
         <!-- JCB -->
-        <% if @jcbcount != 0.0 %>
-        <div class="row payment others-color">
-        <% else %>
-        <div class="row hidden">
-        <% end %>
+        <div class="row <%= @jcbcount!=0.0 ? 'payment others-color' : 'hidden' %>">
           <div class="col-md-5"></div>
           <div class="col-md-3">JCB</div>
           <% if @jcbcount != 0.0 %>
@@ -240,11 +226,7 @@
         </div>
 
         <!-- Master -->
-        <% if @mastercount != 0.0 %>
-        <div class="row payment others-color">
-        <% else %>
-        <div class="row hidden">
-        <% end %>
+        <div class="row <%= @mastercount!=0.0 ? 'payment others-color' : 'hidden' %>">
           <div class="col-md-5"></div>
           <div class="col-md-3">MASTER</div>
           <% if @mastercount != 0.0 %>
@@ -256,11 +238,7 @@
         <!-- <br> -->
 
         <!-- UNIONPAY -->
-        <% if @unionpaycount != 0.0 %>
-        <div class="row payment others-color">
-        <% else %>
-        <div class="row hidden">
-        <% end %>
+        <div class="row <%= @unionpaycount!=0.0 ? 'payment others-color' : 'hidden' %>">
           <div class="col-md-5"></div>
           <div class="col-md-3">UNIONPAY</div>
           <% if @unionpaycount != 0.0 %>
@@ -271,11 +249,7 @@
         </div>
 
         <!-- Alipay -->
-        <% if @alipaycount != 0.0 %>
-        <div class="row payment others-color">
-        <% else %>
-        <div class="row hidden">
-        <% end %>
+        <div class="row <%= @alipaycount!=0.0 ? 'payment others-color' : 'hidden' %>">
           <div class="col-md-5"></div>
           <div class="col-md-3">Alipay</div>
           <% if @alipaycount != 0.0 %>
@@ -285,7 +259,8 @@
           <% end %>
         </div>
 
-        <div class="row payment <%= @paymalcount!=0.0 ? 'payment others-color'  : 'hidden'%>">
+        <!-- PAYMAL -->
+        <div class="row <%= @paymalcount!=0.0 ? 'payment others-color'  : 'hidden'%>">
           <div class="col-md-5"></div>
           <div class="col-md-3">PAYMAL</div>
           <% if @paymalcount != 0.0 %>
@@ -295,13 +270,19 @@
           <% end %>
         </div>
 
+        <!-- DINGA -->
+        <div class="row <%= @dingacount!=0.0 ? 'payment others-color'  : 'hidden'%>">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">DINGA</div>
+          <% if @paymalcount != 0.0 %>
+            <div class="col-md-4 master is_card" id="dingacount"><%= number_with_precision(@dingacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <% else %>
+            <div class="col-md-4" id="dingacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <% end %>
+        </div>
+
         <!-- Junction Pay -->
-        <% if @junctionpaycount != 0.0 %>
-        <div class="row payment others-color">
-        <% else %>
-        <div class="row hidden">
-        <% end %>
-        <!-- PAYMAL -->
+        <div class="row <%= @junctionpaycount!=0.0 ? 'payment others-color' : 'hidden'%>">
           <div class="col-md-5"></div>
           <div class="col-md-3">JUNCTION PAY</div>
           <% if @junctionpaycount != 0.0 %>
@@ -556,7 +537,7 @@ var customer_name = "<%= @customer.name %>";
               $("#credit_payment").show();
             }
 
-            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1, parseInt(jQuery.inArray("PAYMAL", payment_type)) !=-1 || parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Alipay", payment_type)) !=-1){
+            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1, parseInt(jQuery.inArray("PAYMAL", payment_type)) !=-1 || parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Alipay", payment_type)) !=-1 || parseInt(jQuery.inArray("DINGA", payment_type)) !=-1){
               $("#card_payment").show();   
             } else{
              $("#card_payment").hide();
@@ -629,6 +610,8 @@ var customer_name = "<%= @customer.name %>";
           swal("Oops","Please Pay with Credit Payment","warning");
       }else if(payment_type == "PAYMAL" && $('#paymalcount').text()==0 && sub_total != 0.0){
           swal("Oops","Please Pay with Paymal Payment","warning");
+      }else if(payment_type == "DINGA" && $('#dingacount').text()==0 && sub_total != 0.0){
+          swal("Oops","Please Pay with Dinga Payment","warning");
       }else{
 
         $( "#loading_wrapper").show();
@@ -881,23 +864,23 @@ var customer_name = "<%= @customer.name %>";
         }
         break;
         case 'add':
-        var input_value = $(this).attr("data-value");
-        amount = parseInt(input_value) + parseInt(original_value);
-        $('#cash').text(amount);
-        update_balance();
-        break;
+          var input_value = $(this).attr("data-value");
+          amount = parseInt(input_value) + parseInt(original_value);
+          $('#cash').text(amount);
+          update_balance();
+          break;
         case 'del' :
-        var cash=$('#cash').text();
-        if(cash.length == 1)
-          $('#cash').text("0.0");
+          var cash=$('#cash').text();
+          if(cash.length == 1)
+            $('#cash').text("0.0");
         else
           $('#cash').text(cash.substr(0,cash.length-1));
-        update_balance();
-        break;
+          update_balance();
+          break;
         case 'clr':
-        $('#cash').text("0.0");
-        update_balance();
-        break;
+          $('#cash').text("0.0");
+          update_balance();
+          break;
         case 'nett':
           var credit1 = $('#credit').text();
           var card1 = $('#others').text();
@@ -909,7 +892,8 @@ var customer_name = "<%= @customer.name %>";
           var paymal1 = $('#paymalcount').text();
           var alipay1 = $('#alipaycount').text();
           var junctionpay1 = $('#junctionpaycount').text();
-          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(alipay1) + parseFloat(junctionpay1) + parseFloat(paymal1);
+          var dingapay1 = $('#dingacount').text();
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(alipay1) + parseFloat(junctionpay1) + parseFloat(paymal1) + parseFloat(dingapay1);
           var total = $('#amount_due').text();
           var amt = 0;
           <% if precision.to_i > 0 %>;
@@ -940,9 +924,11 @@ var customer_name = "<%= @customer.name %>";
     var paymal = $('#paymalcount').text();
     var alipay = $('#alipaycount').text();
     var junctionpay = $('#junctionpaycount').text();
+    var dinga = $('#dingacount').text();
     var amount_due = $('#amount_due').text();
-    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(alipay) + parseFloat(junctionpay) + parseFloat(paymal);
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(alipay) + parseFloat(junctionpay) + parseFloat(paymal) + parseFloat(dinga);
     var result = parseFloat(amount_due) - parseFloat(total);
+    
     <% if precision.to_i > 0 %>
       $('#balance').text(parseFloat(result).toFixed(<%= precision %>));
     <% else %>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 6dd1ebac..4e902da1 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -34,6 +34,11 @@
 									<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.visa_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.jcb_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.unionpay_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.alipay_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.paymal_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.dinga_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.junctionpay_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.redeem_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
@@ -64,6 +69,11 @@
 								<% master = 0 %>
 								<% visa   = 0 %>
 								<% jcb    = 0 %>
+								<% unionpay    	= 0 %>
+								<% alipay    	= 0 %>
+								<% paymal    	= 0 %>
+								<% dinga    	= 0 %>
+								<% junctionpay  = 0 %>
 								<% paypar = 0 %>
 								<% cash   = 0 %>
 								<% credit = 0 %>
@@ -79,6 +89,11 @@
 								<% master += sale[:master_amount] %>
 								<% visa += sale[:visa_amount] %>
 								<% jcb += sale[:jcb_amount] %>
+								<% unionpay += sale[:unionpay_amount] %>
+								<% alipay += sale[:alipay_amount] %>
+								<% paymal += sale[:paymal_amount] %>
+								<% dinga += sale[:dinga_amount] %>
+								<% junctionpay += sale[:junctionpay_amount] %>
 								<% paypar += sale[:paypar_amount] %>
 								<% cash += sale[:cash_amount]-sale[:total_change_amount] %>
 								<% credit += sale[:credit_amount] %>   
@@ -96,6 +111,11 @@
 									<td style='text-align:right;'><%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:unionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:alipay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:paymal_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:dinga_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:junctionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
@@ -114,6 +134,11 @@
 									<td style='text-align:right;'><%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(visa, precision:precision,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
@@ -129,7 +154,7 @@
 								<% @tax.each do |tax| %>
 								<% total_tax += tax.tax_amount.to_f %>
 								<tr style="font-weight:600;">
-									<td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
+									<td colspan="17" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>
 								</tr>
@@ -137,7 +162,7 @@
 								<% end %>
 								<% net = total - total_tax %>
 								<tr style="font-weight:600;">
-									<td colspan="12" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
+									<td colspan="17" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
 									<td style='text-align:right;'><%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>	
 								</tr>
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index 44a9cc57..c4a9285a 100755
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -19,6 +19,11 @@
 									<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.visa_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.jcb_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.unionpay_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.alipay_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.paymal_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.dinga_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.junctionpay_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.redeem_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
@@ -37,6 +42,11 @@
 								<% master = 0 %>
 								<% visa   = 0 %>
 								<% jcb    = 0 %>
+								<% unionpay    	= 0 %>
+								<% alipay    	= 0 %>
+								<% paymal    	= 0 %>
+								<% dinga    	= 0 %>
+								<% junctionpay  = 0 %>
 								<% paypar = 0 %>
 								<% cash   = 0 %>
 								<% credit = 0 %>
@@ -52,6 +62,11 @@
 								<% master += sale[:master_amount] %>
 								<% visa += sale[:visa_amount] %>
 								<% jcb += sale[:jcb_amount] %>
+								<% unionpay += sale[:unionpay_amount] %>
+								<% alipay += sale[:alipay_amount] %>
+								<% paymal += sale[:paymal_amount] %>
+								<% dinga += sale[:dinga_amount] %>
+								<% junctionpay += sale[:junctionpay_amount] %>
 								<% paypar += sale[:paypar_amount] %>
 								<% cash += sale[:cash_amount]-sale[:total_change_amount] %>
 								<% credit += sale[:credit_amount] %>   
@@ -69,6 +84,11 @@
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:unionpay_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:alipay_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paymal_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:dinga_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:junctionpay_amount]), :delimiter => ',') rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 1fef1eab..c3a00a5d 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -44,6 +44,11 @@
 							<th><%= t("views.right_panel.detail.master_sales") %></th>
 							<th><%= t("views.right_panel.detail.visa_sales") %></th>
 							<th><%= t("views.right_panel.detail.jcb_sales") %></th>
+							<th><%= t("views.right_panel.detail.unionpay_sales") %></th>
+							<th><%= t("views.right_panel.detail.alipay_sales") %></th>
+							<th><%= t("views.right_panel.detail.paymal_sales") %></th>
+							<th><%= t("views.right_panel.detail.dinga_sales") %></th>
+							<th><%= t("views.right_panel.detail.junctionpay_sales") %></th>
 							<th><%= t("views.right_panel.detail.redeem_sales") %></th>
 							<th><%= t("views.right_panel.detail.cash_sales") %></th>
 							<th><%= t("views.right_panel.detail.credit_sales") %></th>
@@ -70,6 +75,11 @@
 								<td><%= number_with_precision(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								<td><%= number_with_precision(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								<td><%= number_with_precision(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:unionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:alipay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:paymal_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:dinga_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:junctionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								<td><%= number_with_precision(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								<td><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								<td><%= number_with_precision(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
diff --git a/app/views/reports/payment_method/index.xls.erb b/app/views/reports/payment_method/index.xls.erb
index b537f7d7..73c8683b 100755
--- a/app/views/reports/payment_method/index.xls.erb
+++ b/app/views/reports/payment_method/index.xls.erb
@@ -24,6 +24,11 @@
 							<th><%= t("views.right_panel.detail.master_sales") %></th>
 							<th><%= t("views.right_panel.detail.visa_sales") %></th>
 							<th><%= t("views.right_panel.detail.jcb_sales") %></th>
+							<th><%= t("views.right_panel.detail.unionpay_sales") %></th>
+							<th><%= t("views.right_panel.detail.alipay_sales") %></th>
+							<th><%= t("views.right_panel.detail.paymal_sales") %></th>
+							<th><%= t("views.right_panel.detail.dinga_sales") %></th>
+							<th><%= t("views.right_panel.detail.junctionpay_sales") %></th>
 							<th><%= t("views.right_panel.detail.redeem_sales") %></th>
 							<th><%= t("views.right_panel.detail.cash_sales") %></th>
 							<th><%= t("views.right_panel.detail.credit_sales") %></th>
@@ -38,6 +43,11 @@
 								<td><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
 								<td><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
 								<td><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:unionpay_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:alipay_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:paymal_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:dinga_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:junctionpay_amount]), :delimiter => ',') rescue '-'%></td>
 								<td><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
 								<td><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
 								<td><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0e787751..58ddbd37 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -411,6 +411,11 @@ en:
         master_sales: "Master Sales"
         visa_sales: "Visa Sales"
         jcb_sales: "JCB Sales"
+        unionpay_sales: "Unionpay Sales"
+        alipay_sales: "Alipay Sales"
+        paymal_sales: "Paymal Sales"
+        dinga_sales: "Dinga Sales"
+        junctionpay_sales: "JunctionPay Sales"
         redeem_sales: "Redeem Sales"
         cash_sales: "Cash Sales"
         credit_sales: "Credit Sales"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 406bcaf4..3004be14 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -407,6 +407,10 @@ mm:
         visa_sales: "Visa ရောင်းရငွေ"
         jcb_sales: "JCB ရောင်းရငွေ"
         alipay_sales: "Alipay ရောင်းရငွေ"
+        unionpay_sales: "Unionpay ရောင်းရငွေ"
+        paymal_sales: "Paymal ရောင်းရငွေ"
+        dinga_sales: "Dinga ရောင်းရငွေ"
+        junctionpay_sales: "JunctionPay ရောင်းရငွေ"
         redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ"
         cash_sales: "ငွေသား ရောင်းရငွေ"
         credit_sales: "အကြွေး ရောင်းရငွေ"
diff --git a/config/routes.rb b/config/routes.rb
index 2c25db97..365d5a79 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -184,6 +184,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/paymal' => 'paymal#create'
     post 'payment/alipay' => 'alipay#create'
     post 'payment/junctionpay' => 'junctionpay#create'
+    post 'payment/dinga' => 'dinga#create'
 
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
@@ -197,6 +198,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
     get 'sale/:sale_id/:type/payment/others_payment/JunctionPay' => "junction_pay#index"
     get 'sale/:sale_id/:type/payment/others_payment/Alipay' => "alipay#index"
+    get 'sale/:sale_id/:type/payment/others_payment/DINGA' => "dinga#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/:type/void' => 'void#overall_void'

From dd3544bdff9ae0dbb9a4bf7b98684d08339a2c15 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 9 Apr 2018 09:40:58 +0630
Subject: [PATCH 563/651] fixed conflix readme

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bbbd539a..ad112488 100755
--- a/README.md
+++ b/README.md
@@ -158,7 +158,6 @@ For CloseCashierCustomisePdf in lookups
 	1) settings/print_settings
   	2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 }
 
-<<<<<<< HEAD
 <---- Extra Fields Script -----> 
 For MoveTablePdf in lookups 
     *** Both Table and Room Moving ***
@@ -170,13 +169,12 @@ For MoveTablePdf in print settings
 	ii) Unique Code: MoveTablePdf 
 	iii)Template: ... 
 	iv) Font: Zawgyi-One v) Printer: #printer name   	
-=======
+
 /* Tax Profile Group Types in lookups */
 1) settings/lookups => { type:tax_profiles, name: Cashier, value:cashier }
 2) settings/lookups => { type:tax_profiles, name: Quick Service, value: quick_service }
 3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal }
 /* Tax Profile Group Types in lookups */
->>>>>>> 1c13b0469758fb968c0dfcc1f0a876ed2c5e395a
 
 Add Kitchen Role of  Employee 
    => 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen }

From cb3f9c4cd73da6f900444e69f83d89d650c1a442 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 9 Apr 2018 09:58:22 +0630
Subject: [PATCH 564/651] remove skip auth from api and check user modified

---
 .../api/restaurant/item_sets_controller.rb     |  1 -
 .../restaurant/menu_categories_controller.rb   |  3 +--
 .../api/restaurant/menu_controller.rb          |  1 -
 .../menu_item_attributes_controller.rb         |  3 +--
 .../menu_item_instances_controller.rb          |  3 +--
 app/controllers/base_origami_controller.rb     | 18 +++++++++++++-----
 app/controllers/concerns/token_verification.rb |  2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/controllers/api/restaurant/item_sets_controller.rb b/app/controllers/api/restaurant/item_sets_controller.rb
index a7ad9efc..99581550 100755
--- a/app/controllers/api/restaurant/item_sets_controller.rb
+++ b/app/controllers/api/restaurant/item_sets_controller.rb
@@ -1,5 +1,4 @@
 class Api::Restaurant::ItemSetsController < Api::ApiController
-
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
diff --git a/app/controllers/api/restaurant/menu_categories_controller.rb b/app/controllers/api/restaurant/menu_categories_controller.rb
index f1f3e6d0..644a38a8 100755
--- a/app/controllers/api/restaurant/menu_categories_controller.rb
+++ b/app/controllers/api/restaurant/menu_categories_controller.rb
@@ -1,5 +1,4 @@
-class Api::Restaurant::MenuCategoriesController < Api::ApiController
- skip_before_action  :authenticate
+class Api::Restaurant::MenuCategoriesController < Api::ApiController 
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb
index ad8ad7f9..96ba3cc0 100755
--- a/app/controllers/api/restaurant/menu_controller.rb
+++ b/app/controllers/api/restaurant/menu_controller.rb
@@ -1,5 +1,4 @@
 class Api::Restaurant::MenuController < Api::ApiController
-  skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
diff --git a/app/controllers/api/restaurant/menu_item_attributes_controller.rb b/app/controllers/api/restaurant/menu_item_attributes_controller.rb
index 37719c37..d0469924 100755
--- a/app/controllers/api/restaurant/menu_item_attributes_controller.rb
+++ b/app/controllers/api/restaurant/menu_item_attributes_controller.rb
@@ -1,5 +1,4 @@
-class Api::Restaurant::MenuItemAttributesController < Api::ApiController
-	skip_before_action  :authenticate
+class Api::Restaurant::MenuItemAttributesController < Api::ApiController	
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
diff --git a/app/controllers/api/restaurant/menu_item_instances_controller.rb b/app/controllers/api/restaurant/menu_item_instances_controller.rb
index be38f782..cfe75b19 100755
--- a/app/controllers/api/restaurant/menu_item_instances_controller.rb
+++ b/app/controllers/api/restaurant/menu_item_instances_controller.rb
@@ -1,5 +1,4 @@
-class Api::Restaurant::MenuItemInstancesController < Api::ApiController
-  skip_before_action  :authenticate
+class Api::Restaurant::MenuItemInstancesController < Api::ApiController  
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index b627ae01..66cc2880 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -15,9 +15,17 @@ class BaseOrigamiController < ActionController::Base
     redirect_to origami_dashboard_path
   end
 
-  def check_user
-    if current_user.nil?
-      redirect_to root_path
+  def check_user   
+    if check_mobile     
+      if current_user.nil?
+        return render status: 401, json: {
+          message: "User using other device!"          
+        }.to_json
+      end
+    else 
+      if current_user.nil?
+        redirect_to root_path    
+      end
     end
   end
 
@@ -41,8 +49,8 @@ class BaseOrigamiController < ActionController::Base
     authenticate_with_http_token do |token, options|   
       if token
         session[:webview] = true
-      end
-      session[:session_token] = token
+        session[:session_token] = token
+      end            
     end
     
     if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index 66658b6a..1d700c8b 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -9,7 +9,7 @@ module TokenVerification
 
   protected
   # Authenticate the user with token based authentication
-  def authenticate
+  def authenticate    
     authenticate_token || render_unauthorized
   end
 

From 0901add832132fdbfc871dd60012028596865ba9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 10:07:03 +0630
Subject: [PATCH 565/651] change time format  in query

---
 app/models/sale.rb | 122 ++++++++++++++++++++++-----------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f612f7b4..b9c0717e 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1201,7 +1201,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                   else
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                         " and sale_status= 'completed'")
@@ -1215,7 +1215,7 @@ end
                 .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                 if !from_time.nil? && !to_time.nil?
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                     else
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                           " and sale_status= 'completed'")
@@ -1230,7 +1230,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
                       else
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                             " and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
@@ -1282,7 +1282,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                        " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                   else
         query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                         " and sale_status= 'completed'")
@@ -1296,7 +1296,7 @@ end
                   .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                   if !from_time.nil? && !to_time.nil?
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
+                          " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
                     else
           query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
                           " and sale_status= 'completed'")
@@ -1311,7 +1311,7 @@ end
                     .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
                     if !from_time.nil? && !to_time.nil?
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
+                            " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
                       else
             query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30') between '#{from}' and '#{to}'"+
                             " and sale_status= 'completed' and shift_sale_id='#{shift.id}'")
@@ -1421,7 +1421,7 @@ end
         query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                   .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                   if !from_time.nil? && !to_time.nil?
-        query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
+        query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'")
                   else
         query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                   end
@@ -1432,7 +1432,7 @@ end
           query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                     if !from_time.nil? && !to_time.nil?
-          query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
+          query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'")
                     else
           query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                     end
@@ -1444,7 +1444,7 @@ end
             query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                   .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                       if !from_time.nil? && !to_time.nil?
-            query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}' and shift_sale_id='#{shift.id}'")
+            query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and shift_sale_id='#{shift.id}'")
                       else
             query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and shift_sale_id='#{shift.id}'")
                       end
@@ -1485,14 +1485,14 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).sum("grand_total")
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).sum("grand_total")
         else
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to).sum("grand_total")
         end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).sum("grand_total")
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).sum("grand_total")
           else
             total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to).sum("grand_total")
           end
@@ -1500,7 +1500,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                   .sum("grand_total")
             else
               total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',from,to,shift.id)
@@ -1530,14 +1530,14 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).count
+          total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).count
         else
           total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to).count
         end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time).count
+            total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time).count
           else
             total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ?',from,to).count
           end
@@ -1545,7 +1545,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and shift_sale_id = ?',from,to,from_time,to_time,shift.id).count
+              total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and shift_sale_id = ?',from,to,from_time,to_time,shift.id).count
             else
               total = Sale.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id = ?',from,to,shift.id).count
             end
@@ -1572,7 +1572,7 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         else
@@ -1583,7 +1583,7 @@ end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
           else
@@ -1595,7 +1595,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
             else
@@ -1632,7 +1632,7 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+          query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
               .sum("payment_amount")
         else
@@ -1643,7 +1643,7 @@ end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+            query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
                 .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
                 .sum("payment_amount")
           else
@@ -1655,7 +1655,7 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and s.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(s.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and s.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
                 .sum("payment_amount")
             else
@@ -1693,7 +1693,7 @@ end
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-            .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+            .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
             .first()
         else
           query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
@@ -1704,7 +1704,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
             query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-              .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
@@ -1716,7 +1716,7 @@ end
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
               query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
-                .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .first()
             else
               query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
@@ -1753,7 +1753,7 @@ end
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("distinct sp.payment_method")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
             .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
         else
           query = Sale.select("distinct sp.payment_method")
@@ -1764,7 +1764,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("distinct sp.payment_method")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
           else
             query = Sale.select("distinct sp.payment_method")
@@ -1776,7 +1776,7 @@ end
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
               query = Sale.select("distinct sp.payment_method")
-                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             else
               query = Sale.select("distinct sp.payment_method")
@@ -1811,16 +1811,16 @@ end
   def self.payment_sale(payment_method, today, current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     time_query = ''
     if !from_time.nil? && !to_time.nil?
-      time_query = " and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'"
+      time_query = " and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'"
     end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method="alipay" or sp.payment_method="paymal" or sp.payment_method="dinga" or sp.payment_method="JunctionPay")',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method="alipay" or sp.payment_method="paymal" or sp.payment_method="dinga" or sp.payment_method="JunctionPay")',from,to,from_time,to_time)
             else
-              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
             end
             query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
         else
@@ -1837,9 +1837,9 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
               if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
               else
-                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
               end
               query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
           else
@@ -1857,9 +1857,9 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
                 if payment_method == 'card'
-                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%M") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 else
-                  query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                  query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                 end
                 query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
             else
@@ -1927,7 +1927,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
             .first()
         else
           query = Sale.select("count(sales.customer_id) as total_dinein_cus")
@@ -1940,7 +1940,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("count(sales.customer_id) as total_dinein_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select("count(sales.customer_id) as total_dinein_cus")
@@ -1954,7 +1954,7 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.select("count(sales.customer_id) as total_dinein_cus")
                 .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Dinein" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .first()
             else
               query = Sale.select("count(sales.customer_id) as total_dinein_cus")
@@ -1996,7 +1996,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZsales.receipt_date,"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZsales.receipt_date,"%H:%i") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
               .first()
         else
           query = Sale.select("count(sales.customer_id) as total_take_cus")
@@ -2009,7 +2009,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("count(sales.customer_id) as total_take_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select("count(sales.customer_id) as total_take_cus")
@@ -2023,7 +2023,7 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.select("count(sales.customer_id) as total_take_cus")
                 .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type = "Takeaway" and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .first()
             else
               query = Sale.select("count(sales.customer_id) as total_take_cus")
@@ -2065,7 +2065,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
+            .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
             .first()
         else
           query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
@@ -2078,7 +2078,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
+              .where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',from,to,from_time,to_time)
               .first()
           else
             query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
@@ -2092,7 +2092,7 @@ end
             query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id).first()
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id).first()
               else 
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null)) and sales.shift_sale_id=?',from,to,shift.id).first()
               end
@@ -2130,7 +2130,7 @@ end
         query = Sale.select("count(sales.customer_id) as total_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
                             .first()
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
@@ -2141,7 +2141,7 @@ end
           query = Sale.select("count(sales.customer_id) as total_cus")
             .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type is null and c.membership_id is null',from,to,from_time,to_time)
                           .first()
             else
               query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null',from,to)
@@ -2153,7 +2153,7 @@ end
             query = Sale.select("count(sales.customer_id) as total_cus")
               .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                       .first()
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and c.customer_type is null and c.membership_id is null and sales.shift_sale_id=?',from,to,shift.id)
@@ -2194,7 +2194,7 @@ end
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
                     .first()
             else
                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
@@ -2206,7 +2206,7 @@ end
             .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
             .joins("JOIN orders as b ON b.order_id = a.order_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+              query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
                           .first()
             else
               query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
@@ -2219,7 +2219,7 @@ end
               .joins("JOIN sale_orders as a ON a.sale_id = sales.sale_id")
               .joins("JOIN orders as b ON b.order_id = a.order_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                           .first()
               else
                 query = query.where('b.status = "billed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
@@ -2263,7 +2263,7 @@ end
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .joins("JOIN accounts as b ON b.id = a.account_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
             else
               query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
             end
@@ -2273,7 +2273,7 @@ end
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
               end
@@ -2284,7 +2284,7 @@ end
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               .joins("JOIN accounts as b ON b.id = a.account_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
               else
                 query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id)
               end
@@ -2322,7 +2322,7 @@ end
         query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                         .first()
             else
               query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2333,7 +2333,7 @@ end
           query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                           .first()
               else
                 query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2345,7 +2345,7 @@ end
             query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                           .first()
               else
                 query = query.where("sales.sale_status = 'completed' and a.account_id ='#{account_id}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
@@ -2385,7 +2385,7 @@ end
         query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
             else  
               query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
             end
@@ -2397,7 +2397,7 @@ end
           query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
               else  
                 query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
               end
@@ -2410,7 +2410,7 @@ end
             query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
               .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
               if !from_time.nil? && !to_time.nil?
-                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
               else
                 query = query.where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
               end
@@ -2456,7 +2456,7 @@ end
       if current_user.nil?
         query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
           if !from_time.nil? && !to_time.nil?
-            query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+            query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                         .sum("a.qty")
           else
             query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2466,7 +2466,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ?",from,to,from_time,to_time)
+              query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
                           .sum("a.qty")
             else
               query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to)
@@ -2477,7 +2477,7 @@ end
           if !shift.nil?
             query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
                 if !from_time.nil? && !to_time.nil?
-                  query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%M') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
+                  query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                             .sum("a.qty")
                 else
                   query = query.where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)

From ee65189b051dab7fe4dfafec99a198cc416384d6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 10:09:35 +0630
Subject: [PATCH 566/651] change sale.rb file

---
 app/models/sale.rb | 82 +++++++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 33 deletions(-)
 mode change 100755 => 100644 app/models/sale.rb

diff --git a/app/models/sale.rb b/app/models/sale.rb
old mode 100755
new mode 100644
index f96d3ca1..b9c0717e
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -50,7 +50,7 @@ class Sale < ApplicationRecord
       charges = DiningCharge.where('dining_facility_id=?',booking.dining_facility_id).take
       if !charges.nil?        
         block_count, diningprice = DiningCharge.amount_calculate(charges, booking.checkin_at, booking.checkout_at)
-        dining_time = booking.checkin_at.strftime('%H:%i %p').to_s + " - " + booking.checkout_at.strftime('%H:%i %p').to_s
+        dining_time = booking.checkin_at.strftime('%H:%M %p').to_s + " - " + booking.checkout_at.strftime('%H:%M %p').to_s
         create_saleitem_diningcharges(charges, block_count, diningprice, booking.dining_facility.name, dining_time)
       end
 
@@ -687,6 +687,10 @@ def self.daily_sales_list(from,to)
      SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
      SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
      SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,
+     SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,
+     SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,
+     SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,
+     SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,
      SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
      SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
      SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
@@ -724,6 +728,10 @@ def self.daily_sales_list(from,to)
                  :jcb_amount => pay.jcb_amount,
                  :paypar_amount => pay.paypar_amount,
                  :unionpay_amount => pay.unionpay_amount,
+                 :alipay_amount => pay.alipay_amount,
+                 :paymal_amount => pay.paymal_amount,
+                 :dinga_amount => pay.dinga_amount,
+                 :junctionpay_amount => pay.junctionpay_amount,
                  :cash_amount => pay.cash_amount,
                  :credit_amount => pay.credit_amount,
                  :foc_amount => pay.foc_amount,
@@ -882,7 +890,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type)
       other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
       discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)
       change_amount  = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -902,7 +910,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type)
       other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
       discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
       change_amount  = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -922,7 +930,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type)
       other_charges  = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
       discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount)
       change_amount  = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
-      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay') then (sale_payments.payment_amount) else 0 end) as card_amount,
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
                                     SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -970,7 +978,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
       payment_type = ''
     else
       if payment_type == 'card'
-        payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay'"
+        payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay'"
       else
         payment_type = " and sale_payments.payment_method = '#{payment_type}'"
       end
@@ -1034,7 +1042,7 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
   #   payment_type = ''
   # else
   #   if payment_type == 'card'
-  #     payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar'"
+  #     payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay'"
   #   else
   #     payment_type = " and sale_payments.payment_method = '#{payment_type}'"
   #   end
@@ -1075,6 +1083,10 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type
                        SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
                        SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
                        SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,
+                       SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,
+                       SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,
+                       SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,
+                       SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,
                        SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
                        SUM(case when (sale_payments.payment_method='cash') then sales.amount_changed else 0 end) as total_change_amount,
                       SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
@@ -1348,7 +1360,7 @@ end
       if current_user.nil?
         query = Sale.select("grand_total")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
               else
                 query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
               end
@@ -1358,7 +1370,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.select("grand_total")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
+              query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
             else
               query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
             end
@@ -1369,7 +1381,7 @@ end
           if !shift.nil?
             query = Sale.select("grand_total")
               if !from_time.nil? && !to_time.nil?
-                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ? and shift_sale_id=?',from,to,from_time,to_time,shift.id)
               else
                 query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',from,to,shift.id)
               end
@@ -1413,7 +1425,7 @@ end
                   else
         query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                   end
-        query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+        query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                   .order("e.name")
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
@@ -1424,7 +1436,7 @@ end
                     else
           query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
                     end
-          query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+          query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                     .order("e.name")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1436,7 +1448,7 @@ end
                       else
             query =     query.where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and shift_sale_id='#{shift.id}'")
                       end
-            query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+            query = query.group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                       .order("e.name")
           end
         end
@@ -1446,14 +1458,14 @@ end
         query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
@@ -1461,7 +1473,7 @@ end
             query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
                 .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
                 .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}' and shift_sale_id='#{shift.id}'")
-                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb' or sp.payment_method='unionpay' or sp.payment_method='alipay' or sp.payment_method='paymal' or sp.payment_method='dinga' or sp.payment_method='JunctionPay') THEN 'card' ELSE sp.payment_method END)","e.name")
                 .order("e.name")
           end
         end
@@ -1560,22 +1572,22 @@ end
     if !from.nil? && !to.nil?
       if current_user.nil?
         if !from_time.nil? && !to_time.nil?
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         else
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         end
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
           if !from_time.nil? && !to_time.nil?
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
           else
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
           end
@@ -1583,11 +1595,11 @@ end
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
             if !from_time.nil? && !to_time.nil?
-              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
             else
-              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',from,to,shift.id)
+              query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',from,to,shift.id)
                 .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
                 .sum("sp.payment_amount")
             end
@@ -1596,18 +1608,18 @@ end
       end
     else
       if current_user.nil?
-        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+        query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
       else
         if current_user.role == 'administrator' || current_user.role == 'manager'
-          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+          query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
         else
           shift = ShiftSale.current_open_shift(current_user.id)
           if !shift.nil?
-            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and shift_sale_id=?',today,shift.id)
+            query = Sale.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and shift_sale_id=?',today,shift.id)
               .joins("JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
               .sum("sp.payment_amount")
           end
@@ -1806,7 +1818,7 @@ end
         if !from_time.nil? && !to_time.nil?
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method="alipay" or sp.payment_method="paymal" or sp.payment_method="dinga" or sp.payment_method="JunctionPay")',from,to,from_time,to_time)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
             end
@@ -1814,7 +1826,7 @@ end
         else
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ?",from,to)
             end
@@ -1825,7 +1837,7 @@ end
           if !from_time.nil? && !to_time.nil?
             query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
               if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',from,to,from_time,to_time)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',from,to,from_time,to_time)
               else
                 query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time)
               end
@@ -1845,7 +1857,7 @@ end
             if !from_time.nil? && !to_time.nil?
               query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
                 if payment_method == 'card'
-                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%H:%i") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id)
                 else
                   query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between ? and ? and sales.shift_sale_id=?",from,to,from_time,to_time,shift.id)
                 end
@@ -1853,7 +1865,7 @@ end
             else
               query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
                 if payment_method == 'card'
-                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',from,to,shift.id)
+                  query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, "+00:00", "+06:30"),"%Y-%m-%d") between ? and ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',from,to,shift.id)
                 else
                   query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between ? and ? and sales.shift_sale_id=?",from,to,shift.id)
                 end
@@ -1866,7 +1878,7 @@ end
       if current_user.nil?
         query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             end
@@ -1875,7 +1887,7 @@ end
         if current_user.role == 'administrator' || current_user.role == 'manager'
           query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
             if payment_method == 'card'
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay")',today)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay")',today)
             else
               query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
             end
@@ -1885,7 +1897,7 @@ end
           if !shift.nil?
             query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
               if payment_method == 'card'
-                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay") and sales.shift_sale_id=?',today,shift.id)
+                query = query.where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and (sp.payment_method = "mpu" or sp.payment_method = "visa" or sp.payment_method = "master" or sp.payment_method = "jcb" or sp.payment_method = "unionpay" or sp.payment_method = "alipay" or sp.payment_method = "paymal" or sp.payment_method = "dinga" or sp.payment_method = "JunctionPay") and sales.shift_sale_id=?',today,shift.id)
               else
                 query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? and sales.shift_sale_id=?",today,shift.id)
               end
@@ -2251,7 +2263,7 @@ end
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .joins("JOIN accounts as b ON b.id = a.account_id")
             if !from_time.nil? && !to_time.nil?
-              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to,from_time,to_time)
+              query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ?',from,to,from_time,to_time)
             else
               query = query.where('sales.sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
             end
@@ -2598,6 +2610,10 @@ end
                           SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
                           SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,     
                           SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,     
+                          SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,     
+                          SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,     
+                          SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,     
+                          SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,     
                           SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
                           SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount,
                           SUM(case when (sale_items.status='foc') then sale_items.price else 0 end) as item_foc,

From 7de85c4e0b4b9cf4bc93fa84119d31b664e877a3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 10:20:22 +0630
Subject: [PATCH 567/651] check integer in all pdf

---
 app/pdf/call_waiter_pdf.rb             | 4 ++--
 app/pdf/close_cashier_customise_pdf.rb | 4 ++--
 app/pdf/close_cashier_pdf.rb           | 4 ++--
 app/pdf/crm_order_pdf.rb               | 4 ++--
 app/pdf/move_table_pdf.rb              | 4 ++--
 app/pdf/order_item_pdf.rb              | 4 ++--
 app/pdf/order_item_slim_pdf.rb         | 4 ++--
 app/pdf/order_set_item_pdf.rb          | 4 ++--
 app/pdf/order_summary_pdf.rb           | 4 ++--
 app/pdf/order_summary_set_pdf.rb       | 4 ++--
 app/pdf/order_summary_slim_pdf.rb      | 4 ++--
 app/pdf/queue_no_pdf.rb                | 4 ++--
 app/pdf/receipt_bill_a5_pdf.rb         | 4 ++--
 app/pdf/receipt_bill_pdf.rb            | 4 ++--
 app/pdf/stock_result_pdf.rb            | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/pdf/call_waiter_pdf.rb b/app/pdf/call_waiter_pdf.rb
index 314d0c33..9ab43985 100644
--- a/app/pdf/call_waiter_pdf.rb
+++ b/app/pdf/call_waiter_pdf.rb
@@ -3,8 +3,8 @@ class CallWaiterPdf < Prawn::Document
   def initialize(printer_settings, table,time,shop_detail)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 5
     self.price_width = 35
     self.qty_width = 20
diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index 0080373c..84311caa 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -5,8 +5,8 @@ class CloseCashierCustomisePdf < Prawn::Document
   def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges)
     self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 5
     self.price_width = 60
     self.qty_width = 20
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 04bbdcf8..a1c92637 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -5,8 +5,8 @@ class CloseCashierPdf < Prawn::Document
   def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
     self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 5
     self.price_width = 60
     self.qty_width = 20
diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb
index 070f5654..f9367907 100755
--- a/app/pdf/crm_order_pdf.rb
+++ b/app/pdf/crm_order_pdf.rb
@@ -3,8 +3,8 @@ class CrmOrderPdf < Prawn::Document
    def initialize(booking,order_items,printer_settings)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 10
     # self.price_width = self.p_width / 2
     self.price_width=80
diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb
index f3f05572..9940c42d 100644
--- a/app/pdf/move_table_pdf.rb
+++ b/app/pdf/move_table_pdf.rb
@@ -4,8 +4,8 @@ class MoveTablePdf < Prawn::Document
     def initialize(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 717a0665..9f7ce125 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -4,8 +4,8 @@ class OrderItemPdf < Prawn::Document
   def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = print_settings.header_font_size
-    self.item_font_size = print_settings.item_font_size
+    self.header_font_size = print_settings.header_font_size.to_i
+    self.item_font_size = print_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 607adf14..118927f6 100755
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -4,8 +4,8 @@ class OrderItemSlimPdf < Prawn::Document
   def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 9668a0f5..1e7b9c7f 100755
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -4,8 +4,8 @@ class OrderSetItemPdf < Prawn::Document
   def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 9bf30615..5feb337e 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -4,8 +4,8 @@ class OrderSummaryPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = print_settings.header_font_size
-    self.item_font_size = print_settings.item_font_size
+    self.header_font_size = print_settings.header_font_size.to_i
+    self.item_font_size = print_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index a16265d2..b9723a5c 100755
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -4,8 +4,8 @@ class OrderSummarySetPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
index e082203f..77aafc60 100755
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -4,8 +4,8 @@ class OrderSummarySlimPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb
index adf824eb..89cca4ca 100755
--- a/app/pdf/queue_no_pdf.rb
+++ b/app/pdf/queue_no_pdf.rb
@@ -3,8 +3,8 @@ class QueueNoPdf < Prawn::Document
   def initialize(printer_settings, queue)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 5
     self.price_width = 35
     self.qty_width = 20
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index a7cf21e2..7253bfe1 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -5,8 +5,8 @@ class ReceiptBillA5Pdf < Prawn::Document
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 15
     self.price_width = 120
     self.qty_width = 50
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 8bae5f60..a04cfcad 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -6,8 +6,8 @@ class ReceiptBillPdf < Prawn::Document
     def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
         self.page_width = printer_settings.page_width
         self.page_height = printer_settings.page_height
-        self.header_font_size = printer_settings.header_font_size
-        self.item_font_size = printer_settings.item_font_size
+        self.header_font_size = printer_settings.header_font_size.to_i
+        self.item_font_size = printer_settings.item_font_size.to_i
         self.margin = 0
         self.price_width = 60
         self.qty_width = 25
diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb
index dec667f7..1da06dd2 100755
--- a/app/pdf/stock_result_pdf.rb
+++ b/app/pdf/stock_result_pdf.rb
@@ -4,8 +4,8 @@ class StockResultPdf < Prawn::Document
   def initialize(printer_settings, stockcheck, stockcheck_items, checker_name, shop_details)
     self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
-    self.header_font_size = printer_settings.header_font_size
-    self.item_font_size = printer_settings.item_font_size
+    self.header_font_size = printer_settings.header_font_size.to_i
+    self.item_font_size = printer_settings.item_font_size.to_i
     self.margin = 5
     self.price_width = 40
     self.qty_width = 20

From 0b07c7109c75e0ec70250455b24172061b0ec606 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 10:22:44 +0630
Subject: [PATCH 568/651] change default value in print settings

---
 db/migrate/20170628103624_create_print_settings.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index a5bb3000..17df2411 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -5,8 +5,8 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :unique_code, :null => false
       t.string  :template  
       t.string  :font, :default => ""
-      t.integer :header_font_size, :null => false, :default => 11    
-      t.integer :item_font_size, :null => false, :default => 9    
+      t.integer :header_font_size, :null => false, :default => 10    
+      t.integer :item_font_size, :null => false, :default => 8    
       t.string  :printer_name, :null => false
       t.string  :api_settings
       t.string  :brand_name

From b194cd6a2865a39d81771dcfd576675e5867b47b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 10:32:34 +0630
Subject: [PATCH 569/651] remove waste and spoil in origami

---
 app/views/origami/home/show.html.erb  | 6 +++---
 app/views/origami/rooms/show.html.erb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index a10d15ba..2af02ca8 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -507,9 +507,9 @@
                  
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
 
-                   <% if current_login_employee.role != "waiter" %>
-                  <button type="button" class="btn action-btn bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button>
-                <% end %>
+                  <!--<% if current_login_employee.role != "waiter" %>
+                   <button type="button" class="btn action-btn bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button> 
+                  <% end %>-->
               <% end %>
             <% end %>
               <!-- Cashier Buttons -->
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1df94a0c..bf01647e 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -454,7 +454,7 @@
           <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
           <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
           <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
-          <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button>
+          <!-- <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button> -->
         <% end %>
         <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>

From 83aeb2eb90dcb48ceb5b7f6d7abc70a1ff1a0224 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 9 Apr 2018 10:53:16 +0630
Subject: [PATCH 570/651] update api authenticate

---
 app/controllers/api/bookings_controller.rb         | 2 +-
 app/controllers/api/check_in_process_controller.rb | 2 +-
 app/controllers/api/orders_controller.rb           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/bookings_controller.rb b/app/controllers/api/bookings_controller.rb
index 24973d63..797583f0 100755
--- a/app/controllers/api/bookings_controller.rb
+++ b/app/controllers/api/bookings_controller.rb
@@ -1,5 +1,5 @@
 class Api::BookingsController < Api::ApiController
-  skip_before_action  :authenticate
+  # skip_before_action  :authenticate
   #Show customer by ID
   def  index
     @customer = Customer.find_by(params[:id])
diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 6f32c613..3d375eee 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -1,5 +1,5 @@
 class Api::CheckInProcessController < Api::ApiController
-
+	# before_action  :authenticate
 	def check_in_time
 		if params[:dining_id]	
 			dining_facility = DiningFacility.find(params[:dining_id])		
diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 383a6606..d937c6c3 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -1,5 +1,5 @@
 class Api::OrdersController <  Api::ApiController
-   skip_before_action  :authenticate
+   # skip_before_action  :authenticate
   #Description
   # This API show current order details
   # Input Params - order_id

From 85b0378b6b08d25a8cf5741b2fd413a72354b592 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 11:33:36 +0630
Subject: [PATCH 571/651] change redeem payment process for dinga

---
 app/controllers/origami/dinga_controller.rb | 76 ++++++++++-----------
 app/models/sale_payment.rb                  |  6 +-
 app/views/crm/customers/index.html.erb      |  6 +-
 app/views/origami/customers/index.html.erb  | 37 +++++++++-
 app/views/origami/dinga/index.html.erb      | 51 +++++++-------
 5 files changed, 106 insertions(+), 70 deletions(-)

diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index 9126556a..b98b3408 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -1,5 +1,5 @@
 class Origami::DingaController < BaseOrigamiController
-  	def index
+ 	def index
  		@sale_id = params[:sale_id]
  		payment_method = params[:payment_method]
         @cashier_type   = params[:type]
@@ -15,16 +15,16 @@ class Origami::DingaController < BaseOrigamiController
         # @rounding_adj = new_total-sale_data.grand_total  
         @rounding_adj = sale_data.rounding_adjustment  
 
-        @payparcount = 0
+        @dingacount = 0
         others = 0
         sale_data.sale_payments.each do |sale_payment|
-            if sale_payment.payment_method == "paypar"
-              @payparcount = @payparcount + sale_payment.payment_amount
+            if sale_payment.payment_method == "dinga"
+              @dingacount = @dingacount + sale_payment.payment_amount
             else
               others = others + sale_payment.payment_amount
             end
         end
-        @payment_prices = sale_data.grand_total - @payparcount -others
+        @redeem_prices = sale_data.grand_total - @dingacount -others
 
 
  		if sale_data
@@ -33,15 +33,15 @@ class Origami::DingaController < BaseOrigamiController
  				if customer_data
  					@membership_id = customer_data.membership_id
  					if !@membership_id.nil?
- 						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+ 						membership_setting = MembershipSetting.find_by_membership_type("dinga_url")
  						if membership_setting.gateway_url
  							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
  							if member_actions.gateway_url
- 								@campaign_type_id = nil
+ 								@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
  								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
  								merchant_uid= member_actions.merchant_account_id
  								auth_token = member_actions.auth_token.to_s
-		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+		 						membership_data = SalePayment.get_dinga_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
 		 						if membership_data["status"]==true
 		 							@membership_rebate_balance=membership_data["balance"]
 		 							@out = true, @membership_rebate_balance,@membership_id
@@ -67,36 +67,36 @@ class Origami::DingaController < BaseOrigamiController
  			@out = false, 0
  		end
  		@out = false, 0
-    end
-    
-  	def create
-	    cash = params[:payment_amount]
-	    sale_id = params[:sale_id]
-	    if(Sale.exists?(sale_id))
-	      saleObj = Sale.find(sale_id)
-	      shop_details =  Shop::ShopDetail 
-	      
-	      # rounding adjustment
-	      # if shop_details.is_rounding_adj
-	      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-	      #   rounding_adj = new_total-saleObj.grand_total
-	      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-	      # end
+ 	end
 
-	      # saleObj = Sale.find(sale_id)
-	      sale_payment = SalePayment.new
-	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga")
-          if status == true
-                @out = true, "Success!"
-            else
-                @out =false, "Please try again payment!"
-            end
-	    end
-  	end
-
-	#Shop Name in Navbor
-	helper_method :shop_detail
-		def shop_detail
-		    @shop = Shop.first
+ 	def create
+		sale_id = params[:sale_id]
+		@cashier_type   = params[:type]
+		redeem_amount = params[:redeem_amount]
+		membership_id = params[:membership_id]
+		payment_method = "dinga"
+		if(Sale.exists?(sale_id))
+			saleObj = Sale.find(sale_id)
+			shop_details =  Shop::ShopDetail 
+      
+			# rounding adjustment
+				if shop_details.is_rounding_adj
+				new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+				rounding_adj = new_total-saleObj.grand_total
+				saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+			end
+			
+      		sale_payment = SalePayment.new
+      		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
+      		if status == true
+      			@out = true, "Success!"
+      		else
+      			@out =false, "Please try again payment!"
+      		end
+      	else
+      		@out = false, "There has no sale record!"
 		end
+
+	end
+        
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 00764d6e..035bb792 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -410,10 +410,10 @@ class SalePayment < ApplicationRecord
     #Next time - validate if the vochure number is valid - within
     customer_data = Customer.find_by_customer_id(self.sale.customer_id)
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
-      remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
+      remark = "#{membership_data} Redeem- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
       sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
 
     if membership_data["status"]==true
@@ -429,8 +429,8 @@ class SalePayment < ApplicationRecord
     else
       sale_update_payment_status(0)
     end
-
     return payment_status
+
   end
 
   def sale_update_payment_status(paid_amount,check_foc = false)    
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 372c05e9..70523063 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -142,7 +142,7 @@ $(function() {
     });
 
     // QR Code Reader
-    $("#qr_code").on('click', function(e){
+    $("#qr_code").on('sclick', function(e){
         var code = "";        
         setTimeout(function(){
            code=getQRCode();
@@ -281,4 +281,8 @@ $(document).on('click',".customer_tr",function(){
     return false;
   });
 
+  $("#sxModal .btn_cancel").on('click',function(){
+    $("#sxModal").hide();
+  });
+
 </script>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 59badabe..e5de4885 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -360,9 +360,42 @@
   // QR Code Reader
   $("#qr_code").on('click', function(e){
       var code = "";        
+      var customer_id = '';
+      var customer_name = '';
+      var sale_id     = $("#sale_id").val() || 0;
+      var customer_mamber_card_no = 0;
+
       setTimeout(function(){
-         code=getQRCode();  
-         setQRCode(code);         
+        code=getQRCode();  
+        setQRCode(code);
+
+        customer_mamber_card_no = $("#search").val();
+        
+        if(sale_id != 0 && customer_mamber_card_no != 0){    
+          $.ajax({
+            type: "POST",
+            url: "/origami/"+sale_id+"/get_customer" ,
+            data: { filter : customer_mamber_card_no ,type :"card"},
+            dataType: "json",
+            success: function(data) {
+              if (data[0].customer_id == false) {
+                swal("Alert!", data[0].message, "error");
+               //  $.alert({
+               //   title: 'Alert!',
+               //   content: data[0].message,
+               //   type: 'red',
+               //   typeAnimated: true,
+               //   btnClass: 'btn-danger',
+               // });
+              }else{
+                customer_id = data[0].customer_id;
+                customer_name = data[0].name;
+                update_sale(customer_id, customer_name,sale_id);
+              }
+
+            }
+          });   
+        }      
       },100);
   });
 
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index bf9d5049..1b35710f 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -15,41 +15,41 @@
 				<div class="rebate-form">
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class="">You can pay up to </label>
-							<%@payment_prices = @payment_prices +@rounding_adj%>
-							<input type="text" name="" id="paymentamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payment_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+							<label class="">You can redeem up to </label>
+							<%@redeem_prices = @redeem_prices +@rounding_adj%>
+							<input type="text" name="" id="redeemamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @redeem_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 						</div>
 						<hr>
 					</div>
-					<% if @payparcount > 0 %>
+					<% if @dingacount > 0 %>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class="">Recent Payment Amount </label>
-							<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payparcount %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+							<label class="">Recent Redeem Amount </label>
+							<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @dingacount %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 						</div>
 						<hr>
 					</div>
 					<% end %>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class="">Available Balance </label>
+							<label class=""> Rebate Balance </label>
 							<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 						</div>
 						<hr>
 					</div>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class="">Payment Balance</label>
+							<label class="">Redeem Amount</label>
 							<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
 						</div>
 						<hr>
 					</div>
 				</div>
 			</div>
-			<!-- <% if @payparcount > 0 %>
-				<p class="">Last time rebate amount is <%= @payparcount %></p>
+			<!-- <% if @dingacount > 0 %>
+				<p class="">Last time rebate amount is <%= @dingacount %></p>
 			<% end %>
-			<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @payment_prices %></span></p> -->
+			<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @redeem_prices %></span></p> -->
 		</div>
 
 		<div class="col-lg-6 col-md-6 col-sm-6">
@@ -92,7 +92,7 @@
 							<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
 						</div>
 						<div class="row bottom m-l-5">
-							<div class="pay purple left" id="dinga_payment">Pay</div>
+							<div class="pay purple left" id="dinga">Pay</div>
 						</div>
 					</div>
 
@@ -109,13 +109,12 @@
 <script type="text/javascript">
     var cashier_type = "<%= @cashier_type %>"; 
 	$(document).ready(function() {
-		setHeaderBreadCrumb(_DINGA_);
+	  setHeaderBreadCrumb(_REDEEM_PAYMENT_);
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-		else {
-			$('#paymentamt').attr("value",parseFloat("<%= @payment_prices %>") - parseFloat(localStorage.getItem("cash")));
-		}
-	});
-
+			else {
+				$('#redeemamt').attr("value",parseFloat("<%= @redeem_prices %>") - parseFloat(localStorage.getItem("cash")));
+			}
+		});
 	$(document).on('click', '.cashier_number', function(event){
 		event.stopPropagation();
 		event.preventDefault();
@@ -149,7 +148,7 @@
 				$('#used_amount').text(cash.substr(0,cash.length-1));
 				break;
 				case 'nett':
-				var remain_amount = $('#paymentamt').val();
+				var remain_amount = $('#redeemamt').val();
 				$('#used_amount').text(remain_amount);
 				break;
 
@@ -160,22 +159,22 @@
 		}
 	});
 
-	$("#dinga_payment").click(function(){
+	$("#dinga").click(function(){
 		valid_amount = $("#valid_amount").val();
 		sale_id = $("#valid_amount").attr('data-value');
 		membership_id = $("#valid_amount").attr('data-member-value');
-		payment_amount = parseFloat($("#used_amount").text());
-		if(payment_amount<=0 ){
+		redeem_amount = parseFloat($("#used_amount").text());
+		if(redeem_amount<=0 ){
 			swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
-		}else if(valid_amount< payment_amount){
+		}else if(valid_amount< redeem_amount){
 			swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
 		}else{
-			if(payment_amount <= "<%= @payment_prices %>"){
+			if(redeem_amount <= "<%= @redeem_prices %>"){
 				$(this).off("click");
 				$.ajax({
 					type: "POST",
 					url:  "<%=origami_payment_dinga_path%>",
-					data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id},
+					data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id},
 					success: function(result){
 						if(result.status == true){
 							swal({
@@ -195,7 +194,7 @@
 					}
 				})
 			}else {
-				swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+				swal ( "Oops" ,  "Redeem Amount is over!" ,  "warning" );
 			}
 		}
 	});

From 66df760323c56c4b60408438595a2c6655fc0cb1 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 9 Apr 2018 11:51:39 +0630
Subject: [PATCH 572/651] update order & reservation

---
 .../origami/order_reservation_controller.rb   | 12 ++++
 app/views/origami/dashboard/index.html.erb    | 15 ++++-
 .../origami/order_reservation/index.html.erb  | 61 +++++++++++++++++++
 config/locales/en.yml                         |  1 +
 config/locales/mm.yml                         |  1 +
 config/routes.rb                              |  2 +
 6 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/origami/order_reservation_controller.rb
 create mode 100644 app/views/origami/order_reservation/index.html.erb

diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
new file mode 100644
index 00000000..db56d882
--- /dev/null
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -0,0 +1,12 @@
+class Origami::OrderReservationController < BaseOrigamiController
+
+  def index
+    @webview = check_mobile
+    @shop     = Shop::ShopDetail
+
+  end
+
+
+
+
+end
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 68b09437..1b6a554e 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -34,6 +34,14 @@
           <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
         </div>
       </div>
+      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 order_reservation">
+        <div class="info-box bg-blue">
+          <div class="icon" >
+            <i class="material-icons">arrow_forward</i>
+          </div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :order_reservation %></div>
+        </div>
+      </div>
     </div>
     <!-- #END# Widgets -->
     <% if !@current_user.nil? && @current_user.role != 'waiter' %>
@@ -199,8 +207,11 @@
 
   $(".qs_view").on('click', function() {
      document.getElementById('second_view').click();
-     window.location.href = '/origami/quick_service';
-    
+     window.location.href = '/origami/quick_service'; 
+  });
+
+  $(".order_reservation").on('click', function() {
+     window.location.href = '/origami/order_reservation';
   });
   
  $("#second_view").on('click', function () {
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
new file mode 100644
index 00000000..e1e7c57e
--- /dev/null
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -0,0 +1,61 @@
+<div class="container-fluid">
+  <div class="row">
+    <div class="<%= @webview==true ? 'col-lg-12 col-md-12 col-sm-12' : 'col-lg-10 col-md-10 col-sm-10'%>">
+      <ul class="nav nav-tabs tab-col-teal" role="tablist">
+        <li class="nav-item">
+          <a class="nav-link" data-toggle="tab" href="#complete" role="tab"><%= t :competed %></a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link active" data-toggle="tab" href="#tables" role="tab"><%= t :tables %></a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><%= t :rooms %></a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
+        </li>
+      </ul>
+       <div class="tab-content m-t-10"  id="custom-slimscroll">
+         <div class="tab-pane dining" id="complete" role="tabpanel">
+           <div class="card-columns">
+             <% @complete.each do |sale| %>
+             <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
+               <div class="card-block">
+                <%= sale.receipt_no %>
+                <span class="pull-right"><%= sale.sale_status %></span>
+              </div>
+            </div>
+            <% end %>
+          </div>
+        </div>
+
+        <!--- Panel 3 - Orders -->
+        <div class="tab-pane dining" id="orders" role="tabpanel">
+         <div class="card-columns">
+           <% @orders.each do |order| %>
+           <div class="card orders red text-white" data-id = "<%= order.order_id %>">
+             <div class="card-block">
+              <%= order.order_id %>
+            </div>
+          </div>
+          <% end %>
+        </div>
+      </div>
+
+    </div>
+    <!-- tabs - End -->
+  </div>
+    <div class="<%= @webview==true ? 'hidden' : 'col-lg-2 col-md-2 col-sm-2' %>">
+    </div>
+  </div>
+</div>
+<!-- Column One -->
+<script>
+  $(document).ready(function(){
+    var webview = <%= @webview %>;
+    if(webview){
+    code2lab.checkMobile(webview); //js func: for mobile login
+  }
+  showHideNavbar(webview,"index");
+}
+</script>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0e787751..e73771e5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -74,6 +74,7 @@ en:
   date_time: "DateTime"
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
+  order_reservation: "Order & Reservation"
 
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 406bcaf4..8a7b424a 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -69,6 +69,7 @@ mm:
   date_time: "ရက်စွဲအ�ျိန်"
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
+  order_reservation: "Order & Reservation"
   
   views:
     btn:       
diff --git a/config/routes.rb b/config/routes.rb
index 2c25db97..148af0ba 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -257,6 +257,8 @@ scope "(:locale)", locale: /en|mm/ do
 
     post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
 
+    #order and reservation
+    resources :order_reservation
   end
 
   #--------- Waiter/Ordering Station ------------#

From 46a20dc0069ba4dae80cf6a9d970aca166d7fa7d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 9 Apr 2018 13:19:47 +0630
Subject: [PATCH 573/651] update order & reservation

---
 .../origami/order_reservation/index.html.erb  | 66 ++++++++++---------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index e1e7c57e..22052479 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -1,6 +1,6 @@
 <div class="container-fluid">
   <div class="row">
-    <div class="<%= @webview==true ? 'col-lg-12 col-md-12 col-sm-12' : 'col-lg-10 col-md-10 col-sm-10'%>">
+    <div class="col-lg-4 col-md-4 col-sm-4">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
         <li class="nav-item">
           <a class="nav-link" data-toggle="tab" href="#complete" role="tab"><%= t :competed %></a>
@@ -15,47 +15,51 @@
           <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
         </li>
       </ul>
-       <div class="tab-content m-t-10"  id="custom-slimscroll">
-         <div class="tab-pane dining" id="complete" role="tabpanel">
-           <div class="card-columns">
-             <% @complete.each do |sale| %>
-             <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
-               <div class="card-block">
-                <%= sale.receipt_no %>
-                <span class="pull-right"><%= sale.sale_status %></span>
-              </div>
-            </div>
-            <% end %>
-          </div>
+
+      <div class="tab-content m-t-10"  id="custom-slimscroll">
+        <div class="tab-pane dining" id="complete" role="tabpanel">
+              <div class="card">
+                <div class="card-header">rrrrr</div>
+                <div class="card-block">
+                  RRRRRR
+                  <span class="pull-right">SSSSSSSSSSS</span>
+                </div>
+              </div>          
         </div>
 
         <!--- Panel 3 - Orders -->
         <div class="tab-pane dining" id="orders" role="tabpanel">
-         <div class="card-columns">
-           <% @orders.each do |order| %>
-           <div class="card orders red text-white" data-id = "<%= order.order_id %>">
-             <div class="card-block">
-              <%= order.order_id %>
-            </div>
-          </div>
-          <% end %>
+              <div class="card">
+                <div class="card-header"></div>
+                <div class="card-block">
+                 oOOOOOOOOOOOOO
+                </div>
+              </div>          
         </div>
       </div>
 
     </div>
-    <!-- tabs - End -->
-  </div>
-    <div class="<%= @webview==true ? 'hidden' : 'col-lg-2 col-md-2 col-sm-2' %>">
+
+    <div class="'col-lg-4 col-md-4 col-sm-4'">
+      <div class="card">
+        <div class="card-header"></div>
+        <div class="card-block">
+          
+        </div>
+      </div>
+    </div>
+    
+    <div class="'col-lg-4 col-md-4 col-sm-4'">
+      <div class="card">
+        <div class="card-header"></div>
+        <div class="card-block">
+          
+        </div>
+      </div>
     </div>
   </div>
 </div>
 <!-- Column One -->
 <script>
-  $(document).ready(function(){
-    var webview = <%= @webview %>;
-    if(webview){
-    code2lab.checkMobile(webview); //js func: for mobile login
-  }
-  showHideNavbar(webview,"index");
-}
+  
 </script>

From 308ecf949170f7307bca16f646be4a0233eaaa44 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 9 Apr 2018 13:49:42 +0630
Subject: [PATCH 574/651] update ordersummarysetPdf and slim for print setting
 to printer_setting

---
 app/pdf/order_summary_set_pdf.rb  | 4 ++--
 app/pdf/order_summary_slim_pdf.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index b9723a5c..316bbe44 100755
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -4,8 +4,8 @@ class OrderSummarySetPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size.to_i
-    self.item_font_size = printer_settings.item_font_size.to_i
+    self.header_font_size = print_settings.header_font_size.to_i
+    self.item_font_size = print_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
index 77aafc60..1e93fc0d 100755
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -4,8 +4,8 @@ class OrderSummarySlimPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
-    self.header_font_size = printer_settings.header_font_size.to_i
-    self.item_font_size = printer_settings.item_font_size.to_i
+    self.header_font_size = print_settings.header_font_size.to_i
+    self.item_font_size = print_settings.item_font_size.to_i
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40

From f6ba7403c57154803d314c6216614a8937966d66 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 13:55:54 +0630
Subject: [PATCH 575/651] add customer api for order reservation

---
 .../api/order_reservation_controller.rb       | 34 +++++++++++++++++++
 config/routes.rb                              |  5 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/api/order_reservation_controller.rb

diff --git a/app/controllers/api/order_reservation_controller.rb b/app/controllers/api/order_reservation_controller.rb
new file mode 100644
index 00000000..97c07669
--- /dev/null
+++ b/app/controllers/api/order_reservation_controller.rb
@@ -0,0 +1,34 @@
+class Api::OrderReservationController < Api::ApiController
+	skip_before_action  :authenticate
+  
+	def check_customer
+		customer_name             = params[:name]
+		customer_email            = params[:email]
+		customer_contact_no       = params[:contact_no]
+		customer_gender           = params[:gender]
+		customer_addr             = params[:address]
+		customer_membership_id    = params[:membership_id]
+		customer_membership_type  = params[:membership_type]
+		customer_date_of_birth    = params[:date_of_birth]
+		customer_id               = 0
+
+		check_customer = Customer.find_by_email_and_contact_no_and_membership_id_and_membership_type(customer_email,customer_contact_no,customer_membership_id,customer_membership_type)
+		if !check_customer.nil?
+		  customer_id = check_customer.customer_id
+		else
+		  customer = Customer.new
+		  customer.name             = customer_name
+		  customer.email            = customer_email
+		  customer.contact_no       = customer_contact_no
+		  customer.gender           = customer_gender
+		  customer.address          = customer_addr
+		  customer.date_of_birth    = Time.parse(customer_date_of_birth).strftime("%Y-%m-%d")
+		  customer.membership_id    = customer_membership_id
+		  customer.membership_type  = customer_membership_type
+		  customer.save!
+		  customer_id = customer.id
+		end
+
+		render :json => { :status => true, :data => { customer_id : customer_id} }
+	end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 365d5a79..7c224dfa 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -82,7 +82,10 @@ scope "(:locale)", locale: /en|mm/ do
       post "survey/:id" => "survey#create"
     end
 
-    
+    #order and reservation api
+    namespace :order_reservation do
+      post "customer" => "order_reservation#check_customer"
+    end
   end
 
   #--------- Cashier ------------#

From c2ea0e25158a7f46cdf9a293b9947d641a8ddc86 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 9 Apr 2018 15:51:23 +0630
Subject: [PATCH 576/651] remove validate brand name and check jade mobile

---
 app/models/print_setting.rb           | 2 +-
 app/views/origami/home/index.html.erb | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb
index 0760b59f..9b883726 100755
--- a/app/models/print_setting.rb
+++ b/app/models/print_setting.rb
@@ -1,6 +1,6 @@
 class PrintSetting < ApplicationRecord
 	# validations
-	validates_presence_of :name, :unique_code, :printer_name, :brand_name, :api_settings, :page_width, :page_height, :print_copies, :header_font_size, :item_font_size
+	validates_presence_of :name, :unique_code, :printer_name, :api_settings, :page_width, :page_height, :print_copies, :header_font_size, :item_font_size
 
 	def self.get_precision_delimiter
 		PrintSetting.find_by_unique_code("ReceiptBillPdf")
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 5e280697..8c67a36d 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -140,9 +140,7 @@
 <script>
 $(document).ready(function(){
   var webview = <%= @webview %>;
-  if(webview){
-    code2lab.checkMobile(webview); //js func: for mobile login
-  }
+
   showHideNavbar(webview,"index");
 
   $(".tables").on('click', function(){

From 6f6e6f040539901e8207a3d2dea6b2c69a16e1da Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 9 Apr 2018 16:03:34 +0630
Subject: [PATCH 577/651] update order

---
 .../origami/order_reservation/index.html.erb  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 22052479..fe23f40e 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -2,17 +2,17 @@
   <div class="row">
     <div class="col-lg-4 col-md-4 col-sm-4">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
-        <li class="nav-item">
-          <a class="nav-link" data-toggle="tab" href="#complete" role="tab"><%= t :competed %></a>
+        <li class="nav-item active" data-color="#F44336">
+          <a class="nav-link" data-toggle="tab" href="#complete" role="tab"><%= t :pending %></a>
         </li>
-        <li class="nav-item">
-          <a class="nav-link active" data-toggle="tab" href="#tables" role="tab"><%= t :tables %></a>
+        <li class="nav-item" data-color="#673AB7">
+          <a class="nav-link" data-toggle="tab" href="#tables" role="tab"><%= t :processing %></a>
         </li>
-        <li class="nav-item">
-          <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><%= t :rooms %></a>
+        <li class="nav-item" data-color="#009688">
+          <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><%= t :delivering %></a>
         </li>
-        <li class="nav-item">
-          <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
+        <li class="nav-item" data-color="#03A9F4">
+          <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :completed %></a>
         </li>
       </ul>
 
@@ -61,5 +61,14 @@
 </div>
 <!-- Column One -->
 <script>
+  $(document).ready(function() {
+   color = $(".active").attr("data-color");
+   
+});
   
 </script>
+<style type="text/css">
+  .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
+  color
+}
+</style>
\ No newline at end of file

From 4bc56a31b80c47a2835c40feb8044e70418395f6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 16:23:16 +0630
Subject: [PATCH 578/651] check time

---
 .../api/check_in_process_controller.rb            |  2 +-
 .../order_reservation_controller.rb               | 15 ++++++++-------
 app/models/customer.rb                            |  4 ++--
 .../api/order_reservation/index.json.jbuilder     |  0
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename app/controllers/api/{ => order_reservation}/order_reservation_controller.rb (70%)
 create mode 100644 app/views/api/order_reservation/index.json.jbuilder

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 3d375eee..4bd9434d 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -49,7 +49,7 @@ class Api::CheckInProcessController < Api::ApiController
 						arr_time = checkout_time[0].split("-")
 						start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
 						end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
-						if start_time <= checkout_at.strftime("%H:%M%p") && checkout_at.strftime("%H:%M%p") <= end_time
+						if start_time <= today.strftime("%H:%M%p") && today.strftime("%H:%M%p") <= end_time
 							checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 						end
 					end
diff --git a/app/controllers/api/order_reservation_controller.rb b/app/controllers/api/order_reservation/order_reservation_controller.rb
similarity index 70%
rename from app/controllers/api/order_reservation_controller.rb
rename to app/controllers/api/order_reservation/order_reservation_controller.rb
index 97c07669..aa01ec39 100644
--- a/app/controllers/api/order_reservation_controller.rb
+++ b/app/controllers/api/order_reservation/order_reservation_controller.rb
@@ -1,5 +1,5 @@
-class Api::OrderReservationController < Api::ApiController
-	skip_before_action  :authenticate
+class Api::OrderReservation::OrderReservationController < Api::ApiController
+	# skip_before_action  :authenticate
   
 	def check_customer
 		customer_name             = params[:name]
@@ -8,11 +8,10 @@ class Api::OrderReservationController < Api::ApiController
 		customer_gender           = params[:gender]
 		customer_addr             = params[:address]
 		customer_membership_id    = params[:membership_id]
-		customer_membership_type  = params[:membership_type]
 		customer_date_of_birth    = params[:date_of_birth]
 		customer_id               = 0
 
-		check_customer = Customer.find_by_email_and_contact_no_and_membership_id_and_membership_type(customer_email,customer_contact_no,customer_membership_id,customer_membership_type)
+		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(customer_email,customer_contact_no,customer_membership_id)
 		if !check_customer.nil?
 		  customer_id = check_customer.customer_id
 		else
@@ -24,11 +23,13 @@ class Api::OrderReservationController < Api::ApiController
 		  customer.address          = customer_addr
 		  customer.date_of_birth    = Time.parse(customer_date_of_birth).strftime("%Y-%m-%d")
 		  customer.membership_id    = customer_membership_id
-		  customer.membership_type  = customer_membership_type
-		  customer.save!
+		  customer.customer_type    = "Doemal"
+          customer.tax_profiles     = ["2"]
+		  customer.save
+
 		  customer_id = customer.id
 		end
 
-		render :json => { :status => true, :data => { customer_id : customer_id} }
+		render :json => { :status => true, :data => { :customer_id => customer_id} }
 	end
 end
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 934d371f..b05caaf6 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -9,10 +9,10 @@ class Customer < ApplicationRecord
   has_many :orders
   has_many :sales
 
-  validates_presence_of :name, :contact_no, :email,:card_no
+  validates_presence_of :name, :contact_no, :email #,:card_no
   validates :contact_no, uniqueness: true, numericality: true
   validates :email, uniqueness: true,format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create }
-  validates :card_no, uniqueness: true
+  # validates :card_no, uniqueness: true
   # validates :paypar_account_no, uniqueness: true
 
   paginates_per 50
diff --git a/app/views/api/order_reservation/index.json.jbuilder b/app/views/api/order_reservation/index.json.jbuilder
new file mode 100644
index 00000000..e69de29b

From 57be26be77aa555550a0c90b4b66cc8d0694dfe5 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 16:59:59 +0630
Subject: [PATCH 579/651] check customer

---
 .../order_reservation_controller.rb           | 22 ++-----------------
 app/models/customer.rb                        | 17 ++++++++++++++
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/controllers/api/order_reservation/order_reservation_controller.rb b/app/controllers/api/order_reservation/order_reservation_controller.rb
index aa01ec39..43b9c597 100644
--- a/app/controllers/api/order_reservation/order_reservation_controller.rb
+++ b/app/controllers/api/order_reservation/order_reservation_controller.rb
@@ -2,31 +2,13 @@ class Api::OrderReservation::OrderReservationController < Api::ApiController
 	# skip_before_action  :authenticate
   
 	def check_customer
-		customer_name             = params[:name]
-		customer_email            = params[:email]
-		customer_contact_no       = params[:contact_no]
-		customer_gender           = params[:gender]
-		customer_addr             = params[:address]
-		customer_membership_id    = params[:membership_id]
-		customer_date_of_birth    = params[:date_of_birth]
 		customer_id               = 0
 
-		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(customer_email,customer_contact_no,customer_membership_id)
+		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(params[:email],params[:contact_no],params[:membership_id])
 		if !check_customer.nil?
 		  customer_id = check_customer.customer_id
 		else
-		  customer = Customer.new
-		  customer.name             = customer_name
-		  customer.email            = customer_email
-		  customer.contact_no       = customer_contact_no
-		  customer.gender           = customer_gender
-		  customer.address          = customer_addr
-		  customer.date_of_birth    = Time.parse(customer_date_of_birth).strftime("%Y-%m-%d")
-		  customer.membership_id    = customer_membership_id
-		  customer.customer_type    = "Doemal"
-          customer.tax_profiles     = ["2"]
-		  customer.save
-
+		  customer = Customer.addCustomer(params)
 		  customer_id = customer.id
 		end
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index b05caaf6..2ece4330 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -352,6 +352,23 @@ class Customer < ApplicationRecord
 
   end
 
+  #new customer for doemal
+  def self.addCustomer(params)
+    customer = Customer.new
+    customer.name             = params[:name]
+    customer.email            = params[:email]
+    customer.contact_no       = params[:contact_no]
+    customer.gender           = params[:gender]
+    customer.address          = params[:address]
+    customer.date_of_birth    = Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d")
+    customer.membership_id    = params[:membership_id]
+    customer.customer_type    = "Takeaway"
+    customer.tax_profiles     = ["2"]
+    customer.save
+
+    return customer
+  end
+
    WALKIN   = "CUS-000000000001"
    TAKEAWAY = "CUS-000000000002"
 

From 4810628930fdc48184709ed92debff2bb07a6369 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 10 Apr 2018 09:56:31 +0630
Subject: [PATCH 580/651] udate ui

---
 .../origami/order_reservation/index.html.erb  | 261 +++++++++++++++---
 1 file changed, 225 insertions(+), 36 deletions(-)

diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index fe23f40e..f22d5f09 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -2,39 +2,94 @@
   <div class="row">
     <div class="col-lg-4 col-md-4 col-sm-4">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
-        <li class="nav-item active" data-color="#F44336">
-          <a class="nav-link" data-toggle="tab" href="#complete" role="tab"><%= t :pending %></a>
+        <li class="nav-item active" data-color="#F44336" style="background-color: #F44336;">
+          <a class="nav-link" data-toggle="tab" href="#complete" role="tab"><p class="num">4</p> <%= t :pending %></a>
         </li>
-        <li class="nav-item" data-color="#673AB7">
-          <a class="nav-link" data-toggle="tab" href="#tables" role="tab"><%= t :processing %></a>
+        <li class="nav-item" data-color="#673AB7" style="background-color: #673AB7;">
+          <a class="nav-link" data-toggle="tab" href="#tables" role="tab"><p class="num">4</p> <%= t :processing %></a>
         </li>
-        <li class="nav-item" data-color="#009688">
-          <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><%= t :delivering %></a>
+        <li class="nav-item" data-color="#009688" style="background-color: #009688;">
+          <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><p class="num">4</p> <%= t :delivering %></a>
         </li>
-        <li class="nav-item" data-color="#03A9F4">
-          <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :completed %></a>
+        <li class="nav-item" data-color="#03A9F4" style="background-color: #03A9F4;">
+          <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><p class="num">4</p> <%= t :completed %></a>
         </li>
       </ul>
 
-      <div class="tab-content m-t-10"  id="custom-slimscroll">
+      <div class="tab-content">
         <div class="tab-pane dining" id="complete" role="tabpanel">
-              <div class="card">
-                <div class="card-header">rrrrr</div>
-                <div class="card-block">
-                  RRRRRR
-                  <span class="pull-right">SSSSSSSSSSS</span>
-                </div>
-              </div>          
+          <div class="card">
+            <div class="card-block">
+              <div class="card-text">
+                <table table table-striped>
+                <tbody>
+                  <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                </tbody>
+              </table>
+              </div>
+            </div>
+          </div>          
         </div>
 
         <!--- Panel 3 - Orders -->
         <div class="tab-pane dining" id="orders" role="tabpanel">
-              <div class="card">
-                <div class="card-header"></div>
-                <div class="card-block">
-                 oOOOOOOOOOOOOO
-                </div>
-              </div>          
+          <div class="card">
+            <div class="card-header" style="color:">
+              <table>
+                <tr>
+                  <td>No.11 (DELIVERY)</td>
+                  <td>0065 4321 0012</td>
+                </tr>
+              </table>
+            </div>
+            <div class="card-block">
+              <div class="card-text">
+                <table table table-striped>
+                <tbody>
+                  <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                <tr>
+                  <td class="item-name">aaaa</td>
+                  <td class="item-attr">aaaa</td>
+                  <td class="item-attr">ssss</td>
+                </tr>
+                </tbody>
+              </table>
+              </div>
+            </div>
+          </div>          
         </div>
       </div>
 
@@ -42,11 +97,84 @@
 
     <div class="'col-lg-4 col-md-4 col-sm-4'">
       <div class="card">
-        <div class="card-header"></div>
-        <div class="card-block">
-          
+          <div class="card-header custom-card-header" style="color:">
+            <table class="table">
+              <tr>
+                <td width ="70%" class="header-td align-left"><b class="col-pink font-16">No.11</b> 
+                    <span class="font-13">(DELIVERY)</span>
+                </td>
+                <td width ="30%" class="header-td font-16 align-right"><b>0065 4321</b></td>
+              </tr>
+            </table>
+          </div>
+        <div class="card-block custom-card-block">
+          <table class="table">
+            <tbody>
+              <tr>
+                 <td width ="70%" class="body-td align-left">
+                   MENU ITEM 01
+                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                </td>
+                <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+              <tr>
+                <td width ="70%" class="body-td align-left">
+                    MENU ITEM 01
+                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                </td>
+                <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+              <tr>
+                <td width ="70%" class="body-td align-left">
+                   MENU ITEM 01
+                    <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                 </td>
+                 <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+              <tr>
+                <td width ="70%" class="body-td align-left">
+                   MENU ITEM 01
+                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                </td>
+                <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+            </tbody>
+          </table>
         </div>
-      </div>
+        <div class="card-footer custom-card-footer">
+          <table class="table">
+            <tbody>
+              <tr>
+                 <td width ="70%" class="body-td align-left">
+                   MENU ITEM 01
+                </td>
+                <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+              <tr>
+                <td width ="70%" class="body-td align-left">
+                    MENU ITEM 01
+                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                </td>
+                <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+              <tr>
+                <td width ="70%" class="body-td align-left">
+                   MENU ITEM 01
+                    <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                 </td>
+                 <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+              <tr>
+                <td width ="70%" class="body-td align-left">
+                   MENU ITEM 01
+                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                </td>
+                <td width ="30%" class="body-td align-right">1400.00</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>  
     </div>
     
     <div class="'col-lg-4 col-md-4 col-sm-4'">
@@ -59,16 +187,77 @@
     </div>
   </div>
 </div>
-<!-- Column One -->
-<script>
-  $(document).ready(function() {
-   color = $(".active").attr("data-color");
-   
-});
-  
-</script>
 <style type="text/css">
-  .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
-  color
+  .nav-tabs > li.active > a, 
+  .nav-tabs > li.active > a:hover,
+  .nav-tabs > li.active > a:focus {
+    border-bottom: 2px solid #2196F3 ;
+    bottom: 2px ;
+}
+
+.nav-tabs .nav-link {
+    padding: 0.9286em .35em;
+}
+.nav-tabs li a.active {
+    color: #111 !important;
+    border-bottom: 0px solid #fff !important;
+}
+.nav-tabs .nav-link.active {
+    color: #111;
+    border-color: #fff;
+}
+.nav-tabs > li > a {
+    margin-right: 0px;
+    color:#fff !important;
+}
+
+.nav-tabs > li > a {
+    border-bottom: 2px solid #2196F3;
+    bottom: 2px;
+}
+.nav-tabs.tab-col-teal > li > a:before {
+    border-bottom: 0px solid #009688;
+}
+.nav-item .a .nav-link {
+}
+.num{
+  color:#fff;
+  text-align: center;
+  margin-bottom: -1px !important;
+}
+.nav-tabs .nav-link.active > p{
+    color: #111;
+    border-color: #fff;
+}
+
+/*Custosm Class*/
+.table .header-td{
+  border-top:0px solid !important;
+  border-bottom: 0px solid !important;
+  padding:0px 7px !important;
+  border-top:0px solid !important;
+  border-bottom: 0px solid !important;
+}
+.card-block .table td:first-child,
+.card-block .table td:nth-child(2),
+.card-footer .table td:first-child,
+.card-footer .table td:nth-child(2){
+  border-top:0px solid !important;
+}
+
+/*.card-block .table .body-td:last-child,
+.card-footer .table .body-td:last-child{
+  border-bottom:0px solid !important;
+}*/
+.custom-card-header{
+  border-bottom: 1px solid #F8BBD0 !important;
+}
+.custom-card-footer{
+  border-top: 1px solid #F8BBD0 !important;
+}
+.custom-card-header,
+.custom-card-block,
+.custom-card-footer{
+  padding :5px !important;
 }
 </style>
\ No newline at end of file

From 0e39e4577f1e407eed2b86d7b7a8ba057f3e28bf Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 10 Apr 2018 10:51:33 +0630
Subject: [PATCH 581/651] update request bill check from quick service

---
 app/views/origami/pending_order/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index de208374..0cc6f949 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -202,13 +202,13 @@ $(document).ready(function(){
   // Bill Request
     $('#request_bills').click(function () {
       var order_id = $('#save_order_id').val();
-      var ajax_url = "/origami/" + order_id + "/request_bills";
+      var ajax_url = "../../../origami/" +order_id+ "/request_bills";
+      console.log(ajax_url)
       $.ajax({
           type: "GET",
           url: ajax_url,
           // data: 'order_id='+ order_id,
           success: function (result) {
-            console.log(result)
               if (!result.status) {
                 swal("Information!", result.error_message);
               }

From 77adad241791c0172e70ec1f41bd439fbedaf1e3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 10 Apr 2018 15:19:46 +0630
Subject: [PATCH 582/651] update order_reservaiotn ui fishe

---
 .../origami/order_reservation/index.html.erb  | 470 +++++++++++++-----
 1 file changed, 339 insertions(+), 131 deletions(-)

diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index f22d5f09..42628dd9 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -1,101 +1,228 @@
 <div class="container-fluid">
-  <div class="row">
-    <div class="col-lg-4 col-md-4 col-sm-4">
+  <div class="row m-t--10">
+    <div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
         <li class="nav-item active" data-color="#F44336" style="background-color: #F44336;">
-          <a class="nav-link" data-toggle="tab" href="#complete" role="tab"><p class="num">4</p> <%= t :pending %></a>
+          <a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">4</p> <%= t :pending %></a>
         </li>
         <li class="nav-item" data-color="#673AB7" style="background-color: #673AB7;">
-          <a class="nav-link" data-toggle="tab" href="#tables" role="tab"><p class="num">4</p> <%= t :processing %></a>
+          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :processing %></a>
         </li>
         <li class="nav-item" data-color="#009688" style="background-color: #009688;">
-          <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><p class="num">4</p> <%= t :delivering %></a>
+          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivering %></a>
         </li>
         <li class="nav-item" data-color="#03A9F4" style="background-color: #03A9F4;">
-          <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><p class="num">4</p> <%= t :completed %></a>
+          <a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num">4</p> <%= t :completed %></a>
         </li>
       </ul>
 
-      <div class="tab-content">
-        <div class="tab-pane dining" id="complete" role="tabpanel">
-          <div class="card">
-            <div class="card-block">
-              <div class="card-text">
-                <table table table-striped>
+      <div class="tab-content m-t--10">
+        <div class="tab-pane active" id="pending" role="tabpanel">
+          <div class="card-block font-13">
+            <div id="menu-slimscroll" data-height="50">
+              <table class="table table-stripe custom-table">
                 <tbody>
                   <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
-                <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
-                <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
-                <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
+                    <td width ="5%" class="align-left">
+                       1
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       2
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       3
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       4
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
                 </tbody>
               </table>
-              </div>
             </div>
-          </div>          
+          </div>        
         </div>
 
         <!--- Panel 3 - Orders -->
-        <div class="tab-pane dining" id="orders" role="tabpanel">
-          <div class="card">
-            <div class="card-header" style="color:">
-              <table>
-                <tr>
-                  <td>No.11 (DELIVERY)</td>
-                  <td>0065 4321 0012</td>
-                </tr>
-              </table>
-            </div>
-            <div class="card-block">
-              <div class="card-text">
-                <table table table-striped>
+        <div class="tab-pane dining" id="processing" role="tabpanel">
+          <div class="card-block font-13">
+            <div id="menu-slimscroll" data-height="50">
+              <table class="table table-stripe custom-table">
                 <tbody>
                   <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
-                <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
-                <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
-                <tr>
-                  <td class="item-name">aaaa</td>
-                  <td class="item-attr">aaaa</td>
-                  <td class="item-attr">ssss</td>
-                </tr>
+                    <td width ="5%" class="align-left">
+                       1
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       2
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  
                 </tbody>
               </table>
-              </div>
             </div>
-          </div>          
+          </div>   
+        </div>
+        <!--- Panel 3 - Orders -->
+        <div class="tab-pane dining" id="delivery" role="tabpanel">
+          <div class="card-block font-13">
+            <div id="menu-slimscroll" data-height="50">
+              <table class="table table-stripe custom-table">
+                <tbody>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       1
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       2
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       3
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  
+                </tbody>
+              </table>
+            </div>
+          </div>      
+        </div>
+        <!--- Panel 3 - Orders -->
+        <div class="tab-pane dining" id="completed" role="tabpanel">
+          <div class="card-block font-13">
+            <div id="menu-slimscroll" data-height="50">
+              <table class="table table-stripe custom-table">
+                <tbody>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       1
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width ="5%" class="align-left">
+                       3
+                    </td>
+                    <td width ="30%" class="align-center">
+                       3:30 PM
+                    </td>
+                    <td width ="30%" class="align-center">
+                       13000
+                    </td>
+                    <td width ="30%" class="align-center">
+                      <span class="font-10 col-blue">STATUS</span>
+                    </td>
+                  </tr>
+                  
+                </tbody>
+              </table>
+            </div>
+          </div>      
         </div>
       </div>
 
     </div>
 
-    <div class="'col-lg-4 col-md-4 col-sm-4'">
+    <div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px -5px !important ">
       <div class="card">
           <div class="card-header custom-card-header" style="color:">
             <table class="table">
@@ -108,68 +235,101 @@
             </table>
           </div>
         <div class="card-block custom-card-block">
-          <table class="table">
-            <tbody>
-              <tr>
-                 <td width ="70%" class="body-td align-left">
-                   MENU ITEM 01
-                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                </td>
-                <td width ="30%" class="body-td align-right">1400.00</td>
-              </tr>
-              <tr>
-                <td width ="70%" class="body-td align-left">
-                    MENU ITEM 01
-                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                </td>
-                <td width ="30%" class="body-td align-right">1400.00</td>
-              </tr>
-              <tr>
-                <td width ="70%" class="body-td align-left">
-                   MENU ITEM 01
-                    <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                 </td>
-                 <td width ="30%" class="body-td align-right">1400.00</td>
-              </tr>
-              <tr>
-                <td width ="70%" class="body-td align-left">
-                   MENU ITEM 01
-                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                </td>
-                <td width ="30%" class="body-td align-right">1400.00</td>
-              </tr>
-            </tbody>
-          </table>
+          <div id="order-detail-slimscroll" data-height="220">
+            <table class="table">
+              <tbody>
+                <tr>
+                   <td width ="70%" class="body-td align-left">
+                     MENU ITEM 01
+                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                  </td>
+                  <td width ="30%" class="body-td align-right">1400.00</td>
+                </tr>
+                <tr>
+                  <td width ="70%" class="body-td align-left">
+                      MENU ITEM 01
+                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                  </td>
+                  <td width ="30%" class="body-td align-right">1400.00</td>
+                </tr>
+                <tr>
+                  <td width ="70%" class="body-td align-left">
+                     MENU ITEM 01
+                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                   </td>
+                   <td width ="30%" class="body-td align-right">1400.00</td>
+                </tr>
+                <tr>
+                  <td width ="70%" class="body-td align-left">
+                     MENU ITEM 01
+                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                  </td>
+                  <td width ="30%" class="body-td align-right">1400.00</td>
+                </tr>
+                <tr>
+                  <td width ="70%" class="body-td align-left">
+                     MENU ITEM 01
+                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                   </td>
+                   <td width ="30%" class="body-td align-right">1400.00</td>
+                </tr>
+                <tr>
+                  <td width ="70%" class="body-td align-left">
+                     MENU ITEM 01
+                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                  </td>
+                  <td width ="30%" class="body-td align-right">1400.00</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
         </div>
         <div class="card-footer custom-card-footer">
           <table class="table">
             <tbody>
               <tr>
-                 <td width ="70%" class="body-td align-left">
-                   MENU ITEM 01
+                <td width ="70%" class="footer-td align-left">
+                   SUB TOTAL 
                 </td>
-                <td width ="30%" class="body-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right">1400.00</td>
               </tr>
               <tr>
-                <td width ="70%" class="body-td align-left">
-                    MENU ITEM 01
-                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+                <td width ="70%" class="footer-td align-left">
+                   DELIVERY FEES (PICK-UP)
                 </td>
-                <td width ="30%" class="body-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right">1400.00</td>
               </tr>
               <tr>
-                <td width ="70%" class="body-td align-left">
-                   MENU ITEM 01
-                    <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                 </td>
-                 <td width ="30%" class="body-td align-right">1400.00</td>
+                <td width ="70%" class="footer-td align-left">
+                   CONVENIENCE CHARGES
+                </td>
+                <td width ="30%" class="footer-td align-right">1400.00</td>
               </tr>
               <tr>
-                <td width ="70%" class="body-td align-left">
-                   MENU ITEM 01
-                   <br><span class="font-13">2 <span class="col-blue">X700</span></span>
+               <td width ="70%" class="footer-td align-left">
+                   GOVERNMENT TAX
+                </td>
+                <td width ="30%" class="footer-td align-right">1400.00</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="card-footer grand-card-footer">
+          <table class="table">
+            <tbody>
+              <tr>
+                <td width ="70%" class="footer-td align-left col-blue">
+                   GRAND TOTAL 
+                </td>
+                <td width ="30%" class="footer-td align-right col-blue">1400.00</td>
+              </tr>
+              <tr>
+                <td width ="50%" class="footer-td align-left col-blue">
+                  <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>DECLINE</strong></button>
+                </td>
+                <td width ="50%" class="footer-td align-right col-blue">
+                <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>ACCEPT</strong></button>
                 </td>
-                <td width ="30%" class="body-td align-right">1400.00</td>
               </tr>
             </tbody>
           </table>
@@ -177,11 +337,46 @@
       </div>  
     </div>
     
-    <div class="'col-lg-4 col-md-4 col-sm-4'">
-      <div class="card">
-        <div class="card-header"></div>
+    <div class="'col-lg-4 col-md-4 col-sm-4'" style="margin:0px -5px 0px -2px !important ">
+      <div class="card" style="background-color: #E8EAF6">
+        <div class="card-header custom-card-header" style="background-color: #E8EAF6">
+          <table class="table">
+            <tr>
+              <td width ="" class="header-td align-left col-blue">CUSTOMER & DELIVERY INFORMATION 
+              </td>
+            </tr>
+          </table>
+        </div>
         <div class="card-block">
-          
+          <table class="table">
+              <tbody>
+                <tr>
+                  <td class="body-td align-left">
+                     <span class="font-13">NAME</span><br>
+                     <b>DAW AYE AYE</b>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="body-td align-left">
+                     <span class="font-13">PHONE</span><br>
+                     <b>09 8765 4321 098</b>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="body-td align-left">
+                     <span class="font-13">ADDRESS</span><br>
+                     <b>No. (12), 3rd floor, zay kyee Street, kyi myin dine
+                      infront of Nya Zay Main Entrance</b>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="body-td align-left">
+                     <span class="font-13">DELEVER TO</span><br>
+                     <b>HOME</b>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
         </div>
       </div>
     </div>
@@ -196,7 +391,7 @@
 }
 
 .nav-tabs .nav-link {
-    padding: 0.9286em .35em;
+    padding: 0.5286em .33em;
 }
 .nav-tabs li a.active {
     color: #111 !important;
@@ -218,7 +413,8 @@
 .nav-tabs.tab-col-teal > li > a:before {
     border-bottom: 0px solid #009688;
 }
-.nav-item .a .nav-link {
+.nav-tabs .nav-item{
+  margin-bottom: 2px ;
 }
 .num{
   color:#fff;
@@ -234,30 +430,42 @@
 .table .header-td{
   border-top:0px solid !important;
   border-bottom: 0px solid !important;
-  padding:0px 7px !important;
+  padding:3px 7px !important;
   border-top:0px solid !important;
   border-bottom: 0px solid !important;
 }
-.card-block .table td:first-child,
-.card-block .table td:nth-child(2),
-.card-footer .table td:first-child,
-.card-footer .table td:nth-child(2){
+.custom-card-block .table td:first-child,
+.custom-card-block .table td:nth-child(2),
+.custom-card-footer .table td:first-child,
+.custom-card-footer .table td:nth-child(2){
   border-top:0px solid !important;
 }
 
-/*.card-block .table .body-td:last-child,
-.card-footer .table .body-td:last-child{
+.custom-card-footer .footer-td ,
+.grand-card-footer .footer-td {
+  border-top:0px solid !important;
   border-bottom:0px solid !important;
-}*/
+  font-weight: bold;
+  padding:5px 10px;
+}
 .custom-card-header{
   border-bottom: 1px solid #F8BBD0 !important;
+  padding:13px 5px !important;
 }
 .custom-card-footer{
   border-top: 1px solid #F8BBD0 !important;
 }
-.custom-card-header,
 .custom-card-block,
+.grand-card-footer,
 .custom-card-footer{
   padding :5px !important;
 }
+.custom-table{
+  background-color:#F3E5F5;
+}
+.custom-table tbody tr td, 
+.custom-table tbody tr th{
+  border-top: 1px solid #FFEBEE;
+  border-bottom: 1px solid #FFEBEE;
+}
 </style>
\ No newline at end of file

From c7e5ae8ab0ce7b8bd7bc23442c6f7eb5651f7346 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 10 Apr 2018 15:21:49 +0630
Subject: [PATCH 583/651] order reservation api

---
 .../order_reservation_controller.rb           | 17 ------
 .../order_reservation_controller.rb           | 52 +++++++++++++++++++
 app/models/delivery.rb                        | 16 ++++++
 app/models/order_reservation.rb               | 47 +++++++++++++++++
 app/models/order_reservation_item.rb          | 32 ++++++++++++
 .../api/order_reservation/index.json.jbuilder |  0
 config/routes.rb                              |  3 +-
 7 files changed, 149 insertions(+), 18 deletions(-)
 delete mode 100644 app/controllers/api/order_reservation/order_reservation_controller.rb
 create mode 100644 app/controllers/api/order_reserve/order_reservation_controller.rb
 create mode 100644 app/models/delivery.rb
 create mode 100644 app/models/order_reservation.rb
 create mode 100644 app/models/order_reservation_item.rb
 delete mode 100644 app/views/api/order_reservation/index.json.jbuilder

diff --git a/app/controllers/api/order_reservation/order_reservation_controller.rb b/app/controllers/api/order_reservation/order_reservation_controller.rb
deleted file mode 100644
index 43b9c597..00000000
--- a/app/controllers/api/order_reservation/order_reservation_controller.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Api::OrderReservation::OrderReservationController < Api::ApiController
-	# skip_before_action  :authenticate
-  
-	def check_customer
-		customer_id               = 0
-
-		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(params[:email],params[:contact_no],params[:membership_id])
-		if !check_customer.nil?
-		  customer_id = check_customer.customer_id
-		else
-		  customer = Customer.addCustomer(params)
-		  customer_id = customer.id
-		end
-
-		render :json => { :status => true, :data => { :customer_id => customer_id} }
-	end
-end
diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
new file mode 100644
index 00000000..0093409c
--- /dev/null
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -0,0 +1,52 @@
+class Api::OrderReserve::OrderReservationController < Api::ApiController
+	# skip_before_action  :authenticate
+  	ORDER = "order"
+  	RESERVATION = "reservation"
+  	ORDER_RESERVATION = "order and reservation"
+
+	def check_customer
+		customer_id  = 0
+
+		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(params[:email],params[:contact_no],params[:membership_id])
+		if !check_customer.nil?
+		  customer_id = check_customer.customer_id
+		else
+		  customer = Customer.addCustomer(params)
+		  customer_id = customer.id
+		end
+
+		render :json => { :status => true, :data => { :customer_id => customer_id} }
+	end
+
+	def create
+		status = false
+		if !params[:cus_info]
+			render :json => { :status => false, :message => "cus_info is required!" }
+		elsif !params[:requested_time]
+			render :json => { :status => false, :message => "requested_time is required!" }
+		elsif !params[:order_type]
+			render :json => { :status => false, :message => "order_type is required!" }
+		elsif params[:order_type] == ORDER || params[:order_type] == ORDER_RESERVATION
+			if !params[:order_info]
+				render :json => { :status => false, :message => "order_info is required!" }
+			else
+				status = true
+			end
+		elsif !params[:payment_info]
+			render :json => { :status => false, :message => "payment_info is required!" }
+		elsif !params[:delivery_info]
+			render :json => { :status => false, :message => "delivery_info is required!" }
+		elsif params[:order_type] == RESERVATION || params[:order_type] == ORDER_RESERVATION
+			if !params[:reservation_info]
+				render :json => { :status => false, :message => "reservation_info is required!" }
+			else
+				status = true
+			end
+		end
+
+		if status == true
+			OrderReservation.addOrderReservationInfo(params)
+			render :json => { :status => true, :message => "Order reservation is successfully created!" }
+		end
+	end
+end
diff --git a/app/models/delivery.rb b/app/models/delivery.rb
new file mode 100644
index 00000000..d2273d8d
--- /dev/null
+++ b/app/models/delivery.rb
@@ -0,0 +1,16 @@
+class Delivery < ApplicationRecord
+	belongs_to :order_reservation
+
+	def self.addDeliveryInfo(params,order_reservation_id)
+		delivery = Delivery.new
+		delivery.order_reservation_id = order_reservation_id
+		delivery.provider = params[:provider]
+		delivery.delivery_type = params[:delivery_type]
+		delivery.township = params[:township]
+		delivery.address = params[:address]
+		delivery.direction_address = params[:address_direction]
+		delivery.delivery_fee = params[:delivery_fee]
+		delivery.remark = params[:delivery_note]
+		delivery.save!
+	end
+end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
new file mode 100644
index 00000000..0be5e4c8
--- /dev/null
+++ b/app/models/order_reservation.rb
@@ -0,0 +1,47 @@
+class OrderReservation < ApplicationRecord
+	self.primary_key = "order_reservation_id"
+
+	#primary key - need to be unique generated for multiple shops
+  	before_create :generate_custom_id
+
+	has_many :order_reservation_items
+	belongs_to :delivery
+
+	def self.addOrderReservationInfo(params)
+		order_reservation = OrderReservation.new
+		order_reservation.order_reservation_type = params[:order_type]
+		order_reservation.customer_id = params[:cus_info]
+		order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
+		if params[:order_info]
+			order_reservation.item_count = params[:order_info][:items].count
+			order_reservation.payment_type = params[:payment_info][:payment_type]
+			order_reservation.payment_status = params[:payment_info][:payment_status]
+			order_reservation.payment_ref = params[:payment_info][:payment_ref]
+			order_reservation.total_amount = params[:payment_info][:sub_total]
+			order_reservation.total_tax = params[:payment_info][:total_tax]
+			order_reservation.discount_amount = params[:payment_info][:discount_amount]
+			order_reservation.grand_total = params[:payment_info][:grand_total]
+			order_reservation.order_remark = params[:payment_info][:order_remark]
+		end
+		if params[:reservation_info]
+			order_reservation.total_customer = params[:reservation_info][:total_user]
+			order_reservation.reservation_remark = params[:reservation_info][:reservation_note]
+		end
+		order_reservation.save!
+		if params[:order_info][:items]
+			params[:order_info][:items].each do |oritem|	
+				OrderReservationItem.process_order_reservation_item(oritem[:product_code],oritem[:item_instance_code],oritem[:product_name],oritem[:product_alt_name],
+					oritem[:account_id],oritem[:qty],oritem[:price],oritem[:unit_price],
+					oritem[:options],nil,order_reservation.id)
+			end
+		end
+		if params[:delivery_info]
+			Delivery.addDeliveryInfo(params[:delivery_info],order_reservation.id)
+		end
+	end
+
+	private
+		def generate_custom_id
+			self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS")
+		end
+end
diff --git a/app/models/order_reservation_item.rb b/app/models/order_reservation_item.rb
new file mode 100644
index 00000000..0d932f92
--- /dev/null
+++ b/app/models/order_reservation_item.rb
@@ -0,0 +1,32 @@
+class OrderReservationItem < ApplicationRecord
+	self.primary_key = "order_reservation_items_id"
+
+	#primary key - need to be unique
+  	before_create :generate_custom_id
+
+	belongs_to :order_reservation, autosave: true
+
+	def self.process_order_reservation_item (item_code, instance_code, menu_name, alt_name, account_id, qty, price, unit_price, options, set_menu_items, order_reservation_id)
+	    orderreservationitem = OrderReservationItem.create do |oitem|
+	      oitem.order_reservation_id = order_reservation_id
+	      oitem.item_code = item_code
+	      oitem.item_instance_code = instance_code
+	      oitem.item_name = menu_name
+	      oitem.alt_name = alt_name ? alt_name : ""
+	      oitem.account_id = account_id
+	      oitem.qty       = qty
+	      oitem.unit_price = unit_price
+	      oitem.price   = price
+	      oitem.options     = options
+	      oitem.set_menu_items = set_menu_items
+	    end
+
+	    #logger.debug orderitem.to_yml
+	    orderreservationitem.save!
+	end
+
+	private
+		def generate_custom_id
+			self.order_reservation_items_id = SeedGenerator.generate_id(self.class.name, "ODRSI")
+		end
+end
diff --git a/app/views/api/order_reservation/index.json.jbuilder b/app/views/api/order_reservation/index.json.jbuilder
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/routes.rb b/config/routes.rb
index 7c224dfa..cec8057f 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,8 +83,9 @@ scope "(:locale)", locale: /en|mm/ do
     end
 
     #order and reservation api
-    namespace :order_reservation do
+    namespace :order_reserve do
       post "customer" => "order_reservation#check_customer"
+      post "order" => "order_reservation#create"
     end
   end
 

From e8c0899a9d086c02db6c1d4cba03c52a27270991 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Apr 2018 16:21:43 +0630
Subject: [PATCH 584/651] menu import export update

---
 app/controllers/settings/menus_controller.rb |  6 +++---
 app/models/menu.rb                           | 15 ++++++---------
 app/views/settings/menus/index.html.erb      |  6 +++---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index c7de4df8..0264084c 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -72,7 +72,7 @@ class Settings::MenusController < ApplicationController
     # end
   end
 
-  def export    
+  def export   
     @settings_menus = Menu.all.page(params[:page]).per(10)
     menu = Menu.find(params[:id])
 
@@ -99,11 +99,11 @@ class Settings::MenusController < ApplicationController
         sheet.add_row ["Name",menu.name], :style=>title                
         sheet.add_row
 
-        sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Item AltName", "Taxable", "Instance Code", "Instance Name", "Price"], :style=>header_text  
+        sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Instance Code", "Instance Name", "Price"], :style=>header_text  
         menu.menu_categories.each do |mc|
           mc.menu_items.each do |mi|
             mi.menu_item_instances.each do |mii|
-              sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.alt_name, mi.taxable, mii.item_instance_code, mii.item_instance_name, mii.price], :style=>wrap_text
+              sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, mii.item_instance_code, mii.item_instance_name, mii.price], :style=>wrap_text
             end
           end
         end
diff --git a/app/models/menu.rb b/app/models/menu.rb
index d81079bd..8bf616c9 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -140,14 +140,6 @@ class Menu < ApplicationRecord
       end
     else
       # Menu by Menu Import
-      accs = Account.all      
-      account_id = 1
-      if accs.length > 0
-        account_id = accs[0].id
-      else 
-        status = "No Account Created."
-      end
-
       sheet = spreadsheet.sheet(0) 
       menu = sheet.row(1)[1]
       imported_menu = Menu.create({name: menu, is_active: true, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by}) 
@@ -163,7 +155,12 @@ class Menu < ApplicationRecord
 
           menu_itm = MenuItem.find_by_item_code(row["Item Code"]) 
           if !menu_itm
-            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by)
+            account = Account.find_by_title(row["Account"])
+            if account.nil?
+              account = Account.create({title: row["Account"], account_type: "0"})
+            end
+
+            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by)
           # else
           #   status = status + "Item Code already exists for " + row["Item Name"] + "."
           end
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 42eca334..d8e37899 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -62,7 +62,7 @@
             <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
             <td>
               <%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %>
-              <a href="#" id="export-xlsx" data-attr="<%= settings_menu.id %>" class="btn btn-primary btn-sm waves-effect" style="height: 33px;">
+              <a href="#" id="export-xlsx" data-attr="<%= settings_menu.id %>" class="export-xlsx btn btn-primary btn-sm waves-effect" style="height: 33px;">
                 <i class="material-icons" style="top: 0px;">backup</i>
               </a>
             </td>
@@ -107,9 +107,9 @@
 
   <script type="text/javascript">
     $(document).ready(function(){
-      $("#export-xlsx").on('click', function(){
+      $(".export-xlsx").on('click', function(){
         var menu_id= $(this).attr('data-attr');
-        console.log(menu_id);
+        
         $.ajax({
           type: "GET",
           url: "/settings/menus/" + menu_id + "/export",

From 0e5269c66fb93975b0de84eec913f9c418f8acdb Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 10 Apr 2018 17:29:02 +0630
Subject: [PATCH 585/651] update request bill msg box error

---
 app/assets/javascripts/addorder.js             |  8 +++++---
 .../origami/quick_service_controller.rb        |  7 +++++--
 .../origami/request_bills_controller.rb        |  7 ++++++-
 app/models/sale.rb                             |  1 +
 app/views/origami/pending_order/index.html.erb | 18 +++++++++---------
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 30ed8af2..07511458 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -974,7 +974,7 @@ console.log(d_option)
       dataType: "json",
        success:function(result){
           if (result.status) {
-            
+            console.log(result)
             if (result.data == null){
                swal({
                   title: "Please Open Shift !",
@@ -984,11 +984,13 @@ console.log(d_option)
                   confirmButtonText: "Ok",
                   closeOnConfirm: false
               }, function () {
-                  window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+                 window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
               });
 
+            }else if(result.data == 'OK'){
+              window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
             }else{
-            window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
+              window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
             }
           }
        } 
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index d2194bb5..d5d3437b 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -154,10 +154,13 @@ class Origami::QuickServiceController < ApplicationController
           
           result = {:status=> true, :data => @sale }
           render :json => result.to_json
-        end   
+        end  
+      elsif (params[:sale_id][0,3] == "BKI")
+         result = {:status=> true, :data => 'OK' }
+          render :json => result.to_json 
       else
         result = {:status=> true, :data => nil }
-          render :json => result.to_json
+        render :json => result.to_json
       end 
 
   end
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index cdd1f442..05dbdce4 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -16,7 +16,12 @@ class Origami::RequestBillsController < ApplicationController
       bk_order = BookingOrder.find_by_order_id(order_id)
       order = Order.find(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
-      table = DiningFacility.find(check_booking.dining_facility_id)
+      if check_booking.dining_facility_id.to_i > 0
+        table = DiningFacility.find(check_booking.dining_facility_id)
+      else
+        table = nil
+      end
+      
       if check_booking.sale_id.nil?
         # Create Sale if it doesn't exist
         @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b9c0717e..f6ba19b8 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2592,6 +2592,7 @@ end
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
     query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
+                  .group("sales.sale_id")
   end
   def self.pending_order
     query = Booking.all
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index 2d4ba1d4..447612d1 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -10,19 +10,19 @@
 	            	<div id="custom-slimscroll">
 		                <div class="card-columns">
 		                  <% @sale.each do |sale| %>
-		                      <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
+		                   <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
 						           <div class="card-block">
 						              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span>
 						           </div>
-						      </div>
+						          </div>
 		                  <% end %>
-                          <% @order.each do |order| %>
-                              <div class="card sales blue text-white" data-id = "<%= order.booking_id %>">
-                                   <div class="card-block">
-                                      <%= order.booking_id %><span style="font-size:12px;float:right;line-height:inherit;">new</span>
-                                   </div>
-                              </div>
-                          <% end %>
+                      <% @order.each do |order| %>
+                        <div class="card sales blue text-white" data-id = "<%= order.booking_id %>">
+                              <div class="card-block">
+                                <%= order.booking_id %><span style="font-size:12px;float:right;line-height:inherit;">new</span>
+                             </div>
+                         </div>
+                      <% end %>
 		                </div>
 		          </div>
 	            </div>

From 7a9fe91fa336cc3a4fcb41cd8015aded9bb2daa9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 10 Apr 2018 17:42:07 +0630
Subject: [PATCH 586/651] open liscen for master

---
 config/initializers/action_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index b063f28e..26255b59 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From 0ff340cac29fbd17304c2cc4f5e0afc350744d50 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Apr 2018 18:10:40 +0630
Subject: [PATCH 587/651] shop upate for 20 files

---
 app/controllers/api/call_waiters_controller.rb        |  2 +-
 app/controllers/origami/alipay_controller.rb          |  4 ++--
 app/controllers/origami/credit_payments_controller.rb |  4 ++--
 app/controllers/origami/dinga_controller.rb           |  4 ++--
 app/controllers/origami/home_controller.rb            |  4 ++--
 app/controllers/origami/jcb_controller.rb             |  4 ++--
 app/controllers/origami/junction_pay_controller.rb    |  4 ++--
 app/controllers/origami/master_controller.rb          |  4 ++--
 app/controllers/origami/movetable_controller.rb       |  2 +-
 app/controllers/origami/mpu_controller.rb             |  4 ++--
 app/controllers/origami/paymal_controller.rb          |  4 ++--
 app/controllers/origami/payments_controller.rb        | 10 +++++-----
 app/controllers/origami/paypar_payments_controller.rb |  2 +-
 app/controllers/origami/redeem_payments_controller.rb |  2 +-
 app/controllers/origami/rooms_controller.rb           |  2 +-
 app/controllers/origami/table_invoices_controller.rb  |  4 ++--
 app/controllers/origami/unionpay_controller.rb        |  4 ++--
 app/controllers/origami/visa_controller.rb            |  4 ++--
 app/controllers/origami/voucher_controller.rb         |  2 +-
 app/models/sale.rb                                    |  6 +++---
 20 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index 7cf80a5d..b695dc33 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -9,7 +9,7 @@ class Api::CallWaitersController < ActionController::API
     ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
 
     # get printer info
-    @shop          = Shop::ShopDetail 
+    @shop          = Shop.first 
     unique_code    = "CallWaiterPdf" 
     print_settings = PrintSetting.find_by_unique_code(unique_code)
     printer        = Printer::ReceiptPrinter.new(print_settings)   
diff --git a/app/controllers/origami/alipay_controller.rb b/app/controllers/origami/alipay_controller.rb
index 3f449856..d3b7c488 100644
--- a/app/controllers/origami/alipay_controller.rb
+++ b/app/controllers/origami/alipay_controller.rb
@@ -6,7 +6,7 @@ class Origami::AlipayController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @alipaycount = 0
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     @rounding_adj = 0
     @can_alipay = 0
     @member_discount = 0
@@ -54,7 +54,7 @@ class Origami::AlipayController < BaseOrigamiController
     ref_no = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index d70ef870..1aab35a5 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -9,7 +9,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     @creditcount = 0
     others = 0
 
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
@@ -32,7 +32,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index b98b3408..1b3c9ca2 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -6,7 +6,7 @@ class Origami::DingaController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-        @shop        = Shop::ShopDetail 
+        @shop        = Shop.first 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         # else
@@ -77,7 +77,7 @@ class Origami::DingaController < BaseOrigamiController
 		payment_method = "dinga"
 		if(Sale.exists?(sale_id))
 			saleObj = Sale.find(sale_id)
-			shop_details =  Shop::ShopDetail 
+			shop_details =  Shop.first 
       
 			# rounding adjustment
 				if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 8e00ef80..493e4680 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -8,7 +8,7 @@ class Origami::HomeController < BaseOrigamiController
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
-    @shop     = Shop::ShopDetail
+    @shop     = Shop.first
     
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
@@ -26,7 +26,7 @@ class Origami::HomeController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
-    @shop =  Shop::ShopDetail
+    @shop =  Shop.first
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index fd79f6d8..dece303a 100644
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -7,7 +7,7 @@ class Origami::JcbController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @jcbcount = 0
-    @shop        = Shop::ShopDetail
+    @shop        = Shop.first
     @rounding_adj = 0
     @can_jcb = 0
     @member_discount= 0
@@ -56,7 +56,7 @@ class Origami::JcbController < BaseOrigamiController
     ref_no  = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/junction_pay_controller.rb b/app/controllers/origami/junction_pay_controller.rb
index 1c52a271..aa0f0615 100644
--- a/app/controllers/origami/junction_pay_controller.rb
+++ b/app/controllers/origami/junction_pay_controller.rb
@@ -11,7 +11,7 @@ class Origami::JunctionPayController < BaseOrigamiController
     @cashier_id = current_user.emp_id
 
     @payment_method_setting_nav = PaymentMethodSetting.all
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
@@ -52,7 +52,7 @@ class Origami::JunctionPayController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index cca8a2c4..1e4c972d 100644
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -7,7 +7,7 @@ class Origami::MasterController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @mastercount = 0
-    @shop        = Shop::ShopDetail
+    @shop        = Shop.first
     @rounding_adj = 0
     @can_master = 0
     @member_discount = 0
@@ -53,7 +53,7 @@ class Origami::MasterController < BaseOrigamiController
     ref_no = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 3844293e..d6d1fc61 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -86,7 +86,7 @@ class Origami::MovetableController < BaseOrigamiController
     @type          = (DiningFacility.find(change_to)).type
     @moved_by      = @current_user.name
     @date          = DateTime.now
-    @shop          = Shop::ShopDetail
+    @shop          = Shop.first
     unique_code    = "MoveTablePdf" 
     pdf_no        = PrintSetting.where(:unique_code => unique_code).count
     #print_settings = PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 6bd06b5a..234cebaa 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -6,7 +6,7 @@ class Origami::MpuController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @mpucount = 0
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     @rounding_adj = 0
     @can_mpu = 0
     @member_discount = 0
@@ -54,7 +54,7 @@ class Origami::MpuController < BaseOrigamiController
     ref_no  = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 3db34a1c..a72a28ec 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -6,7 +6,7 @@ class Origami::PaymalController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-        @shop        = Shop::ShopDetail 
+        @shop        = Shop.first 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         # else
@@ -73,7 +73,7 @@ class Origami::PaymalController < BaseOrigamiController
 	    sale_id = params[:sale_id]
 	    if(Sale.exists?(sale_id))
 	      saleObj = Sale.find(sale_id)
-	      shop_details =  Shop::ShopDetail 
+	      shop_details =  Shop.first 
 	      
 	      # rounding adjustment
 	      # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index baa5d2ec..dbd1cbb1 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -44,7 +44,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
 
        #shop detail
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       # customer= Customer.where('customer_id=' +.customer_id)
       customer = Customer.find(sale_data.customer_id)
       # rounding adjustment
@@ -99,7 +99,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       # rounding adjustment
       if shop_details.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
@@ -238,7 +238,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @dining  = ''
       @other_payment = 0.0
 
-      @shop        =  Shop::ShopDetail  #show shop info 
+      @shop        =  Shop.first  #show shop info 
 
       @customer_lists = Customer.where("customer_id = 'CUS-000000000001' or customer_id = 'CUS-000000000002'")
 
@@ -391,7 +391,7 @@ class Origami::PaymentsController < BaseOrigamiController
       customer= Customer.find(saleObj.customer_id)
 
       #shop detail
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
@@ -475,7 +475,7 @@ class Origami::PaymentsController < BaseOrigamiController
         customer= Customer.find(saleObj.customer_id)
         
          #shop detail
-        shop_details =  Shop::ShopDetail 
+        shop_details =  Shop.first 
 
         # get printer info
         print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index faaeca8e..e6e8d14a 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -7,7 +7,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 		payment_method = "paypar"
 		if(Sale.exists?(sale_id))
 			saleObj = Sale.find(sale_id)
-			shop_details =  Shop::ShopDetail 
+			shop_details =  Shop.first 
       
 			# rounding adjustment
 				if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 347fd3ea..708f9f8f 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,7 +6,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-        @shop        = Shop::ShopDetail 
+        @shop        = Shop.first 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         # else
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 505d747c..af59cd98 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -28,7 +28,7 @@ class Origami::RoomsController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
-    @shop =  Shop::ShopDetail
+    @shop =  Shop.first
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index 5cd22054..1e8b1fbd 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -1,7 +1,7 @@
 class Origami::TableInvoicesController < BaseOrigamiController
  	def index
     @table = DiningFacility.find(params[:table_id])
-    shop        =  Shop::ShopDetail  
+    shop        =  Shop.first  
     puts "table bookig lenght"
     @sale_array = Array.new
     @table.bookings.each do |booking|
@@ -33,7 +33,7 @@ class Origami::TableInvoicesController < BaseOrigamiController
     @table = DiningFacility.find(params[:table_id])
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-    shop        =  Shop::ShopDetail  
+    shop        =  Shop.first  
     @sale_array = Array.new
     @table.bookings.each do |booking|
          if booking.sale_id.nil?
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index ec941a20..2bb5b0cf 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -6,7 +6,7 @@ class Origami::UnionpayController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @unionpaycount = 0
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     @rounding_adj = 0
     @can_unionpay = 0
     @member_discount = 0
@@ -51,7 +51,7 @@ class Origami::UnionpayController < BaseOrigamiController
     ref_no = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 17b70010..4dc0912a 100644
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -6,7 +6,7 @@ class Origami::VisaController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @visacount = 0
-    @shop      = Shop::ShopDetail 
+    @shop      = Shop.first 
     @rounding_adj = 0
     @can_visa = 0
     @member_discount = 0
@@ -51,7 +51,7 @@ class Origami::VisaController < BaseOrigamiController
     ref_no = params[:ref_no]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       
       # rounding adjustment
       # if shop_details.is_rounding_adj
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 25352597..079e045d 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -8,7 +8,7 @@ class Origami::VoucherController < BaseOrigamiController
     @vouchercount = 0
     others = 0
 
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b9c0717e..f0ad6c7e 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -535,7 +535,7 @@ class Sale < ApplicationRecord
   end
 
   def adjust_rounding
-    shop_details =  Shop::ShopDetail 
+    shop_details =  Shop.first 
       # rounding adjustment
     if shop_details.is_rounding_adj
       a = self.grand_total % 25 # Modulus
@@ -555,7 +555,7 @@ class Sale < ApplicationRecord
   end
 
   def compute_adjust_rounding(grand_total)
-    shop_details =  Shop::ShopDetail 
+    shop_details =  Shop.first 
       # rounding adjustment
     if shop_details.is_rounding_adj
       a = grand_total % 25 # Modulus
@@ -577,7 +577,7 @@ class Sale < ApplicationRecord
   #Generate new Receipt No when it is not assigned
   def generate_receipt_no
     #shop_code and client_code
-    shop_details =  Shop::ShopDetail
+    shop_details =  Shop.first
 
     #Date-Shift-
     if self.receipt_no.nil?

From 41d897d5c2a3100486d57598bd755b1f36f10523 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 10 Apr 2018 18:18:08 +0630
Subject: [PATCH 588/651] Edit Move Table Pdf

---
 app/controllers/origami/movetable_controller.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 3844293e..a92956e6 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -71,9 +71,11 @@ class Origami::MovetableController < BaseOrigamiController
 
         booking.booking_orders.each do |booking_order|
           order = Order.find(booking_order.order_id)
-          order.order_items.each do |order_item|
-            order_items.push(order_item)
-          end
+          if order.status == 'new'  
+            order.order_items.each do |order_item|
+              order_items.push(order_item)
+            end
+          end  
         end
       end
     end

From 5b0e1ce040450e24a0160f6380bbf674795a4d90 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 11 Apr 2018 09:34:08 +0630
Subject: [PATCH 589/651] =?UTF-8?q?add=20qr=20code=E1=80=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/origami/payments/show.html.erb | 30 +++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 044d42f3..6d7d013b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1132,16 +1132,40 @@ var customer_name = "<%= @customer.name %>";
   // QR Code Reader
   $(".btn_qr_code").on('click', function(e){
     $("#is_memberModal").hide();
-    var code = "";        
+    var code = "";  
+    var customer_id = '';
+    var customer_name = '';
+    var membership_id = '';
+    var membership_type = '';    
     setTimeout(function(){
-       code=getQRCode(); 
-       $("#qr_code").val(code);          
+      code=getQRCode(); 
+      if(sale_id != 0 && code != ""){    
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/get_customer" ,
+          data: { filter : code ,type :"card"},
+          dataType: "json",
+          success: function(data) {
+            if (data[0].customer_id == false) {
+              swal("Alert!", data[0].message, "error");
+            }else{
+              customer_id = data[0].customer_id;
+              customer_name = data[0].name;
+              membership_id = data[0].membership_id;
+              membership_type = data[0].membership_type;
+              update_sale(membership_id, customer_id, customer_name,sale_id);
+            }
+
+          }
+        });                
+      }         
     },100);
   });
 
   // Read qrcode from java
   function getQRCode(){
     return code2lab.readQRCode();
+    $("#qr_code").val(code);  
   }
 
   function update_sale(membership_id, customer_id, customer_name, sale_id) {

From 27e70f1a86632db7a7e8b82a2d673e5b55893498 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 11 Apr 2018 10:28:33 +0630
Subject: [PATCH 590/651] modify api and change rounding adj

---
 .../api/order_reserve/order_reservation_controller.rb       | 4 +++-
 app/controllers/origami/movetable_controller.rb             | 6 ++++--
 app/models/customer.rb                                      | 2 +-
 app/models/order_reservation.rb                             | 3 ++-
 app/views/reports/receipt_no/index.html.erb                 | 4 ++--
 db/migrate/20170626191519_create_shift_sales.rb             | 2 +-
 db/migrate/20180406080240_create_order_reservations.rb      | 1 +
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index 0093409c..957b84a9 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -2,7 +2,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 	# skip_before_action  :authenticate
   	ORDER = "order"
   	RESERVATION = "reservation"
-  	ORDER_RESERVATION = "order and reservation"
+  	ORDER_RESERVATION = "order_and_reservation"
 
 	def check_customer
 		customer_id  = 0
@@ -42,6 +42,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			else
 				status = true
 			end
+		elsif !params[:callback_url]
+			render :json => { :status => false, :message => "callback_url is required!" }
 		end
 
 		if status == true
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index d6d1fc61..9cacd8f4 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -71,8 +71,10 @@ class Origami::MovetableController < BaseOrigamiController
 
         booking.booking_orders.each do |booking_order|
           order = Order.find(booking_order.order_id)
-          order.order_items.each do |order_item|
-            order_items.push(order_item)
+          if order.status == 'new'
+            order.order_items.each do |order_item|
+              order_items.push(order_item)
+            end
           end
         end
       end
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 2ece4330..3eb51a24 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -360,7 +360,7 @@ class Customer < ApplicationRecord
     customer.contact_no       = params[:contact_no]
     customer.gender           = params[:gender]
     customer.address          = params[:address]
-    customer.date_of_birth    = Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d")
+    customer.date_of_birth    = params[:date_of_birth] ? Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d") : ''
     customer.membership_id    = params[:membership_id]
     customer.customer_type    = "Takeaway"
     customer.tax_profiles     = ["2"]
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 0be5e4c8..84821314 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -13,6 +13,7 @@ class OrderReservation < ApplicationRecord
 		order_reservation.customer_id = params[:cus_info]
 		order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
 		if params[:order_info]
+			order_reservation.callback_url = params[:order_info][:callback_url]
 			order_reservation.item_count = params[:order_info][:items].count
 			order_reservation.payment_type = params[:payment_info][:payment_type]
 			order_reservation.payment_status = params[:payment_info][:payment_status]
@@ -21,7 +22,7 @@ class OrderReservation < ApplicationRecord
 			order_reservation.total_tax = params[:payment_info][:total_tax]
 			order_reservation.discount_amount = params[:payment_info][:discount_amount]
 			order_reservation.grand_total = params[:payment_info][:grand_total]
-			order_reservation.order_remark = params[:payment_info][:order_remark]
+			order_reservation.order_remark = params[:order_info][:order_remark]
 		end
 		if params[:reservation_info]
 			order_reservation.total_customer = params[:reservation_info][:total_user]
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 9eee6ab9..567b056b 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -107,7 +107,7 @@
 							<%end%>
 
 							<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td>			
-							<td><%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>			
+							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
 							<td><%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 						</tr>
 
@@ -120,7 +120,7 @@
 							<td><b><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<% end %>
 							<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>		
-							<td><b><%= number_with_precision(rounding_adj, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>		
+							<td><b><%= rounding_adj.to_f rescue '-' %></b></td>		
 							<td><b><%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter)  %></b></td>				
 						</tr>
 						<tr>
diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb
index d16449d7..f18a2c1c 100755
--- a/db/migrate/20170626191519_create_shift_sales.rb
+++ b/db/migrate/20170626191519_create_shift_sales.rb
@@ -21,7 +21,7 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
       t.integer :dining_count, :default => 0
       t.integer :takeaway_count, :default => 0
       t.integer :member_count, :default => 0
-      t.integer :total_rounding, :default => 0
+      t.decimal :total_rounding,, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.integer :total_receipt, :default => 0
       t.decimal :total_void, :default => 0
       t.timestamps
diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index 7f044ff0..4a53aaf0 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -5,6 +5,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
     	t.string 	   :order_reservation_type, :null => false
     	t.string 	   :customer_id, :null => false
     	t.datetime 	 :requested_time, :null => false
+      t.string     :callback_url, :null => false
     	t.integer :item_count, :null => false, :default => 0
       t.integer :total_customer
     	t.string 	:payment_type

From 8b2f36fbc50a46422c91671b6b577dfce4f3fe31 Mon Sep 17 00:00:00 2001
From: Julian <julion@code2lab.com>
Date: Wed, 11 Apr 2018 11:24:34 +0630
Subject: [PATCH 591/651] Docker Setup

---
 .code2lab.env             |  1 +
 .dockerignore             |  2 ++
 Dockerfile                | 12 ++++++++++++
 config/application.rb     |  2 ++
 config/puma.rb.production |  5 +++--
 docker-compose.yml        | 31 +++++++++++++++++++++++++++++++
 6 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 .code2lab.env
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/.code2lab.env b/.code2lab.env
new file mode 100644
index 00000000..0a6c7f0b
--- /dev/null
+++ b/.code2lab.env
@@ -0,0 +1 @@
+RAILS_ENV=production
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..6be8c8f3
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+.dockerignore
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..69f0f58e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM ruby:2.4.1
+RUN apt-get update -qq && apt-get install -y build-essential libmysqlclient-dev libcups2-dev libpq-dev nodejs
+RUN mkdir /sxrestaurant
+RUN mkdir -p /sxrestaurant/tmp/puma
+ENV RAILS_ENV production
+WORKDIR /sxrestaurant
+COPY Gemfile /sxrestaurant/Gemfile
+COPY Gemfile.lock /sxrestaurant/Gemfile.lock
+RUN bundle install --without development test
+RUN bundle exec rails assets:precompile
+COPY . /sxrestaurant
+
diff --git a/config/application.rb b/config/application.rb
index 0e75d195..382661d3 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -3,6 +3,8 @@ require_relative 'boot'
 require 'csv'
 require 'rails/all'
 # require 'iconv'
+require 'openssl'
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
diff --git a/config/puma.rb.production b/config/puma.rb.production
index e88031af..cd3f0829 100755
--- a/config/puma.rb.production
+++ b/config/puma.rb.production
@@ -1,6 +1,7 @@
-application_path = '/home/superuser/Application/sxrestaurant'
+application_path="#{File.expand_path("../..", __FILE__)}"
 directory application_path
-environment ENV.fetch("RAILS_ENV") { "production" }
+#environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
 pidfile "#{application_path}/tmp/puma/pid"
 state_path "#{application_path}/tmp/puma/state"
 stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..34ee2324
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,31 @@
+version: '3'
+services:
+  code2lab:
+    build: .
+    links:
+      - redis
+    command: bundle exec puma -C config/puma.rb
+    volumes:
+      - .:/sxrestaurant
+    env_file:
+      - .code2lab.env
+    ports:
+      - '8081:62158'
+    environment:
+      - REDIS_URL=redis://redis:6379/0
+  sidekiq:
+    build: .
+    command: bundle exec sidekiq -C config/sidekiq.yml
+    links:
+       - redis
+    volumes:
+       - .:/sxrestaurant
+    environment:
+      - REDIS_URL=redis://redis:6379/0
+
+  redis:
+    image: redis
+    ports:
+      - '6379:6379'
+    volumes:
+      - ../data/redis:/data

From 04ae7414625eeaa045ef54e5f32ffb00921649fa Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Apr 2018 11:27:05 +0630
Subject: [PATCH 592/651] cloud for api and doemal

---
 .gitignore                                    |  1 +
 app/controllers/api/api_controller.rb         | 31 ++++++++++++++++++-
 .../concerns/token_verification.rb            | 11 +++++--
 app/models/my_aes_crypt.rb                    | 15 +++++++++
 config/initializers/action_controller.rb      | 10 +++---
 5 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e32934b1..4b1b7cee 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ pickle-email-*.html
 /gems/*
 ._*.*
 .rbenv-version
+config/initializers/*
 config/deploy/config/*
 config/puma.rb
 #config/shops.json
diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb
index 5b60b5df..04dc3a72 100755
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -1,7 +1,8 @@
 class Api::ApiController < ActionController::API
   include TokenVerification
-  helper_method :current_token, :current_login_employee, :get_cashier
 
+  before_action :lookup_domain
+  helper_method :current_token, :current_login_employee, :get_cashier
 
   private
   #this is base api base controller to need to inherit.
@@ -21,4 +22,32 @@ class Api::ApiController < ActionController::API
   def current_login_employee
     @employee = Employee.find_by_token_session(current_token)
   end
+
+  def lookup_domain     
+    if request.subdomain.present? && request.subdomain != "www" 
+      from = request.subdomain.downcase  + "." + request.domain.downcase    
+      @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
+      if (!@license.nil?)
+        logger.info "Location - " + @license.dbhost        
+        ActiveRecord::Base.establish_connection(website_connection(@license))    
+        # authenticate_session_token    
+        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
+      else8
+        # reconnect_default_db
+        logger.info 'License is nil'
+        # redirect_to root_url(:host => request.domain) + "store_error"
+         render :json => [{ status: false, message: 'Invalid Access!'}]
+      end                   
+    end    
+  end
+
+  def cache_license(url, lookup)    
+    @license = License.new(url, lookup)        
+
+    if (@license.detail_with_local_cache(lookup) == true)
+      return @license
+    else
+      return nil
+    end
+  end
 end
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index 1d700c8b..419b9b3b 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -15,8 +15,15 @@ module TokenVerification
 
   def authenticate_token
     authenticate_with_http_token do |token, options|      
-      #@current_user = User.find_by(api_key: token)
-      Rails.logger.debug "token - " + token.to_s
+      # Rails.logger.debug "token - " + token.to_s
+      if(!options.from.nil? && options.from == "DOEMAL"){
+        if(ENV["SERVER_MODE"] === "cloud"){
+          from = request.subdomain.downcase  + "." + request.domain.downcase  
+          aes = MyAesCrypt.new
+          return aes.checkKeyForAuth(from, token)  
+        }
+      }
+
       @user = Employee.authenticate_by_token(token)
       if @user
         return true
diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb
index 680d0624..339585e4 100644
--- a/app/models/my_aes_crypt.rb
+++ b/app/models/my_aes_crypt.rb
@@ -56,6 +56,21 @@ class MyAesCrypt
 		return aes_key, aes_iv
 	end
 
+	def checkKeyForAuth(from,token){
+		file_path = "config/shops.json"
+		shop_data = File.read(file_path)
+
+		shop_json = JSON.parse(shop_data)	
+		shop_json["data"].each do |j|
+			if j["lookup"] == from				
+				if(j["value"]["key"] == token){
+					return true
+				}
+			end
+		end
+		return false
+	}
+
 	private
 	def encrypt(data)
 		cipher.encrypt
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 26255b59..b063f28e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

From ace2853cf48089fd0eec75029f2b7eb00a7a836e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Apr 2018 11:30:34 +0630
Subject: [PATCH 593/651] add config/initializer/* in ignore

---
 .gitignore                               |  6 +++---
 config/initializers/action_controller.rb | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b1b7cee..25b7a581 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,9 +36,9 @@ pickle-email-*.html
 /gems/*
 ._*.*
 .rbenv-version
-config/initializers/*
-config/deploy/config/*
-config/puma.rb
+/config/initializers/*
+/config/deploy/config/*
+/config/puma.rb
 #config/shops.json
 !/log/.keep
 !/tmp/.keep
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index b063f28e..26255b59 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From b2d302b846879274918614c7fa6831d847c451ab Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Apr 2018 11:36:26 +0630
Subject: [PATCH 594/651] add action_cntr in ignore

---
 .gitignore                               |  7 ++++---
 config/initializers/action_controller.rb | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25b7a581..69fbb2d2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,9 +36,10 @@ pickle-email-*.html
 /gems/*
 ._*.*
 .rbenv-version
-/config/initializers/*
-/config/deploy/config/*
-/config/puma.rb
+
+/config/initializers/action_controller.rb
+config/deploy/config/*
+config/puma.rb
 #config/shops.json
 !/log/.keep
 !/tmp/.keep
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 26255b59..b063f28e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

From fc91fe51af6c73c8800d561db73922e2b8a9b78d Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Apr 2018 11:36:34 +0630
Subject: [PATCH 595/651] add action_cntr in ignore

---
 config/initializers/action_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index b063f28e..26255b59 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From 5e2d8a6d3ad3562cf34d8101789de72575f0fdf5 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Apr 2018 11:37:43 +0630
Subject: [PATCH 596/651] add action_cntr in ignore

---
 .gitignore                               |  2 +-
 config/initializers/action_controller.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69fbb2d2..eadc1489 100755
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ pickle-email-*.html
 ._*.*
 .rbenv-version
 
-/config/initializers/action_controller.rb
+/config/initializers/*
 config/deploy/config/*
 config/puma.rb
 #config/shops.json
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 26255b59..b063f28e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

From 5801a48f4b0bce41c7c0110c8bc0a2a4b03d299b Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Apr 2018 11:49:36 +0630
Subject: [PATCH 597/651] cannot add action_cntr in ignore

---
 config/initializers/action_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index b063f28e..26255b59 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From 9b2312d3ba07b49c52e1d2a312638694c970767b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 11 Apr 2018 14:38:16 +0630
Subject: [PATCH 598/651] change ordr reservation api

---
 app/assets/javascripts/origami.js             |  18 +-
 .../order_reservation_controller.rb           |  31 ++-
 app/models/order_reservation.rb               |  65 +++---
 app/views/origami/paymal/index.html.erb       | 209 ++++++++++++++++--
 config/initializers/action_controller.rb      |  10 +-
 ...0180406080240_create_order_reservations.rb |   2 +
 ...06080359_create_order_reservation_items.rb |   1 +
 .../20180406080436_create_deliveries.rb       |   1 +
 8 files changed, 269 insertions(+), 68 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index fb3f966b..ca021430 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -336,8 +336,24 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
           }
         });
   }else{
+  	if(payment_type!="master"){
+		payment_type = payment_type.toUpperCase();
+	}else{
+		payment_type = "Master";
+	}
+	
   	$("#loading_wrapper").hide();
-    swal ( "Oops" ,  resMsg.toString() ,  "error" );
+    swal({
+		  title: 'Oops',
+		  text: resMsg.toString(),
+		  type: 'error',
+		  html: true,
+		  closeOnConfirm: false,
+		  closeOnCancel: false,
+		  allowOutsideClick: false
+		}, function () {
+		window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/"+payment_type;
+	});
   }
 }
 
diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index 957b84a9..2dfc29aa 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -6,8 +6,15 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 
 	def check_customer
 		customer_id  = 0
+		if !params[:name]
+			render :json => { :status => false, :message => "name is required!" }
+		elsif !params[:email]
+			render :json => { :status => false, :message => "email is required!" }
+		elsif !params[:membership_id]
+			render :json => { :status => false, :message => "membership_id is required!" }
+		end
 
-		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(params[:email],params[:contact_no],params[:membership_id])
+		check_customer = Customer.find_by_email_and_membership_id(params[:email],params[:membership_id])
 		if !check_customer.nil?
 		  customer_id = check_customer.customer_id
 		else
@@ -24,6 +31,10 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			render :json => { :status => false, :message => "cus_info is required!" }
 		elsif !params[:requested_time]
 			render :json => { :status => false, :message => "requested_time is required!" }
+		elsif !params[:callback_url]
+			render :json => { :status => false, :message => "callback_url is required!" }
+		elsif !params[:reference]
+			render :json => { :status => false, :message => "reference is required!" }
 		elsif !params[:order_type]
 			render :json => { :status => false, :message => "order_type is required!" }
 		elsif params[:order_type] == ORDER || params[:order_type] == ORDER_RESERVATION
@@ -32,23 +43,25 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			else
 				status = true
 			end
-		elsif !params[:payment_info]
-			render :json => { :status => false, :message => "payment_info is required!" }
-		elsif !params[:delivery_info]
-			render :json => { :status => false, :message => "delivery_info is required!" }
 		elsif params[:order_type] == RESERVATION || params[:order_type] == ORDER_RESERVATION
 			if !params[:reservation_info]
 				render :json => { :status => false, :message => "reservation_info is required!" }
 			else
 				status = true
 			end
-		elsif !params[:callback_url]
-			render :json => { :status => false, :message => "callback_url is required!" }
+		elsif !params[:payment_info]
+			render :json => { :status => false, :message => "payment_info is required!" }
+		elsif !params[:delivery_info]
+			render :json => { :status => false, :message => "delivery_info is required!" }
 		end
 
 		if status == true
-			OrderReservation.addOrderReservationInfo(params)
-			render :json => { :status => true, :message => "Order reservation is successfully created!" }
+			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(params)
+			if flag
+				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
+			else
+				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" }
+			end
 		end
 	end
 end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 84821314..62342b0c 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -8,36 +8,43 @@ class OrderReservation < ApplicationRecord
 	belongs_to :delivery
 
 	def self.addOrderReservationInfo(params)
-		order_reservation = OrderReservation.new
-		order_reservation.order_reservation_type = params[:order_type]
-		order_reservation.customer_id = params[:cus_info]
-		order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
-		if params[:order_info]
-			order_reservation.callback_url = params[:order_info][:callback_url]
-			order_reservation.item_count = params[:order_info][:items].count
-			order_reservation.payment_type = params[:payment_info][:payment_type]
-			order_reservation.payment_status = params[:payment_info][:payment_status]
-			order_reservation.payment_ref = params[:payment_info][:payment_ref]
-			order_reservation.total_amount = params[:payment_info][:sub_total]
-			order_reservation.total_tax = params[:payment_info][:total_tax]
-			order_reservation.discount_amount = params[:payment_info][:discount_amount]
-			order_reservation.grand_total = params[:payment_info][:grand_total]
-			order_reservation.order_remark = params[:order_info][:order_remark]
-		end
-		if params[:reservation_info]
-			order_reservation.total_customer = params[:reservation_info][:total_user]
-			order_reservation.reservation_remark = params[:reservation_info][:reservation_note]
-		end
-		order_reservation.save!
-		if params[:order_info][:items]
-			params[:order_info][:items].each do |oritem|	
-				OrderReservationItem.process_order_reservation_item(oritem[:product_code],oritem[:item_instance_code],oritem[:product_name],oritem[:product_alt_name],
-					oritem[:account_id],oritem[:qty],oritem[:price],oritem[:unit_price],
-					oritem[:options],nil,order_reservation.id)
+		check_order_reservation = OrderReservation.where("transaction_ref = ?",params[:reference])
+		if check_order_reservation.empty?
+			order_reservation = OrderReservation.new
+			order_reservation.order_reservation_type = params[:order_type]
+			order_reservation.customer_id = params[:cus_info]
+			order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
+			order_reservation.callback_url = params[:callback_url]
+			order_reservation.transaction_ref = params[:reference]
+			if params[:order_info]
+				order_reservation.item_count = params[:order_info][:items].count
+				order_reservation.payment_type = params[:payment_info][:payment_type]
+				order_reservation.payment_status = params[:payment_info][:payment_status]
+				order_reservation.payment_ref = params[:payment_info][:payment_ref]
+				order_reservation.total_amount = params[:payment_info][:sub_total]
+				order_reservation.total_tax = params[:payment_info][:total_tax]
+				order_reservation.discount_amount = params[:payment_info][:discount_amount]
+				order_reservation.grand_total = params[:payment_info][:grand_total]
+				order_reservation.order_remark = params[:order_info][:order_remark]
 			end
-		end
-		if params[:delivery_info]
-			Delivery.addDeliveryInfo(params[:delivery_info],order_reservation.id)
+			if params[:reservation_info]
+				order_reservation.total_customer = params[:reservation_info][:total_user]
+				order_reservation.reservation_remark = params[:reservation_info][:reservation_note]
+			end
+			order_reservation.save!
+			if params[:order_info][:items]
+				params[:order_info][:items].each do |oritem|	
+					OrderReservationItem.process_order_reservation_item(oritem[:product_code],oritem[:item_instance_code],oritem[:product_name],oritem[:product_alt_name],
+						oritem[:account_id],oritem[:qty],oritem[:price],oritem[:unit_price],
+						oritem[:options],nil,order_reservation.id)
+				end
+			end
+			if params[:delivery_info]
+				Delivery.addDeliveryInfo(params[:delivery_info],order_reservation.id)
+			end
+			return order_reservation.id, true
+		else
+			return check_order_reservation[0].id, false
 		end
 	end
 
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index 627f9085..bbbbbafa 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -106,6 +106,32 @@
 		</div>
 	</div>
 </div>
+
+<!-- customer light box -->
+<div class="modal fade" id="is_memberModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-md" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title" id="is_memberModalLabel">Are you Member?</h1>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+        <input type="hidden" name="qr_code" id="qr_code" />
+        <div class="row text-center m-t-20">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Card Member</button>
+          </div>
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR Code</button>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer"></div>
+    </div>
+  </div>
+</div>   
+
 <script type="text/javascript">
     var cashier_type = "<%= @cashier_type %>"; 
 	$(document).ready(function() {
@@ -170,33 +196,168 @@
 		}else if(valid_amount< payment_amount){
 			swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
 		}else{
-			if(payment_amount <= "<%= @payment_prices %>"){
-				$(this).off("click");
-				$.ajax({
-					type: "POST",
-					url:  "<%=origami_payment_paymal_path%>",
-					data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id},
-					success: function(result){
-						if(result.status == true){
-							swal({
-								title: "Information!",
-								text: result.message,
-								html: true,
-								closeOnConfirm: false,
-								closeOnCancel: false,
-								allowOutsideClick: false
-							}, function () {
-								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
-							});
+			if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
+				if(payment_amount <= "<%= @payment_prices %>"){
+					$(this).off("click");
+					$.ajax({
+						type: "POST",
+						url:  "<%=origami_payment_paymal_path%>",
+						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id},
+						success: function(result){
+							if(result.status == true){
+								swal({
+									title: "Information!",
+									text: result.message,
+									html: true,
+									closeOnConfirm: false,
+									closeOnCancel: false,
+									allowOutsideClick: false
+								}, function () {
+									window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
+								});
 
-						}else{
-							swal ( "Information" , result.message);
+							}else{
+								swal ( "Information" , result.message);
+							}
 						}
-					}
-				})
-			}else {
-				swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+					})
+				}else {
+					swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+				}
+			}else{
+				$("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
 			}
 		}
 	});
+
+	// Read Card Reader
+  $(".btn_member").on('click', function(){  
+    var cardNo = ""; 
+    var customer_id = '';
+    var customer_name = '';
+    var membership_id = '';
+    var membership_type = '';
+    var sale_id     = $("#sale_id").text() || 0;
+    var customer_mamber_card_no = 0;
+
+    $("#is_memberModal").hide();
+    $("#sxModal").show();   
+    setTimeout(function(){
+      getCardNo();
+      $("#sxModal").hide();        
+      customer_mamber_card_no = $("#paypar_account_no").val();
+      
+      if(sale_id != 0 && customer_mamber_card_no != 0){    
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/get_customer" ,
+          data: { filter : customer_mamber_card_no ,type :"card"},
+          dataType: "json",
+          success: function(data) {
+            if (data[0].customer_id == false) {
+              swal("Alert!", data[0].message, "error");
+            }else{
+              customer_id = data[0].customer_id;
+              customer_name = data[0].name;
+              membership_id = data[0].membership_id;
+              membership_type = data[0].membership_type;
+              update_sale(membership_id, customer_id, customer_name,sale_id);
+            }
+
+          }
+        });                
+      }
+    },100);
+  });
+
+  // Read NFC card no from java
+  function getCardNo(){
+    code2lab.readNFC();
+  }
+
+  // get CardNo from Java
+  function setCardNo(cardNo){
+    if(cardNo.length == 16){
+      $("#paypar_account_no").val(cardNo);
+    }
+  }
+
+  // QR Code Reader
+  $(".btn_qr_code").on('click', function(e){
+	    $("#is_memberModal").hide();
+	    var code = "";  
+	    var customer_id = '';
+	    var customer_name = '';
+	    var membership_id = '';
+	    var membership_type = '';    
+	    setTimeout(function(){
+	      code=getQRCode(); 
+	      if(sale_id != 0 && code != ""){    
+	        $.ajax({
+	          type: "POST",
+	          url: "/origami/"+sale_id+"/get_customer" ,
+	          data: { filter : code ,type :"card"},
+	          dataType: "json",
+	          success: function(data) {
+	            if (data[0].customer_id == false) {
+	              swal("Alert!", data[0].message, "error");
+	            }else{
+	              customer_id = data[0].customer_id;
+	              customer_name = data[0].name;
+	              membership_id = data[0].membership_id;
+	              membership_type = data[0].membership_type;
+	              update_sale(membership_id, customer_id, customer_name,sale_id);
+	            }
+
+	          }
+	        });                
+	      }         
+	    },100);
+	  });
+
+	  // Read qrcode from java
+	  function getQRCode(){
+	    return code2lab.readQRCode();
+	    $("#qr_code").val(code);  
+	  }
+
+	  function update_sale(membership_id, customer_id, customer_name, sale_id) {
+	    var customer="";
+	    if(customer_name != ""){
+	      customer = '(' + customer_name + ')';
+	    }
+
+	    swal({
+	      title: "Confirmation !",
+	      text: 'Are You Sure to assign this customer' + customer + '!',
+	      showCancelButton: true,
+	      confirmButtonColor: "green",
+	      confirmButtonText: "Yes!",
+	      cancelButtonClass: 'btn btn-danger',
+	      closeOnConfirm: false,
+	    }, function () {
+	      $.ajax({
+	        type: "POST",
+	        url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,
+	        data: {customer_id:customer_id,sale_id:sale_id},
+	        dataType: "json",
+	        success: function(data) {
+	          if(data.status == true)
+	          {
+	            //change customer detail
+	            $("#customer_name").html(customer_name);
+	            $("#membership_id").html(membership_id);
+	            window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+	          }else{
+	            swal("Alert!", "Record not found!", "error");
+	            location.reload();
+	          }
+	        }
+	      });        
+	    });
+	  }
+
+	  $("#sxModal .btn_cancel").on('click',function(){
+	    $("#sxModal").hide();
+	  });
 </script>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 26255b59..b063f28e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index 4a53aaf0..cde96ac0 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -6,6 +6,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
     	t.string 	   :customer_id, :null => false
     	t.datetime 	 :requested_time, :null => false
       t.string     :callback_url, :null => false
+      t.string     :transaction_ref, :null => false
     	t.integer :item_count, :null => false, :default => 0
       t.integer :total_customer
     	t.string 	:payment_type
@@ -18,6 +19,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
     	t.string 	:status, :null => false, :default => "new"
       t.string  :order_remark
       t.string  :reservation_remark
+      t.timestamps
     end
   end
 
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
index 9d320f77..c74900dd 100644
--- a/db/migrate/20180406080359_create_order_reservation_items.rb
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -16,6 +16,7 @@ class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
 		t.string :remark
 		t.string :options
 		t.boolean :taxable, :null => false, :default => true
+		t.timestamps
     end
   end
 
diff --git a/db/migrate/20180406080436_create_deliveries.rb b/db/migrate/20180406080436_create_deliveries.rb
index 6b4e6487..4c66ada0 100644
--- a/db/migrate/20180406080436_create_deliveries.rb
+++ b/db/migrate/20180406080436_create_deliveries.rb
@@ -9,6 +9,7 @@ class CreateDeliveries < ActiveRecord::Migration[5.1]
     	t.string :direction_address
     	t.string :delivery_fee
     	t.string :remark
+      t.timestamps
     end
   end
 

From 8261a3453a5508f6d33a73abe5dab3c9d9c95105 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 11 Apr 2018 14:40:28 +0630
Subject: [PATCH 599/651] remove # in action controller

---
 config/initializers/action_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index b063f28e..26255b59 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

From f159673c6045914de1287e0e42d1d11b15804bea Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 11 Apr 2018 14:47:50 +0630
Subject: [PATCH 600/651] Remove Discount button in cashier of waiter role

---
 app/views/origami/home/show.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 2af02ca8..7c736299 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -488,7 +488,9 @@
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
                 <% end %>
+                <% if current_login_employee.role != "waiter" %>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
+                <% end %>  
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
                 
                   <% if !@split_bill.nil? %>

From 0413d56a83a77a0987d4c2e1e2b980ac53e2ac9c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 11 Apr 2018 16:18:42 +0630
Subject: [PATCH 601/651] add paymal and dinga with account no

---
 app/assets/stylesheets/origami.scss           |   8 +
 .../origami/customers_controller.rb           |  29 +-
 app/controllers/origami/dinga_controller.rb   | 177 ++++++-----
 app/controllers/origami/paymal_controller.rb  | 154 +++++-----
 app/models/sale_payment.rb                    |  34 +-
 app/views/origami/dinga/index.html.erb        | 290 ++++++++++++++++--
 app/views/origami/paymal/index.html.erb       | 180 ++++++-----
 config/routes.rb                              |   1 +
 8 files changed, 585 insertions(+), 288 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 601b8f89..1de250a3 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -417,6 +417,14 @@ i.logout_icon{
 #is_memberModal .btn {
 	width: 80%;
 }
+
+#is_paymemberModal .modal-body {
+	height: 150px !important;
+}
+
+#is_paymemberModal .btn {
+	width: 80%;
+}
 /* End Is Member Modal */
 
 /* Start iframe */
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 70e5260f..fefb973e 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -144,5 +144,32 @@ class Origami::CustomersController < BaseOrigamiController
         render json: JSON.generate({:status => false, :error_message => "Record not found"})
     end
   end
-   
+  
+  def send_account
+    amount = params[:amount]
+    account_no = params[:account_no]
+    receipt_no = params[:receipt_no]
+    sale = Sale.find_by_receipt_no(receipt_no)
+    @out = []
+    action_by = current_user.id
+    membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+    if membership_setting.gateway_url
+      member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+      if member_actions.gateway_url
+        @campaign_type_id = nil
+        url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+        merchant_uid= member_actions.merchant_account_id
+        auth_token = member_actions.auth_token.to_s
+        membership_data = SalePayment.get_paypar_account_data(url,membership_setting.auth_token,merchant_uid,auth_token,account_no,amount,receipt_no)
+        if membership_data["status"]==true
+          remark = "Payment by account no Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} | Transaction ref: #{membership_data[:transaction_ref]} | Reload amount #{membership_data[:reload_amount]} | Old Balance Amount #{membership_data[:old_balance_amount]} | DateTime : #{membership_data[:date]}"
+          sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_id, action_by,remark,"PAYBYACCOUNT" )
+        else
+          remark = "Payment by account no Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} | Remark : #{membership_data[:message]}"
+          sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_id, action_by,remark,"PAYBYACCOUNT" )
+        end
+        @out = membership_data
+      end
+    end
+  end
 end
diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index 1b3c9ca2..448b39dd 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -1,102 +1,97 @@
 class Origami::DingaController < BaseOrigamiController
- 	def index
- 		@sale_id = params[:sale_id]
- 		payment_method = params[:payment_method]
-        @cashier_type   = params[:type]
- 		@membership_rebate_balance=0
- 		sale_data = Sale.find_by_sale_id(@sale_id)
+  def index
+     @sale_id = params[:sale_id]
+     payment_method = params[:payment_method]
+     @cashier_type   = params[:type]
+     @membership_rebate_balance=0
+     sale_data = Sale.find_by_sale_id(@sale_id)
+     @receipt_no = sale_data.receipt_no
+     @shop        = Shop.first 
+          # if @shop.is_rounding_adj
+          #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+          # else
+          #     new_total    = sale_data.grand_total
+          # end
+          # @rounding_adj = new_total-sale_data.grand_total  
+          @rounding_adj = sale_data.rounding_adjustment  
 
-        @shop        = Shop.first 
-        # if @shop.is_rounding_adj
-        #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-        # else
-        #     new_total    = sale_data.grand_total
-        # end
-        # @rounding_adj = new_total-sale_data.grand_total  
-        @rounding_adj = sale_data.rounding_adjustment  
-
-        @dingacount = 0
-        others = 0
-        sale_data.sale_payments.each do |sale_payment|
+          @payparcount = 0
+          others = 0
+          sale_data.sale_payments.each do |sale_payment|
             if sale_payment.payment_method == "dinga"
-              @dingacount = @dingacount + sale_payment.payment_amount
+              @payparcount = @payparcount + sale_payment.payment_amount
             else
               others = others + sale_payment.payment_amount
             end
-        end
-        @redeem_prices = sale_data.grand_total - @dingacount -others
+          end
+          @payment_prices = sale_data.grand_total - @payparcount -others
 
 
- 		if sale_data
- 			if sale_data.customer_id
- 				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
- 				if customer_data
- 					@membership_id = customer_data.membership_id
- 					if !@membership_id.nil?
- 						membership_setting = MembershipSetting.find_by_membership_type("dinga_url")
- 						if membership_setting.gateway_url
- 							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
- 							if member_actions.gateway_url
- 								@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
- 								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
- 								merchant_uid= member_actions.merchant_account_id
- 								auth_token = member_actions.auth_token.to_s
-		 						membership_data = SalePayment.get_dinga_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
-		 						if membership_data["status"]==true
-		 							@membership_rebate_balance=membership_data["balance"]
-		 							@out = true, @membership_rebate_balance,@membership_id
-		 						end
-		 					else
-		 						@out =false,0
- 							end
- 						else
- 							@out = false,0
- 						end
+          if sale_data
+            if sale_data.customer_id
+             customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+             if customer_data
+              @membership_id = customer_data.membership_id
+              if !@membership_id.nil?
+               membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+               if membership_setting.gateway_url
+                member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+                if member_actions.gateway_url
+                 @campaign_type_id = nil
+                 url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+                 merchant_uid= member_actions.merchant_account_id
+                 auth_token = member_actions.auth_token.to_s
+                 membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+                 if membership_data["status"]==true
+                  @membership_rebate_balance=membership_data["balance"]
+                  @out = true, @membership_rebate_balance,@membership_id
+                end
+              else
+               @out =false,0
+             end
+           else
+            @out = false,0
+          end
 
 
- 					else
- 						@out = false, 0
- 					end
- 				else
- 					@out = false, 0
- 				end
- 			else
- 				@out = false, 0
- 			end
- 		else
- 			@out = false, 0
- 		end
- 		@out = false, 0
- 	end
-
- 	def create
-		sale_id = params[:sale_id]
-		@cashier_type   = params[:type]
-		redeem_amount = params[:redeem_amount]
-		membership_id = params[:membership_id]
-		payment_method = "dinga"
-		if(Sale.exists?(sale_id))
-			saleObj = Sale.find(sale_id)
-			shop_details =  Shop.first 
-      
-			# rounding adjustment
-				if shop_details.is_rounding_adj
-				new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-				rounding_adj = new_total-saleObj.grand_total
-				saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-			end
-			
-      		sale_payment = SalePayment.new
-      		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
-      		if status == true
-      			@out = true, "Success!"
-      		else
-      			@out =false, "Please try again payment!"
-      		end
-      	else
-      		@out = false, "There has no sale record!"
-		end
-
-	end
-        
+        else
+         @out = false, 0
+       end
+     else
+      @out = false, 0
+    end
+  else
+   @out = false, 0
+  end
+  else
+    @out = false, 0
+  end
+  @out = false, 0
+end
+
+def create
+ cash = params[:payment_amount]
+ sale_id = params[:sale_id]
+ transaction_ref = params[:transaction_ref]
+ if(Sale.exists?(sale_id))
+   saleObj = Sale.find(sale_id)
+   shop_details =  Shop.first 
+      # rounding adjustment
+      # if shop_details.is_rounding_adj
+      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      #   rounding_adj = new_total-saleObj.grand_total
+      #   saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      # end
+
+      # saleObj = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",transaction_ref)
+      if status == true
+        @out = true, "Success!"
+      else
+        @out =false, "Please try again payment!"
+      end
+    end
+  end
+
 end
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index a72a28ec..65af0c3b 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -1,80 +1,82 @@
 class Origami::PaymalController < BaseOrigamiController
-  	def index
- 		@sale_id = params[:sale_id]
- 		payment_method = params[:payment_method]
-        @cashier_type   = params[:type]
- 		@membership_rebate_balance=0
- 		sale_data = Sale.find_by_sale_id(@sale_id)
+ def index
+     @sale_id = params[:sale_id]
+     payment_method = params[:payment_method]
+     @cashier_type   = params[:type]
+     @membership_rebate_balance=0
+     sale_data = Sale.find_by_sale_id(@sale_id)
+     @receipt_no = sale_data.receipt_no
+     @shop        = Shop.first 
+          # if @shop.is_rounding_adj
+          #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+          # else
+          #     new_total    = sale_data.grand_total
+          # end
+          # @rounding_adj = new_total-sale_data.grand_total  
+          @rounding_adj = sale_data.rounding_adjustment  
 
-        @shop        = Shop.first 
-        # if @shop.is_rounding_adj
-        #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-        # else
-        #     new_total    = sale_data.grand_total
-        # end
-        # @rounding_adj = new_total-sale_data.grand_total  
-        @rounding_adj = sale_data.rounding_adjustment  
-
-        @payparcount = 0
-        others = 0
-        sale_data.sale_payments.each do |sale_payment|
+          @payparcount = 0
+          others = 0
+          sale_data.sale_payments.each do |sale_payment|
             if sale_payment.payment_method == "paypar"
               @payparcount = @payparcount + sale_payment.payment_amount
             else
               others = others + sale_payment.payment_amount
             end
-        end
-        @payment_prices = sale_data.grand_total - @payparcount -others
+          end
+          @payment_prices = sale_data.grand_total - @payparcount -others
 
 
- 		if sale_data
- 			if sale_data.customer_id
- 				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
- 				if customer_data
- 					@membership_id = customer_data.membership_id
- 					if !@membership_id.nil?
- 						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
- 						if membership_setting.gateway_url
- 							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
- 							if member_actions.gateway_url
- 								@campaign_type_id = nil
- 								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
- 								merchant_uid= member_actions.merchant_account_id
- 								auth_token = member_actions.auth_token.to_s
-		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
-		 						if membership_data["status"]==true
-		 							@membership_rebate_balance=membership_data["balance"]
-		 							@out = true, @membership_rebate_balance,@membership_id
-		 						end
-		 					else
-		 						@out =false,0
- 							end
- 						else
- 							@out = false,0
- 						end
+          if sale_data
+            if sale_data.customer_id
+             customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+             if customer_data
+              @membership_id = customer_data.membership_id
+              if !@membership_id.nil?
+               membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+               if membership_setting.gateway_url
+                member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+                if member_actions.gateway_url
+                 @campaign_type_id = nil
+                 url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+                 merchant_uid= member_actions.merchant_account_id
+                 auth_token = member_actions.auth_token.to_s
+                 membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+                 if membership_data["status"]==true
+                  @membership_rebate_balance=membership_data["balance"]
+                  @out = true, @membership_rebate_balance,@membership_id
+                end
+              else
+               @out =false,0
+             end
+           else
+            @out = false,0
+          end
 
 
- 					else
- 						@out = false, 0
- 					end
- 				else
- 					@out = false, 0
- 				end
- 			else
- 				@out = false, 0
- 			end
- 		else
- 			@out = false, 0
- 		end
- 		@out = false, 0
+        else
+         @out = false, 0
+       end
+     else
+      @out = false, 0
     end
-  	def create
-	    cash = params[:payment_amount]
-	    sale_id = params[:sale_id]
-	    if(Sale.exists?(sale_id))
-	      saleObj = Sale.find(sale_id)
-	      shop_details =  Shop.first 
-	      
+  else
+   @out = false, 0
+  end
+  else
+    @out = false, 0
+  end
+  @out = false, 0
+end
+
+def create
+ cash = params[:payment_amount]
+ sale_id = params[:sale_id]
+ transaction_ref = params[:transaction_ref]
+ if(Sale.exists?(sale_id))
+   saleObj = Sale.find(sale_id)
+   shop_details =  Shop.first 
+
 	      # rounding adjustment
 	      # if shop_details.is_rounding_adj
 	      #   new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
@@ -84,18 +86,12 @@ class Origami::PaymalController < BaseOrigamiController
 
 	      # saleObj = Sale.find(sale_id)
 	      sale_payment = SalePayment.new
-	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal")
-          if status == true
-                @out = true, "Success!"
-            else
-                @out =false, "Please try again payment!"
-            end
-	    end
-  	end
-
-	#Shop Name in Navbor
-	helper_method :shop_detail
-		def shop_detail
-		    @shop = Shop.first
-		end
+	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",transaction_ref)
+        if status == true
+          @out = true, "Success!"
+        else
+          @out =false, "Please try again payment!"
+        end
+      end
+    end
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 035bb792..201a1b57 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -103,6 +103,31 @@ class SalePayment < ApplicationRecord
     rescue OpenURI::HTTPError
       response = { status: false}
 
+    rescue SocketError
+      response = { status: false}
+    end
+    Rails.logger.debug "Get Paypar Account "
+    Rails.logger.debug response.to_json
+    return response
+  end
+
+  def self.get_paypar_account_data(url,token,merchant_uid,auth_token,account_no,amount,receipt_no)
+    # Control for Paypar Cloud
+    begin
+      response = HTTParty.get(url,
+              :body => { merchant_uid:merchant_uid,auth_token:auth_token,receipt_no: receipt_no,
+                account_no: account_no, amount: amount}.to_json,
+              :headers => {
+                        'Content-Type' => 'application/json',
+                        'Accept' => 'application/json; version=3'
+              }, :timeout => 10
+        )
+    rescue Net::OpenTimeout
+        response = { status: false }
+
+    rescue OpenURI::HTTPError
+      response = { status: false}
+
     rescue SocketError
       response = { status: false}
     end
@@ -378,7 +403,7 @@ class SalePayment < ApplicationRecord
       self.payment_amount = self.received_amount
       self.payment_reference  = self.voucher_no
       self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
-      self.payment_status = "pending"
+      self.payment_status = "paid"
       payment_method = self.save!
       SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
       sale_update_payment_status(self.received_amount.to_f)
@@ -410,10 +435,10 @@ class SalePayment < ApplicationRecord
     #Next time - validate if the vochure number is valid - within
     customer_data = Customer.find_by_customer_id(self.sale.customer_id)
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
-      remark = "#{membership_data} Redeem- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
+      remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
       sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
 
     if membership_data["status"]==true
@@ -421,7 +446,7 @@ class SalePayment < ApplicationRecord
       self.payment_amount = self.received_amount
       self.payment_reference  = self.voucher_no
       self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
-      self.payment_status = "pending"
+      self.payment_status = "paid"
       payment_method = self.save!
       SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
       sale_update_payment_status(self.received_amount.to_f)
@@ -429,6 +454,7 @@ class SalePayment < ApplicationRecord
     else
       sale_update_payment_status(0)
     end
+
     return payment_status
 
   end
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index 1b35710f..6a4fc12b 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -15,41 +15,41 @@
 				<div class="rebate-form">
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class="">You can redeem up to </label>
-							<%@redeem_prices = @redeem_prices +@rounding_adj%>
-							<input type="text" name="" id="redeemamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @redeem_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+							<label class="">You can pay up to </label>
+							<%@payment_prices = @payment_prices +@rounding_adj%>
+							<input type="text" name="" id="paymentamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payment_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 						</div>
 						<hr>
 					</div>
-					<% if @dingacount > 0 %>
+					<% if @payparcount > 0 %>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class="">Recent Redeem Amount </label>
-							<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @dingacount %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+							<label class="">Recent Payment Amount </label>
+							<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @payparcount %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 						</div>
 						<hr>
 					</div>
 					<% end %>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class=""> Rebate Balance </label>
+							<label class="">Available Balance </label>
 							<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 						</div>
 						<hr>
 					</div>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-							<label class="">Redeem Amount</label>
+							<label class="">Payment Balance</label>
 							<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
 						</div>
 						<hr>
 					</div>
 				</div>
 			</div>
-			<!-- <% if @dingacount > 0 %>
-				<p class="">Last time rebate amount is <%= @dingacount %></p>
+			<!-- <% if @payparcount > 0 %>
+				<p class="">Last time rebate amount is <%= @payparcount %></p>
 			<% end %>
-			<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @redeem_prices %></span></p> -->
+			<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @payment_prices %></span></p> -->
 		</div>
 
 		<div class="col-lg-6 col-md-6 col-sm-6">
@@ -92,7 +92,7 @@
 							<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
 						</div>
 						<div class="row bottom m-l-5">
-							<div class="pay purple left" id="dinga">Pay</div>
+							<div class="pay purple left" id="dinga_payment">Pay</div>
 						</div>
 					</div>
 
@@ -106,15 +106,43 @@
 		</div>
 	</div>
 </div>
+
+<!-- customer light box -->
+<div class="modal fade" id="is_paymemberModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-md" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title" id="is_paymemberModalLabel">Are you Member?</h1>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+        <input type="hidden" name="qr_code" id="qr_code" />
+        <div class="row text-center m-t-20">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_member">Card Member</button>
+          </div>
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_qr_code">QR Code</button>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer"></div>
+    </div>
+  </div>
+</div>   
+
 <script type="text/javascript">
     var cashier_type = "<%= @cashier_type %>"; 
 	$(document).ready(function() {
-	  setHeaderBreadCrumb(_REDEEM_PAYMENT_);
+		setHeaderBreadCrumb(_DINGA_);
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-			else {
-				$('#redeemamt').attr("value",parseFloat("<%= @redeem_prices %>") - parseFloat(localStorage.getItem("cash")));
-			}
-		});
+		else {
+			$('#paymentamt').attr("value",parseFloat("<%= @payment_prices %>") - parseFloat(localStorage.getItem("cash")));
+		}
+	});
+
 	$(document).on('click', '.cashier_number', function(event){
 		event.stopPropagation();
 		event.preventDefault();
@@ -148,7 +176,7 @@
 				$('#used_amount').text(cash.substr(0,cash.length-1));
 				break;
 				case 'nett':
-				var remain_amount = $('#redeemamt').val();
+				var remain_amount = $('#paymentamt').val();
 				$('#used_amount').text(remain_amount);
 				break;
 
@@ -159,22 +187,82 @@
 		}
 	});
 
-	$("#dinga").click(function(){
+	$("#dinga_payment").click(function(){
 		valid_amount = $("#valid_amount").val();
 		sale_id = $("#valid_amount").attr('data-value');
 		membership_id = $("#valid_amount").attr('data-member-value');
-		redeem_amount = parseFloat($("#used_amount").text());
-		if(redeem_amount<=0 ){
-			swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
-		}else if(valid_amount< redeem_amount){
-			swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
+		payment_amount = parseFloat($("#used_amount").text());
+		if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
+			if(payment_amount<=0 ){
+				swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
+			}else if(valid_amount< payment_amount){
+				swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
+			}else{
+				if(payment_amount <= "<%= @payment_prices %>"){
+					$(this).off("click");
+					$.ajax({
+						type: "POST",
+						url:  "<%=origami_payment_dinga_path%>",
+						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:""},
+						success: function(result){
+							if(result.status == true){
+								swal({
+									title: "Information!",
+									text: result.message,
+									html: true,
+									closeOnConfirm: false,
+									closeOnCancel: false,
+									allowOutsideClick: false
+								}, function () {
+									window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
+								});
+
+							}else{
+								swal ( "Information" , result.message);
+							}
+						}
+					})
+				}else {
+					swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+				}
+			}
 		}else{
-			if(redeem_amount <= "<%= @redeem_prices %>"){
-				$(this).off("click");
-				$.ajax({
+			$("#is_paymemberModal").modal({show : true, backdrop: false, keyboard : false});
+		}
+	});
+
+	// Read Card Reader
+  $(".btn_member").on('click', function(){  
+    var cardNo = ""; 
+    var customer_id = '';
+    var customer_name = '';
+    var membership_id = '';
+    var membership_type = '';
+    var sale_id     = $("#sale_id").text() || 0;
+    var customer_mamber_card_no = 0;
+
+    $("#is_paymemberModal").hide();
+    $("#sxModal").show();   
+    setTimeout(function(){
+      getCardNo();
+      $("#sxModal").hide();        
+      customer_mamber_card_no = $("#paypar_account_no").val();
+      
+      if(sale_id != 0 && customer_mamber_card_no != 0){    
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/send_account" ,
+          data: { account_no : customer_mamber_card_no, amount : payment_amount, receipt_no : receipt_no},
+          dataType: "json",
+          success: function(data) {
+            if (data.status == true) {
+            	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
+            	$("#valid_amount").val(parseFloat(valid_amount));
+
+              	$.ajax({
 					type: "POST",
 					url:  "<%=origami_payment_dinga_path%>",
-					data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id},
+					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
 					success: function(result){
 						if(result.status == true){
 							swal({
@@ -185,17 +273,151 @@
 								closeOnCancel: false,
 								allowOutsideClick: false
 							}, function () {
-								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
+								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
 							});
 
 						}else{
 							swal ( "Information" , result.message);
 						}
 					}
-				})
-			}else {
-				swal ( "Oops" ,  "Redeem Amount is over!" ,  "warning" );
-			}
-		}
+				});
+            }else{
+            	swal({
+					  title: 'Oops',
+					  text: data.message.toString(),
+					  type: 'error',
+					  html: true,
+					  closeOnConfirm: false,
+					  closeOnCancel: false,
+					  allowOutsideClick: false
+					}, function () {
+					window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/DINGA";
+				});
+            }
+
+          }
+        });                
+      }
+    },100);
+  });
+
+  // Read NFC card no from java
+  function getCardNo(){
+    code2lab.readNFC();
+  }
+
+  // get CardNo from Java
+  function setCardNo(cardNo){
+    if(cardNo.length == 16){
+      $("#paypar_account_no").val(cardNo);
+    }
+  }
+
+  // QR Code Reader
+  $(".btn_qr_code").on('click', function(e){
+	    $("#is_memberModal").hide();
+	    var code = "";  
+	    var customer_id = '';
+	    var customer_name = '';
+	    var membership_id = '';
+	    var membership_type = '';    
+	    setTimeout(function(){
+	      code=getQRCode(); 
+	      if(sale_id != 0 && code != ""){    
+	         $.ajax({
+	          type: "POST",
+	          url: "/origami/"+sale_id+"/send_account" ,
+	          data: { account_no : code, amount : payment_amount, receipt_no : receipt_no},
+	          dataType: "json",
+	          success: function(data) {
+	            if (data.status == true) {
+	            	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
+	            	$("#valid_amount").val(parseFloat(valid_amount));
+
+	              	$.ajax({
+						type: "POST",
+						url:  "<%=origami_payment_paymal_path%>",
+						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+						success: function(result){
+							if(result.status == true){
+								swal({
+									title: "Information!",
+									text: result.message,
+									html: true,
+									closeOnConfirm: false,
+									closeOnCancel: false,
+									allowOutsideClick: false
+								}, function () {
+									window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+								});
+
+							}else{
+								swal ( "Information" , result.message);
+							}
+						}
+					});
+	            }else{
+	            	swal({
+						  title: 'Oops',
+						  text: data.message.toString(),
+						  type: 'error',
+						  html: true,
+						  closeOnConfirm: false,
+						  closeOnCancel: false,
+						  allowOutsideClick: false
+						}, function () {
+						window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/DINGA";
+					});
+	            }
+	          }
+	        });                
+	      }    
+	    },100);
+	});
+
+	// Read qrcode from java
+	function getQRCode(){
+		return code2lab.readQRCode();
+		$("#qr_code").val(code);  
+	}
+
+	function update_sale(membership_id, customer_id, customer_name, sale_id) {
+		var customer="";
+		if(customer_name != ""){
+		  customer = '(' + customer_name + ')';
+	}
+
+	swal({
+	  title: "Confirmation !",
+	  text: 'Are You Sure to assign this customer' + customer + '!',
+	  showCancelButton: true,
+	  confirmButtonColor: "green",
+	  confirmButtonText: "Yes!",
+	  cancelButtonClass: 'btn btn-danger',
+	  closeOnConfirm: false,
+	}, function () {
+	  $.ajax({
+	    type: "POST",
+	    url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,
+	    data: {customer_id:customer_id,sale_id:sale_id},
+	    dataType: "json",
+	    success: function(data) {
+	      if(data.status == true)
+	      {
+	        //change customer detail
+	        $("#customer_name").html(customer_name);
+	        $("#membership_id").html(membership_id);
+	        window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+	      }else{
+	        swal("Alert!", "Record not found!", "error");
+	        location.reload();
+	      }
+	    }
+	  });        
+	});
+	}
+
+	$("#sxModal .btn_cancel").on('click',function(){
+		$("#sxModal").hide();
 	});
 </script>
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index bbbbbafa..d92f162a 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -13,6 +13,7 @@
 		<div class="col-lg-5 col-md-5 col-sm-5">
 			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
+					<input type="hidden" name="receipt_no" id="receipt_no" value="<%= @receipt_no%>">
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label class="">You can pay up to </label>
@@ -108,11 +109,12 @@
 </div>
 
 <!-- customer light box -->
-<div class="modal fade" id="is_memberModal" tabindex="-1" role="dialog">
+<div class="modal fade" id="is_paymemberModal" tabindex="-1" role="dialog">
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h1 class="modal-title" id="is_memberModalLabel">Are you Member?</h1>
+        <h1 class="modal-title" id="is_paymemberModalLabel">Are you Member?</h1>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
       </div>
       <div class="modal-body">
         <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
@@ -191,18 +193,18 @@
 		sale_id = $("#valid_amount").attr('data-value');
 		membership_id = $("#valid_amount").attr('data-member-value');
 		payment_amount = parseFloat($("#used_amount").text());
-		if(payment_amount<=0 ){
-			swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
-		}else if(valid_amount< payment_amount){
-			swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
-		}else{
-			if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
+		if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
+			if(payment_amount<=0 ){
+				swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
+			}else if(valid_amount< payment_amount){
+				swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
+			}else{
 				if(payment_amount <= "<%= @payment_prices %>"){
 					$(this).off("click");
 					$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id},
+						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:""},
 						success: function(result){
 							if(result.status == true){
 								swal({
@@ -224,23 +226,21 @@
 				}else {
 					swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
 				}
-			}else{
-				$("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
 			}
+		}else{
+			$("#is_paymemberModal").modal({show : true, backdrop: false, keyboard : false});
 		}
 	});
 
 	// Read Card Reader
   $(".btn_member").on('click', function(){  
     var cardNo = ""; 
-    var customer_id = '';
-    var customer_name = '';
-    var membership_id = '';
-    var membership_type = '';
     var sale_id     = $("#sale_id").text() || 0;
+    var receipt_no = $("#receipt_no").val() || "";
     var customer_mamber_card_no = 0;
+    var payment_amount = parseFloat($("#used_amount").text());
 
-    $("#is_memberModal").hide();
+    $("#is_paymemberModal").hide();
     $("#sxModal").show();   
     setTimeout(function(){
       getCardNo();
@@ -250,18 +250,48 @@
       if(sale_id != 0 && customer_mamber_card_no != 0){    
         $.ajax({
           type: "POST",
-          url: "/origami/"+sale_id+"/get_customer" ,
-          data: { filter : customer_mamber_card_no ,type :"card"},
+          url: "/origami/"+sale_id+"/send_account" ,
+          data: { account_no : customer_mamber_card_no, amount : payment_amount, receipt_no : receipt_no},
           dataType: "json",
           success: function(data) {
-            if (data[0].customer_id == false) {
-              swal("Alert!", data[0].message, "error");
+            if (data.status == true) {
+            	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
+            	$("#valid_amount").val(parseFloat(valid_amount));
+
+              	$.ajax({
+					type: "POST",
+					url:  "<%=origami_payment_paymal_path%>",
+					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+					success: function(result){
+						if(result.status == true){
+							swal({
+								title: "Information!",
+								text: result.message,
+								html: true,
+								closeOnConfirm: false,
+								closeOnCancel: false,
+								allowOutsideClick: false
+							}, function () {
+								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+							});
+
+						}else{
+							swal ( "Information" , result.message);
+						}
+					}
+				});
             }else{
-              customer_id = data[0].customer_id;
-              customer_name = data[0].name;
-              membership_id = data[0].membership_id;
-              membership_type = data[0].membership_type;
-              update_sale(membership_id, customer_id, customer_name,sale_id);
+            	swal({
+					  title: 'Oops',
+					  text: data.message.toString(),
+					  type: 'error',
+					  html: true,
+					  closeOnConfirm: false,
+					  closeOnCancel: false,
+					  allowOutsideClick: false
+					}, function () {
+					window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/PAYMAL";
+				});
             }
 
           }
@@ -284,31 +314,59 @@
 
   // QR Code Reader
   $(".btn_qr_code").on('click', function(e){
-	    $("#is_memberModal").hide();
-	    var code = "";  
-	    var customer_id = '';
-	    var customer_name = '';
-	    var membership_id = '';
-	    var membership_type = '';    
+	    $("#is_paymemberModal").hide();
+	    var code = ""; 
+	    var sale_id     = $("#sale_id").text() || 0;
+	    var receipt_no = $("#receipt_no").val() || "";
+	    var payment_amount = parseFloat($("#used_amount").text());
 	    setTimeout(function(){
 	      code=getQRCode(); 
 	      if(sale_id != 0 && code != ""){    
-	        $.ajax({
+	         $.ajax({
 	          type: "POST",
-	          url: "/origami/"+sale_id+"/get_customer" ,
-	          data: { filter : code ,type :"card"},
+	          url: "/origami/"+sale_id+"/send_account" ,
+	          data: { account_no : code, amount : payment_amount, receipt_no : receipt_no},
 	          dataType: "json",
 	          success: function(data) {
-	            if (data[0].customer_id == false) {
-	              swal("Alert!", data[0].message, "error");
-	            }else{
-	              customer_id = data[0].customer_id;
-	              customer_name = data[0].name;
-	              membership_id = data[0].membership_id;
-	              membership_type = data[0].membership_type;
-	              update_sale(membership_id, customer_id, customer_name,sale_id);
-	            }
+	            if (data.status == true) {
+	            	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
+	            	$("#valid_amount").val(parseFloat(valid_amount));
 
+	              	$.ajax({
+						type: "POST",
+						url:  "<%=origami_payment_paymal_path%>",
+						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+						success: function(result){
+							if(result.status == true){
+								swal({
+									title: "Information!",
+									text: result.message,
+									html: true,
+									closeOnConfirm: false,
+									closeOnCancel: false,
+									allowOutsideClick: false
+								}, function () {
+									window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+								});
+
+							}else{
+								swal ( "Information" , result.message);
+							}
+						}
+					});
+	            }else{
+	            	swal({
+						  title: 'Oops',
+						  text: data.message.toString(),
+						  type: 'error',
+						  html: true,
+						  closeOnConfirm: false,
+						  closeOnCancel: false,
+						  allowOutsideClick: false
+						}, function () {
+						window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/PAYMAL";
+					});
+	            }
 	          }
 	        });                
 	      }         
@@ -321,42 +379,6 @@
 	    $("#qr_code").val(code);  
 	  }
 
-	  function update_sale(membership_id, customer_id, customer_name, sale_id) {
-	    var customer="";
-	    if(customer_name != ""){
-	      customer = '(' + customer_name + ')';
-	    }
-
-	    swal({
-	      title: "Confirmation !",
-	      text: 'Are You Sure to assign this customer' + customer + '!',
-	      showCancelButton: true,
-	      confirmButtonColor: "green",
-	      confirmButtonText: "Yes!",
-	      cancelButtonClass: 'btn btn-danger',
-	      closeOnConfirm: false,
-	    }, function () {
-	      $.ajax({
-	        type: "POST",
-	        url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,
-	        data: {customer_id:customer_id,sale_id:sale_id},
-	        dataType: "json",
-	        success: function(data) {
-	          if(data.status == true)
-	          {
-	            //change customer detail
-	            $("#customer_name").html(customer_name);
-	            $("#membership_id").html(membership_id);
-	            window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
-	          }else{
-	            swal("Alert!", "Record not found!", "error");
-	            location.reload();
-	          }
-	        }
-	      });        
-	    });
-	  }
-
 	  $("#sxModal .btn_cancel").on('click',function(){
 	    $("#sxModal").hide();
 	  });
diff --git a/config/routes.rb b/config/routes.rb
index e5421453..444e961a 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -222,6 +222,7 @@ scope "(:locale)", locale: /en|mm/ do
     post '/:sale_id/:type/customers/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
 
     post '/:sale_id/get_customer' => "customers#get_customer"
+    post '/:sale_id/send_account' => "customers#send_account"
 
     get '/:id/:type/surveys', to: "surveys#new"
     match '/:id/create_survey', to: "surveys#create", as: "create_surveys", via: [:post, :patch, :put]

From b730c78afeb44358e0d60620ac1fedfd29b207dc Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Apr 2018 17:20:17 +0630
Subject: [PATCH 602/651] doemal or other api token added

---
 app/controllers/api/api_controller.rb          |  2 +-
 app/controllers/concerns/token_verification.rb | 14 +++++++-------
 app/models/my_aes_crypt.rb                     |  8 ++++----
 app/views/origami/payments/show.html.erb       |  2 +-
 config/initializers/action_controller.rb       | 12 ++++++------
 config/license.yml                             | 15 ---------------
 config/secrets.yml                             |  4 ++--
 config/shops.json                              |  6 +++++-
 8 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 config/license.yml

diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb
index 04dc3a72..973fc159 100755
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -32,7 +32,7 @@ class Api::ApiController < ActionController::API
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else8
+      else
         # reconnect_default_db
         logger.info 'License is nil'
         # redirect_to root_url(:host => request.domain) + "store_error"
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index 419b9b3b..2c17e258 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -13,16 +13,16 @@ module TokenVerification
     authenticate_token || render_unauthorized
   end
 
-  def authenticate_token
-    authenticate_with_http_token do |token, options|      
+  def authenticate_token    
+    authenticate_with_http_token do |token, options|           
       # Rails.logger.debug "token - " + token.to_s
-      if(!options.from.nil? && options.from == "DOEMAL"){
-        if(ENV["SERVER_MODE"] === "cloud"){
-          from = request.subdomain.downcase  + "." + request.domain.downcase  
+      if(options.length !=0 && options["from"] == "DOEMAL")
+        if(ENV["SERVER_MODE"] === "cloud")
+          from = request.subdomain.downcase  + "." + request.domain.downcase            
           aes = MyAesCrypt.new
           return aes.checkKeyForAuth(from, token)  
-        }
-      }
+        end
+      end
 
       @user = Employee.authenticate_by_token(token)
       if @user
diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb
index 339585e4..20f747c9 100644
--- a/app/models/my_aes_crypt.rb
+++ b/app/models/my_aes_crypt.rb
@@ -56,20 +56,20 @@ class MyAesCrypt
 		return aes_key, aes_iv
 	end
 
-	def checkKeyForAuth(from,token){
+	def checkKeyForAuth(from,token)
 		file_path = "config/shops.json"
 		shop_data = File.read(file_path)
 
 		shop_json = JSON.parse(shop_data)	
 		shop_json["data"].each do |j|
 			if j["lookup"] == from				
-				if(j["value"]["key"] == token){
+				if(j["value"]["key"] == token)
 					return true
-				}
+				end
 			end
 		end
 		return false
-	}
+	end
 
 	private
 	def encrypt(data)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 6d7d013b..1f87ca65 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -429,7 +429,7 @@
         <input type="hidden" name="sale_receipt_no" id="sale_receipt_no">
         <input type="hidden" name="filename" id="filename">
         <input type="hidden" name="printer_name" id="printer_name">
-        <div class="text-center">
+        <div class="text-center">          
           <iframe id="receipt_pdf" src="" class="pdf-iframe" scrolling="no"></iframe>
         </div>
       </div>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 26255b59..802324cf 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -3,7 +3,7 @@ class ActionController::Base
 
   private
 
-  def lookup_domain     
+  def lookup_domain   
     if request.subdomain.present? && request.subdomain != "www" 
       from = request.subdomain.downcase  + "." + request.domain.downcase    
       @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/config/license.yml b/config/license.yml
deleted file mode 100644
index 9f4d1542..00000000
--- a/config/license.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-iv_key: rwOZKWcQho6fE4V+A2zFuQ==
-shop_name: AMZ_Test
-email: aungmyo.zaw@code2lab.com
-telephone: 
-fax: 
-address: 
-dbhost: dNzh66R80remB694OEds96OpuyZ4wmHeHFdQh0KwjYFvTInK6+pCN/y6HdbyIlqqjcBHkqPjkjzw45PznLn7hA==
-dbschema: 4vooJDxgWdFv/8V7Qx8tzR/8B8T2c5U4XvYcF+2KOoA=
-dbusername: Xc8ELRsW7N/f8KsVikMBlg==
-dbpassword: HMg+TbLxmfYrDFI4IIAd4g==
-api_token: bisryXiEnbTJlZwghAnIByQpiRUMouu
-app_token: LycQXJYBZGeCygjIEKdlBXnjIGMiMzgmt
-plan_sku: 84hdnSCgkfhvItY7uB/pPQ==
-renewable_date: 8E6Ecz8QXAMSlKZnIzn0pQ==
-plan_name: 4cMIO0n/JzGFPIccXM6u5A==
diff --git a/config/secrets.yml b/config/secrets.yml
index 076b6691..6e8b73d4 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,8 +12,8 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
+  sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 
diff --git a/config/shops.json b/config/shops.json
index 1e141bc9..b3369529 100644
--- a/config/shops.json
+++ b/config/shops.json
@@ -1,7 +1,11 @@
 {
   "data": [
     {
-      
+      "lookup": "local",
+      "value": {
+      	"key": "999d675168d813d5e1c7",
+      	"iv": "999d675168d813d5e1c7"
+      }
     }
   ]
 }

From b11480a90c015191adea4734ddcf0ebfee0303bc Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 11 Apr 2018 17:53:57 +0630
Subject: [PATCH 603/651] Add Total Customer

---
 app/views/origami/surveys/_form.html.erb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 5640b549..52e8a517 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -9,12 +9,12 @@
             <div class="row clearfix">
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10' }%>
+                  <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10', :onChange => "total_customer();" }%>
                 </div>
               </div>
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10' }%>
+                  <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10', :onChange => "total_customer();" }%>
                 </div>
               </div>
             </div>  
@@ -30,7 +30,7 @@
                 </div>
               </div>
             </div>   
-            <%= f.input :total_customer, input_html: { value: @survey_data.total_customer, class: 'col-md-11'} %>
+            <%= f.input :total_customer, input_html: { value:@survey_data.total_customer , :readonly => true, class: 'col-md-11'} %>
             <%= f.input :local , input_html: { value: @survey_data.local, class: 'col-md-11' }%>
             <!--<fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;"> -->
               <!-- <legend style="font-size: 1.2em !important;font-weight: bold !important;text-align: left !important;border:none;width:100px;">Foreigner</legend> -->
@@ -457,4 +457,11 @@ var cashier_type = "<%= @cashier_type %>";
       });
     }
   }
+
+  function total_customer(){
+    var child = $("#survey_child").val() || 0;
+    var adult = $("#survey_adult").val() || 0;
+    var result = parseInt(child) + parseInt(adult);
+    $("#survey_total_customer").val(result);
+  }
 </script>
\ No newline at end of file

From a0fca242d462723e78ad581dc6f3ab73724113ef Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 11 Apr 2018 17:59:37 +0630
Subject: [PATCH 604/651] add sale id in order reservations

---
 db/migrate/20180406080240_create_order_reservations.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index cde96ac0..740ce6f1 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -7,6 +7,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
     	t.datetime 	 :requested_time, :null => false
       t.string     :callback_url, :null => false
       t.string     :transaction_ref, :null => false
+      t.string     :sale_id
     	t.integer :item_count, :null => false, :default => 0
       t.integer :total_customer
     	t.string 	:payment_type

From 4d92d71b5cfee724ce734bc24fed5ad5cb2fc450 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 11 Apr 2018 18:05:49 +0630
Subject: [PATCH 605/651] update doemal ordering

---
 app/assets/javascripts/order_reservation.js   | 135 ++++++
 app/assets/stylesheets/order_reservation.scss |  88 ++++
 .../origami/addorders_controller.rb           |   3 +-
 .../origami/order_reservation_controller.rb   |  36 +-
 app/models/order_reservation.rb               |  49 ++
 .../_order_item.json.jbuilder                 |  15 +
 .../order_reservation/get_order.json.jbuilder |  25 +
 .../origami/order_reservation/index.html.erb  | 434 ++++++------------
 config/initializers/assets.rb                 |   7 +-
 config/routes.rb                              |   3 +
 10 files changed, 485 insertions(+), 310 deletions(-)
 create mode 100644 app/assets/javascripts/order_reservation.js
 create mode 100644 app/assets/stylesheets/order_reservation.scss
 create mode 100644 app/views/origami/order_reservation/_order_item.json.jbuilder
 create mode 100644 app/views/origami/order_reservation/get_order.json.jbuilder

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
new file mode 100644
index 00000000..49ef043e
--- /dev/null
+++ b/app/assets/javascripts/order_reservation.js
@@ -0,0 +1,135 @@
+
+$(function() { 
+ 
+  $(".nav-item").on("click", function(){
+ 	type = $(this).attr("data-type");
+ 	if (type == "pending") {
+ 	  $('#accepted').text("Accepted");
+ 	  $('#accepted').attr("data-value","accepted");
+ 	}else if(type == "processing"){
+ 		$('#accepted').text("SEND TO KITCHEN");
+ 		$('#accepted').attr("data-value","processed");
+ 	}else if(type == "delivery"){
+ 		$('#accepted').text("READY TO DELIVERY");
+ 		$('#accepted').attr("data-value","delivery");
+ 	}else if(type == "completed"){
+ 		$('#accepted').text("PICK-UP");
+ 		$('#accepted').attr("data-value","completed");
+ 	}
+ 	console.log(type)
+  });
+
+  jQuery(function(){
+       jQuery('.first-1').click();
+    });
+
+  $(".custom-tr").on("click", function(){
+ 	$(".custom-tr").removeClass("tr-active");
+ 	$(this).addClass("tr-active");
+    var order_id  = $(this).attr("data-id");
+    var url       = "order_reservation/get_order/"+order_id;
+    show_order_detail(url);
+  });
+
+ //show order list 
+  function show_order_detail(url){ 
+    //Start Ajax
+    $.ajax({      
+      type: "GET",         
+      url: url, 
+      data: {},
+      dataType: "json",
+      success: function(data) {
+      	var delivery = data["delivery"]
+      	var items    = data["order_items"]
+
+      	var item_list = $('.summary-items');
+        item_list.empty();
+
+        for(var i in items) {  
+        	var total = items[i].qty*items[i].unit_price;
+            row = '<tr>'
+                   +'<td width ="70%" class="body-td align-left">'+items[i].item_name
+                    +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
+                  +'</td>'
+                  +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
+                +'</tr>';
+              $('.summary-items').append(row);
+        }
+
+      	$('#sub_total').text(data.total_amount);
+      	$('#delivery_fee').text(delivery.delivery_fee);
+      	$('#total_charges').text(0);
+      	$('#total_tax').text(data.total_tax);
+      	$('#grand_total').text(data.grand_total);
+
+      	var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")"
+      	$('#customer_name').text(data.customer_name);
+      	$('#phone').text(data.phone);
+      	$('#address').text(address);
+      	$('#delivery_to').text(delivery.provider);
+
+      	$('#ref_no').text(data.transaction_ref);
+      	$('#callback_url').text(data.callback_url);
+      	$('#order_id').text(data.order_reservation_id);
+      }
+    });
+    //end Ajax 
+  }
+
+  $("#accepted").on("click", function(){
+ 	var status    = $(this).attr("data-value");
+    var order_id  = $('#order_id').text();
+    var url       = 'order_reservation/update';
+    var callback  = $('#callback_url').text();
+	    $.ajax({      
+	      type: "POST",         
+	      url: url, 
+	      data: {'order_id': order_id, 'status': status},
+	      dataType: "json",
+	      success: function(data) {
+	      	console.log(data)
+	      	if (data.status) {
+	      		// callback_url(callback,data.message)
+	      		swal("Information","Order has been +'data.status'+","success");
+	      		window.location.href = '/origami/order_reservation';
+	      	}
+	      }
+	    });
+  });
+
+  $("#cancel").on("click", function(){
+ 	var status    = $(this).attr("data-value");
+    var order_id  = $('#order_id').text();
+    var url       = 'order_reservation/update';
+    var callback  = $('#callback_url').text();
+	    $.ajax({      
+	      type: "POST",         
+	      url: url, 
+	      data: {'order_id': order_id, 'status': status},
+	      dataType: "json",
+	      success: function(data) {
+	      	console.log(data)
+	      	if (data.status) {
+	      		console.log(data)
+	      		// callback_url(callback,data.message)
+	      		swal("Information","Order has been +'data.status'+","warning");
+	      		window.location.href = '/origami/order_reservation';
+	      	}
+	      }
+	    });
+  });
+
+  function callback_url(url,message){ 
+    $.ajax({      
+      type: "POST",         
+      url: url, 
+      data: {},
+      dataType: "json",
+      success: function(data) {
+
+      }
+    });
+  }
+
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/order_reservation.scss b/app/assets/stylesheets/order_reservation.scss
new file mode 100644
index 00000000..c33e1f32
--- /dev/null
+++ b/app/assets/stylesheets/order_reservation.scss
@@ -0,0 +1,88 @@
+  .nav-tabs > li.active > a, 
+  .nav-tabs > li.active > a:hover,
+  .nav-tabs > li.active > a:focus {
+    border-bottom: 2px solid #2196F3 ;
+    bottom: 2px ;
+}
+
+.nav-tabs .nav-link {
+    padding: 0.5286em .33em;
+}
+.nav-tabs li a.active {
+    color: #111 !important;
+    border-bottom: 0px solid #fff !important;
+}
+.nav-tabs .nav-link.active {
+    color: #111;
+    border-color: #fff;
+}
+.nav-tabs > li > a {
+    margin-right: 0px;
+    color:#fff !important;
+}
+
+.nav-tabs > li > a {
+    border-bottom: 2px solid #2196F3;
+    bottom: 2px;
+}
+.nav-tabs.tab-col-teal > li > a:before {
+    border-bottom: 0px solid #009688;
+}
+.nav-tabs .nav-item{
+  margin-bottom: 2px ;
+}
+.num{
+  color:#fff;
+  text-align: center;
+  margin-bottom: -1px !important;
+}
+.nav-tabs .nav-link.active > p{
+    color: #111;
+    border-color: #fff;
+}
+
+/*Custosm Class*/
+.table .header-td{
+  border-top:0px solid !important;
+  border-bottom: 0px solid !important;
+  padding:3px 7px !important;
+  border-top:0px solid !important;
+  border-bottom: 0px solid !important;
+}
+.custom-card-block .table td:first-child,
+.custom-card-block .table td:nth-child(2),
+.custom-card-footer .table td:first-child,
+.custom-card-footer .table td:nth-child(2){
+  border-top:0px solid !important;
+}
+
+.custom-card-footer .footer-td ,
+.grand-card-footer .footer-td {
+  border-top:0px solid !important;
+  border-bottom:0px solid !important;
+  font-weight: bold;
+  padding:6px 10px;
+}
+.custom-card-header{
+  border-bottom: 1px solid #F8BBD0 !important;
+  padding:13px 5px !important;
+}
+.custom-card-footer{
+  border-top: 1px solid #F8BBD0 !important;
+}
+.custom-card-block,
+.grand-card-footer,
+.custom-card-footer{
+  padding :5px !important;
+}
+.custom-table{
+  background-color:#F3E5F5;
+}
+.custom-table tbody tr td, 
+.custom-table tbody tr th{
+  border-top: 1px solid #FFEBEE;
+  border-bottom: 1px solid #FFEBEE;
+}
+.tr-active{
+  background-color : #FFCDD2;
+}
\ No newline at end of file
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 4abab9c8..8e23d2c9 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -111,7 +111,8 @@ class Origami::AddordersController < BaseOrigamiController
        end
        items_arr.push(items)
      }
-
+puts items_arr.to_json
+    puts "sssssssssssssssssssssss"
     # begin
     # if params[:order_source] == "quick_service"
     #   customer_id = "CUS-000000000002" # for no customer id from mobile
diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index db56d882..a90e755b 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -1,12 +1,40 @@
 class Origami::OrderReservationController < BaseOrigamiController
 
   def index
-    @webview = check_mobile
-    @shop     = Shop::ShopDetail
+  	@order = OrderReservation.all
+  end
 
+  def update
+  	@id     = params[:order_id]
+  	@status = params[:status]
+  	@order  = OrderReservation.find(@id)
+
+  	status = true
+
+  	if status
+  		if @status == "processed"
+  			OrderReservation.create_doemal_order(@order)
+  		else
+  			if @status == "cancel"
+  			    result = {:status=> true, :message => "cancelled" }
+	  		else
+	  			result = {:status=> true, :message => "accepted" }
+	  		end
+	        render :json => result.to_json
+  		end
+  		
+    else
+    	result = {:status=> false, :message => "Order not accepted !" }
+        render :json => result.to_json
+  	end
+  end
+
+  def get_order
+    if (params[:id])
+      @order = OrderReservation.find(params[:id])
+      return @order
+    end
   end
 
 
-
-
 end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 0be5e4c8..d9a60a1f 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -40,6 +40,55 @@ class OrderReservation < ApplicationRecord
 		end
 	end
 
+    def self.create_doemal_order(order)
+    
+    is_extra_time = false
+    extra_time = ''
+
+    items_arr = []
+    count = 1
+    order.order_reservation_items.each { |i| 
+      i.item_instance_code = i.item_instance_code.downcase.to_s
+     
+        items = {"order_item_id": count,"item_instance_code": i.item_instance_code,"quantity": i.qty,"options": []}
+       count += 1
+       items_arr.push(items)
+     }
+
+    puts items_arr.to_json
+    puts "sssssssssssssssssssssss"
+      customer_id = order.customer_id
+ 
+    @order = Order.new
+    @order.source     = "doemal_order"
+    @order.order_type = "delivery"
+    @order.customer_id = customer_id
+    @order.items = items_arr
+    @order.guest = ''
+    @order.table_id = nil  # this is dining facilities's id
+    @order.new_booking = true
+    @order.waiters = current_login_employee.name
+    @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
+
+     @status, @booking = @order.generate
+
+      # Order.send_customer_view(@booking)
+    
+     
+        if @status && @booking
+        
+          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+          # for second display 
+
+          result = {:status=> @status, :data => @sale }
+          render :json => result.to_json
+        end
+      
+    end
+
 	private
 		def generate_custom_id
 			self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS")
diff --git a/app/views/origami/order_reservation/_order_item.json.jbuilder b/app/views/origami/order_reservation/_order_item.json.jbuilder
new file mode 100644
index 00000000..794da464
--- /dev/null
+++ b/app/views/origami/order_reservation/_order_item.json.jbuilder
@@ -0,0 +1,15 @@
+json.id                   item.order_reservation_items_id
+json.order_id             item.order_reservation_id
+json.item_status          item.item_status
+json.item_code            item.item_code
+json.item_instance_code   item.item_instance_code
+json.item_name            item.item_name
+json.alt_name             item.alt_name
+json.set_menu_items       item.set_menu_items
+json.account_id           item.account_id
+json.qty                  item.qty
+json.unit_price           item.unit_price
+json.price                item.price
+json.remark               item.remark
+json.options              item.options
+json.taxable              item.taxable
\ No newline at end of file
diff --git a/app/views/origami/order_reservation/get_order.json.jbuilder b/app/views/origami/order_reservation/get_order.json.jbuilder
new file mode 100644
index 00000000..5fdd5293
--- /dev/null
+++ b/app/views/origami/order_reservation/get_order.json.jbuilder
@@ -0,0 +1,25 @@
+if @order
+
+	json.(@order, :order_reservation_id,:order_reservation_type,:customer_id,
+						:requested_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
+						:payment_status,:payment_ref,:total_amount,:total_tax,
+						:discount_amount,:grand_total,:status,:order_remark,
+						:reservation_remark)
+	@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
+	if @delivery
+	    json.delivery do |json|
+		  # json.(@article.author, :id, :name)
+		  json.(@delivery, :provider,:delivery_type,:township,
+							:address,:direction_address,:delivery_fee,:remark)
+		end
+	end
+	if @order.order_reservation_items
+	    json.order_items @order.order_reservation_items do |item|
+	    	json.partial! 'origami/order_reservation/order_item', item: item
+	    end
+	end
+	@customer = Customer.find(@order.customer_id)
+
+	json.customer_name @customer.name
+	json.phone @customer.contact_no
+end
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 42628dd9..15af828f 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -1,17 +1,19 @@
+<%= stylesheet_link_tag    'order_reservation', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %> 
 <div class="container-fluid">
   <div class="row m-t--10">
     <div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
-        <li class="nav-item active" data-color="#F44336" style="background-color: #F44336;">
+        <li class="nav-item active" data-color="#F44336" data-type="pending" style="background-color: #F44336;">
           <a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">4</p> <%= t :pending %></a>
         </li>
-        <li class="nav-item" data-color="#673AB7" style="background-color: #673AB7;">
-          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :processing %></a>
+        <li class="nav-item" data-color="#673AB7" data-type="processing" style="background-color: #673AB7;">
+          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :process %></a>
         </li>
-        <li class="nav-item" data-color="#009688" style="background-color: #009688;">
-          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivering %></a>
+        <li class="nav-item" data-color="#009688" data-type="delivery" style="background-color: #009688;">
+          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivery %></a>
         </li>
-        <li class="nav-item" data-color="#03A9F4" style="background-color: #03A9F4;">
+        <li class="nav-item" data-color="#03A9F4" data-type="completed" style="background-color: #03A9F4;">
           <a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num">4</p> <%= t :completed %></a>
         </li>
       </ul>
@@ -22,62 +24,26 @@
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       2
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       3
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       4
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'new' %>
+                      <tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
@@ -90,35 +56,26 @@
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       2
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'accepted' %>
+                      <tr class="custom-tr " style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
@@ -130,89 +87,57 @@
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       2
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       3
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'processed' %>
+                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
           </div>      
         </div>
         <!--- Panel 3 - Orders -->
-        <div class="tab-pane dining" id="completed" role="tabpanel">
+        <div class="tab-pane dining" id="delivery" role="tabpanel">
           <div class="card-block font-13">
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       3
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'completed' %>
+                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
@@ -227,7 +152,8 @@
           <div class="card-header custom-card-header" style="color:">
             <table class="table">
               <tr>
-                <td width ="70%" class="header-td align-left"><b class="col-pink font-16">No.11</b> 
+                <td width ="70%" class="header-td align-left">
+                <b class="col-pink font-16">No.11</b> 
                     <span class="font-13">(DELIVERY)</span>
                 </td>
                 <td width ="30%" class="header-td font-16 align-right"><b>0065 4321</b></td>
@@ -236,50 +162,15 @@
           </div>
         <div class="card-block custom-card-block">
           <div id="order-detail-slimscroll" data-height="220">
-            <table class="table">
+            <table class="table  summary-items">
               <tbody>
-                <tr>
+                <!-- <tr>
                    <td width ="70%" class="body-td align-left">
                      MENU ITEM 01
                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
                   </td>
                   <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                      MENU ITEM 01
-                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                  </td>
-                  <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                   </td>
-                   <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                  </td>
-                  <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                   </td>
-                   <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                  </td>
-                  <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
+                </tr>   -->              
               </tbody>
             </table>
           </div>
@@ -288,28 +179,28 @@
           <table class="table">
             <tbody>
               <tr>
-                <td width ="70%" class="footer-td align-left">
+                <td width ="70%" class="footer-td align-left" >
                    SUB TOTAL 
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="sub_total">0.00</td>
               </tr>
               <tr>
                 <td width ="70%" class="footer-td align-left">
                    DELIVERY FEES (PICK-UP)
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="delivery_fee">0.00</td>
               </tr>
               <tr>
                 <td width ="70%" class="footer-td align-left">
                    CONVENIENCE CHARGES
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="total_charges">0.00</td>
               </tr>
               <tr>
                <td width ="70%" class="footer-td align-left">
                    GOVERNMENT TAX
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="total_tax">0.00</td>
               </tr>
             </tbody>
           </table>
@@ -321,14 +212,27 @@
                 <td width ="70%" class="footer-td align-left col-blue">
                    GRAND TOTAL 
                 </td>
-                <td width ="30%" class="footer-td align-right col-blue">1400.00</td>
+                <td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
               </tr>
               <tr>
                 <td width ="50%" class="footer-td align-left col-blue">
-                  <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>DECLINE</strong></button>
+                  <button type="button" class="btn btn-lg bg-red waves-effect" id="cancel" data-value="cancel">
+                      <strong>DECLINE</strong>
+                  </button>
                 </td>
                 <td width ="50%" class="footer-td align-right col-blue">
-                <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>ACCEPT</strong></button>
+                <button type="button" class="btn btn-lg bg-blue waves-effect " id="accepted" data-value="accepted">
+                   ACCEPT
+                </button>
+                <!-- <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="delivery">
+                   <strong>SEND TO KITCHEN</strong>
+                </button>
+                <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="completed">
+                   <strong>READY TO DELIVERY</strong>
+                </button>
+                <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="pick-up">
+                   <strong>PICK UP</strong>
+                </button> -->
                 </td>
               </tr>
             </tbody>
@@ -353,119 +257,41 @@
                 <tr>
                   <td class="body-td align-left">
                      <span class="font-13">NAME</span><br>
-                     <b>DAW AYE AYE</b>
+                     <b id="customer_name"></b>
                   </td>
                 </tr>
                 <tr>
                   <td class="body-td align-left">
                      <span class="font-13">PHONE</span><br>
-                     <b>09 8765 4321 098</b>
+                     <b id="phone"></b>
                   </td>
                 </tr>
                 <tr>
                   <td class="body-td align-left">
                      <span class="font-13">ADDRESS</span><br>
-                     <b>No. (12), 3rd floor, zay kyee Street, kyi myin dine
-                      infront of Nya Zay Main Entrance</b>
+                     <b id="address"></b>
                   </td>
                 </tr>
                 <tr>
                   <td class="body-td align-left">
-                     <span class="font-13">DELEVER TO</span><br>
-                     <b>HOME</b>
+                     <span class="font-13">DELEVERY</span><br>
+                     <b id="delivery_to"></b>
                   </td>
                 </tr>
               </tbody>
-            </table>
+          </table>
         </div>
       </div>
     </div>
   </div>
 </div>
-<style type="text/css">
-  .nav-tabs > li.active > a, 
-  .nav-tabs > li.active > a:hover,
-  .nav-tabs > li.active > a:focus {
-    border-bottom: 2px solid #2196F3 ;
-    bottom: 2px ;
-}
+<p id="ref_no"></p>
+<p id="callback_url"></p>
+<p id="order_id"></p>
+<p id="status"></p>
+<script type="text/javascript">
+  jQuery(function(){
+       jQuery('.first-1').click();
+    });
 
-.nav-tabs .nav-link {
-    padding: 0.5286em .33em;
-}
-.nav-tabs li a.active {
-    color: #111 !important;
-    border-bottom: 0px solid #fff !important;
-}
-.nav-tabs .nav-link.active {
-    color: #111;
-    border-color: #fff;
-}
-.nav-tabs > li > a {
-    margin-right: 0px;
-    color:#fff !important;
-}
-
-.nav-tabs > li > a {
-    border-bottom: 2px solid #2196F3;
-    bottom: 2px;
-}
-.nav-tabs.tab-col-teal > li > a:before {
-    border-bottom: 0px solid #009688;
-}
-.nav-tabs .nav-item{
-  margin-bottom: 2px ;
-}
-.num{
-  color:#fff;
-  text-align: center;
-  margin-bottom: -1px !important;
-}
-.nav-tabs .nav-link.active > p{
-    color: #111;
-    border-color: #fff;
-}
-
-/*Custosm Class*/
-.table .header-td{
-  border-top:0px solid !important;
-  border-bottom: 0px solid !important;
-  padding:3px 7px !important;
-  border-top:0px solid !important;
-  border-bottom: 0px solid !important;
-}
-.custom-card-block .table td:first-child,
-.custom-card-block .table td:nth-child(2),
-.custom-card-footer .table td:first-child,
-.custom-card-footer .table td:nth-child(2){
-  border-top:0px solid !important;
-}
-
-.custom-card-footer .footer-td ,
-.grand-card-footer .footer-td {
-  border-top:0px solid !important;
-  border-bottom:0px solid !important;
-  font-weight: bold;
-  padding:5px 10px;
-}
-.custom-card-header{
-  border-bottom: 1px solid #F8BBD0 !important;
-  padding:13px 5px !important;
-}
-.custom-card-footer{
-  border-top: 1px solid #F8BBD0 !important;
-}
-.custom-card-block,
-.grand-card-footer,
-.custom-card-footer{
-  padding :5px !important;
-}
-.custom-table{
-  background-color:#F3E5F5;
-}
-.custom-table tbody tr td, 
-.custom-table tbody tr th{
-  border-top: 1px solid #FFEBEE;
-  border-bottom: 1px solid #FFEBEE;
-}
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 7aa7b6ba..bd889f51 100755
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -37,7 +37,7 @@ Rails.application.config.assets.precompile += %w( CRM.js )
 # --- Image Uploader ----
 Rails.application.config.assets.precompile += %w( fileinput.min.js )
 
-# --- Customer/ Customer - Crm ----
+# --- Add order/ Add order - Crm ----
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
 
@@ -53,4 +53,9 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 Rails.application.config.assets.precompile += %w( inventory.js )
 
+# --- Customer/ Customer - Crm ----
+Rails.application.config.assets.precompile += %w( order_reservation.css )
+Rails.application.config.assets.precompile += %w( order_reservation.js )
+
+
 
diff --git a/config/routes.rb b/config/routes.rb
index e5421453..a4d61642 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -265,6 +265,9 @@ scope "(:locale)", locale: /en|mm/ do
 
     #order and reservation
     resources :order_reservation
+    get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
+    post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
+
   end
 
   #--------- Waiter/Ordering Station ------------#

From 36eab44f8b29636622e3ee15134d8db7d31fb099 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 12 Apr 2018 09:59:34 +0630
Subject: [PATCH 606/651] edit Total Customer in survey

---
 app/views/origami/surveys/_form.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 52e8a517..1b6d07e2 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -67,12 +67,12 @@
             <div class="row clearfix">
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :child , input_html: { class: 'col-md-10' }%>
+                  <%= f.input :child , input_html: { class: 'col-md-10' , :onChange => "total_customer();"}%>
                 </div>
               </div>
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :adult , input_html: { class: 'col-md-10' }%>     
+                  <%= f.input :adult , input_html: { class: 'col-md-10' , :onChange => "total_customer();"}%>     
                 </div>
               </div>
             </div>  
@@ -88,7 +88,7 @@
                 </div>
               </div>
             </div>
-            <%= f.input :total_customer, input_html: { class: 'col-md-11'} %>
+            <%= f.input :total_customer, input_html: { :readonly => true, class: 'col-md-11'} %>
             <%= f.input :local , input_html: { class: 'col-md-11' }%>
 
             <fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;">

From 4a0995c7bad3ab4e94191f66c765b938c1e44b35 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 12 Apr 2018 10:04:28 +0630
Subject: [PATCH 607/651] Pull from master

---
 app/assets/javascripts/order_reservation.js   | 135 ++++++
 app/assets/stylesheets/order_reservation.scss |  88 ++++
 .../origami/addorders_controller.rb           |   3 +-
 .../origami/order_reservation_controller.rb   |  36 +-
 app/models/order_reservation.rb               |  49 ++
 .../_order_item.json.jbuilder                 |  15 +
 .../order_reservation/get_order.json.jbuilder |  25 +
 .../origami/order_reservation/index.html.erb  | 434 ++++++------------
 config/initializers/assets.rb                 |   7 +-
 config/routes.rb                              |   3 +
 ...0180406080240_create_order_reservations.rb |   1 +
 11 files changed, 486 insertions(+), 310 deletions(-)
 create mode 100644 app/assets/javascripts/order_reservation.js
 create mode 100644 app/assets/stylesheets/order_reservation.scss
 create mode 100644 app/views/origami/order_reservation/_order_item.json.jbuilder
 create mode 100644 app/views/origami/order_reservation/get_order.json.jbuilder

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
new file mode 100644
index 00000000..49ef043e
--- /dev/null
+++ b/app/assets/javascripts/order_reservation.js
@@ -0,0 +1,135 @@
+
+$(function() { 
+ 
+  $(".nav-item").on("click", function(){
+ 	type = $(this).attr("data-type");
+ 	if (type == "pending") {
+ 	  $('#accepted').text("Accepted");
+ 	  $('#accepted').attr("data-value","accepted");
+ 	}else if(type == "processing"){
+ 		$('#accepted').text("SEND TO KITCHEN");
+ 		$('#accepted').attr("data-value","processed");
+ 	}else if(type == "delivery"){
+ 		$('#accepted').text("READY TO DELIVERY");
+ 		$('#accepted').attr("data-value","delivery");
+ 	}else if(type == "completed"){
+ 		$('#accepted').text("PICK-UP");
+ 		$('#accepted').attr("data-value","completed");
+ 	}
+ 	console.log(type)
+  });
+
+  jQuery(function(){
+       jQuery('.first-1').click();
+    });
+
+  $(".custom-tr").on("click", function(){
+ 	$(".custom-tr").removeClass("tr-active");
+ 	$(this).addClass("tr-active");
+    var order_id  = $(this).attr("data-id");
+    var url       = "order_reservation/get_order/"+order_id;
+    show_order_detail(url);
+  });
+
+ //show order list 
+  function show_order_detail(url){ 
+    //Start Ajax
+    $.ajax({      
+      type: "GET",         
+      url: url, 
+      data: {},
+      dataType: "json",
+      success: function(data) {
+      	var delivery = data["delivery"]
+      	var items    = data["order_items"]
+
+      	var item_list = $('.summary-items');
+        item_list.empty();
+
+        for(var i in items) {  
+        	var total = items[i].qty*items[i].unit_price;
+            row = '<tr>'
+                   +'<td width ="70%" class="body-td align-left">'+items[i].item_name
+                    +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
+                  +'</td>'
+                  +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
+                +'</tr>';
+              $('.summary-items').append(row);
+        }
+
+      	$('#sub_total').text(data.total_amount);
+      	$('#delivery_fee').text(delivery.delivery_fee);
+      	$('#total_charges').text(0);
+      	$('#total_tax').text(data.total_tax);
+      	$('#grand_total').text(data.grand_total);
+
+      	var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")"
+      	$('#customer_name').text(data.customer_name);
+      	$('#phone').text(data.phone);
+      	$('#address').text(address);
+      	$('#delivery_to').text(delivery.provider);
+
+      	$('#ref_no').text(data.transaction_ref);
+      	$('#callback_url').text(data.callback_url);
+      	$('#order_id').text(data.order_reservation_id);
+      }
+    });
+    //end Ajax 
+  }
+
+  $("#accepted").on("click", function(){
+ 	var status    = $(this).attr("data-value");
+    var order_id  = $('#order_id').text();
+    var url       = 'order_reservation/update';
+    var callback  = $('#callback_url').text();
+	    $.ajax({      
+	      type: "POST",         
+	      url: url, 
+	      data: {'order_id': order_id, 'status': status},
+	      dataType: "json",
+	      success: function(data) {
+	      	console.log(data)
+	      	if (data.status) {
+	      		// callback_url(callback,data.message)
+	      		swal("Information","Order has been +'data.status'+","success");
+	      		window.location.href = '/origami/order_reservation';
+	      	}
+	      }
+	    });
+  });
+
+  $("#cancel").on("click", function(){
+ 	var status    = $(this).attr("data-value");
+    var order_id  = $('#order_id').text();
+    var url       = 'order_reservation/update';
+    var callback  = $('#callback_url').text();
+	    $.ajax({      
+	      type: "POST",         
+	      url: url, 
+	      data: {'order_id': order_id, 'status': status},
+	      dataType: "json",
+	      success: function(data) {
+	      	console.log(data)
+	      	if (data.status) {
+	      		console.log(data)
+	      		// callback_url(callback,data.message)
+	      		swal("Information","Order has been +'data.status'+","warning");
+	      		window.location.href = '/origami/order_reservation';
+	      	}
+	      }
+	    });
+  });
+
+  function callback_url(url,message){ 
+    $.ajax({      
+      type: "POST",         
+      url: url, 
+      data: {},
+      dataType: "json",
+      success: function(data) {
+
+      }
+    });
+  }
+
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/order_reservation.scss b/app/assets/stylesheets/order_reservation.scss
new file mode 100644
index 00000000..c33e1f32
--- /dev/null
+++ b/app/assets/stylesheets/order_reservation.scss
@@ -0,0 +1,88 @@
+  .nav-tabs > li.active > a, 
+  .nav-tabs > li.active > a:hover,
+  .nav-tabs > li.active > a:focus {
+    border-bottom: 2px solid #2196F3 ;
+    bottom: 2px ;
+}
+
+.nav-tabs .nav-link {
+    padding: 0.5286em .33em;
+}
+.nav-tabs li a.active {
+    color: #111 !important;
+    border-bottom: 0px solid #fff !important;
+}
+.nav-tabs .nav-link.active {
+    color: #111;
+    border-color: #fff;
+}
+.nav-tabs > li > a {
+    margin-right: 0px;
+    color:#fff !important;
+}
+
+.nav-tabs > li > a {
+    border-bottom: 2px solid #2196F3;
+    bottom: 2px;
+}
+.nav-tabs.tab-col-teal > li > a:before {
+    border-bottom: 0px solid #009688;
+}
+.nav-tabs .nav-item{
+  margin-bottom: 2px ;
+}
+.num{
+  color:#fff;
+  text-align: center;
+  margin-bottom: -1px !important;
+}
+.nav-tabs .nav-link.active > p{
+    color: #111;
+    border-color: #fff;
+}
+
+/*Custosm Class*/
+.table .header-td{
+  border-top:0px solid !important;
+  border-bottom: 0px solid !important;
+  padding:3px 7px !important;
+  border-top:0px solid !important;
+  border-bottom: 0px solid !important;
+}
+.custom-card-block .table td:first-child,
+.custom-card-block .table td:nth-child(2),
+.custom-card-footer .table td:first-child,
+.custom-card-footer .table td:nth-child(2){
+  border-top:0px solid !important;
+}
+
+.custom-card-footer .footer-td ,
+.grand-card-footer .footer-td {
+  border-top:0px solid !important;
+  border-bottom:0px solid !important;
+  font-weight: bold;
+  padding:6px 10px;
+}
+.custom-card-header{
+  border-bottom: 1px solid #F8BBD0 !important;
+  padding:13px 5px !important;
+}
+.custom-card-footer{
+  border-top: 1px solid #F8BBD0 !important;
+}
+.custom-card-block,
+.grand-card-footer,
+.custom-card-footer{
+  padding :5px !important;
+}
+.custom-table{
+  background-color:#F3E5F5;
+}
+.custom-table tbody tr td, 
+.custom-table tbody tr th{
+  border-top: 1px solid #FFEBEE;
+  border-bottom: 1px solid #FFEBEE;
+}
+.tr-active{
+  background-color : #FFCDD2;
+}
\ No newline at end of file
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 4abab9c8..8e23d2c9 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -111,7 +111,8 @@ class Origami::AddordersController < BaseOrigamiController
        end
        items_arr.push(items)
      }
-
+puts items_arr.to_json
+    puts "sssssssssssssssssssssss"
     # begin
     # if params[:order_source] == "quick_service"
     #   customer_id = "CUS-000000000002" # for no customer id from mobile
diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index db56d882..a90e755b 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -1,12 +1,40 @@
 class Origami::OrderReservationController < BaseOrigamiController
 
   def index
-    @webview = check_mobile
-    @shop     = Shop::ShopDetail
+  	@order = OrderReservation.all
+  end
 
+  def update
+  	@id     = params[:order_id]
+  	@status = params[:status]
+  	@order  = OrderReservation.find(@id)
+
+  	status = true
+
+  	if status
+  		if @status == "processed"
+  			OrderReservation.create_doemal_order(@order)
+  		else
+  			if @status == "cancel"
+  			    result = {:status=> true, :message => "cancelled" }
+	  		else
+	  			result = {:status=> true, :message => "accepted" }
+	  		end
+	        render :json => result.to_json
+  		end
+  		
+    else
+    	result = {:status=> false, :message => "Order not accepted !" }
+        render :json => result.to_json
+  	end
+  end
+
+  def get_order
+    if (params[:id])
+      @order = OrderReservation.find(params[:id])
+      return @order
+    end
   end
 
 
-
-
 end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 62342b0c..e23f852e 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -48,6 +48,55 @@ class OrderReservation < ApplicationRecord
 		end
 	end
 
+    def self.create_doemal_order(order)
+    
+    is_extra_time = false
+    extra_time = ''
+
+    items_arr = []
+    count = 1
+    order.order_reservation_items.each { |i| 
+      i.item_instance_code = i.item_instance_code.downcase.to_s
+     
+        items = {"order_item_id": count,"item_instance_code": i.item_instance_code,"quantity": i.qty,"options": []}
+       count += 1
+       items_arr.push(items)
+     }
+
+    puts items_arr.to_json
+    puts "sssssssssssssssssssssss"
+      customer_id = order.customer_id
+ 
+    @order = Order.new
+    @order.source     = "doemal_order"
+    @order.order_type = "delivery"
+    @order.customer_id = customer_id
+    @order.items = items_arr
+    @order.guest = ''
+    @order.table_id = nil  # this is dining facilities's id
+    @order.new_booking = true
+    @order.waiters = current_login_employee.name
+    @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
+
+     @status, @booking = @order.generate
+
+      # Order.send_customer_view(@booking)
+    
+     
+        if @status && @booking
+        
+          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+          # for second display 
+
+          result = {:status=> @status, :data => @sale }
+          render :json => result.to_json
+        end
+      
+    end
+
 	private
 		def generate_custom_id
 			self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS")
diff --git a/app/views/origami/order_reservation/_order_item.json.jbuilder b/app/views/origami/order_reservation/_order_item.json.jbuilder
new file mode 100644
index 00000000..794da464
--- /dev/null
+++ b/app/views/origami/order_reservation/_order_item.json.jbuilder
@@ -0,0 +1,15 @@
+json.id                   item.order_reservation_items_id
+json.order_id             item.order_reservation_id
+json.item_status          item.item_status
+json.item_code            item.item_code
+json.item_instance_code   item.item_instance_code
+json.item_name            item.item_name
+json.alt_name             item.alt_name
+json.set_menu_items       item.set_menu_items
+json.account_id           item.account_id
+json.qty                  item.qty
+json.unit_price           item.unit_price
+json.price                item.price
+json.remark               item.remark
+json.options              item.options
+json.taxable              item.taxable
\ No newline at end of file
diff --git a/app/views/origami/order_reservation/get_order.json.jbuilder b/app/views/origami/order_reservation/get_order.json.jbuilder
new file mode 100644
index 00000000..5fdd5293
--- /dev/null
+++ b/app/views/origami/order_reservation/get_order.json.jbuilder
@@ -0,0 +1,25 @@
+if @order
+
+	json.(@order, :order_reservation_id,:order_reservation_type,:customer_id,
+						:requested_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
+						:payment_status,:payment_ref,:total_amount,:total_tax,
+						:discount_amount,:grand_total,:status,:order_remark,
+						:reservation_remark)
+	@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
+	if @delivery
+	    json.delivery do |json|
+		  # json.(@article.author, :id, :name)
+		  json.(@delivery, :provider,:delivery_type,:township,
+							:address,:direction_address,:delivery_fee,:remark)
+		end
+	end
+	if @order.order_reservation_items
+	    json.order_items @order.order_reservation_items do |item|
+	    	json.partial! 'origami/order_reservation/order_item', item: item
+	    end
+	end
+	@customer = Customer.find(@order.customer_id)
+
+	json.customer_name @customer.name
+	json.phone @customer.contact_no
+end
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 42628dd9..15af828f 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -1,17 +1,19 @@
+<%= stylesheet_link_tag    'order_reservation', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %> 
 <div class="container-fluid">
   <div class="row m-t--10">
     <div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
-        <li class="nav-item active" data-color="#F44336" style="background-color: #F44336;">
+        <li class="nav-item active" data-color="#F44336" data-type="pending" style="background-color: #F44336;">
           <a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">4</p> <%= t :pending %></a>
         </li>
-        <li class="nav-item" data-color="#673AB7" style="background-color: #673AB7;">
-          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :processing %></a>
+        <li class="nav-item" data-color="#673AB7" data-type="processing" style="background-color: #673AB7;">
+          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :process %></a>
         </li>
-        <li class="nav-item" data-color="#009688" style="background-color: #009688;">
-          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivering %></a>
+        <li class="nav-item" data-color="#009688" data-type="delivery" style="background-color: #009688;">
+          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivery %></a>
         </li>
-        <li class="nav-item" data-color="#03A9F4" style="background-color: #03A9F4;">
+        <li class="nav-item" data-color="#03A9F4" data-type="completed" style="background-color: #03A9F4;">
           <a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num">4</p> <%= t :completed %></a>
         </li>
       </ul>
@@ -22,62 +24,26 @@
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       2
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       3
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       4
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'new' %>
+                      <tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
@@ -90,35 +56,26 @@
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       2
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'accepted' %>
+                      <tr class="custom-tr " style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
@@ -130,89 +87,57 @@
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       2
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       3
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'processed' %>
+                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
           </div>      
         </div>
         <!--- Panel 3 - Orders -->
-        <div class="tab-pane dining" id="completed" role="tabpanel">
+        <div class="tab-pane dining" id="delivery" role="tabpanel">
           <div class="card-block font-13">
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       1
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width ="5%" class="align-left">
-                       3
-                    </td>
-                    <td width ="30%" class="align-center">
-                       3:30 PM
-                    </td>
-                    <td width ="30%" class="align-center">
-                       13000
-                    </td>
-                    <td width ="30%" class="align-center">
-                      <span class="font-10 col-blue">STATUS</span>
-                    </td>
-                  </tr>
-                  
+                  <% i=1
+                   @order.each do |order| %>
+                    <% if order.status == 'completed' %>
+                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                        <td width ="5%" class="align-left">
+                           <%=i%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
+                        </td>
+                        <td width ="30%" class="align-center">
+                           <%=order.grand_total%>
+                        </td>
+                        <td width ="30%" class="align-center">
+                          <span class="font-10 col-blue"><%=order.status%></span>
+                        </td>
+                      </tr>
+                      <%i+=1%>
+                    <%end%>
+                  <%end%>
                 </tbody>
               </table>
             </div>
@@ -227,7 +152,8 @@
           <div class="card-header custom-card-header" style="color:">
             <table class="table">
               <tr>
-                <td width ="70%" class="header-td align-left"><b class="col-pink font-16">No.11</b> 
+                <td width ="70%" class="header-td align-left">
+                <b class="col-pink font-16">No.11</b> 
                     <span class="font-13">(DELIVERY)</span>
                 </td>
                 <td width ="30%" class="header-td font-16 align-right"><b>0065 4321</b></td>
@@ -236,50 +162,15 @@
           </div>
         <div class="card-block custom-card-block">
           <div id="order-detail-slimscroll" data-height="220">
-            <table class="table">
+            <table class="table  summary-items">
               <tbody>
-                <tr>
+                <!-- <tr>
                    <td width ="70%" class="body-td align-left">
                      MENU ITEM 01
                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
                   </td>
                   <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                      MENU ITEM 01
-                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                  </td>
-                  <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                   </td>
-                   <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                  </td>
-                  <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                      <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                   </td>
-                   <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
-                <tr>
-                  <td width ="70%" class="body-td align-left">
-                     MENU ITEM 01
-                     <br><span class="font-13">2 <span class="col-blue">X700</span></span>
-                  </td>
-                  <td width ="30%" class="body-td align-right">1400.00</td>
-                </tr>
+                </tr>   -->              
               </tbody>
             </table>
           </div>
@@ -288,28 +179,28 @@
           <table class="table">
             <tbody>
               <tr>
-                <td width ="70%" class="footer-td align-left">
+                <td width ="70%" class="footer-td align-left" >
                    SUB TOTAL 
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="sub_total">0.00</td>
               </tr>
               <tr>
                 <td width ="70%" class="footer-td align-left">
                    DELIVERY FEES (PICK-UP)
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="delivery_fee">0.00</td>
               </tr>
               <tr>
                 <td width ="70%" class="footer-td align-left">
                    CONVENIENCE CHARGES
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="total_charges">0.00</td>
               </tr>
               <tr>
                <td width ="70%" class="footer-td align-left">
                    GOVERNMENT TAX
                 </td>
-                <td width ="30%" class="footer-td align-right">1400.00</td>
+                <td width ="30%" class="footer-td align-right" id="total_tax">0.00</td>
               </tr>
             </tbody>
           </table>
@@ -321,14 +212,27 @@
                 <td width ="70%" class="footer-td align-left col-blue">
                    GRAND TOTAL 
                 </td>
-                <td width ="30%" class="footer-td align-right col-blue">1400.00</td>
+                <td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
               </tr>
               <tr>
                 <td width ="50%" class="footer-td align-left col-blue">
-                  <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>DECLINE</strong></button>
+                  <button type="button" class="btn btn-lg bg-red waves-effect" id="cancel" data-value="cancel">
+                      <strong>DECLINE</strong>
+                  </button>
                 </td>
                 <td width ="50%" class="footer-td align-right col-blue">
-                <button type="button" class="btn btn-lg bg-blue waves-effect" data-dismiss="modal"><strong>ACCEPT</strong></button>
+                <button type="button" class="btn btn-lg bg-blue waves-effect " id="accepted" data-value="accepted">
+                   ACCEPT
+                </button>
+                <!-- <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="delivery">
+                   <strong>SEND TO KITCHEN</strong>
+                </button>
+                <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="completed">
+                   <strong>READY TO DELIVERY</strong>
+                </button>
+                <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="pick-up">
+                   <strong>PICK UP</strong>
+                </button> -->
                 </td>
               </tr>
             </tbody>
@@ -353,119 +257,41 @@
                 <tr>
                   <td class="body-td align-left">
                      <span class="font-13">NAME</span><br>
-                     <b>DAW AYE AYE</b>
+                     <b id="customer_name"></b>
                   </td>
                 </tr>
                 <tr>
                   <td class="body-td align-left">
                      <span class="font-13">PHONE</span><br>
-                     <b>09 8765 4321 098</b>
+                     <b id="phone"></b>
                   </td>
                 </tr>
                 <tr>
                   <td class="body-td align-left">
                      <span class="font-13">ADDRESS</span><br>
-                     <b>No. (12), 3rd floor, zay kyee Street, kyi myin dine
-                      infront of Nya Zay Main Entrance</b>
+                     <b id="address"></b>
                   </td>
                 </tr>
                 <tr>
                   <td class="body-td align-left">
-                     <span class="font-13">DELEVER TO</span><br>
-                     <b>HOME</b>
+                     <span class="font-13">DELEVERY</span><br>
+                     <b id="delivery_to"></b>
                   </td>
                 </tr>
               </tbody>
-            </table>
+          </table>
         </div>
       </div>
     </div>
   </div>
 </div>
-<style type="text/css">
-  .nav-tabs > li.active > a, 
-  .nav-tabs > li.active > a:hover,
-  .nav-tabs > li.active > a:focus {
-    border-bottom: 2px solid #2196F3 ;
-    bottom: 2px ;
-}
+<p id="ref_no"></p>
+<p id="callback_url"></p>
+<p id="order_id"></p>
+<p id="status"></p>
+<script type="text/javascript">
+  jQuery(function(){
+       jQuery('.first-1').click();
+    });
 
-.nav-tabs .nav-link {
-    padding: 0.5286em .33em;
-}
-.nav-tabs li a.active {
-    color: #111 !important;
-    border-bottom: 0px solid #fff !important;
-}
-.nav-tabs .nav-link.active {
-    color: #111;
-    border-color: #fff;
-}
-.nav-tabs > li > a {
-    margin-right: 0px;
-    color:#fff !important;
-}
-
-.nav-tabs > li > a {
-    border-bottom: 2px solid #2196F3;
-    bottom: 2px;
-}
-.nav-tabs.tab-col-teal > li > a:before {
-    border-bottom: 0px solid #009688;
-}
-.nav-tabs .nav-item{
-  margin-bottom: 2px ;
-}
-.num{
-  color:#fff;
-  text-align: center;
-  margin-bottom: -1px !important;
-}
-.nav-tabs .nav-link.active > p{
-    color: #111;
-    border-color: #fff;
-}
-
-/*Custosm Class*/
-.table .header-td{
-  border-top:0px solid !important;
-  border-bottom: 0px solid !important;
-  padding:3px 7px !important;
-  border-top:0px solid !important;
-  border-bottom: 0px solid !important;
-}
-.custom-card-block .table td:first-child,
-.custom-card-block .table td:nth-child(2),
-.custom-card-footer .table td:first-child,
-.custom-card-footer .table td:nth-child(2){
-  border-top:0px solid !important;
-}
-
-.custom-card-footer .footer-td ,
-.grand-card-footer .footer-td {
-  border-top:0px solid !important;
-  border-bottom:0px solid !important;
-  font-weight: bold;
-  padding:5px 10px;
-}
-.custom-card-header{
-  border-bottom: 1px solid #F8BBD0 !important;
-  padding:13px 5px !important;
-}
-.custom-card-footer{
-  border-top: 1px solid #F8BBD0 !important;
-}
-.custom-card-block,
-.grand-card-footer,
-.custom-card-footer{
-  padding :5px !important;
-}
-.custom-table{
-  background-color:#F3E5F5;
-}
-.custom-table tbody tr td, 
-.custom-table tbody tr th{
-  border-top: 1px solid #FFEBEE;
-  border-bottom: 1px solid #FFEBEE;
-}
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 7aa7b6ba..bd889f51 100755
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -37,7 +37,7 @@ Rails.application.config.assets.precompile += %w( CRM.js )
 # --- Image Uploader ----
 Rails.application.config.assets.precompile += %w( fileinput.min.js )
 
-# --- Customer/ Customer - Crm ----
+# --- Add order/ Add order - Crm ----
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
 
@@ -53,4 +53,9 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 Rails.application.config.assets.precompile += %w( inventory.js )
 
+# --- Customer/ Customer - Crm ----
+Rails.application.config.assets.precompile += %w( order_reservation.css )
+Rails.application.config.assets.precompile += %w( order_reservation.js )
+
+
 
diff --git a/config/routes.rb b/config/routes.rb
index 444e961a..935cdfba 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -266,6 +266,9 @@ scope "(:locale)", locale: /en|mm/ do
 
     #order and reservation
     resources :order_reservation
+    get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
+    post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
+
   end
 
   #--------- Waiter/Ordering Station ------------#
diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index cde96ac0..740ce6f1 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -7,6 +7,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
     	t.datetime 	 :requested_time, :null => false
       t.string     :callback_url, :null => false
       t.string     :transaction_ref, :null => false
+      t.string     :sale_id
     	t.integer :item_count, :null => false, :default => 0
       t.integer :total_customer
     	t.string 	:payment_type

From 926ce2f2590dac22cf5e99beaf1f84a7885474d3 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 12 Apr 2018 10:42:43 +0630
Subject: [PATCH 608/651] Edit in Printer

---
 app/views/print_settings/_form.html.erb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index 9c62b36f..e07da111 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -13,14 +13,10 @@
 
           <%= f.input :header_font_size %>
           <%= f.input :item_font_size %>
-          <%
-            if(@server_mode != 'cloud')
-          %>
+          <% if(@server_mode != 'cloud') %>
             <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
-          <%
-             else              
-          %>
-            <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %>
+          <% else %>
+            <%= f.input :printer_name %>
           <% end %>
           <%= f.input :brand_name %>
           <%= f.input :printer_type %>

From 49ebc6c0dc078179f52fce15b6300d0524e59cb6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 12 Apr 2018 11:01:13 +0630
Subject: [PATCH 609/651] order reservation

---
 app/assets/javascripts/order_reservation.js   | 92 +++++++++++--------
 .../origami/order_reservation_controller.rb   | 32 +++++++
 app/models/customer.rb                        |  5 +
 app/models/order_reservation.rb               | 56 ++++++-----
 .../origami/order_reservation/index.html.erb  |  8 +-
 config/routes.rb                              |  2 +-
 6 files changed, 122 insertions(+), 73 deletions(-)

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 49ef043e..8f4155ba 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -47,7 +47,13 @@ $(function() {
         item_list.empty();
 
         for(var i in items) {  
-        	var total = items[i].qty*items[i].unit_price;
+          var item_price = 0;
+          if(items[i].price > 0){
+            item_price = items[i].price;
+          }else{
+            item_price = items[i].unit_price;
+          }
+        	var total = items[i].qty * item_price;
             row = '<tr>'
                    +'<td width ="70%" class="body-td align-left">'+items[i].item_name
                     +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
@@ -78,56 +84,66 @@ $(function() {
   }
 
   $("#accepted").on("click", function(){
- 	var status    = $(this).attr("data-value");
+ 	  var status    = $(this).attr("data-value");
     var order_id  = $('#order_id').text();
-    var url       = 'order_reservation/update';
+    var ref_no    = $('#ref_no').text();
     var callback  = $('#callback_url').text();
-	    $.ajax({      
-	      type: "POST",         
-	      url: url, 
-	      data: {'order_id': order_id, 'status': status},
-	      dataType: "json",
-	      success: function(data) {
-	      	console.log(data)
-	      	if (data.status) {
-	      		// callback_url(callback,data.message)
-	      		swal("Information","Order has been +'data.status'+","success");
-	      		window.location.href = '/origami/order_reservation';
-	      	}
-	      }
-	    });
+    callback_url(callback,ref_no,order_id,status);
   });
 
   $("#cancel").on("click", function(){
- 	var status    = $(this).attr("data-value");
+ 	  var status    = $(this).attr("data-value");
     var order_id  = $('#order_id').text();
-    var url       = 'order_reservation/update';
     var callback  = $('#callback_url').text();
-	    $.ajax({      
-	      type: "POST",         
-	      url: url, 
-	      data: {'order_id': order_id, 'status': status},
-	      dataType: "json",
-	      success: function(data) {
-	      	console.log(data)
-	      	if (data.status) {
-	      		console.log(data)
-	      		// callback_url(callback,data.message)
-	      		swal("Information","Order has been +'data.status'+","warning");
-	      		window.location.href = '/origami/order_reservation';
-	      	}
-	      }
-	    });
+    var ref_no    = $('#ref_no').text();
+    callback_url(callback,ref_no,order_id,status);
   });
 
-  function callback_url(url,message){ 
+  function callback_url(callback,ref_no,order_id,status){ 
+    var url       = 'order_reservation/update';
+    var post_url = "order_reservation/send_status";
     $.ajax({      
       type: "POST",         
-      url: url, 
-      data: {},
+      url: post_url, 
+      data: {url: callback, ref_no: ref_no, status: status},
       dataType: "json",
       success: function(data) {
-
+        if(data.status){
+          $.ajax({      
+            type: "POST",         
+            url: url, 
+            data: {'order_id': order_id, 'status': status},
+            dataType: "json",
+            success: function(data) {
+              console.log(data);
+              if (data.status) {
+                swal({
+                  title: 'Information',
+                  text: "Order has been "+data.status,
+                  type: 'success',
+                  html: true,
+                  closeOnConfirm: false,
+                  closeOnCancel: false,
+                  allowOutsideClick: false
+                }, function () {
+                  window.location.href = '/origami/order_reservation';
+                });
+              }
+            }
+          });
+        }else{
+          swal({
+            title: 'Oops',
+            text: data.message.toString(),
+            type: 'error',
+            html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+          }, function () {
+            window.location.href = '/origami/order_reservation';
+          });
+        }
       }
     });
   }
diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index a90e755b..3c3bfd0b 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -36,5 +36,37 @@ class Origami::OrderReservationController < BaseOrigamiController
     end
   end
 
+  def send_status
+    base_url = "http://192.168.1.186:3002"
+    post_url = base_url + params[:url]
+    # status = params[:status]
+    if params[:status] == "cancel"
+      status = "rejected"
+    else
+      status = params[:status]
+    end
+
+    begin
+      response = HTTParty.post(post_url,
+              :body => { id: params[:ref_no], status: status}.to_json,
+              :headers => {
+                        'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ',
+                        'Content-Type' => 'application/json',
+                        'Accept' => 'application/json; version=3'
+              }, :timeout => 10
+        )
+    rescue Net::OpenTimeout
+        response = { status: false }
+
+    rescue OpenURI::HTTPError
+        response = { status: false}
+    rescue SocketError
+        response = { status: false}
+    end
+      Rails.logger.debug "Get Doemal Status "
+      Rails.logger.debug response.to_json
+    render :json => response
+  end
+
 
 end
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 3eb51a24..c380f24b 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -354,6 +354,11 @@ class Customer < ApplicationRecord
 
   #new customer for doemal
   def self.addCustomer(params)
+    if params[:gender] == "female"
+      gender = "Female"
+    else
+      gender = "Male"
+    end
     customer = Customer.new
     customer.name             = params[:name]
     customer.email            = params[:email]
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index e23f852e..2d0e53bb 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -49,43 +49,39 @@ class OrderReservation < ApplicationRecord
 	end
 
     def self.create_doemal_order(order)
-    
-    is_extra_time = false
-    extra_time = ''
+	    is_extra_time = false
+	    extra_time = ''
 
-    items_arr = []
-    count = 1
-    order.order_reservation_items.each { |i| 
-      i.item_instance_code = i.item_instance_code.downcase.to_s
-     
-        items = {"order_item_id": count,"item_instance_code": i.item_instance_code,"quantity": i.qty,"options": []}
-       count += 1
-       items_arr.push(items)
-     }
+	    items_arr = []
+	    count = 1
+	    order.order_reservation_items.each { |i| 
+	    	i.item_instance_code = i.item_instance_code.downcase.to_s
+	       	items = {"order_item_id": count,"item_instance_code": i.item_instance_code,"quantity": i.qty,"options": []}
+	       	count += 1
+	       	items_arr.push(items)
+	    }
 
-    puts items_arr.to_json
-    puts "sssssssssssssssssssssss"
-      customer_id = order.customer_id
+	    puts items_arr.to_json
+	    puts "sssssssssssssssssssssss"
+      	customer_id = order.customer_id
  
-    @order = Order.new
-    @order.source     = "doemal_order"
-    @order.order_type = "delivery"
-    @order.customer_id = customer_id
-    @order.items = items_arr
-    @order.guest = ''
-    @order.table_id = nil  # this is dining facilities's id
-    @order.new_booking = true
-    @order.waiters = current_login_employee.name
-    @order.employee_name = current_login_employee.name
+		@order = Order.new
+		@order.source     = "doemal_order"
+		@order.order_type = "delivery"
+		@order.customer_id = customer_id
+		@order.items = items_arr
+		@order.guest = ''
+		@order.table_id = nil  # this is dining facilities's id
+		@order.new_booking = true
+		@order.waiters = current_login_employee.name
+		@order.employee_name = current_login_employee.name
 
-    @order.is_extra_time = is_extra_time
-    @order.extra_time    = extra_time
+		@order.is_extra_time = is_extra_time
+		@order.extra_time    = extra_time
 
-     @status, @booking = @order.generate
+		@status, @booking = @order.generate
 
       # Order.send_customer_view(@booking)
-    
-     
         if @status && @booking
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 15af828f..5bec897f 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -285,10 +285,10 @@
     </div>
   </div>
 </div>
-<p id="ref_no"></p>
-<p id="callback_url"></p>
-<p id="order_id"></p>
-<p id="status"></p>
+<p id="ref_no" class="hidden"></p>
+<p id="callback_url" class="hidden"></p>
+<p id="order_id" class="hidden"></p>
+<p id="status" class="hidden"></p>
 <script type="text/javascript">
   jQuery(function(){
        jQuery('.first-1').click();
diff --git a/config/routes.rb b/config/routes.rb
index 935cdfba..753c4cdb 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -268,7 +268,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :order_reservation
     get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
     post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
-
+    post 'order_reservation/send_status', to: "order_reservation#send_status"
   end
 
   #--------- Waiter/Ordering Station ------------#

From 4137026c16626488f46d8eecdc018ccb1bb518e5 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 12 Apr 2018 14:28:44 +0630
Subject: [PATCH 610/651] order reservation updated

---
 app/assets/javascripts/order_reservation.js   | 166 +++++++++-------
 .../concerns/token_verification.rb            |  11 +-
 .../origami/order_reservation_controller.rb   |  41 ++--
 app/models/order_reservation.rb               | 178 +++++++++++++++++-
 .../origami/order_reservation/index.html.erb  |  37 ++--
 config/locales/en.yml                         |   4 +
 config/locales/mm.yml                         |   4 +
 7 files changed, 319 insertions(+), 122 deletions(-)

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 613462ee..fdea26b8 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -2,37 +2,56 @@
 $(function() { 
  
   $(".nav-item").on("click", function(){
- 	type = $(this).attr("data-type");
- 	if (type == "pending") {
- 	  $('#accepted').text("Accepted");
- 	  $('#accepted').attr("data-value","accepted");
- 	}else if(type == "processing"){
- 		$('#accepted').text("SEND TO KITCHEN");
- 		$('#accepted').attr("data-value","processed");
- 	}else if(type == "delivery"){
- 		$('#accepted').text("READY TO DELIVERY");
- 		$('#accepted').attr("data-value","delivery");
- 	}else if(type == "completed"){
- 		$('#accepted').text("PICK-UP");
- 		$('#accepted').attr("data-value","completed");
- 	}
- 	console.log(type)
+   	type = $(this).attr("data-type");
+    refreshDetailData();
+   	if (type == "pending") {
+      $(".first-1").click();
+   	  $('#accepted').text("Accepted");
+   	  $('#accepted').attr("data-value","accepted");
+   	}else if(type == "processing"){
+      $(".second-1").click();
+   		$('#accepted').text("SEND TO KITCHEN");
+   		$('#accepted').attr("data-value","processed");
+   	}else if(type == "delivery"){
+      $(".third-1").click();
+   		$('#accepted').text("READY TO DELIVERY");
+   		$('#accepted').attr("data-value","delivery");
+   	}else if(type == "completed"){
+      $(".fourth-1").click();
+   		$('#accepted').text("PICK-UP");
+   		$('#accepted').attr("data-value","completed");
+   	}
+   	// console.log(type);
   });
 
   jQuery(function(){
-       jQuery('.first-1').click();
-    });
-
-  $(".custom-tr").on("click", function(){
- 	$(".custom-tr").removeClass("tr-active");
- 	$(this).addClass("tr-active");
-    var order_id  = $(this).attr("data-id");
-    var url       = "order_reservation/get_order/"+order_id;
-    show_order_detail(url);
+     jQuery('.first-1').click();
   });
 
- //show order list 
-  function show_order_detail(url){ 
+  $(".custom-tr").on("click", function(){
+ 	  $(".custom-tr").removeClass("tr-active");
+ 	  $(this).addClass("tr-active");
+    var order_id  = $(this).attr("data-id");
+    var sr_no = $(this).attr("data-sr-no");
+    var url       = "order_reservation/get_order/"+order_id;
+    show_order_detail(url,sr_no);
+  });
+
+  function refreshDetailData(){
+    $("#sr_number").text("");
+    $("#delivery_info").text("");
+    $("#contact_info").text("");
+    $('.summary-items').html("");
+    $('#sub_total').text("0.00");
+    $('#delivery_fee').text("0.00");
+    $('#total_charges').text("0.00");
+    $('#total_tax').text("0.00");
+    $('#grand_total').text("0.00");
+  }
+
+  //show order list 
+  function show_order_detail(url,sr_no){ 
+    $('.summary-items').html("");
     //Start Ajax
     $.ajax({      
       type: "GET",         
@@ -40,51 +59,70 @@ $(function() {
       data: {},
       dataType: "json",
       success: function(data) {
-      	var delivery = data["delivery"]
-      	var items    = data["order_items"]
+        // console.log(data);
+        var delivery = data["delivery"];
+        var items    = data["order_items"];
 
-      	var item_list = $('.summary-items');
+        var item_list = $('.summary-items');
         item_list.empty();
 
-        for(var i in items) { 
-          var item_price = 0;
-          if(items[i].price > 0){
-            item_price = items[i].price;
-          }else{
-            item_price = items[i].unit_price;
+        if(items!=undefined && items!=""){
+          if(items.length > 0){
+            for(var i in items) { 
+              var item_price = 0;
+              if(items[i].price > 0){
+                item_price = items[i].price;
+              }else{
+                item_price = items[i].unit_price;
+              }
+              var total = items[i].qty * item_price;
+                row = '<tr>'
+                       +'<td width ="70%" class="body-td align-left">'+items[i].item_name
+                        +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
+                      +'</td>'
+                      +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
+                    +'</tr>';
+                  $('.summary-items').append(row);
+            }
+
+            $('#sub_total').text(data.total_amount);
+            $('#delivery_fee').text(delivery.delivery_fee);
+            $('#total_charges').text(0);
+            $('#total_tax').text(data.total_tax);
+            $('#grand_total').text(data.grand_total);
+
+            var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")"
+            $('#customer_name').text(data.customer_name);
+            $('#phone').text(data.phone);
+            $('#address').text(address);
+            $('#delivery_to').text(delivery.provider);
+
+            $('#ref_no').text(data.transaction_ref);
+            $('#callback_url').text(data.callback_url);
+            $('#order_id').text(data.order_reservation_id);
+
+            if(delivery.provider == "direct_delivery"){
+              $("#delivery_info").text("(DELIVERY)");
+            }else if(delivery.provider == "self_pick_up"){
+              $("#delivery_info").text("(PICK-UP)");
+            }
+
+            if(data.order_remark!=null && data.order_remark!=""){
+              $("#order_remark").text(data.order_remark);
+            }else if(data.reservation_remark!=null && data.reservation_remark!=""){
+              $("#order_remark").text(data.reservation_remark);
+            }
+            $("#sr_number").text("No."+sr_no);
+            $("#contact_info").text();
           }
-        	var total = items[i].qty * item_price;
-            row = '<tr>'
-                   +'<td width ="70%" class="body-td align-left">'+items[i].item_name
-                    +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
-                  +'</td>'
-                  +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
-                +'</tr>';
-              $('.summary-items').append(row);
         }
-
-      	$('#sub_total').text(data.total_amount);
-      	$('#delivery_fee').text(delivery.delivery_fee);
-      	$('#total_charges').text(0);
-      	$('#total_tax').text(data.total_tax);
-      	$('#grand_total').text(data.grand_total);
-
-      	var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")"
-      	$('#customer_name').text(data.customer_name);
-      	$('#phone').text(data.phone);
-      	$('#address').text(address);
-      	$('#delivery_to').text(delivery.provider);
-
-      	$('#ref_no').text(data.transaction_ref);
-      	$('#callback_url').text(data.callback_url);
-      	$('#order_id').text(data.order_reservation_id);
       }
     });
     //end Ajax 
   }
 
   $("#accepted").on("click", function(){
- 	  var status    = $(this).attr("data-value");
+    var status    = $(this).attr("data-value");
     var order_id  = $('#order_id').text();
     var ref_no    = $('#ref_no').text();
     var callback  = $('#callback_url').text();
@@ -92,7 +130,7 @@ $(function() {
   });
 
   $("#cancel").on("click", function(){
- 	  var status    = $(this).attr("data-value");
+    var status    = $(this).attr("data-value");
     var order_id  = $('#order_id').text();
     var callback  = $('#callback_url').text();
     var ref_no    = $('#ref_no').text();
@@ -119,7 +157,7 @@ $(function() {
               if (data.status) {
                 swal({
                   title: 'Information',
-                  text: "Order has been "+data.status,
+                  text: "Order has been "+data.message,
                   type: 'success',
                   html: true,
                   closeOnConfirm: false,
@@ -134,7 +172,7 @@ $(function() {
         }else{
           swal({
             title: 'Oops',
-            text: data.message.toString(),
+            text: data.message,
             type: 'error',
             html: true,
             closeOnConfirm: false,
@@ -147,5 +185,5 @@ $(function() {
       }
     });
   }
+});
 
-});
\ No newline at end of file
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index 2c17e258..34570ee1 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -17,11 +17,12 @@ module TokenVerification
     authenticate_with_http_token do |token, options|           
       # Rails.logger.debug "token - " + token.to_s
       if(options.length !=0 && options["from"] == "DOEMAL")
-        if(ENV["SERVER_MODE"] === "cloud")
-          from = request.subdomain.downcase  + "." + request.domain.downcase            
-          aes = MyAesCrypt.new
-          return aes.checkKeyForAuth(from, token)  
-        end
+        # if(ENV["SERVER_MODE"] === "cloud")
+        #   from = request.subdomain.downcase  + "." + request.domain.downcase            
+        #   aes = MyAesCrypt.new
+        #   return aes.checkKeyForAuth(from, token)  
+        # end
+        return true
       end
 
       @user = Employee.authenticate_by_token(token)
diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index 8a51617e..562eaaed 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -7,22 +7,29 @@ class Origami::OrderReservationController < BaseOrigamiController
   def update
   	@id     = params[:order_id]
   	@status = params[:status]
-  	@order  = OrderReservation.find(@id)
+  	@order_reservation  = OrderReservation.find(@id)
 
   	status = true
 
   	if status
   		if @status == "processed"
-  			OrderReservation.create_doemal_order(@order)
-  		else
+  			result = OrderReservation.create_doemal_order(@order_reservation,current_user)
+  		elsif @status == "delivery"
+        OrderReservation.update_order_reservation(@id, nil, "ready_to_delivery")
+        response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"ready_to_delivery")
+        result = {:status=> true, :message => "ready for delivery" }
+      elsif @status == "completed"
+        result = OrderReservation.update_doemal_payment(@order_reservation,current_user)
+      else
   			if @status == "cancel"
-  			    result = {:status=> true, :message => "cancelled" }
+          OrderReservation.update_order_reservation(@id, nil, "cancelled")
+  			  result = {:status=> true, :message => "rejected" }
 	  		else
+          OrderReservation.update_order_reservation(@id, nil, "accepted")
 	  			result = {:status=> true, :message => "accepted" }
 	  		end
-	        render :json => result.to_json
   		end
-  		
+  		render :json => result.to_json
     else
     	result = {:status=> false, :message => "Order not accepted !" }
         render :json => result.to_json
@@ -37,34 +44,14 @@ class Origami::OrderReservationController < BaseOrigamiController
   end
 
   def send_status
-    base_url = "http://192.168.1.186:3002"
-    post_url = base_url + params[:url]
-    # status = params[:status]
     if params[:status] == "cancel"
       status = "rejected"
     else
       status = params[:status]
     end
 
-    begin
-      response = HTTParty.post(post_url,
-              :body => { id: params[:ref_no], status: status}.to_json,
-              :headers => {
-                        'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ',
-                        'Content-Type' => 'application/json',
-                        'Accept' => 'application/json; version=3'
-              }, :timeout => 10
-        )
-    rescue Net::OpenTimeout
-        response = { status: false }
+    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
 
-    rescue OpenURI::HTTPError
-        response = { status: false}
-    rescue SocketError
-        response = { status: false}
-    end
-      Rails.logger.debug "Get Doemal Status "
-      Rails.logger.debug response.to_json
     render :json => response
   end
 
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 26f3dad8..bae58e5c 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -7,13 +7,18 @@ class OrderReservation < ApplicationRecord
 	has_many :order_reservation_items
 	belongs_to :delivery
 
+	SEND_TO_KITCHEN = "send_to_kitchen"
+	READY_TO_DELIVERY = "ready_to_deliver"
+	DELIVERED = "delivered"
+	COMPLETED = "completed"
+
 	def self.addOrderReservationInfo(params)
 		check_order_reservation = OrderReservation.where("transaction_ref = ?",params[:reference])
 		if check_order_reservation.empty?
 			order_reservation = OrderReservation.new
 			order_reservation.order_reservation_type = params[:order_type]
 			order_reservation.customer_id = params[:cus_info]
-			order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
+			order_reservation.requested_time = DateTime.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
 			order_reservation.callback_url = params[:callback_url]
 			order_reservation.transaction_ref = params[:reference]
 			if params[:order_info]
@@ -48,7 +53,7 @@ class OrderReservation < ApplicationRecord
 		end
 	end
 
-    def self.create_doemal_order(order)
+    def self.create_doemal_order(order,current_user)
 	    is_extra_time = false
 	    extra_time = ''
 
@@ -73,8 +78,8 @@ class OrderReservation < ApplicationRecord
 		@order.guest = ''
 		@order.table_id = nil  # this is dining facilities's id
 		@order.new_booking = true
-		@order.waiters = current_login_employee.name
-		@order.employee_name = current_login_employee.name
+		@order.waiters = current_user.name
+		@order.employee_name = current_user.name
 
 		@order.is_extra_time = is_extra_time
 		@order.extra_time    = extra_time
@@ -84,13 +89,168 @@ class OrderReservation < ApplicationRecord
       	# Order.send_customer_view(@booking)
         if @status && @booking
         
-          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
-          # for second display 
+          @status, @sale = Sale.request_bill(@order,current_user,current_user)
 
-          result = {:status=> @status, :data => @sale }
-          render :json => result.to_json
+          #order status send to doemal
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
+          #order reservation status updated
+          update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN)
+
+          result = {:status=> @status, :data => @sale, :message => "created" }
+          return result
         end
-      
+    end
+
+    def self.update_doemal_payment(order,current_user)
+    	if(Sale.exists?(order.sale_id))
+	      saleObj = Sale.find(order.sale_id)
+	      shop_details =  Shop.first 
+	      # rounding adjustment
+	      if shop_details.is_rounding_adj
+	        a = saleObj.grand_total % 25 # Modulus
+	        b = saleObj.grand_total / 25 # Division
+	        #not calculate rounding if modulus is 0 and division is even
+	        #calculate rounding if modulus is zero or not zero and division are not even
+	        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+	          new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+	          rounding_adj = new_total-saleObj.grand_total
+	          saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+	        end
+	      end
+	      #end rounding adjustment
+	      
+	      sale_payment = SalePayment.new
+	      sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash")
+
+	      #order status send to doemal
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,COMPLETED)
+          #order reservation status updated
+          update_order_reservation(order.id, saleObj.sale_id, COMPLETED)
+
+	      result = {:status=> true, :message => "completed" }
+          return result
+	      # rebate_amount = nil
+
+	      # For Cashier by Zone
+	      # bookings = Booking.where("sale_id='#{sale_id}'")
+
+	      # if bookings[0].dining_facility_id.to_i > 0
+	      #   table = DiningFacility.find(bookings[0].dining_facility_id)
+	      #   cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+	      #   cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+	      # else
+	      #   shift = ShiftSale.find(saleObj.shift_sale_id)
+	      #   cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+	      # end
+
+	      # For Print
+	      # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+	        # receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
+	        # unique_code = "ReceiptBillPdf"
+	        # if !receipt_bill_a5_pdf.empty?
+	        #   receipt_bill_a5_pdf.each do |receipt_bilA5|
+	        #     if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+	        #       if receipt_bilA5[1] == '1'
+	        #         unique_code = "ReceiptBillA5Pdf"
+	        #       else
+	        #         unique_code = "ReceiptBillPdf"
+	        #       end
+	        #     end
+	        #   end
+	        # end
+
+	        # customer= Customer.find(saleObj.customer_id)
+
+	        # get member information
+	        # rebate = MembershipSetting.find_by_rebate(1)
+	        # credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote')
+	        
+	        # if customer.membership_id != nil && rebate && credit_data.nil?
+	        #   member_info    = Customer.get_member_account(customer)
+	        #   if member_info["status"] == true
+	        #     rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+	        #     current_balance = SaleAudit.paymal_search(sale_id)
+	        #   end
+	        # end
+	        
+	        #orders print out
+	        # if params[:type] == "quick_service"
+	        #   booking = Booking.find_by_sale_id(sale_id)
+	        #   if booking.dining_facility_id.to_i>0
+	        #     table_id = booking.dining_facility_id
+	        #   else
+	        #     table_id = 0
+	        #   end
+	          
+	        #   booking.booking_orders.each do |order|
+	        #     # Order.pay_process_order_queue(order.order_id, table_id)
+	        #     oqs = OrderQueueStation.new
+	        #     oqs.pay_process_order_queue(order.order_id, table_id)
+	        #   end
+	          
+	        # end
+
+	        #for card sale data
+	        # card_data = Array.new
+	        # card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
+	        # if !card_sale_trans_ref_no.nil? 
+	        #   card_sale_trans_ref_no.each do |cash_sale_trans|
+	        #     card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
+	        #     card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
+	        #     card_no = cash_sale_trans.pan.last(4)
+	        #     card_no = card_no.rjust(19,"**** **** **** ")
+	        #     card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+	        #   end
+	        # end
+	        
+	        # 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)
+	        # filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+
+	        # render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
+
+	      #end
+	    end 
+    end
+
+    def self.send_status_to_ordering(url,ref_no,status)
+    	base_url = "http://192.168.1.186:3002"
+    	post_url = base_url + url
+
+    	begin
+	      response = HTTParty.post(post_url,
+	              :body => { id: ref_no, status: status}.to_json,
+	              :headers => {
+	                        'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ',
+	                        'Content-Type' => 'application/json',
+	                        'Accept' => 'application/json; version=3'
+	              }, :timeout => 10
+	        )
+	    rescue Net::OpenTimeout
+	        response = { status: false }
+
+	    rescue OpenURI::HTTPError
+	        response = { status: false}
+	    rescue SocketError
+	        response = { status: false}
+	    end
+		Rails.logger.debug "Get Doemal Status "
+		Rails.logger.debug response.to_json
+		return response
+    end
+
+    def self.update_order_reservation(id, sale_id, status)
+    	order_reservation  = OrderReservation.find(id)
+    	if sale_id.present?
+    		order_reservation.sale_id = sale_id
+    	end
+    	order_reservation.status = status
+    	order_reservation.save
     end
 
 	private
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 5bec897f..c157b1bb 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -5,13 +5,13 @@
     <div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
         <li class="nav-item active" data-color="#F44336" data-type="pending" style="background-color: #F44336;">
-          <a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">4</p> <%= t :pending %></a>
+          <a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">1</p> <%= t :pending %></a>
         </li>
         <li class="nav-item" data-color="#673AB7" data-type="processing" style="background-color: #673AB7;">
-          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :process %></a>
+          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">2</p> <%= t :processing %></a>
         </li>
         <li class="nav-item" data-color="#009688" data-type="delivery" style="background-color: #009688;">
-          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivery %></a>
+          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">3</p> <%= t :delivering %></a>
         </li>
         <li class="nav-item" data-color="#03A9F4" data-type="completed" style="background-color: #03A9F4;">
           <a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num">4</p> <%= t :completed %></a>
@@ -27,9 +27,9 @@
                   <% i=1
                    @order.each do |order| %>
                     <% if order.status == 'new' %>
-                      <tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>">
+                      <tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
-                           <%=i%>
+                          <%=i%>
                         </td>
                         <td width ="30%" class="align-center">
                            <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
@@ -38,7 +38,7 @@
                            <%=order.grand_total%>
                         </td>
                         <td width ="30%" class="align-center">
-                          <span class="font-10 col-blue"><%=order.status%></span>
+                          <span class="font-10 col-blue"><%= order.status %></span>
                         </td>
                       </tr>
                       <%i+=1%>
@@ -59,9 +59,9 @@
                   <% i=1
                    @order.each do |order| %>
                     <% if order.status == 'accepted' %>
-                      <tr class="custom-tr " style="" data-id="<%=order.order_reservation_id%>">
+                      <tr class="custom-tr second-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
-                           <%=i%>
+                          <%=i%>
                         </td>
                         <td width ="30%" class="align-center">
                            <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
@@ -89,8 +89,8 @@
                 <tbody>
                   <% i=1
                    @order.each do |order| %>
-                    <% if order.status == 'processed' %>
-                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                    <% if order.status == 'send_to_kitchen' %>
+                      <tr class="custom-tr third-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
                            <%=i%>
                         </td>
@@ -113,15 +113,15 @@
           </div>      
         </div>
         <!--- Panel 3 - Orders -->
-        <div class="tab-pane dining" id="delivery" role="tabpanel">
+        <div class="tab-pane dining" id="completed" role="tabpanel">
           <div class="card-block font-13">
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
                   <% i=1
                    @order.each do |order| %>
-                    <% if order.status == 'completed' %>
-                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                    <% if order.status == 'ready_to_delivery' %>
+                      <tr class="custom-tr fourth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
                            <%=i%>
                         </td>
@@ -153,10 +153,10 @@
             <table class="table">
               <tr>
                 <td width ="70%" class="header-td align-left">
-                <b class="col-pink font-16">No.11</b> 
-                    <span class="font-13">(DELIVERY)</span>
+                <b class="col-pink font-16"><span id="sr_number"></span> </b> 
+                    <span class="font-13"><span id="delivery_info"></span></span>
                 </td>
-                <td width ="30%" class="header-td font-16 align-right"><b>0065 4321</b></td>
+                <td width ="30%" class="header-td font-16 align-right"><b><span id="contact_info">0065 4321</span></b></td>
               </tr>
             </table>
           </div>
@@ -214,6 +214,9 @@
                 </td>
                 <td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
               </tr>
+              <tr>
+                <td colspan="2" id="order_remark"></td>
+              </tr>
               <tr>
                 <td width ="50%" class="footer-td align-left col-blue">
                   <button type="button" class="btn btn-lg bg-red waves-effect" id="cancel" data-value="cancel">
@@ -287,7 +290,7 @@
 </div>
 <p id="ref_no" class="hidden"></p>
 <p id="callback_url" class="hidden"></p>
-<p id="order_id" class="hidden"></p>
+<p id="order_id"></p>
 <p id="status" class="hidden"></p>
 <script type="text/javascript">
   jQuery(function(){
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b2862dd2..cdce1df7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -75,6 +75,10 @@ en:
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"
 
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 3a025eaf..aba51ed5 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -70,6 +70,10 @@ mm:
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"
   
   views:
     btn:       

From b12d4b8bf85752210f9d560a23a6fc6d946e828c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 12 Apr 2018 14:30:25 +0630
Subject: [PATCH 611/651] token checked for doemal

---
 app/controllers/concerns/token_verification.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index 34570ee1..2c17e258 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -17,12 +17,11 @@ module TokenVerification
     authenticate_with_http_token do |token, options|           
       # Rails.logger.debug "token - " + token.to_s
       if(options.length !=0 && options["from"] == "DOEMAL")
-        # if(ENV["SERVER_MODE"] === "cloud")
-        #   from = request.subdomain.downcase  + "." + request.domain.downcase            
-        #   aes = MyAesCrypt.new
-        #   return aes.checkKeyForAuth(from, token)  
-        # end
-        return true
+        if(ENV["SERVER_MODE"] === "cloud")
+          from = request.subdomain.downcase  + "." + request.domain.downcase            
+          aes = MyAesCrypt.new
+          return aes.checkKeyForAuth(from, token)  
+        end
       end
 
       @user = Employee.authenticate_by_token(token)

From 859080d4a1c84fb0fc83f15d36588312ae65f472 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 12 Apr 2018 15:28:10 +0630
Subject: [PATCH 612/651] Edit MoveTablePdf for cloud

---
 .../origami/movetable_controller.rb           | 36 ++++++++++---------
 app/views/origami/payments/show.html.erb      |  6 ++--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 1753e096..bbc02bdc 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -82,24 +82,26 @@ class Origami::MovetableController < BaseOrigamiController
 
     @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
 
-    # get printer info
-    @from          = (DiningFacility.find(change_from)).name
-    @to            = (DiningFacility.find(change_to)).name
-    @type          = (DiningFacility.find(change_to)).type
-    @moved_by      = @current_user.name
-    @date          = DateTime.now
-    @shop          = Shop.first
-    unique_code    = "MoveTablePdf" 
-    pdf_no        = PrintSetting.where(:unique_code => unique_code).count
-    #print_settings = PrintSetting.find_by_unique_code(unique_code)
-    printer_array = []
-    printer_array = PrintSetting.where(:unique_code => unique_code)
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      # get printer info
+      @from          = (DiningFacility.find(change_from)).name
+      @to            = (DiningFacility.find(change_to)).name
+      @type          = (DiningFacility.find(change_to)).type
+      @moved_by      = @current_user.name
+      @date          = DateTime.now
+      @shop          = Shop.first
+      unique_code    = "MoveTablePdf" 
+      pdf_no        = PrintSetting.where(:unique_code => unique_code).count
+      #print_settings = PrintSetting.find_by_unique_code(unique_code)
+      printer_array = []
+      printer_array = PrintSetting.where(:unique_code => unique_code)
 
-    for i in 0..pdf_no
-      if i != pdf_no
-        print_settings = printer_array[i]
-        printer        = Printer::ReceiptPrinter.new(print_settings)  
-        printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items)
+      for i in 0..pdf_no
+        if i != pdf_no
+          print_settings = printer_array[i]
+          printer        = Printer::ReceiptPrinter.new(print_settings)  
+          printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items)
+        end  
       end  
     end  
   end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1f87ca65..00852f95 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -437,10 +437,12 @@
         <div class="row m-b-10 m-r-30">
           
           <div class="col-md-5 m-r-20">
-            <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
+            <% if ENV["SERVER_MODE"] != "cloud" %>
+              <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
+            <% end %>  
           </div>
           
-          <div class="col-md-5">
+          <div class="col-md-5 m-r-20">
             <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
           </div>
         </div>

From bf38beb0667ab4f4bf3231d4d1fc7b3488cb5ba1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 12 Apr 2018 16:18:32 +0630
Subject: [PATCH 613/651] change status

---
 app/models/order_reservation.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index bae58e5c..2fa99cf4 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -123,11 +123,11 @@ class OrderReservation < ApplicationRecord
 	      sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash")
 
 	      #order status send to doemal
-          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,COMPLETED)
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
           #order reservation status updated
-          update_order_reservation(order.id, saleObj.sale_id, COMPLETED)
+          update_order_reservation(order.id, saleObj.sale_id, DELIVERED)
 
-	      result = {:status=> true, :message => "completed" }
+	      result = {:status=> true, :message => DELIVERED }
           return result
 	      # rebate_amount = nil
 

From c22fc3e86e87ad082b3c49097e119f63e84ffb62 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 18 Apr 2018 14:17:37 +0630
Subject: [PATCH 614/651] add pdf viewer and test doemal

---
 Gemfile                                        |  1 +
 Gemfile.lock                                   |  6 ++++++
 app/controllers/api/api_controller.rb          |  2 +-
 app/controllers/concerns/token_verification.rb |  4 ++--
 app/views/origami/payments/show.html.erb       |  7 +++++--
 config/routes.rb                               |  2 ++
 config/shops.json                              | 11 +++++++++--
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 41682d12..6005cae2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,6 +52,7 @@ gem 'rubyzip', '= 1.0.0'
 gem 'axlsx', '= 2.0.1'
 gem 'axlsx_rails'
 gem 'roo'
+gem 'pdfjs_viewer-rails'
 #Reporting gem
 #gem 'compendium'
 #gem "cancan"
diff --git a/Gemfile.lock b/Gemfile.lock
index eee001d1..b7f4b2ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,6 +125,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
+    json (2.1.0)
     kaminari (1.0.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.0.1)
@@ -168,6 +169,10 @@ GEM
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     pdf-core (0.7.0)
+    pdfjs_viewer-rails (0.2.0)
+      json (> 1.8.4)
+      rails (> 4.2.0)
+      sass-rails (~> 5.0)
     pg (0.21.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
@@ -333,6 +338,7 @@ DEPENDENCIES
   momentjs-rails
   mysql2 (>= 0.3.18, < 0.5)
   nested_form
+  pdfjs_viewer-rails
   pg
   prawn
   prawn-table
diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb
index 973fc159..2340abd4 100755
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -1,7 +1,7 @@
 class Api::ApiController < ActionController::API
   include TokenVerification
 
-  before_action :lookup_domain
+  # before_action :lookup_domain
   helper_method :current_token, :current_login_employee, :get_cashier
 
   private
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index 2c17e258..f8602ded 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -13,12 +13,12 @@ module TokenVerification
     authenticate_token || render_unauthorized
   end
 
-  def authenticate_token    
+  def authenticate_token      
     authenticate_with_http_token do |token, options|           
       # Rails.logger.debug "token - " + token.to_s
       if(options.length !=0 && options["from"] == "DOEMAL")
         if(ENV["SERVER_MODE"] === "cloud")
-          from = request.subdomain.downcase  + "." + request.domain.downcase            
+          from = "local" #request.subdomain.downcase  + "." + request.domain.downcase            
           aes = MyAesCrypt.new
           return aes.checkKeyForAuth(from, token)  
         end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1f87ca65..18b7b69d 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -631,6 +631,8 @@ var customer_name = "<%= @customer.name %>";
             if (credit <= 0) {
               calculate_member_discount(sale_id);
             }
+
+            $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",
@@ -651,13 +653,14 @@ var customer_name = "<%= @customer.name %>";
                   var msg = '';
                 }
 
-                $("#loading_wrapper" ).hide();
+                $("#loading_wrapper" ).hide();                
 
                 //PDF lightbox data
+                var pdfPath = "/en/pdfjs/minimal?file=" + result.filename.substring(6);
                 $("#sale_receipt_no").val(result.receipt_no);
                 $("#filename").val(result.filename);
                 $("#printer_name").val(result.printer_name);
-                $("#receipt_pdf").attr("src", result.filename.substring(6));
+                $("#receipt_pdf").attr("src", pdfPath);
                 $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
                 $("#pdfModalLabel").text("Sale Completed");
                 $("#changed_amount").text("");
diff --git a/config/routes.rb b/config/routes.rb
index 444e961a..0e868e3b 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,8 @@ scope "(:locale)", locale: /en|mm/ do
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
+  mount PdfjsViewer::Rails::Engine => "/pdfjs", as: 'pdfjs'
+
   # Action Cable Creation
   # if ENV["SERVER_MODE"] !=  "cloud"
     mount ActionCable.server => "/cable"
diff --git a/config/shops.json b/config/shops.json
index b3369529..65755243 100644
--- a/config/shops.json
+++ b/config/shops.json
@@ -3,8 +3,15 @@
     {
       "lookup": "local",
       "value": {
-      	"key": "999d675168d813d5e1c7",
-      	"iv": "999d675168d813d5e1c7"
+        "key": "999d675168d813d5e1c7",
+        "iv": "999d675168d813d5e1c7"
+      }
+    },
+    {
+      "lookup": "demo10.pos-myanmar.com",
+      "value": {
+        "key": "634W2ioj6QA88vafKamHBRu5aKX/BLIPdTWuuXGFBsA=\n",
+        "iv": "QqpO/h7o60dYTbNETRbZ4g==\n"
       }
     }
   ]

From 5816a48d3250f3dc94c38773f4454a515c483e79 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 18 Apr 2018 14:40:53 +0630
Subject: [PATCH 615/651] update dinga and paymal

---
 .../origami/customers_controller.rb           |  2 ++
 app/controllers/origami/dinga_controller.rb   | 25 ++++++-------
 app/controllers/origami/paymal_controller.rb  |  3 +-
 app/models/sale_payment.rb                    | 21 ++++++++---
 app/views/origami/dinga/index.html.erb        | 36 ++++++++++---------
 .../origami/order_reservation/index.html.erb  |  2 +-
 app/views/origami/payments/show.html.erb      | 19 +++++-----
 7 files changed, 64 insertions(+), 44 deletions(-)

diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index fefb973e..537703a1 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -169,6 +169,8 @@ class Origami::CustomersController < BaseOrigamiController
           sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_id, action_by,remark,"PAYBYACCOUNT" )
         end
         @out = membership_data
+
+        render json: JSON.generate({:status => membership_data["status"], :message => membership_data["message"]})
       end
     end
   end
diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index 448b39dd..586403f9 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -4,32 +4,32 @@ class Origami::DingaController < BaseOrigamiController
      payment_method = params[:payment_method]
      @cashier_type   = params[:type]
      @membership_rebate_balance=0
-     sale_data = Sale.find_by_sale_id(@sale_id)
-     @receipt_no = sale_data.receipt_no
+     @sale_data = Sale.find_by_sale_id(@sale_id)
+     @receipt_no = @sale_data.receipt_no
      @shop        = Shop.first 
           # if @shop.is_rounding_adj
-          #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+          #      new_total    = Sale.get_rounding_adjustment(@sale_data.grand_total)
           # else
-          #     new_total    = sale_data.grand_total
+          #     new_total    = @sale_data.grand_total
           # end
-          # @rounding_adj = new_total-sale_data.grand_total  
-          @rounding_adj = sale_data.rounding_adjustment  
+          # @rounding_adj = new_total-@sale_data.grand_total  
+          @rounding_adj = @sale_data.rounding_adjustment  
 
           @payparcount = 0
           others = 0
-          sale_data.sale_payments.each do |sale_payment|
+          @sale_data.sale_payments.each do |sale_payment|
             if sale_payment.payment_method == "dinga"
               @payparcount = @payparcount + sale_payment.payment_amount
             else
               others = others + sale_payment.payment_amount
             end
           end
-          @payment_prices = sale_data.grand_total - @payparcount -others
+          @payment_prices = @sale_data.grand_total - @payparcount -others
 
 
-          if sale_data
-            if sale_data.customer_id
-             customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+          if @sale_data
+            if @sale_data.customer_id
+             customer_data= Customer.find_by_customer_id(@sale_data.customer_id)
              if customer_data
               @membership_id = customer_data.membership_id
               if !@membership_id.nil?
@@ -73,6 +73,7 @@ def create
  cash = params[:payment_amount]
  sale_id = params[:sale_id]
  transaction_ref = params[:transaction_ref]
+ account_no = params[:account_no]
  if(Sale.exists?(sale_id))
    saleObj = Sale.find(sale_id)
    shop_details =  Shop.first 
@@ -85,7 +86,7 @@ def create
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",transaction_ref)
+      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no)
       if status == true
         @out = true, "Success!"
       else
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 65af0c3b..499a0625 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -73,6 +73,7 @@ def create
  cash = params[:payment_amount]
  sale_id = params[:sale_id]
  transaction_ref = params[:transaction_ref]
+ account_no = params[:account_no]
  if(Sale.exists?(sale_id))
    saleObj = Sale.find(sale_id)
    shop_details =  Shop.first 
@@ -86,7 +87,7 @@ def create
 
 	      # saleObj = Sale.find(sale_id)
 	      sale_payment = SalePayment.new
-	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",transaction_ref)
+	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
         if status == true
           @out = true, "Success!"
         else
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 201a1b57..50599f68 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -214,7 +214,7 @@ class SalePayment < ApplicationRecord
           # Control for Paypar Cloud
           begin
             response = HTTParty.post(url,
-                  :body => { membership_id:membership_id,
+                  :body => { account_no:membership_id,
                             amount:received_amount,
                             receipt_no:sale_data.receipt_no,
                             merchant_uid:merchant_uid,
@@ -242,7 +242,7 @@ class SalePayment < ApplicationRecord
         response =false;
       end
 
-      Rails.logger.debug "Payment response"
+      Rails.logger.debug "Create Payment response"
       Rails.logger.debug response.to_json
 
       return response;
@@ -391,8 +391,13 @@ class SalePayment < ApplicationRecord
 
     #Next time - validate if the vochure number is valid - within
     customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+
+    account_no = self.payment_reference
+    if account_no == 0
+      account_no  = customer_data.customer_id
+    end
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
       remark = "#{membership_data} PayMal Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
@@ -433,9 +438,17 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     #Next time - validate if the vochure number is valid - within
+
     customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+
+    account_no = self.payment_reference
+    if account_no == 0
+      account_no  = customer_data.customer_id
+    end
+    
+
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
       remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index 6a4fc12b..1bd18f39 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -46,6 +46,8 @@
 					</div>
 				</div>
 			</div>
+			<p class="hidden" name="sale_id" id="sale_id" ><%=@sale_id %></p>
+			<p class="hidden" name="receipt_no" id="receipt_no" ><%=@sale_data.receipt_no %></p>
 			<!-- <% if @payparcount > 0 %>
 				<p class="">Last time rebate amount is <%= @payparcount %></p>
 			<% end %>
@@ -116,7 +118,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
       </div>
       <div class="modal-body">
-        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" value="1011002923682533" />
         <input type="hidden" name="qr_code" id="qr_code" />
         <div class="row text-center m-t-20">
           <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
@@ -239,15 +241,15 @@
     var membership_id = '';
     var membership_type = '';
     var sale_id     = $("#sale_id").text() || 0;
+    var receipt_no  = $("#receipt_no").text() || 0;
     var customer_mamber_card_no = 0;
 
-    $("#is_paymemberModal").hide();
-    $("#sxModal").show();   
-    setTimeout(function(){
-      getCardNo();
-      $("#sxModal").hide();        
+    // $("#is_paymemberModal").hide();
+    // $("#sxModal").show();   
+    // setTimeout(function(){
+    //   getCardNo();
+      // $("#sxModal").hide();        
       customer_mamber_card_no = $("#paypar_account_no").val();
-      
       if(sale_id != 0 && customer_mamber_card_no != 0){    
         $.ajax({
           type: "POST",
@@ -255,6 +257,7 @@
           data: { account_no : customer_mamber_card_no, amount : payment_amount, receipt_no : receipt_no},
           dataType: "json",
           success: function(data) {
+          	console.log(data)
             if (data.status == true) {
             	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
             	$("#valid_amount").val(parseFloat(valid_amount));
@@ -262,8 +265,9 @@
               	$.ajax({
 					type: "POST",
 					url:  "<%=origami_payment_dinga_path%>",
-					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no :customer_mamber_card_no},
 					success: function(result){
+						console.log(result)
 						if(result.status == true){
 							swal({
 								title: "Information!",
@@ -273,7 +277,7 @@
 								closeOnCancel: false,
 								allowOutsideClick: false
 							}, function () {
-								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+								 window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
 							});
 
 						}else{
@@ -291,14 +295,14 @@
 					  closeOnCancel: false,
 					  allowOutsideClick: false
 					}, function () {
-					window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/DINGA";
+					 window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/DINGA";
 				});
             }
 
           }
         });                
       }
-    },100);
+    // },100);
   });
 
   // Read NFC card no from java
@@ -316,13 +320,13 @@
   // QR Code Reader
   $(".btn_qr_code").on('click', function(e){
 	    $("#is_memberModal").hide();
-	    var code = "";  
+	    var code = "1011002923682533";  
 	    var customer_id = '';
 	    var customer_name = '';
 	    var membership_id = '';
 	    var membership_type = '';    
-	    setTimeout(function(){
-	      code=getQRCode(); 
+	    // setTimeout(function(){
+	    //   code=getQRCode(); 
 	      if(sale_id != 0 && code != ""){    
 	         $.ajax({
 	          type: "POST",
@@ -337,7 +341,7 @@
 	              	$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no : code},
 						success: function(result){
 							if(result.status == true){
 								swal({
@@ -372,7 +376,7 @@
 	          }
 	        });                
 	      }    
-	    },100);
+	    // },100);
 	});
 
 	// Read qrcode from java
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index c157b1bb..ba735a1f 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -290,7 +290,7 @@
 </div>
 <p id="ref_no" class="hidden"></p>
 <p id="callback_url" class="hidden"></p>
-<p id="order_id"></p>
+<p id="order_id" class="hidden"></p>
 <p id="status" class="hidden"></p>
 <script type="text/javascript">
   jQuery(function(){
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 00852f95..cb8db5f0 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -168,15 +168,15 @@
         <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
       </div>
       <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0 && @unionpaycount == 0.0 && @alipaycount == 0.0 && @paymalcount == 0.0 && @junctionpaycount == 0.0 && @dingacount == 0.0 %>
-      <div class="row payment other-payment-color" id="card_payment" >
-        <div class="col-md-8">Other Payments</div>
-        <div class="col-md-4" id="others"><%= number_with_precision(@other, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
-      </div>
+        <div class="row payment other-payment-color" id="card_payment" >
+          <div class="col-md-8">Other Payments</div>
+          <div class="col-md-4" id="others"><%= number_with_precision(@other, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
+        </div>
       <% else %>
-      <div class="row payment other-payment-color" id="card_payment"  >
-        <div class="col-md-8">Other Payments</div>
-        <div class="col-md-4" id=""><%= number_with_precision(@other_payment, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
-      </div>
+        <div class="row payment other-payment-color" id="card_payment"  >
+          <div class="col-md-8">Other Payments</div>
+          <div class="col-md-4" id=""><%= number_with_precision(@other_payment, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
+        </div>
       <% end %>
     </div>
     <div class="card-block">
@@ -269,12 +269,11 @@
             <div class="col-md-4" id="paymalcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
-
         <!-- DINGA -->
         <div class="row <%= @dingacount!=0.0 ? 'payment others-color'  : 'hidden'%>">
           <div class="col-md-5"></div>
           <div class="col-md-3">DINGA</div>
-          <% if @paymalcount != 0.0 %>
+          <% if @dingacount != 0.0 %>
             <div class="col-md-4 master is_card" id="dingacount"><%= number_with_precision(@dingacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
           <% else %>
             <div class="col-md-4" id="dingacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>

From 2a26abff9ad823164ce7308f2be34e9efe2da296 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 18 Apr 2018 16:47:38 +0630
Subject: [PATCH 616/651] finished dinga and paymal payment

---
 app/controllers/origami/paymal_controller.rb |  1 +
 app/models/sale_payment.rb                   | 46 ++++++++++++--------
 app/views/origami/dinga/index.html.erb       | 24 +++++-----
 app/views/origami/paymal/index.html.erb      | 19 +++++---
 4 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 499a0625..1321cf87 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -74,6 +74,7 @@ def create
  sale_id = params[:sale_id]
  transaction_ref = params[:transaction_ref]
  account_no = params[:account_no]
+ puts params.to_json  
  if(Sale.exists?(sale_id))
    saleObj = Sale.find(sale_id)
    shop_details =  Shop.first 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 50599f68..29d755d7 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -197,13 +197,14 @@ class SalePayment < ApplicationRecord
 
   def self.create_payment(paypar_url,token,membership_id,received_amount,sale_id)
       membership_actions_data = MembershipAction.find_by_membership_type("create_payment");
-
+      sale_data = Sale.find_by_sale_id(sale_id)
+      customer_data = Customer.find_by_customer_id(sale_data.customer_id)
       if !membership_actions_data.nil?
 
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
         merchant_uid = membership_actions_data.merchant_account_id
         auth_token = membership_actions_data.auth_token
-        sale_data = Sale.find_by_sale_id(sale_id)
+        
 
         if sale_data
           others = 0
@@ -211,14 +212,27 @@ class SalePayment < ApplicationRecord
               others = others + sale_payment.payment_amount
           end
           payment_prices = sale_data.grand_total - others
-          # Control for Paypar Cloud
-          begin
-            response = HTTParty.post(url,
-                  :body => { account_no:membership_id,
+
+          if membership_id.to_i <= 0
+          membership_id  = customer_data.membership_id
+            params  = { membership_id:membership_id,
                             amount:received_amount,
                             receipt_no:sale_data.receipt_no,
                             merchant_uid:merchant_uid,
-                            auth_token:auth_token}.to_json,
+                            auth_token:auth_token}.to_json
+          else
+            params  = { account_no:membership_id,
+                            amount:received_amount,
+                            receipt_no:sale_data.receipt_no,
+                            merchant_uid:merchant_uid,
+                            auth_token:auth_token}.to_json
+          end
+
+          
+          # Control for Paypar Cloud
+          begin
+            response = HTTParty.post(url,
+                  :body => params,
                   :headers => {
                             'Content-Type' => 'application/json',
                             'Accept' => 'application/json; version=3'
@@ -390,12 +404,11 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     #Next time - validate if the vochure number is valid - within
-    customer_data = Customer.find_by_customer_id(self.sale.customer_id)
-
+    # customer_data = Customer.find_by_customer_id(self.sale.customer_id)
     account_no = self.payment_reference
-    if account_no == 0
-      account_no  = customer_data.customer_id
-    end
+    # if account_no.to_i <= 0
+    #   account_no  = customer_data.membership_id
+    # end
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
     membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
 
@@ -439,13 +452,12 @@ class SalePayment < ApplicationRecord
 
     #Next time - validate if the vochure number is valid - within
 
-    customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+    # customer_data = Customer.find_by_customer_id(self.sale.customer_id)
 
     account_no = self.payment_reference
-    if account_no == 0
-      account_no  = customer_data.customer_id
-    end
-    
+    # if account_no == 0
+    #   account_no  = customer_data.customer_id
+    # end
 
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
     membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index 1bd18f39..e9205fbf 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -205,7 +205,7 @@
 					$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_dinga_path%>",
-						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:""},
+						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
 						success: function(result){
 							if(result.status == true){
 								swal({
@@ -244,11 +244,11 @@
     var receipt_no  = $("#receipt_no").text() || 0;
     var customer_mamber_card_no = 0;
 
-    // $("#is_paymemberModal").hide();
-    // $("#sxModal").show();   
-    // setTimeout(function(){
-    //   getCardNo();
-      // $("#sxModal").hide();        
+    $("#is_paymemberModal").hide();
+    $("#sxModal").show();   
+    setTimeout(function(){
+      getCardNo();
+      $("#sxModal").hide();        
       customer_mamber_card_no = $("#paypar_account_no").val();
       if(sale_id != 0 && customer_mamber_card_no != 0){    
         $.ajax({
@@ -302,7 +302,7 @@
           }
         });                
       }
-    // },100);
+     },100);
   });
 
   // Read NFC card no from java
@@ -320,13 +320,13 @@
   // QR Code Reader
   $(".btn_qr_code").on('click', function(e){
 	    $("#is_memberModal").hide();
-	    var code = "1011002923682533";  
+	    var code = "";  
 	    var customer_id = '';
 	    var customer_name = '';
 	    var membership_id = '';
 	    var membership_type = '';    
-	    // setTimeout(function(){
-	    //   code=getQRCode(); 
+	    setTimeout(function(){
+	      code=getQRCode(); 
 	      if(sale_id != 0 && code != ""){    
 	         $.ajax({
 	          type: "POST",
@@ -341,7 +341,7 @@
 	              	$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no : code},
+						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
 							if(result.status == true){
 								swal({
@@ -376,7 +376,7 @@
 	          }
 	        });                
 	      }    
-	    // },100);
+	    },100);
 	});
 
 	// Read qrcode from java
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index d92f162a..5594eb13 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -14,6 +14,8 @@
 			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
 					<input type="hidden" name="receipt_no" id="receipt_no" value="<%= @receipt_no%>">
+					<p class="hidden" name="sale_id" id="sale_id" ><%=@sale_id %></p>
+					<p class="hidden" name="membership_id" id="membership_id" ><%=@membership_id %></p>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label class="">You can pay up to </label>
@@ -204,7 +206,7 @@
 					$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:""},
+						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
 						success: function(result){
 							if(result.status == true){
 								swal({
@@ -237,6 +239,7 @@
     var cardNo = ""; 
     var sale_id     = $("#sale_id").text() || 0;
     var receipt_no = $("#receipt_no").val() || "";
+
     var customer_mamber_card_no = 0;
     var payment_amount = parseFloat($("#used_amount").text());
 
@@ -246,8 +249,10 @@
       getCardNo();
       $("#sxModal").hide();        
       customer_mamber_card_no = $("#paypar_account_no").val();
-      
-      if(sale_id != 0 && customer_mamber_card_no != 0){    
+      if (customer_mamber_card_no == 0) {
+      	customer_mamber_card_no = $("#membership_id").text() || 0;
+      }
+      if(sale_id != 0 && customer_mamber_card_no !=0){ 
         $.ajax({
           type: "POST",
           url: "/origami/"+sale_id+"/send_account" ,
@@ -261,7 +266,7 @@
               	$.ajax({
 					type: "POST",
 					url:  "<%=origami_payment_paymal_path%>",
-					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:customer_mamber_card_no},
 					success: function(result){
 						if(result.status == true){
 							swal({
@@ -296,8 +301,10 @@
 
           }
         });                
+      }else{
+      	swal("Opp","Please Check Member","warning")
       }
-    },100);
+     },100);
   });
 
   // Read NFC card no from java
@@ -335,7 +342,7 @@
 	              	$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
 							if(result.status == true){
 								swal({

From 70ec80a1d55c688d709e036edf6ddfc088f4f502 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 18 Apr 2018 16:57:02 +0630
Subject: [PATCH 617/651] Manager level can not edit Administrator's password
 and id

---
 app/views/origami/payments/show.html.erb    | 22 +++++++++++----------
 app/views/settings/employees/_form.html.erb |  6 +++++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 00852f95..2cf6fea5 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -435,16 +435,18 @@
       </div>
       <div class="modal-footer ">
         <div class="row m-b-10 m-r-30">
-          
-          <div class="col-md-5 m-r-20">
-            <% if ENV["SERVER_MODE"] != "cloud" %>
-              <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
-            <% end %>  
-          </div>
-          
-          <div class="col-md-5 m-r-20">
-            <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
-          </div>
+          <% if ENV["SERVER_MODE"] != "cloud" %>
+            <div class="col-md-5 m-r-15">
+                <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
+            </div>
+            <div class="col-md-5 m-r-13">
+              <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
+            </div>
+          <% else %>
+            <div class="col-md-9 m-r-15">
+              <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
+            </div>
+          <% end %>  
         </div>
         
       </div>
diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb
index 0b973416..ad50e9b8 100755
--- a/app/views/settings/employees/_form.html.erb
+++ b/app/views/settings/employees/_form.html.erb
@@ -7,7 +7,11 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :name %>
-          <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
+          <% if current_user.role == "administrator" %>
+            <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
+          <% else %>
+            <%= f.input :role, :collection => Lookup.collection_of("employee_roles").select{|r| r[1] != "administrator"},:class=>'form-group' %>
+          <% end %>
           <%= f.input :emp_id,  :label => "Employee Numberic ID (*Unique)" %>
           <%= f.input :password %>
 

From a5cb5a67f4fc5e82456c1d9b1a06f5b6853281f8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 18 Apr 2018 17:55:32 +0630
Subject: [PATCH 618/651] update  order reservation

---
 app/controllers/origami/order_reservation_controller.rb | 5 +++--
 app/models/order_reservation.rb                         | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index 562eaaed..87e8b18f 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -50,9 +50,10 @@ class Origami::OrderReservationController < BaseOrigamiController
       status = params[:status]
     end
 
-    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
+    # response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
 
-    render :json => response
+    result = {:status=> true, :message => " accepted !" }
+        render :json => result.to_json
   end
 
 end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 2fa99cf4..21c76030 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -92,7 +92,7 @@ class OrderReservation < ApplicationRecord
           @status, @sale = Sale.request_bill(@order,current_user,current_user)
 
           #order status send to doemal
-          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
+          # callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
           #order reservation status updated
           update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN)
 
@@ -123,7 +123,7 @@ class OrderReservation < ApplicationRecord
 	      sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash")
 
 	      #order status send to doemal
-          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
+          # callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
           #order reservation status updated
           update_order_reservation(order.id, saleObj.sale_id, DELIVERED)
 

From 28a79fe60fa5ff1846c15d82e4d9b91f01d90e3e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 18 Apr 2018 18:12:01 +0630
Subject: [PATCH 619/651] pdf viewer add and menu export testing

---
 Main Menu.xlsx                               | Bin 3997 -> 0 bytes
 app/controllers/settings/menus_controller.rb |   5 +++--
 app/models/menu.rb                           |   2 +-
 app/views/settings/menus/index.html.erb      |   3 ++-
 public/menus/Main Menu.xlsx                  | Bin 0 -> 4375 bytes
 public/menus/Shwe Myittar.xlsx               | Bin 0 -> 3942 bytes
 6 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 Main Menu.xlsx
 create mode 100644 public/menus/Main Menu.xlsx
 create mode 100644 public/menus/Shwe Myittar.xlsx

diff --git a/Main Menu.xlsx b/Main Menu.xlsx
deleted file mode 100644
index 94c703382ba6733020ef9e02db8febb2b38c130b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3997
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

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 0264084c..bc92a959 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -167,8 +167,9 @@ class Settings::MenusController < ApplicationController
       # end
     end
 
-    p.serialize("tmp/menus/" + menu.name + ".xlsx")
-    render :json => {status: true}
+    file_path = "public/menus/" + menu.name + ".xlsx"
+    p.serialize(file_path)
+    render :json => { status: true, path: file_path }
   end
 
   def import
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 8bf616c9..28b23c76 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -160,7 +160,7 @@ class Menu < ApplicationRecord
               account = Account.create({title: row["Account"], account_type: "0"})
             end
 
-            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by)
+            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", is_sub_item: 0, is_available: 1, created_by: created_by)
           # else
           #   status = status + "Item Code already exists for " + row["Item Name"] + "."
           end
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index d8e37899..8eeb5269 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -115,7 +115,8 @@
           url: "/settings/menus/" + menu_id + "/export",
           success: function(result){
             if(result.status){
-              swal("Success", "Export Success...", "success");
+              location.href = result.path.substring(6);
+              // swal("Success", "Export Success...", "success");
             }
           }
         });
diff --git a/public/menus/Main Menu.xlsx b/public/menus/Main Menu.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a35944b08060038e4423411b423ca20df5ba36cc
GIT binary patch
literal 4375
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
K#{V__$?9LlKY1_!

literal 0
HcmV?d00001

diff --git a/public/menus/Shwe Myittar.xlsx b/public/menus/Shwe Myittar.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5cd9d6b903be9a4a4aa41d6b779d9174911c1195
GIT binary patch
literal 3942
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

literal 0
HcmV?d00001


From ed8e9836fe2a9d2a5e7ee83c37460aa8928a9c7f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 10:16:38 +0630
Subject: [PATCH 620/651] check and update qrcode payment

---
 app/controllers/origami/order_reservation_controller.rb | 5 ++---
 app/models/order_reservation.rb                         | 4 ++--
 app/views/origami/dinga/index.html.erb                  | 8 +++++---
 app/views/origami/paymal/index.html.erb                 | 2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index 87e8b18f..562eaaed 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -50,10 +50,9 @@ class Origami::OrderReservationController < BaseOrigamiController
       status = params[:status]
     end
 
-    # response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
+    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
 
-    result = {:status=> true, :message => " accepted !" }
-        render :json => result.to_json
+    render :json => response
   end
 
 end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 21c76030..2fa99cf4 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -92,7 +92,7 @@ class OrderReservation < ApplicationRecord
           @status, @sale = Sale.request_bill(@order,current_user,current_user)
 
           #order status send to doemal
-          # callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
           #order reservation status updated
           update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN)
 
@@ -123,7 +123,7 @@ class OrderReservation < ApplicationRecord
 	      sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash")
 
 	      #order status send to doemal
-          # callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
           #order reservation status updated
           update_order_reservation(order.id, saleObj.sale_id, DELIVERED)
 
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index e9205fbf..1a7bd798 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -118,7 +118,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
       </div>
       <div class="modal-body">
-        <input type="hidden" name="paypar_account_no" id="paypar_account_no" value="1011002923682533" />
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
         <input type="hidden" name="qr_code" id="qr_code" />
         <div class="row text-center m-t-20">
           <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
@@ -325,9 +325,10 @@
 	    var customer_name = '';
 	    var membership_id = '';
 	    var membership_type = '';    
+	    var receipt_no  = $("#receipt_no").text() || 0;
 	    setTimeout(function(){
-	      code=getQRCode(); 
-	      if(sale_id != 0 && code != ""){    
+	      code=getQRCode();
+	      if(sale_id != 0 && code != ""){  
 	         $.ajax({
 	          type: "POST",
 	          url: "/origami/"+sale_id+"/send_account" ,
@@ -343,6 +344,7 @@
 						url:  "<%=origami_payment_paymal_path%>",
 						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
+
 							if(result.status == true){
 								swal({
 									title: "Information!",
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index 5594eb13..6818fbad 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -328,6 +328,7 @@
 	    var payment_amount = parseFloat($("#used_amount").text());
 	    setTimeout(function(){
 	      code=getQRCode(); 
+	      alert(code)
 	      if(sale_id != 0 && code != ""){    
 	         $.ajax({
 	          type: "POST",
@@ -344,6 +345,7 @@
 						url:  "<%=origami_payment_paymal_path%>",
 						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
+							alert(result)
 							if(result.status == true){
 								swal({
 									title: "Information!",

From e468bc65afea17786aba8b42368744c56ccac912 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 10:32:59 +0630
Subject: [PATCH 621/651] update shift_sale migration file and secret yml

---
 config/secrets.yml                              | 2 +-
 db/migrate/20170626191519_create_shift_sales.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index 6e8b73d4..b0d7c5c8 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -24,7 +24,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+  sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb
index f18a2c1c..bd19a8cf 100755
--- a/db/migrate/20170626191519_create_shift_sales.rb
+++ b/db/migrate/20170626191519_create_shift_sales.rb
@@ -21,7 +21,7 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
       t.integer :dining_count, :default => 0
       t.integer :takeaway_count, :default => 0
       t.integer :member_count, :default => 0
-      t.decimal :total_rounding,, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_rounding, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.integer :total_receipt, :default => 0
       t.decimal :total_void, :default => 0
       t.timestamps

From 0241d209acea7691c31309bfdd9755095d25b0f5 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 19 Apr 2018 10:49:25 +0630
Subject: [PATCH 622/651] Pull from master

---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   6 +
 Main Menu.xlsx                                | Bin 3997 -> 0 bytes
 app/assets/javascripts/order_reservation.js   | 238 +++++++++++-------
 app/controllers/api/api_controller.rb         |   2 +-
 .../concerns/token_verification.rb            |   4 +-
 .../origami/customers_controller.rb           |   2 +
 app/controllers/origami/dinga_controller.rb   |  25 +-
 .../origami/order_reservation_controller.rb   |  30 ++-
 app/controllers/origami/paymal_controller.rb  |   4 +-
 app/controllers/settings/menus_controller.rb  |   5 +-
 app/models/customer.rb                        |   5 +
 app/models/menu.rb                            |   2 +-
 app/models/order_reservation.rb               | 232 ++++++++++++++---
 app/models/sale_payment.rb                    |  49 +++-
 app/views/origami/dinga/index.html.erb        |  24 +-
 .../origami/order_reservation/index.html.erb  |  43 ++--
 app/views/origami/paymal/index.html.erb       |  21 +-
 app/views/origami/payments/show.html.erb      |  26 +-
 app/views/settings/menus/index.html.erb       |   3 +-
 config/locales/en.yml                         |   4 +
 config/locales/mm.yml                         |   4 +
 config/routes.rb                              |   4 +-
 config/secrets.yml                            |   2 +-
 config/shops.json                             |  11 +-
 .../20170626191519_create_shift_sales.rb      |   2 +-
 public/menus/Main Menu.xlsx                   | Bin 0 -> 4375 bytes
 public/menus/Shwe Myittar.xlsx                | Bin 0 -> 3942 bytes
 28 files changed, 529 insertions(+), 220 deletions(-)
 delete mode 100644 Main Menu.xlsx
 create mode 100644 public/menus/Main Menu.xlsx
 create mode 100644 public/menus/Shwe Myittar.xlsx

diff --git a/Gemfile b/Gemfile
index 41682d12..6005cae2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,6 +52,7 @@ gem 'rubyzip', '= 1.0.0'
 gem 'axlsx', '= 2.0.1'
 gem 'axlsx_rails'
 gem 'roo'
+gem 'pdfjs_viewer-rails'
 #Reporting gem
 #gem 'compendium'
 #gem "cancan"
diff --git a/Gemfile.lock b/Gemfile.lock
index eee001d1..b7f4b2ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,6 +125,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
+    json (2.1.0)
     kaminari (1.0.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.0.1)
@@ -168,6 +169,10 @@ GEM
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     pdf-core (0.7.0)
+    pdfjs_viewer-rails (0.2.0)
+      json (> 1.8.4)
+      rails (> 4.2.0)
+      sass-rails (~> 5.0)
     pg (0.21.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
@@ -333,6 +338,7 @@ DEPENDENCIES
   momentjs-rails
   mysql2 (>= 0.3.18, < 0.5)
   nested_form
+  pdfjs_viewer-rails
   pg
   prawn
   prawn-table
diff --git a/Main Menu.xlsx b/Main Menu.xlsx
deleted file mode 100644
index 94c703382ba6733020ef9e02db8febb2b38c130b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3997
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

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 49ef043e..fdea26b8 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -2,37 +2,56 @@
 $(function() { 
  
   $(".nav-item").on("click", function(){
- 	type = $(this).attr("data-type");
- 	if (type == "pending") {
- 	  $('#accepted').text("Accepted");
- 	  $('#accepted').attr("data-value","accepted");
- 	}else if(type == "processing"){
- 		$('#accepted').text("SEND TO KITCHEN");
- 		$('#accepted').attr("data-value","processed");
- 	}else if(type == "delivery"){
- 		$('#accepted').text("READY TO DELIVERY");
- 		$('#accepted').attr("data-value","delivery");
- 	}else if(type == "completed"){
- 		$('#accepted').text("PICK-UP");
- 		$('#accepted').attr("data-value","completed");
- 	}
- 	console.log(type)
+   	type = $(this).attr("data-type");
+    refreshDetailData();
+   	if (type == "pending") {
+      $(".first-1").click();
+   	  $('#accepted').text("Accepted");
+   	  $('#accepted').attr("data-value","accepted");
+   	}else if(type == "processing"){
+      $(".second-1").click();
+   		$('#accepted').text("SEND TO KITCHEN");
+   		$('#accepted').attr("data-value","processed");
+   	}else if(type == "delivery"){
+      $(".third-1").click();
+   		$('#accepted').text("READY TO DELIVERY");
+   		$('#accepted').attr("data-value","delivery");
+   	}else if(type == "completed"){
+      $(".fourth-1").click();
+   		$('#accepted').text("PICK-UP");
+   		$('#accepted').attr("data-value","completed");
+   	}
+   	// console.log(type);
   });
 
   jQuery(function(){
-       jQuery('.first-1').click();
-    });
-
-  $(".custom-tr").on("click", function(){
- 	$(".custom-tr").removeClass("tr-active");
- 	$(this).addClass("tr-active");
-    var order_id  = $(this).attr("data-id");
-    var url       = "order_reservation/get_order/"+order_id;
-    show_order_detail(url);
+     jQuery('.first-1').click();
   });
 
- //show order list 
-  function show_order_detail(url){ 
+  $(".custom-tr").on("click", function(){
+ 	  $(".custom-tr").removeClass("tr-active");
+ 	  $(this).addClass("tr-active");
+    var order_id  = $(this).attr("data-id");
+    var sr_no = $(this).attr("data-sr-no");
+    var url       = "order_reservation/get_order/"+order_id;
+    show_order_detail(url,sr_no);
+  });
+
+  function refreshDetailData(){
+    $("#sr_number").text("");
+    $("#delivery_info").text("");
+    $("#contact_info").text("");
+    $('.summary-items').html("");
+    $('#sub_total').text("0.00");
+    $('#delivery_fee').text("0.00");
+    $('#total_charges').text("0.00");
+    $('#total_tax').text("0.00");
+    $('#grand_total').text("0.00");
+  }
+
+  //show order list 
+  function show_order_detail(url,sr_no){ 
+    $('.summary-items').html("");
     //Start Ajax
     $.ajax({      
       type: "GET",         
@@ -40,96 +59,131 @@ $(function() {
       data: {},
       dataType: "json",
       success: function(data) {
-      	var delivery = data["delivery"]
-      	var items    = data["order_items"]
+        // console.log(data);
+        var delivery = data["delivery"];
+        var items    = data["order_items"];
 
-      	var item_list = $('.summary-items');
+        var item_list = $('.summary-items');
         item_list.empty();
 
-        for(var i in items) {  
-        	var total = items[i].qty*items[i].unit_price;
-            row = '<tr>'
-                   +'<td width ="70%" class="body-td align-left">'+items[i].item_name
-                    +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
-                  +'</td>'
-                  +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
-                +'</tr>';
-              $('.summary-items').append(row);
+        if(items!=undefined && items!=""){
+          if(items.length > 0){
+            for(var i in items) { 
+              var item_price = 0;
+              if(items[i].price > 0){
+                item_price = items[i].price;
+              }else{
+                item_price = items[i].unit_price;
+              }
+              var total = items[i].qty * item_price;
+                row = '<tr>'
+                       +'<td width ="70%" class="body-td align-left">'+items[i].item_name
+                        +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
+                      +'</td>'
+                      +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
+                    +'</tr>';
+                  $('.summary-items').append(row);
+            }
+
+            $('#sub_total').text(data.total_amount);
+            $('#delivery_fee').text(delivery.delivery_fee);
+            $('#total_charges').text(0);
+            $('#total_tax').text(data.total_tax);
+            $('#grand_total').text(data.grand_total);
+
+            var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")"
+            $('#customer_name').text(data.customer_name);
+            $('#phone').text(data.phone);
+            $('#address').text(address);
+            $('#delivery_to').text(delivery.provider);
+
+            $('#ref_no').text(data.transaction_ref);
+            $('#callback_url').text(data.callback_url);
+            $('#order_id').text(data.order_reservation_id);
+
+            if(delivery.provider == "direct_delivery"){
+              $("#delivery_info").text("(DELIVERY)");
+            }else if(delivery.provider == "self_pick_up"){
+              $("#delivery_info").text("(PICK-UP)");
+            }
+
+            if(data.order_remark!=null && data.order_remark!=""){
+              $("#order_remark").text(data.order_remark);
+            }else if(data.reservation_remark!=null && data.reservation_remark!=""){
+              $("#order_remark").text(data.reservation_remark);
+            }
+            $("#sr_number").text("No."+sr_no);
+            $("#contact_info").text();
+          }
         }
-
-      	$('#sub_total').text(data.total_amount);
-      	$('#delivery_fee').text(delivery.delivery_fee);
-      	$('#total_charges').text(0);
-      	$('#total_tax').text(data.total_tax);
-      	$('#grand_total').text(data.grand_total);
-
-      	var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")"
-      	$('#customer_name').text(data.customer_name);
-      	$('#phone').text(data.phone);
-      	$('#address').text(address);
-      	$('#delivery_to').text(delivery.provider);
-
-      	$('#ref_no').text(data.transaction_ref);
-      	$('#callback_url').text(data.callback_url);
-      	$('#order_id').text(data.order_reservation_id);
       }
     });
     //end Ajax 
   }
 
   $("#accepted").on("click", function(){
- 	var status    = $(this).attr("data-value");
+    var status    = $(this).attr("data-value");
     var order_id  = $('#order_id').text();
-    var url       = 'order_reservation/update';
+    var ref_no    = $('#ref_no').text();
     var callback  = $('#callback_url').text();
-	    $.ajax({      
-	      type: "POST",         
-	      url: url, 
-	      data: {'order_id': order_id, 'status': status},
-	      dataType: "json",
-	      success: function(data) {
-	      	console.log(data)
-	      	if (data.status) {
-	      		// callback_url(callback,data.message)
-	      		swal("Information","Order has been +'data.status'+","success");
-	      		window.location.href = '/origami/order_reservation';
-	      	}
-	      }
-	    });
+    callback_url(callback,ref_no,order_id,status);
   });
 
   $("#cancel").on("click", function(){
- 	var status    = $(this).attr("data-value");
+    var status    = $(this).attr("data-value");
     var order_id  = $('#order_id').text();
-    var url       = 'order_reservation/update';
     var callback  = $('#callback_url').text();
-	    $.ajax({      
-	      type: "POST",         
-	      url: url, 
-	      data: {'order_id': order_id, 'status': status},
-	      dataType: "json",
-	      success: function(data) {
-	      	console.log(data)
-	      	if (data.status) {
-	      		console.log(data)
-	      		// callback_url(callback,data.message)
-	      		swal("Information","Order has been +'data.status'+","warning");
-	      		window.location.href = '/origami/order_reservation';
-	      	}
-	      }
-	    });
+    var ref_no    = $('#ref_no').text();
+    callback_url(callback,ref_no,order_id,status);
   });
 
-  function callback_url(url,message){ 
+  function callback_url(callback,ref_no,order_id,status){ 
+    var url       = 'order_reservation/update';
+    var post_url = "order_reservation/send_status";
     $.ajax({      
       type: "POST",         
-      url: url, 
-      data: {},
+      url: post_url, 
+      data: {url: callback, ref_no: ref_no, status: status},
       dataType: "json",
       success: function(data) {
-
+        if(data.status){
+          $.ajax({      
+            type: "POST",         
+            url: url, 
+            data: {'order_id': order_id, 'status': status},
+            dataType: "json",
+            success: function(data) {
+              console.log(data);
+              if (data.status) {
+                swal({
+                  title: 'Information',
+                  text: "Order has been "+data.message,
+                  type: 'success',
+                  html: true,
+                  closeOnConfirm: false,
+                  closeOnCancel: false,
+                  allowOutsideClick: false
+                }, function () {
+                  window.location.href = '/origami/order_reservation';
+                });
+              }
+            }
+          });
+        }else{
+          swal({
+            title: 'Oops',
+            text: data.message,
+            type: 'error',
+            html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+          }, function () {
+            window.location.href = '/origami/order_reservation';
+          });
+        }
       }
     });
   }
+});
 
-});
\ No newline at end of file
diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb
index 973fc159..2340abd4 100755
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -1,7 +1,7 @@
 class Api::ApiController < ActionController::API
   include TokenVerification
 
-  before_action :lookup_domain
+  # before_action :lookup_domain
   helper_method :current_token, :current_login_employee, :get_cashier
 
   private
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index 2c17e258..f8602ded 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -13,12 +13,12 @@ module TokenVerification
     authenticate_token || render_unauthorized
   end
 
-  def authenticate_token    
+  def authenticate_token      
     authenticate_with_http_token do |token, options|           
       # Rails.logger.debug "token - " + token.to_s
       if(options.length !=0 && options["from"] == "DOEMAL")
         if(ENV["SERVER_MODE"] === "cloud")
-          from = request.subdomain.downcase  + "." + request.domain.downcase            
+          from = "local" #request.subdomain.downcase  + "." + request.domain.downcase            
           aes = MyAesCrypt.new
           return aes.checkKeyForAuth(from, token)  
         end
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index fefb973e..537703a1 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -169,6 +169,8 @@ class Origami::CustomersController < BaseOrigamiController
           sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_id, action_by,remark,"PAYBYACCOUNT" )
         end
         @out = membership_data
+
+        render json: JSON.generate({:status => membership_data["status"], :message => membership_data["message"]})
       end
     end
   end
diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index 448b39dd..586403f9 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -4,32 +4,32 @@ class Origami::DingaController < BaseOrigamiController
      payment_method = params[:payment_method]
      @cashier_type   = params[:type]
      @membership_rebate_balance=0
-     sale_data = Sale.find_by_sale_id(@sale_id)
-     @receipt_no = sale_data.receipt_no
+     @sale_data = Sale.find_by_sale_id(@sale_id)
+     @receipt_no = @sale_data.receipt_no
      @shop        = Shop.first 
           # if @shop.is_rounding_adj
-          #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+          #      new_total    = Sale.get_rounding_adjustment(@sale_data.grand_total)
           # else
-          #     new_total    = sale_data.grand_total
+          #     new_total    = @sale_data.grand_total
           # end
-          # @rounding_adj = new_total-sale_data.grand_total  
-          @rounding_adj = sale_data.rounding_adjustment  
+          # @rounding_adj = new_total-@sale_data.grand_total  
+          @rounding_adj = @sale_data.rounding_adjustment  
 
           @payparcount = 0
           others = 0
-          sale_data.sale_payments.each do |sale_payment|
+          @sale_data.sale_payments.each do |sale_payment|
             if sale_payment.payment_method == "dinga"
               @payparcount = @payparcount + sale_payment.payment_amount
             else
               others = others + sale_payment.payment_amount
             end
           end
-          @payment_prices = sale_data.grand_total - @payparcount -others
+          @payment_prices = @sale_data.grand_total - @payparcount -others
 
 
-          if sale_data
-            if sale_data.customer_id
-             customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+          if @sale_data
+            if @sale_data.customer_id
+             customer_data= Customer.find_by_customer_id(@sale_data.customer_id)
              if customer_data
               @membership_id = customer_data.membership_id
               if !@membership_id.nil?
@@ -73,6 +73,7 @@ def create
  cash = params[:payment_amount]
  sale_id = params[:sale_id]
  transaction_ref = params[:transaction_ref]
+ account_no = params[:account_no]
  if(Sale.exists?(sale_id))
    saleObj = Sale.find(sale_id)
    shop_details =  Shop.first 
@@ -85,7 +86,7 @@ def create
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",transaction_ref)
+      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no)
       if status == true
         @out = true, "Success!"
       else
diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index a90e755b..562eaaed 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -7,22 +7,29 @@ class Origami::OrderReservationController < BaseOrigamiController
   def update
   	@id     = params[:order_id]
   	@status = params[:status]
-  	@order  = OrderReservation.find(@id)
+  	@order_reservation  = OrderReservation.find(@id)
 
   	status = true
 
   	if status
   		if @status == "processed"
-  			OrderReservation.create_doemal_order(@order)
-  		else
+  			result = OrderReservation.create_doemal_order(@order_reservation,current_user)
+  		elsif @status == "delivery"
+        OrderReservation.update_order_reservation(@id, nil, "ready_to_delivery")
+        response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"ready_to_delivery")
+        result = {:status=> true, :message => "ready for delivery" }
+      elsif @status == "completed"
+        result = OrderReservation.update_doemal_payment(@order_reservation,current_user)
+      else
   			if @status == "cancel"
-  			    result = {:status=> true, :message => "cancelled" }
+          OrderReservation.update_order_reservation(@id, nil, "cancelled")
+  			  result = {:status=> true, :message => "rejected" }
 	  		else
+          OrderReservation.update_order_reservation(@id, nil, "accepted")
 	  			result = {:status=> true, :message => "accepted" }
 	  		end
-	        render :json => result.to_json
   		end
-  		
+  		render :json => result.to_json
     else
     	result = {:status=> false, :message => "Order not accepted !" }
         render :json => result.to_json
@@ -36,5 +43,16 @@ class Origami::OrderReservationController < BaseOrigamiController
     end
   end
 
+  def send_status
+    if params[:status] == "cancel"
+      status = "rejected"
+    else
+      status = params[:status]
+    end
+
+    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
+
+    render :json => response
+  end
 
 end
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 65af0c3b..1321cf87 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -73,6 +73,8 @@ def create
  cash = params[:payment_amount]
  sale_id = params[:sale_id]
  transaction_ref = params[:transaction_ref]
+ account_no = params[:account_no]
+ puts params.to_json  
  if(Sale.exists?(sale_id))
    saleObj = Sale.find(sale_id)
    shop_details =  Shop.first 
@@ -86,7 +88,7 @@ def create
 
 	      # saleObj = Sale.find(sale_id)
 	      sale_payment = SalePayment.new
-	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",transaction_ref)
+	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
         if status == true
           @out = true, "Success!"
         else
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 0264084c..bc92a959 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -167,8 +167,9 @@ class Settings::MenusController < ApplicationController
       # end
     end
 
-    p.serialize("tmp/menus/" + menu.name + ".xlsx")
-    render :json => {status: true}
+    file_path = "public/menus/" + menu.name + ".xlsx"
+    p.serialize(file_path)
+    render :json => { status: true, path: file_path }
   end
 
   def import
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 3eb51a24..c380f24b 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -354,6 +354,11 @@ class Customer < ApplicationRecord
 
   #new customer for doemal
   def self.addCustomer(params)
+    if params[:gender] == "female"
+      gender = "Female"
+    else
+      gender = "Male"
+    end
     customer = Customer.new
     customer.name             = params[:name]
     customer.email            = params[:email]
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 8bf616c9..28b23c76 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -160,7 +160,7 @@ class Menu < ApplicationRecord
               account = Account.create({title: row["Account"], account_type: "0"})
             end
 
-            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by)
+            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", is_sub_item: 0, is_available: 1, created_by: created_by)
           # else
           #   status = status + "Item Code already exists for " + row["Item Name"] + "."
           end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index e23f852e..2fa99cf4 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -7,13 +7,18 @@ class OrderReservation < ApplicationRecord
 	has_many :order_reservation_items
 	belongs_to :delivery
 
+	SEND_TO_KITCHEN = "send_to_kitchen"
+	READY_TO_DELIVERY = "ready_to_deliver"
+	DELIVERED = "delivered"
+	COMPLETED = "completed"
+
 	def self.addOrderReservationInfo(params)
 		check_order_reservation = OrderReservation.where("transaction_ref = ?",params[:reference])
 		if check_order_reservation.empty?
 			order_reservation = OrderReservation.new
 			order_reservation.order_reservation_type = params[:order_type]
 			order_reservation.customer_id = params[:cus_info]
-			order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
+			order_reservation.requested_time = DateTime.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
 			order_reservation.callback_url = params[:callback_url]
 			order_reservation.transaction_ref = params[:reference]
 			if params[:order_info]
@@ -48,53 +53,204 @@ class OrderReservation < ApplicationRecord
 		end
 	end
 
-    def self.create_doemal_order(order)
-    
-    is_extra_time = false
-    extra_time = ''
+    def self.create_doemal_order(order,current_user)
+	    is_extra_time = false
+	    extra_time = ''
 
-    items_arr = []
-    count = 1
-    order.order_reservation_items.each { |i| 
-      i.item_instance_code = i.item_instance_code.downcase.to_s
-     
-        items = {"order_item_id": count,"item_instance_code": i.item_instance_code,"quantity": i.qty,"options": []}
-       count += 1
-       items_arr.push(items)
-     }
+	    items_arr = []
+	    count = 1
+	    order.order_reservation_items.each { |i| 
+	    	i.item_instance_code = i.item_instance_code.downcase.to_s
+	       	items = {"order_item_id": count,"item_instance_code": i.item_instance_code,"quantity": i.qty,"options": []}
+	       	count += 1
+	       	items_arr.push(items)
+	    }
 
-    puts items_arr.to_json
-    puts "sssssssssssssssssssssss"
-      customer_id = order.customer_id
+	    puts items_arr.to_json
+	    puts "sssssssssssssssssssssss"
+      	customer_id = order.customer_id
  
-    @order = Order.new
-    @order.source     = "doemal_order"
-    @order.order_type = "delivery"
-    @order.customer_id = customer_id
-    @order.items = items_arr
-    @order.guest = ''
-    @order.table_id = nil  # this is dining facilities's id
-    @order.new_booking = true
-    @order.waiters = current_login_employee.name
-    @order.employee_name = current_login_employee.name
+		@order = Order.new
+		@order.source     = "doemal_order"
+		@order.order_type = "delivery"
+		@order.customer_id = customer_id
+		@order.items = items_arr
+		@order.guest = ''
+		@order.table_id = nil  # this is dining facilities's id
+		@order.new_booking = true
+		@order.waiters = current_user.name
+		@order.employee_name = current_user.name
 
-    @order.is_extra_time = is_extra_time
-    @order.extra_time    = extra_time
+		@order.is_extra_time = is_extra_time
+		@order.extra_time    = extra_time
 
-     @status, @booking = @order.generate
+		@status, @booking = @order.generate
 
-      # Order.send_customer_view(@booking)
-    
-     
+      	# Order.send_customer_view(@booking)
         if @status && @booking
         
-          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
-          # for second display 
+          @status, @sale = Sale.request_bill(@order,current_user,current_user)
 
-          result = {:status=> @status, :data => @sale }
-          render :json => result.to_json
+          #order status send to doemal
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
+          #order reservation status updated
+          update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN)
+
+          result = {:status=> @status, :data => @sale, :message => "created" }
+          return result
         end
-      
+    end
+
+    def self.update_doemal_payment(order,current_user)
+    	if(Sale.exists?(order.sale_id))
+	      saleObj = Sale.find(order.sale_id)
+	      shop_details =  Shop.first 
+	      # rounding adjustment
+	      if shop_details.is_rounding_adj
+	        a = saleObj.grand_total % 25 # Modulus
+	        b = saleObj.grand_total / 25 # Division
+	        #not calculate rounding if modulus is 0 and division is even
+	        #calculate rounding if modulus is zero or not zero and division are not even
+	        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+	          new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+	          rounding_adj = new_total-saleObj.grand_total
+	          saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+	        end
+	      end
+	      #end rounding adjustment
+	      
+	      sale_payment = SalePayment.new
+	      sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash")
+
+	      #order status send to doemal
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
+          #order reservation status updated
+          update_order_reservation(order.id, saleObj.sale_id, DELIVERED)
+
+	      result = {:status=> true, :message => DELIVERED }
+          return result
+	      # rebate_amount = nil
+
+	      # For Cashier by Zone
+	      # bookings = Booking.where("sale_id='#{sale_id}'")
+
+	      # if bookings[0].dining_facility_id.to_i > 0
+	      #   table = DiningFacility.find(bookings[0].dining_facility_id)
+	      #   cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+	      #   cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+	      # else
+	      #   shift = ShiftSale.find(saleObj.shift_sale_id)
+	      #   cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+	      # end
+
+	      # For Print
+	      # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+	        # receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
+	        # unique_code = "ReceiptBillPdf"
+	        # if !receipt_bill_a5_pdf.empty?
+	        #   receipt_bill_a5_pdf.each do |receipt_bilA5|
+	        #     if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
+	        #       if receipt_bilA5[1] == '1'
+	        #         unique_code = "ReceiptBillA5Pdf"
+	        #       else
+	        #         unique_code = "ReceiptBillPdf"
+	        #       end
+	        #     end
+	        #   end
+	        # end
+
+	        # customer= Customer.find(saleObj.customer_id)
+
+	        # get member information
+	        # rebate = MembershipSetting.find_by_rebate(1)
+	        # credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote')
+	        
+	        # if customer.membership_id != nil && rebate && credit_data.nil?
+	        #   member_info    = Customer.get_member_account(customer)
+	        #   if member_info["status"] == true
+	        #     rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+	        #     current_balance = SaleAudit.paymal_search(sale_id)
+	        #   end
+	        # end
+	        
+	        #orders print out
+	        # if params[:type] == "quick_service"
+	        #   booking = Booking.find_by_sale_id(sale_id)
+	        #   if booking.dining_facility_id.to_i>0
+	        #     table_id = booking.dining_facility_id
+	        #   else
+	        #     table_id = 0
+	        #   end
+	          
+	        #   booking.booking_orders.each do |order|
+	        #     # Order.pay_process_order_queue(order.order_id, table_id)
+	        #     oqs = OrderQueueStation.new
+	        #     oqs.pay_process_order_queue(order.order_id, table_id)
+	        #   end
+	          
+	        # end
+
+	        #for card sale data
+	        # card_data = Array.new
+	        # card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
+	        # if !card_sale_trans_ref_no.nil? 
+	        #   card_sale_trans_ref_no.each do |cash_sale_trans|
+	        #     card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s
+	        #     card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s
+	        #     card_no = cash_sale_trans.pan.last(4)
+	        #     card_no = card_no.rjust(19,"**** **** **** ")
+	        #     card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
+	        #   end
+	        # end
+	        
+	        # 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)
+	        # filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+
+	        # render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
+
+	      #end
+	    end 
+    end
+
+    def self.send_status_to_ordering(url,ref_no,status)
+    	base_url = "http://192.168.1.186:3002"
+    	post_url = base_url + url
+
+    	begin
+	      response = HTTParty.post(post_url,
+	              :body => { id: ref_no, status: status}.to_json,
+	              :headers => {
+	                        'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ',
+	                        'Content-Type' => 'application/json',
+	                        'Accept' => 'application/json; version=3'
+	              }, :timeout => 10
+	        )
+	    rescue Net::OpenTimeout
+	        response = { status: false }
+
+	    rescue OpenURI::HTTPError
+	        response = { status: false}
+	    rescue SocketError
+	        response = { status: false}
+	    end
+		Rails.logger.debug "Get Doemal Status "
+		Rails.logger.debug response.to_json
+		return response
+    end
+
+    def self.update_order_reservation(id, sale_id, status)
+    	order_reservation  = OrderReservation.find(id)
+    	if sale_id.present?
+    		order_reservation.sale_id = sale_id
+    	end
+    	order_reservation.status = status
+    	order_reservation.save
     end
 
 	private
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 201a1b57..29d755d7 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -197,13 +197,14 @@ class SalePayment < ApplicationRecord
 
   def self.create_payment(paypar_url,token,membership_id,received_amount,sale_id)
       membership_actions_data = MembershipAction.find_by_membership_type("create_payment");
-
+      sale_data = Sale.find_by_sale_id(sale_id)
+      customer_data = Customer.find_by_customer_id(sale_data.customer_id)
       if !membership_actions_data.nil?
 
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
         merchant_uid = membership_actions_data.merchant_account_id
         auth_token = membership_actions_data.auth_token
-        sale_data = Sale.find_by_sale_id(sale_id)
+        
 
         if sale_data
           others = 0
@@ -211,14 +212,27 @@ class SalePayment < ApplicationRecord
               others = others + sale_payment.payment_amount
           end
           payment_prices = sale_data.grand_total - others
-          # Control for Paypar Cloud
-          begin
-            response = HTTParty.post(url,
-                  :body => { membership_id:membership_id,
+
+          if membership_id.to_i <= 0
+          membership_id  = customer_data.membership_id
+            params  = { membership_id:membership_id,
                             amount:received_amount,
                             receipt_no:sale_data.receipt_no,
                             merchant_uid:merchant_uid,
-                            auth_token:auth_token}.to_json,
+                            auth_token:auth_token}.to_json
+          else
+            params  = { account_no:membership_id,
+                            amount:received_amount,
+                            receipt_no:sale_data.receipt_no,
+                            merchant_uid:merchant_uid,
+                            auth_token:auth_token}.to_json
+          end
+
+          
+          # Control for Paypar Cloud
+          begin
+            response = HTTParty.post(url,
+                  :body => params,
                   :headers => {
                             'Content-Type' => 'application/json',
                             'Accept' => 'application/json; version=3'
@@ -242,7 +256,7 @@ class SalePayment < ApplicationRecord
         response =false;
       end
 
-      Rails.logger.debug "Payment response"
+      Rails.logger.debug "Create Payment response"
       Rails.logger.debug response.to_json
 
       return response;
@@ -390,9 +404,13 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     #Next time - validate if the vochure number is valid - within
-    customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+    # customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+    account_no = self.payment_reference
+    # if account_no.to_i <= 0
+    #   account_no  = customer_data.membership_id
+    # end
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
       remark = "#{membership_data} PayMal Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
@@ -433,9 +451,16 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     #Next time - validate if the vochure number is valid - within
-    customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+
+    # customer_data = Customer.find_by_customer_id(self.sale.customer_id)
+
+    account_no = self.payment_reference
+    # if account_no == 0
+    #   account_no  = customer_data.customer_id
+    # end
+
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
       remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index 6a4fc12b..1a7bd798 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -46,6 +46,8 @@
 					</div>
 				</div>
 			</div>
+			<p class="hidden" name="sale_id" id="sale_id" ><%=@sale_id %></p>
+			<p class="hidden" name="receipt_no" id="receipt_no" ><%=@sale_data.receipt_no %></p>
 			<!-- <% if @payparcount > 0 %>
 				<p class="">Last time rebate amount is <%= @payparcount %></p>
 			<% end %>
@@ -203,7 +205,7 @@
 					$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_dinga_path%>",
-						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:""},
+						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
 						success: function(result){
 							if(result.status == true){
 								swal({
@@ -239,6 +241,7 @@
     var membership_id = '';
     var membership_type = '';
     var sale_id     = $("#sale_id").text() || 0;
+    var receipt_no  = $("#receipt_no").text() || 0;
     var customer_mamber_card_no = 0;
 
     $("#is_paymemberModal").hide();
@@ -247,7 +250,6 @@
       getCardNo();
       $("#sxModal").hide();        
       customer_mamber_card_no = $("#paypar_account_no").val();
-      
       if(sale_id != 0 && customer_mamber_card_no != 0){    
         $.ajax({
           type: "POST",
@@ -255,6 +257,7 @@
           data: { account_no : customer_mamber_card_no, amount : payment_amount, receipt_no : receipt_no},
           dataType: "json",
           success: function(data) {
+          	console.log(data)
             if (data.status == true) {
             	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
             	$("#valid_amount").val(parseFloat(valid_amount));
@@ -262,8 +265,9 @@
               	$.ajax({
 					type: "POST",
 					url:  "<%=origami_payment_dinga_path%>",
-					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no :customer_mamber_card_no},
 					success: function(result){
+						console.log(result)
 						if(result.status == true){
 							swal({
 								title: "Information!",
@@ -273,7 +277,7 @@
 								closeOnCancel: false,
 								allowOutsideClick: false
 							}, function () {
-								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+								 window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
 							});
 
 						}else{
@@ -291,14 +295,14 @@
 					  closeOnCancel: false,
 					  allowOutsideClick: false
 					}, function () {
-					window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/DINGA";
+					 window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/DINGA";
 				});
             }
 
           }
         });                
       }
-    },100);
+     },100);
   });
 
   // Read NFC card no from java
@@ -321,9 +325,10 @@
 	    var customer_name = '';
 	    var membership_id = '';
 	    var membership_type = '';    
+	    var receipt_no  = $("#receipt_no").text() || 0;
 	    setTimeout(function(){
-	      code=getQRCode(); 
-	      if(sale_id != 0 && code != ""){    
+	      code=getQRCode();
+	      if(sale_id != 0 && code != ""){  
 	         $.ajax({
 	          type: "POST",
 	          url: "/origami/"+sale_id+"/send_account" ,
@@ -337,8 +342,9 @@
 	              	$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
+
 							if(result.status == true){
 								swal({
 									title: "Information!",
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 15af828f..ba735a1f 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -5,13 +5,13 @@
     <div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
       <ul class="nav nav-tabs tab-col-teal" role="tablist">
         <li class="nav-item active" data-color="#F44336" data-type="pending" style="background-color: #F44336;">
-          <a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">4</p> <%= t :pending %></a>
+          <a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">1</p> <%= t :pending %></a>
         </li>
         <li class="nav-item" data-color="#673AB7" data-type="processing" style="background-color: #673AB7;">
-          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :process %></a>
+          <a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">2</p> <%= t :processing %></a>
         </li>
         <li class="nav-item" data-color="#009688" data-type="delivery" style="background-color: #009688;">
-          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivery %></a>
+          <a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">3</p> <%= t :delivering %></a>
         </li>
         <li class="nav-item" data-color="#03A9F4" data-type="completed" style="background-color: #03A9F4;">
           <a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num">4</p> <%= t :completed %></a>
@@ -27,9 +27,9 @@
                   <% i=1
                    @order.each do |order| %>
                     <% if order.status == 'new' %>
-                      <tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>">
+                      <tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
-                           <%=i%>
+                          <%=i%>
                         </td>
                         <td width ="30%" class="align-center">
                            <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
@@ -38,7 +38,7 @@
                            <%=order.grand_total%>
                         </td>
                         <td width ="30%" class="align-center">
-                          <span class="font-10 col-blue"><%=order.status%></span>
+                          <span class="font-10 col-blue"><%= order.status %></span>
                         </td>
                       </tr>
                       <%i+=1%>
@@ -59,9 +59,9 @@
                   <% i=1
                    @order.each do |order| %>
                     <% if order.status == 'accepted' %>
-                      <tr class="custom-tr " style="" data-id="<%=order.order_reservation_id%>">
+                      <tr class="custom-tr second-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
-                           <%=i%>
+                          <%=i%>
                         </td>
                         <td width ="30%" class="align-center">
                            <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
@@ -89,8 +89,8 @@
                 <tbody>
                   <% i=1
                    @order.each do |order| %>
-                    <% if order.status == 'processed' %>
-                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                    <% if order.status == 'send_to_kitchen' %>
+                      <tr class="custom-tr third-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
                            <%=i%>
                         </td>
@@ -113,15 +113,15 @@
           </div>      
         </div>
         <!--- Panel 3 - Orders -->
-        <div class="tab-pane dining" id="delivery" role="tabpanel">
+        <div class="tab-pane dining" id="completed" role="tabpanel">
           <div class="card-block font-13">
             <div id="menu-slimscroll" data-height="50">
               <table class="table table-stripe custom-table">
                 <tbody>
                   <% i=1
                    @order.each do |order| %>
-                    <% if order.status == 'completed' %>
-                      <tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
+                    <% if order.status == 'ready_to_delivery' %>
+                      <tr class="custom-tr fourth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
                         <td width ="5%" class="align-left">
                            <%=i%>
                         </td>
@@ -153,10 +153,10 @@
             <table class="table">
               <tr>
                 <td width ="70%" class="header-td align-left">
-                <b class="col-pink font-16">No.11</b> 
-                    <span class="font-13">(DELIVERY)</span>
+                <b class="col-pink font-16"><span id="sr_number"></span> </b> 
+                    <span class="font-13"><span id="delivery_info"></span></span>
                 </td>
-                <td width ="30%" class="header-td font-16 align-right"><b>0065 4321</b></td>
+                <td width ="30%" class="header-td font-16 align-right"><b><span id="contact_info">0065 4321</span></b></td>
               </tr>
             </table>
           </div>
@@ -214,6 +214,9 @@
                 </td>
                 <td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
               </tr>
+              <tr>
+                <td colspan="2" id="order_remark"></td>
+              </tr>
               <tr>
                 <td width ="50%" class="footer-td align-left col-blue">
                   <button type="button" class="btn btn-lg bg-red waves-effect" id="cancel" data-value="cancel">
@@ -285,10 +288,10 @@
     </div>
   </div>
 </div>
-<p id="ref_no"></p>
-<p id="callback_url"></p>
-<p id="order_id"></p>
-<p id="status"></p>
+<p id="ref_no" class="hidden"></p>
+<p id="callback_url" class="hidden"></p>
+<p id="order_id" class="hidden"></p>
+<p id="status" class="hidden"></p>
 <script type="text/javascript">
   jQuery(function(){
        jQuery('.first-1').click();
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index d92f162a..6818fbad 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -14,6 +14,8 @@
 			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
 					<input type="hidden" name="receipt_no" id="receipt_no" value="<%= @receipt_no%>">
+					<p class="hidden" name="sale_id" id="sale_id" ><%=@sale_id %></p>
+					<p class="hidden" name="membership_id" id="membership_id" ><%=@membership_id %></p>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label class="">You can pay up to </label>
@@ -204,7 +206,7 @@
 					$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:""},
+						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
 						success: function(result){
 							if(result.status == true){
 								swal({
@@ -237,6 +239,7 @@
     var cardNo = ""; 
     var sale_id     = $("#sale_id").text() || 0;
     var receipt_no = $("#receipt_no").val() || "";
+
     var customer_mamber_card_no = 0;
     var payment_amount = parseFloat($("#used_amount").text());
 
@@ -246,8 +249,10 @@
       getCardNo();
       $("#sxModal").hide();        
       customer_mamber_card_no = $("#paypar_account_no").val();
-      
-      if(sale_id != 0 && customer_mamber_card_no != 0){    
+      if (customer_mamber_card_no == 0) {
+      	customer_mamber_card_no = $("#membership_id").text() || 0;
+      }
+      if(sale_id != 0 && customer_mamber_card_no !=0){ 
         $.ajax({
           type: "POST",
           url: "/origami/"+sale_id+"/send_account" ,
@@ -261,7 +266,7 @@
               	$.ajax({
 					type: "POST",
 					url:  "<%=origami_payment_paymal_path%>",
-					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+					data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:customer_mamber_card_no},
 					success: function(result){
 						if(result.status == true){
 							swal({
@@ -296,8 +301,10 @@
 
           }
         });                
+      }else{
+      	swal("Opp","Please Check Member","warning")
       }
-    },100);
+     },100);
   });
 
   // Read NFC card no from java
@@ -321,6 +328,7 @@
 	    var payment_amount = parseFloat($("#used_amount").text());
 	    setTimeout(function(){
 	      code=getQRCode(); 
+	      alert(code)
 	      if(sale_id != 0 && code != ""){    
 	         $.ajax({
 	          type: "POST",
@@ -335,8 +343,9 @@
 	              	$.ajax({
 						type: "POST",
 						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref},
+						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
+							alert(result)
 							if(result.status == true){
 								swal({
 									title: "Information!",
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 2cf6fea5..d4d44046 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -168,15 +168,15 @@
         <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
       </div>
       <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0 && @unionpaycount == 0.0 && @alipaycount == 0.0 && @paymalcount == 0.0 && @junctionpaycount == 0.0 && @dingacount == 0.0 %>
-      <div class="row payment other-payment-color" id="card_payment" >
-        <div class="col-md-8">Other Payments</div>
-        <div class="col-md-4" id="others"><%= number_with_precision(@other, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
-      </div>
+        <div class="row payment other-payment-color" id="card_payment" >
+          <div class="col-md-8">Other Payments</div>
+          <div class="col-md-4" id="others"><%= number_with_precision(@other, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
+        </div>
       <% else %>
-      <div class="row payment other-payment-color" id="card_payment"  >
-        <div class="col-md-8">Other Payments</div>
-        <div class="col-md-4" id=""><%= number_with_precision(@other_payment, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
-      </div>
+        <div class="row payment other-payment-color" id="card_payment"  >
+          <div class="col-md-8">Other Payments</div>
+          <div class="col-md-4" id=""><%= number_with_precision(@other_payment, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %></div>
+        </div>
       <% end %>
     </div>
     <div class="card-block">
@@ -269,12 +269,11 @@
             <div class="col-md-4" id="paymalcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
-
         <!-- DINGA -->
         <div class="row <%= @dingacount!=0.0 ? 'payment others-color'  : 'hidden'%>">
           <div class="col-md-5"></div>
           <div class="col-md-3">DINGA</div>
-          <% if @paymalcount != 0.0 %>
+          <% if @dingacount != 0.0 %>
             <div class="col-md-4 master is_card" id="dingacount"><%= number_with_precision(@dingacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
           <% else %>
             <div class="col-md-4" id="dingacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
@@ -635,6 +634,8 @@ var customer_name = "<%= @customer.name %>";
             if (credit <= 0) {
               calculate_member_discount(sale_id);
             }
+
+            $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",
@@ -655,13 +656,14 @@ var customer_name = "<%= @customer.name %>";
                   var msg = '';
                 }
 
-                $("#loading_wrapper" ).hide();
+                $("#loading_wrapper" ).hide();                
 
                 //PDF lightbox data
+                var pdfPath = "/en/pdfjs/minimal?file=" + result.filename.substring(6);
                 $("#sale_receipt_no").val(result.receipt_no);
                 $("#filename").val(result.filename);
                 $("#printer_name").val(result.printer_name);
-                $("#receipt_pdf").attr("src", result.filename.substring(6));
+                $("#receipt_pdf").attr("src", pdfPath);
                 $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
                 $("#pdfModalLabel").text("Sale Completed");
                 $("#changed_amount").text("");
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index d8e37899..8eeb5269 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -115,7 +115,8 @@
           url: "/settings/menus/" + menu_id + "/export",
           success: function(result){
             if(result.status){
-              swal("Success", "Export Success...", "success");
+              location.href = result.path.substring(6);
+              // swal("Success", "Export Success...", "success");
             }
           }
         });
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b2862dd2..cdce1df7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -75,6 +75,10 @@ en:
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"
 
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 3a025eaf..aba51ed5 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -70,6 +70,10 @@ mm:
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"
   
   views:
     btn:       
diff --git a/config/routes.rb b/config/routes.rb
index 935cdfba..bd1d8921 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,8 @@ scope "(:locale)", locale: /en|mm/ do
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
+  mount PdfjsViewer::Rails::Engine => "/pdfjs", as: 'pdfjs'
+
   # Action Cable Creation
   # if ENV["SERVER_MODE"] !=  "cloud"
     mount ActionCable.server => "/cable"
@@ -268,7 +270,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :order_reservation
     get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
     post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
-
+    post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' }
   end
 
   #--------- Waiter/Ordering Station ------------#
diff --git a/config/secrets.yml b/config/secrets.yml
index 6e8b73d4..b0d7c5c8 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -24,7 +24,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+  sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
diff --git a/config/shops.json b/config/shops.json
index b3369529..65755243 100644
--- a/config/shops.json
+++ b/config/shops.json
@@ -3,8 +3,15 @@
     {
       "lookup": "local",
       "value": {
-      	"key": "999d675168d813d5e1c7",
-      	"iv": "999d675168d813d5e1c7"
+        "key": "999d675168d813d5e1c7",
+        "iv": "999d675168d813d5e1c7"
+      }
+    },
+    {
+      "lookup": "demo10.pos-myanmar.com",
+      "value": {
+        "key": "634W2ioj6QA88vafKamHBRu5aKX/BLIPdTWuuXGFBsA=\n",
+        "iv": "QqpO/h7o60dYTbNETRbZ4g==\n"
       }
     }
   ]
diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb
index f18a2c1c..bd19a8cf 100755
--- a/db/migrate/20170626191519_create_shift_sales.rb
+++ b/db/migrate/20170626191519_create_shift_sales.rb
@@ -21,7 +21,7 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
       t.integer :dining_count, :default => 0
       t.integer :takeaway_count, :default => 0
       t.integer :member_count, :default => 0
-      t.decimal :total_rounding,, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_rounding, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.integer :total_receipt, :default => 0
       t.decimal :total_void, :default => 0
       t.timestamps
diff --git a/public/menus/Main Menu.xlsx b/public/menus/Main Menu.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a35944b08060038e4423411b423ca20df5ba36cc
GIT binary patch
literal 4375
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
K#{V__$?9LlKY1_!

literal 0
HcmV?d00001

diff --git a/public/menus/Shwe Myittar.xlsx b/public/menus/Shwe Myittar.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5cd9d6b903be9a4a4aa41d6b779d9174911c1195
GIT binary patch
literal 3942
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

literal 0
HcmV?d00001


From 635db2e0110ecfc539777a30057290552cc8d363 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 13:59:50 +0630
Subject: [PATCH 623/651] update rake receipt file

---
 db/migrate/20180306044939_create_receipts.rb |  2 +-
 lib/tasks/clear_data.rake                    | 20 ++---------
 lib/tasks/receipt.rake                       | 38 +++++++++++---------
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/db/migrate/20180306044939_create_receipts.rb b/db/migrate/20180306044939_create_receipts.rb
index 22f3b0fa..7e1df523 100644
--- a/db/migrate/20180306044939_create_receipts.rb
+++ b/db/migrate/20180306044939_create_receipts.rb
@@ -5,7 +5,7 @@ class CreateReceipts < ActiveRecord::Migration[5.1]
       t.string  :client_name, :null => false
       t.string  :shop_code, :limit => 16, :null => false
       t.string  :shop_name, :null => false
-      t.integer :receipt_no, :limit => 8, :null => false
+      t.integer :receipt_no, :null => false
       t.datetime  :transaction_time, :null => false
       t.datetime  :receipt_open_time, :null => false
       t.datetime  :receipt_close_time, :null => false
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 247992be..508fcd8c 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -1,23 +1,9 @@
 namespace :clear do
   desc "Clear Data"
   task :data => :environment do
-    BookingOrder.delete_all
-    Booking.delete_all
-    OrderItem.delete_all
-    AssignedOrderItem.delete_all
-    Order.delete_all
-    SaleOrder.delete_all
-    SaleItem.delete_all
-    Sale.delete_all
-    SaleTax.delete_all
-    SaleAudit.delete_all
-    SalePayment.delete_all
-    ShiftSale.delete_all
-    PaymentJournal.delete_all
-    Survey.delete_all
-    DiningFacility.update_all(status:'available')
-    CashierTerminal.update_all(is_currently_login: 0)
-    SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
+   
+    Receipt.delete_all
+    ReceiptDetail.delete_all
     puts "Clear Data Done."
   end
 
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index fa24f481..23f57896 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -3,18 +3,22 @@ namespace :consolidate do
   task :receipt => :environment do
     Receipt.delete_all
     sales = Sale.all_receipts
-   
+
     shop  = Shop.find(1)
     sales.each do |sale|
+     shift = ShiftSale.find(sale.shift_sale_id)
       receipt = Receipt.new
-      receipt.client_code         = shop.id
-      receipt.client_name         = shop.id
-      receipt.shop_code           = shop.id
-      receipt.shop_name           = shop.id
+      receipt.client_code         = shop.client_code
+      receipt.client_name         = shop.client_name
+      receipt.shop_code           = shop.shop_code
+      receipt.shop_name           = shop.name
       receipt.receipt_no          = sale.receipt_no
       receipt.transaction_time    = sale.requested_at #requet-at
       receipt.receipt_open_time   = sale.requested_at #before disco/after tax /after/ser_char
       receipt.receipt_close_time  = sale.receipt_close_time
+      receipt.shift_id            = sale.shift_sale_id
+      receipt.shift_open_time     = shift.shift_started_at
+      receipt.shift_close_time    = shift.shift_closed_at
       receipt.gross_sales         = sale.total_amount + sale.total_tax #before disco/after tax /after/ser_char
       receipt.discount_amount     = sale.total_discount + sale.item_discount
       receipt.sales               = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn
@@ -96,10 +100,10 @@ namespace :consolidate do
         if sale_id != sale.sale_id && count !=0 
 
           receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = @receipt_no
           receipt.receipt_date        = @requested_at #requet-at
           receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
@@ -145,10 +149,10 @@ namespace :consolidate do
         
         discount_amount = (sale.status=="Discount") ? sale.price : 0
           receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = sale.receipt_no
           receipt.receipt_date        = sale.requested_at #requet-at
           receipt.transaction_date    = sale.requested_at #before disco/after tax /after/ser_char
@@ -195,10 +199,10 @@ namespace :consolidate do
     
     if count == sale_count
       receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = @receipt_no
           receipt.receipt_date        = @requested_at #requet-at
           receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char

From 652251f2439b78c5584019b377b1099589c3b020 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 15:00:48 +0630
Subject: [PATCH 624/651] update rake file

---
 lib/tasks/clear_data.rake | 18 +++++++++++++++++-
 lib/tasks/receipt.rake    |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 508fcd8c..cd4fec49 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -1,7 +1,23 @@
 namespace :clear do
   desc "Clear Data"
   task :data => :environment do
-   
+    BookingOrder.delete_all
+    Booking.delete_all
+    OrderItem.delete_all
+    AssignedOrderItem.delete_all
+    Order.delete_all
+    SaleOrder.delete_all
+    SaleItem.delete_all
+    Sale.delete_all
+    SaleTax.delete_all
+    SaleAudit.delete_all
+    SalePayment.delete_all
+    ShiftSale.delete_all
+    PaymentJournal.delete_all
+    Survey.delete_all
+    DiningFacility.update_all(status:'available')
+    CashierTerminal.update_all(is_currently_login: 0)
+    SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
     Receipt.delete_all
     ReceiptDetail.delete_all
     puts "Clear Data Done."
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index 23f57896..d23efea6 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -6,6 +6,7 @@ namespace :consolidate do
 
     shop  = Shop.find(1)
     sales.each do |sale|
+      puts sale.to_json
      shift = ShiftSale.find(sale.shift_sale_id)
       receipt = Receipt.new
       receipt.client_code         = shop.client_code

From 3db2db093b9d9766c8754886d3a3c6614ce5f597 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 19 Apr 2018 15:17:59 +0630
Subject: [PATCH 625/651] menu export import update and print setting update

---
 app/controllers/settings/menus_controller.rb |  32 +++++++++++++++++--
 app/models/menu.rb                           |  26 +++++++++++++--
 app/views/origami/payments/show.html.erb     |  10 ++----
 app/views/print_settings/_form.html.erb      |   2 +-
 public/menus/Main Menu.xlsx                  | Bin 4375 -> 4585 bytes
 5 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index bc92a959..f73226f4 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -99,11 +99,39 @@ class Settings::MenusController < ApplicationController
         sheet.add_row ["Name",menu.name], :style=>title                
         sheet.add_row
 
-        sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Instance Code", "Instance Name", "Price"], :style=>header_text  
+        sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Attributes", "Options", "Instance Code", "Instance Name", "Price", "Is Default"], :style=>header_text  
         menu.menu_categories.each do |mc|
           mc.menu_items.each do |mi|
+            attributes = ""
+            i=0            
+            if mi.item_attributes.length > 0
+              mi.item_attributes.each do |mia|
+                attribute = MenuItemAttribute.find(mia)
+                if i == mi.item_attributes.length - 1
+                  attributes = attributes + attribute.name
+                else
+                  attributes = attributes + attribute.name + ","
+                end  
+                i = i + 1               
+              end
+            end
+
+            options = ""
+            i=0
+            if mi.item_options.length > 0
+              mi.item_options.each do |mia|
+                option = MenuItemOption.find(mia)
+                if i == mi.item_options.length - 1
+                  options = options + option.name
+                else
+                  options = options + option.name + ","
+                end  
+                i = i + 1              
+              end
+            end
+
             mi.menu_item_instances.each do |mii|
-              sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, mii.item_instance_code, mii.item_instance_name, mii.price], :style=>wrap_text
+              sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, attributes, options, mii.item_instance_code, mii.item_instance_name, mii.price, mii.is_default], :style=>wrap_text
             end
           end
         end
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 28b23c76..6d7e9cbe 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -153,6 +153,28 @@ class Menu < ApplicationRecord
           #   status = status + "Category Code already exists."
           end
 
+          # Menu Item Attributes
+          item_attrs = []
+          attributes = row["Attributes"].split(',')
+          attributes.each do |attr|            
+            attribute = MenuItemAttribute.find_by_name(attr)
+            if attribute.nil?
+              attribute = MenuItemAttribute.create({ attribute_type:"any", name: attr.capitalize, value: attr.downcase })
+            end
+            item_attrs.push(attribute.id)
+          end
+
+          # Menu Item Options
+          item_opts = []
+          options = row["Options"].split(',')
+          options.each do |opt|
+            option = MenuItemOption.find_by_name(opt)
+            if option.nil?
+              option = MenuItemOption.create({ option_type:"any", name: opt.capitalize, value: opt.downcase })
+            end
+            item_opts.push(option.id)
+          end
+
           menu_itm = MenuItem.find_by_item_code(row["Item Code"]) 
           if !menu_itm
             account = Account.find_by_title(row["Account"])
@@ -160,14 +182,14 @@ class Menu < ApplicationRecord
               account = Account.create({title: row["Account"], account_type: "0"})
             end
 
-            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", is_sub_item: 0, is_available: 1, created_by: created_by)
+            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: item_attrs, item_options: item_opts, is_sub_item: 0, is_available: 1, created_by: created_by)
           # else
           #   status = status + "Item Code already exists for " + row["Item Name"] + "."
           end
 
           menu_inst = MenuItemInstance.find_by_item_instance_code(row["Instance Code"]) 
           if !menu_inst
-            imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: "[]", price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: false)
+            imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: [], price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: row["Is Default"])
           # else
           #   status = status + "Instance Code already exists for " + row["Instance Name"] + "."
           end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index d5ac5bb8..f31341d9 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -433,12 +433,9 @@
         </div>
       </div>
       <div class="modal-footer ">
-        <div class="row m-b-10 m-r-30">
-          
-          <div class="col-md-5 m-r-20">
-            <% if ENV["SERVER_MODE"] != "cloud" %>
-              <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
-            <% end %>  
+        <div class="row m-b-10 m-r-30">          
+          <div class="col-md-5 m-r-20">            
+              <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>            
           </div>
           
           <div class="col-md-5 m-r-20">
@@ -1049,7 +1046,6 @@ var customer_name = "<%= @customer.name %>";
             url: "/origami/sale/"+sale_id+"/"+cashier_type+"/payment/print",
             data: params,
             success:function(result){
-              console.log(result);
               // For Server Print - from jade
                  if ($("#server_mode").val() == "cloud") {
                   code2lab.printFile(result.filepath.substr(6), result.printer_url);
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index e07da111..ae1f90c1 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -16,7 +16,7 @@
           <% if(@server_mode != 'cloud') %>
             <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
           <% else %>
-            <%= f.input :printer_name %>
+            <%= f.input :printer_name, :as => :select, :collection => [] %>
           <% end %>
           <%= f.input :brand_name %>
           <%= f.input :printer_type %>
diff --git a/public/menus/Main Menu.xlsx b/public/menus/Main Menu.xlsx
index a35944b08060038e4423411b423ca20df5ba36cc..2987ce8986a0cb975aca8635c3972fecdc96eca0 100644
GIT binary patch
delta 1891
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

delta 1680
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
a7EntC1^@s600{sI08Rn`0J9DN0001@Gb3jJ


From f8a247c61a56787926d4029f160aca7a1d8ed107 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 19 Apr 2018 15:41:22 +0630
Subject: [PATCH 626/651] print pdf btn ui change

---
 app/views/origami/payments/show.html.erb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 0641a6a3..334beea9 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -432,16 +432,12 @@
           <iframe id="receipt_pdf" src="" class="pdf-iframe" scrolling="no"></iframe>
         </div>
       </div>
-      <div class="modal-footer ">
-        <div class="row m-b-10 m-r-30">          
-          <div class="col-md-5 m-r-15">            
-              <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>            
-          </div>
-          
-          <div class="col-md-5 m-r-13">
-            <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
-          </div>
-        </div>
+      <div class="modal-footer">
+        <button type="button" class="mr-2 btn btn-link bg-red waves-effect print_receipt">   Print
+        </button> 
+        <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">
+          CLOSE
+        </button>
       </div>
     </div>
   </div>

From 1187ddba373343a7f785227338c3c3665530302d Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 19 Apr 2018 16:40:59 +0630
Subject: [PATCH 627/651] move check license to action controler

---
 .../concerns/login_verification.rb            | 12 -----------
 config/initializers/action_controller.rb      | 20 ++++++++++++++-----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index 14b1e2e1..590fdcbc 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -53,16 +53,4 @@ module LoginVerification
   def render_unauthorized
     redirect_to root_path
   end
-
-  private
-  def check_license
-    License.check_license_file 
-  end
-
-  def check_installation
-    if current_company.nil?
-      redirect_to install_path
-    end
-  end
-
 end
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 802324cf..9284042f 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 
@@ -50,6 +50,16 @@ class ActionController::Base
     end
   end
 
+  def check_license
+    License.check_license_file 
+  end
+
+  def check_installation
+    if current_company.nil?
+      redirect_to install_path
+    end
+  end
+
   def website_connection(license)
     default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
     :username => license.dbusername, :password => license.dbpassword)

From ed025800c4ea20799f7a397f9e8332f664e9aaee Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 16:55:49 +0630
Subject: [PATCH 628/651] update addor for set instance api for addorder and
 paymal paymant

---
 app/assets/javascripts/addorder.js            | 11 ++++--
 .../concerns/token_verification.rb            |  4 +-
 .../origami/addorders_controller.rb           |  4 ++
 .../addorders/get_item_instance.json.jbuilder | 39 +++++++++++++++++++
 app/views/origami/dinga/index.html.erb        |  8 +++-
 config/routes.rb                              |  3 ++
 config/secrets.yml                            |  2 +-
 7 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 app/views/origami/addorders/get_item_instance.json.jbuilder

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 07511458..1044bc6f 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -268,21 +268,24 @@ $(function() {
       value = item_sets[field]["instances"];
       $(value).each(function(i){
         if (type != -1 && modify_order != -1) {
-          url = '../../../../api/restaurant/menu_item_instances/'+value[i]["id"];
+
+          url = '../../../addorders/get_item_instance/'+value[i]["id"];
           console.log("ssssssss")
         }
         if(modify_order == -1 && type != -1){
-          url = '../../api/restaurant/menu_item_instances/'+value[i]["id"] ;  
+
+          url = 'addorders/get_item_instance/'+value[i]["id"] ;  
           console.log("aaaaaa")       
         }
         if (type ==-1 && modify_order == -1){
-          url   = '../../api/restaurant/menu_item_instances/'+value[i]["id"];
+
+          url   = '../addorders/get_item_instance/'+value[i]["id"];
           console.log("cccccccccc")
         }
         $.ajax({
           type: "GET",
             url: url,
-            data: {id:value[i]},
+            // data: {id:value[i]},
             success:function(result){
 
                 row = '<div class="col-md-4 " >'
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index f8602ded..b49ef597 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -13,8 +13,8 @@ module TokenVerification
     authenticate_token || render_unauthorized
   end
 
-  def authenticate_token      
-    authenticate_with_http_token do |token, options|           
+  def authenticate_token 
+    authenticate_with_http_token do |token, options|       
       # Rails.logger.debug "token - " + token.to_s
       if(options.length !=0 && options["from"] == "DOEMAL")
         if(ENV["SERVER_MODE"] === "cloud")
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 8e23d2c9..0f16b981 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -58,6 +58,10 @@ class Origami::AddordersController < BaseOrigamiController
     end
   end
 
+  def get_item_instance
+    @id = MenuItemInstance.find(params[:id])
+  end
+
   def get_menu()
     if (params[:id])
       #Pull this menu
diff --git a/app/views/origami/addorders/get_item_instance.json.jbuilder b/app/views/origami/addorders/get_item_instance.json.jbuilder
new file mode 100644
index 00000000..69302b8e
--- /dev/null
+++ b/app/views/origami/addorders/get_item_instance.json.jbuilder
@@ -0,0 +1,39 @@
+if(@id)
+	menu_item = MenuItem.find(@id.menu_item_id)
+	# Format for option json
+	opt_format = []
+	# Format for attributes json    
+	menu_item.item_options.each do|opt|      
+	  menu_opt = MenuItemOption.find(opt)
+	  if opt_format.count == 0
+	    opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
+	    next
+	  end
+
+	  opt_format.each do |of|
+	    if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
+	      if menu_opt.option_type == of[:type]
+	        of[:values].push(menu_opt.name)
+	      end
+	    else 
+	      new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
+	      opt_format.push(new_opt) 
+	      break
+	    end
+	  end         
+	end
+
+  json.success true
+  json.id @id.id
+  json.name @id.item_instance_name
+  json.code @id.item_instance_code
+ 
+  json.item_id @id.menu_item_id
+  json.attributes @id.item_attributes
+  json.price @id.price
+  json.is_default @id.is_default
+  
+  json.options opt_format
+else
+  json.success false
+end
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index 1a7bd798..fd41a44d 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -106,6 +106,12 @@
 		<div class="col-lg-1 col-md-1 col-sm-1">
 		 <button type="button" class="btn bg-default m-t-10 btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 		</div>
+		<div id="sxModal">
+		    <div id="sxModal-Content"><h3>Card Tap</h3></div>
+		    <div class="m-r-20" align="right">
+		        <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
+		    </div>
+		 </div>
 	</div>
 </div>
 
@@ -341,7 +347,7 @@
 
 	              	$.ajax({
 						type: "POST",
-						url:  "<%=origami_payment_paymal_path%>",
+						url:  "<%=origami_payment_dinga_path%>",
 						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
 
diff --git a/config/routes.rb b/config/routes.rb
index bd1d8921..30b78fd9 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -237,6 +237,9 @@ scope "(:locale)", locale: /en|mm/ do
     get '/:addorders/:id' => "addorders#detail"
     post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }
     
+
+    get '/addorders/get_item_instance/:id' => "addorders#get_item_instance",:as => "get_item_instance", :defaults => { :format => 'json' }
+    
     resources :commissions
     resources :commissioners
 
diff --git a/config/secrets.yml b/config/secrets.yml
index b0d7c5c8..218234f1 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From 7d5d070e0d19b03a38c25f4b3bccf72fba4e15e2 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 19 Apr 2018 17:25:58 +0630
Subject: [PATCH 629/651] fix action contorller

---
 config/initializers/action_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 9284042f..92add0d2 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -12,7 +12,7 @@ class ActionController::Base
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else8
+      else
         # reconnect_default_db
         logger.info 'License is nil'
         # redirect_to root_url(:host => request.domain) + "store_error"

From c957ef7423f8e390c7340a7f6a3b2fe8b2f88681 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 18:38:08 +0630
Subject: [PATCH 630/651] update order for cloud process order

---
 app/models/order.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index fcc8b6c2..7cfd09a2 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -285,6 +285,7 @@ class Order < ApplicationRecord
 
   #Process order items and send to order queue
   def process_order_queue
+  if ENV["SERVER_MODE"] != 'cloud'
     #Send to background job for processing
     order        = Order.find(self.id) 
     cup_status   = `#{"sudo service cups status"}`
@@ -299,8 +300,8 @@ class Order < ApplicationRecord
           oqs = OrderQueueStation.new
           oqs.process_order(order, self.table_id, self.source)
         end
-        assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-        ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+        # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+        # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
       end
     else
       cup_start    = `#{"sudo service cups start"}`
@@ -315,8 +316,8 @@ class Order < ApplicationRecord
             oqs = OrderQueueStation.new
             oqs.process_order(order, self.table_id, self.source)
           end
-          assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-          ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+          # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+          # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
         end
       else
         msg = ' Print Error ! Please contact to service'
@@ -328,12 +329,14 @@ class Order < ApplicationRecord
               oqs = OrderQueueStation.new
               oqs.process_order(order, self.table_id, self.source)
             end
-            assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-            ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+            # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+            # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
           end
       end
     end
- 
+  end
+    assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+    ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
   end
 
   #Process order items and send to order queue

From e75a276326f72587b017670d27e9bbe41eab3bf9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 18:57:03 +0630
Subject: [PATCH 631/651] udpate order

---
 app/models/order.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index 7cfd09a2..3f3414e1 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -334,10 +334,11 @@ class Order < ApplicationRecord
           end
       end
     end
-  end
     assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
     ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
   end
+    
+  end
 
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)

From 830dc1b4d2a92580b60f987c6ca54d8ea5f006e6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 19:02:21 +0630
Subject: [PATCH 632/651] udpate order

---
 .../origami/addorders_controller.rb           |  6 ++-
 .../origami/second_display_controller.rb      |  3 +-
 app/models/order.rb                           | 54 +++++++++----------
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 0f16b981..e3122ded 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -184,7 +184,11 @@ puts items_arr.to_json
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
           # for second display 
-          ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
+           if ENV["SERVER_MODE"] != 'cloud'
+
+            ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
+            
+          end
           result = {:status=> @status, :data => @sale }
           render :json => result.to_json
         end
diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb
index a2bf34fd..87368470 100644
--- a/app/controllers/origami/second_display_controller.rb
+++ b/app/controllers/origami/second_display_controller.rb
@@ -13,8 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
    else
      tax_profiles = nil
    end
-   
+    if ENV["SERVER_MODE"] != 'cloud'
    ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
+ end
   end
   #Shop Name in Navbor
   helper_method :shop_detail
diff --git a/app/models/order.rb b/app/models/order.rb
index 3f3414e1..ef8127f5 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -285,29 +285,13 @@ class Order < ApplicationRecord
 
   #Process order items and send to order queue
   def process_order_queue
-  if ENV["SERVER_MODE"] != 'cloud'
-    #Send to background job for processing
-    order        = Order.find(self.id) 
-    cup_status   = `#{"sudo service cups status"}`
-    print_status = check_cup_status(cup_status)
-    sidekiq      = Lookup.find_by_lookup_type("sidekiq")
- 
-    if print_status
-      if !sidekiq.nil?
-        OrderQueueProcessorJob.perform_later(self.id, self.table_id)
-      else
-        if order
-          oqs = OrderQueueStation.new
-          oqs.process_order(order, self.table_id, self.source)
-        end
-        # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-        # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
-      end
-    else
-      cup_start    = `#{"sudo service cups start"}`
+    if ENV["SERVER_MODE"] != 'cloud'
+      #Send to background job for processing
+      order        = Order.find(self.id) 
       cup_status   = `#{"sudo service cups status"}`
       print_status = check_cup_status(cup_status)
-
+      sidekiq      = Lookup.find_by_lookup_type("sidekiq")
+   
       if print_status
         if !sidekiq.nil?
           OrderQueueProcessorJob.perform_later(self.id, self.table_id)
@@ -320,10 +304,13 @@ class Order < ApplicationRecord
           # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
         end
       else
-        msg = ' Print Error ! Please contact to service'
-        ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+        cup_start    = `#{"sudo service cups start"}`
+        cup_status   = `#{"sudo service cups status"}`
+        print_status = check_cup_status(cup_status)
+
+        if print_status
           if !sidekiq.nil?
-          OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+            OrderQueueProcessorJob.perform_later(self.id, self.table_id)
           else
             if order
               oqs = OrderQueueStation.new
@@ -332,11 +319,24 @@ class Order < ApplicationRecord
             # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
             # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
           end
+        else
+          msg = ' Print Error ! Please contact to service'
+          ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+            if !sidekiq.nil?
+            OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+            else
+              if order
+                oqs = OrderQueueStation.new
+                oqs.process_order(order, self.table_id, self.source)
+              end
+              # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+              # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+            end
+        end
       end
+      assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+      ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
     end
-    assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-    ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
-  end
     
   end
 

From f8687b501001500540e24e5df816e47934d3f8b4 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 20 Apr 2018 09:23:11 +0630
Subject: [PATCH 633/651] update cloud mode off for order and queue

---
 .../origami/second_display_controller.rb      |  4 ++--
 app/models/order.rb                           | 22 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb
index 87368470..4f2c06f8 100644
--- a/app/controllers/origami/second_display_controller.rb
+++ b/app/controllers/origami/second_display_controller.rb
@@ -14,8 +14,8 @@ class Origami::SecondDisplayController < BaseOrigamiController
      tax_profiles = nil
    end
     if ENV["SERVER_MODE"] != 'cloud'
-   ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
- end
+      ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
+    end
   end
   #Shop Name in Navbor
   helper_method :shop_detail
diff --git a/app/models/order.rb b/app/models/order.rb
index ef8127f5..e4ab883b 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -342,17 +342,19 @@ class Order < ApplicationRecord
 
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)
-    sidekiq      = Lookup.find_by_lookup_type("sidekiq")
-    if !sidekiq.nil?
-      OrderQueueProcessorJob.perform_later(id, table_id)
-    else
-      order        = Order.find(id) 
-      if order
-        oqs = OrderQueueStation.new
-        oqs.process_order(order, table_id)
+    if ENV["SERVER_MODE"] != 'cloud'
+      sidekiq      = Lookup.find_by_lookup_type("sidekiq")
+      if !sidekiq.nil?
+        OrderQueueProcessorJob.perform_later(id, table_id)
+      else
+        order        = Order.find(id) 
+        if order
+          oqs = OrderQueueStation.new
+          oqs.process_order(order, table_id)
+        end
+        assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
+        ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
       end
-      assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
-      ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
     end
   end
   

From 6a63390da655420a0e2c2940092d200cabcdb369 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 20 Apr 2018 09:29:39 +0630
Subject: [PATCH 634/651] update receipt migrate

---
 db/migrate/20180306044939_create_receipts.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/db/migrate/20180306044939_create_receipts.rb b/db/migrate/20180306044939_create_receipts.rb
index 22f3b0fa..13c7ccfe 100644
--- a/db/migrate/20180306044939_create_receipts.rb
+++ b/db/migrate/20180306044939_create_receipts.rb
@@ -5,10 +5,13 @@ class CreateReceipts < ActiveRecord::Migration[5.1]
       t.string  :client_name, :null => false
       t.string  :shop_code, :limit => 16, :null => false
       t.string  :shop_name, :null => false
-      t.integer :receipt_no, :limit => 8, :null => false
+      t.string :receipt_no, :null => false
       t.datetime  :transaction_time, :null => false
       t.datetime  :receipt_open_time, :null => false
       t.datetime  :receipt_close_time, :null => false
+      t.string    :shift_id, :null => false
+      t.datetime  :shift_open_time, :null => false
+      t.datetime  :shift_close_time, :null => false
       t.decimal :gross_sales, :null => false, :default => 0
       t.decimal :discount_amount, :null => false, :default => 0
       t.decimal :sales, :null => false, :default => 0

From 8720ffd1951c8b94059cc06c493a8c7670ae15ed Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 20 Apr 2018 10:36:34 +0630
Subject: [PATCH 635/651] update discuount view

---
 app/views/origami/home/show.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 7c736299..9e6cb2f9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -786,7 +786,6 @@
 
     $(".choose_payment").on('click', function () {
       $( "#loading_wrapper").show();
-      alert(parseInt(jQuery.inArray("PAYMAL", type)));
 
         var sale_id = $('#sale_id').val();
           // type = $('.payment_method').val();

From 223404a3b0be0c795daeaf36273a2e2d0ea0df21 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 20 Apr 2018 11:51:33 +0630
Subject: [PATCH 636/651] fix childplay code and qr code

---
 app/views/crm/customers/index.html.erb     |  2 +-
 app/views/origami/customers/index.html.erb | 55 +++++++++++-----------
 app/views/origami/payments/show.html.erb   | 43 ++++++++---------
 config/initializers/action_controller.rb   | 10 ++--
 4 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 70523063..87f3cabd 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -142,7 +142,7 @@ $(function() {
     });
 
     // QR Code Reader
-    $("#qr_code").on('sclick', function(e){
+    $("#qr_code").on('click', function(e){
         var code = "";        
         setTimeout(function(){
            code=getQRCode();
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index e5de4885..afe36d39 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -358,7 +358,7 @@
   }
 
   // QR Code Reader
-  $("#qr_code").on('click', function(e){
+  $("#qr_code").on('click', function(e){      
       var code = "";        
       var customer_id = '';
       var customer_name = '';
@@ -368,35 +368,34 @@
       setTimeout(function(){
         code=getQRCode();  
         setQRCode(code);
+      }, 100);
 
-        customer_mamber_card_no = $("#search").val();
-        
-        if(sale_id != 0 && customer_mamber_card_no != 0){    
-          $.ajax({
-            type: "POST",
-            url: "/origami/"+sale_id+"/get_customer" ,
-            data: { filter : customer_mamber_card_no ,type :"card"},
-            dataType: "json",
-            success: function(data) {
-              if (data[0].customer_id == false) {
-                swal("Alert!", data[0].message, "error");
-               //  $.alert({
-               //   title: 'Alert!',
-               //   content: data[0].message,
-               //   type: 'red',
-               //   typeAnimated: true,
-               //   btnClass: 'btn-danger',
-               // });
-              }else{
-                customer_id = data[0].customer_id;
-                customer_name = data[0].name;
-                update_sale(customer_id, customer_name,sale_id);
-              }
-
+      customer_mamber_card_no = $("#search").val();
+      
+      if(sale_id != 0 && customer_mamber_card_no != 0){    
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/get_customer" ,
+          data: { filter : customer_mamber_card_no ,type :"card"},
+          dataType: "json",
+          success: function(data) {
+            if (data[0].customer_id == false) {
+              swal("Alert!", data[0].message, "error");
+             //  $.alert({
+             //   title: 'Alert!',
+             //   content: data[0].message,
+             //   type: 'red',
+             //   typeAnimated: true,
+             //   btnClass: 'btn-danger',
+             // });
+            }else{
+              customer_id = data[0].customer_id;
+              customer_name = data[0].name;
+              update_sale(customer_id, customer_name,sale_id);
             }
-          });   
-        }      
-      },100);
+          }
+        });   
+      }            
   });
 
   // Read qrcode from java
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 334beea9..28b3f2ea 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1134,33 +1134,34 @@ var customer_name = "<%= @customer.name %>";
     var membership_type = '';    
     setTimeout(function(){
       code=getQRCode(); 
-      if(sale_id != 0 && code != ""){    
-        $.ajax({
-          type: "POST",
-          url: "/origami/"+sale_id+"/get_customer" ,
-          data: { filter : code ,type :"card"},
-          dataType: "json",
-          success: function(data) {
-            if (data[0].customer_id == false) {
-              swal("Alert!", data[0].message, "error");
-            }else{
-              customer_id = data[0].customer_id;
-              customer_name = data[0].name;
-              membership_id = data[0].membership_id;
-              membership_type = data[0].membership_type;
-              update_sale(membership_id, customer_id, customer_name,sale_id);
-            }
+      $("#qr_code").val(code);
+    });
 
+    if(sale_id != 0 && code != ""){    
+      $.ajax({
+        type: "POST",
+        url: "/origami/"+sale_id+"/get_customer" ,
+        data: { filter : code ,type :"card"},
+        dataType: "json",
+        success: function(data) {
+          if (data[0].customer_id == false) {
+            swal("Alert!", data[0].message, "error");
+          }else{
+            customer_id = data[0].customer_id;
+            customer_name = data[0].name;
+            membership_id = data[0].membership_id;
+            membership_type = data[0].membership_type;
+            update_sale(membership_id, customer_id, customer_name,sale_id);
           }
-        });                
-      }         
-    },100);
+
+        }
+      });                
+    }             
   });
 
   // Read qrcode from java
   function getQRCode(){
-    return code2lab.readQRCode();
-    $("#qr_code").val(code);  
+    return code2lab.readQRCode();    
   }
 
   function update_sale(membership_id, customer_id, customer_name, sale_id) {
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 92add0d2..8a149cb7 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

From 983baa88c92524ae0fbb8c39c1b34122ba996f84 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 20 Apr 2018 13:00:48 +0630
Subject: [PATCH 637/651] update discount member message

---
 app/controllers/origami/discounts_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 0d3899bd..8bbba963 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -285,10 +285,10 @@ class Origami::DiscountsController < BaseOrigamiController
                                       'Accept'       => 'application/json; version=3'
                            }, :timeout => 10)
           rescue HTTParty::Error
-            response = {"status": false, "message": "Can't open membership server " }
+            response = {"status": false, "message": "Http party error" }
 
           rescue Net::OpenTimeout
-            response = {"status": false, "message": "Can't open membership server " }
+            response = {"status": false, "message": "Connection TIme out " }
           rescue OpenURI::HTTPError
             response = {"status": false, "message": "Can't open membership server " }
 

From 97ec370a8f4079185151db8b998232bfea2d6310 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 20 Apr 2018 17:03:18 +0630
Subject: [PATCH 638/651] update order and reserve and receipt rake

---
 app/assets/javascripts/order_reservation.js   |  9 +++-
 app/models/sale.rb                            | 50 ++++++++++---------
 .../order_reservation/get_order.json.jbuilder |  7 ++-
 .../origami/order_reservation/index.html.erb  |  5 +-
 lib/tasks/receipt.rake                        |  4 +-
 5 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index fdea26b8..63760798 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -62,7 +62,7 @@ $(function() {
         // console.log(data);
         var delivery = data["delivery"];
         var items    = data["order_items"];
-
+console.log(data)
         var item_list = $('.summary-items');
         item_list.empty();
 
@@ -113,7 +113,12 @@ $(function() {
               $("#order_remark").text(data.reservation_remark);
             }
             $("#sr_number").text("No."+sr_no);
-            $("#contact_info").text();
+            if (data["receipt_no"]) {
+              $("#contact_info").text(data["receipt_no"]);
+            }else{
+              $("#contact_info").text(data["order_reservation_id"]);
+            }
+            
           }
         }
       }
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 10b48a18..0e090073 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2603,34 +2603,35 @@ end
   end
 
   def self.all_receipts
-    query = Sale.select("sales.*, sale_payments.created_at as receipt_close_time,
-                          case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark,
-                          case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges,
-                          SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
-                          SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount,
-                          SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
-                          SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,     
-                          SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,     
-                          SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,     
-                          SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,     
-                          SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,     
-                          SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,     
-                          SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
-                          SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount,
-                          SUM(case when (sale_items.status='foc') then sale_items.price else 0 end) as item_foc,
-                          SUM(case when (sale_items.status='Discount') then sale_items.price else 0 end) as item_discount,
-                          SUM(sale_items.qty) as qty,
-                          sales.cashier_name as cashier_name,
-                          surveys.child as child,
-                          surveys.adult as adult")
+    query = Sale.select("sale_payments.created_at as receipt_close_time,
+                case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark,
+                case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges,
+                SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
+                 SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount,
+                SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
+                SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,     
+                SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount,     
+                SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount,     
+                SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount,     
+                SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount,     
+                 SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount,     
+                 SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
+                 SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount,
+                 SUM(case when (sale_items.status='foc') then sale_items.price else 0 end) as item_foc,
+                 SUM(case when (sale_items.status='Discount') then sale_items.price else 0 end) as item_discount,                
+                 SUM(sale_items.qty) as qty,
+                sales.cashier_name as cashier_name,
+                surveys.child as child,
+                surveys.adult as adult")
             .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
             .joins("join sale_taxes on sale_taxes.sale_id = sales.sale_id")
             .joins("join sale_items on sale_items.sale_id = sales.sale_id")
             .joins("join sale_audits on sale_audits.sale_id = sales.sale_id")
             .joins("left join surveys on surveys.receipt_no = sales.receipt_no")
-            
-    query = query.where("sale_status != 'new' && sale_payments.payment_amount > 0")
-            .group("sale_id")
+          
+    query = query.where("sales.sale_status != 'new' && sale_payments.payment_amount > 0")
+    query = query.where("sales.created_at between ? and ?", '2017-11-01 00:00:00 +0630','2018-02-05 13:59:59 +0630')
+                  .group("sales.sale_id")
     return query
 end
 
@@ -2640,7 +2641,8 @@ def self.all_receipt_details
             .joins("join sale_payments on sale_payments.sale_id = sale_items.sale_id")
             .joins("join sales on sales.sale_id = sale_items.sale_id")
             .group("sale_items.sale_item_id")
-   query = query.where("qty > 0 and sales.sale_status !='new'")
+   query = query.where("sale_itemsqty > 0 and sales.sale_status !='new'")
+       query = query.where("sale_items.created_at between ? and ?", '2017-11-01 00:00:00 +0630','2018-02-05 13:59:59 +0630')
     return query
 end
 
diff --git a/app/views/origami/order_reservation/get_order.json.jbuilder b/app/views/origami/order_reservation/get_order.json.jbuilder
index 5fdd5293..e5ecdfe6 100644
--- a/app/views/origami/order_reservation/get_order.json.jbuilder
+++ b/app/views/origami/order_reservation/get_order.json.jbuilder
@@ -4,7 +4,7 @@ if @order
 						:requested_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
 						:payment_status,:payment_ref,:total_amount,:total_tax,
 						:discount_amount,:grand_total,:status,:order_remark,
-						:reservation_remark)
+						:reservation_remark,:sale_id)
 	@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
 	if @delivery
 	    json.delivery do |json|
@@ -22,4 +22,9 @@ if @order
 
 	json.customer_name @customer.name
 	json.phone @customer.contact_no
+	if @order.sale_id
+		@receipt_no = Sale.find(@order.sale_id).receipt_no
+	    json.receipt_no @receipt_no
+	end
+	
 end
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index ba735a1f..f693946e 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -152,11 +152,12 @@
           <div class="card-header custom-card-header" style="color:">
             <table class="table">
               <tr>
-                <td width ="70%" class="header-td align-left">
+                <td width ="30%" class="header-td align-left">
                 <b class="col-pink font-16"><span id="sr_number"></span> </b> 
                     <span class="font-13"><span id="delivery_info"></span></span>
                 </td>
-                <td width ="30%" class="header-td font-16 align-right"><b><span id="contact_info">0065 4321</span></b></td>
+                <td class="header-td align-left"></td>
+                <td width ="50%" class="header-td font- align-right"><b><span id="contact_info"></span></b></td>
               </tr>
             </table>
           </div>
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index d23efea6..fce410fa 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -1,9 +1,9 @@
 namespace :consolidate do
   desc "Receipt"
   task :receipt => :environment do
-    Receipt.delete_all
+    # Receipt.delete_all
     sales = Sale.all_receipts
-
+puts sales.to_json
     shop  = Shop.find(1)
     sales.each do |sale|
       puts sale.to_json

From 0dea849d462a7a2c3ea6a4b12e4e64cec74d745a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 20 Apr 2018 18:22:36 +0630
Subject: [PATCH 639/651] update ability account and suvisor and manager

---
 app/models/ability.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index e9509289..5eab518f 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -40,6 +40,8 @@ class Ability
         can :index, :shiftsale
         can :index, :credit_payment
         can :index, :void_sale
+        can :index, :waste_and_spoilage
+        can :index, :product_sale
 
         can :show, :dailysale
         can :show, :saleitem
@@ -47,6 +49,8 @@ class Ability
         can :show, :shiftsale
         can :show, :credit_payment
         can :show, :void_sale
+        can :show, :waste_and_spoilage
+        can :show, :product_sale
 
         can :get_customer, Customer
         can :add_customer, Customer  
@@ -114,6 +118,9 @@ class Ability
         can :print, :print
         can :print_order_summary, :print
 
+        can :read, ShiftSale  
+        can :update, ShiftSale    
+
     elsif user.role == "cashier"
         
         # can :overall_void, :void
@@ -185,12 +192,16 @@ class Ability
         can :index, :shiftsale
         can :index, :credit_payment
         can :index, :void_sale
+        can :index, :waste_and_spoilage
+        can :index, :product_sale
         can :show, :dailysale
         can :show, :saleitem
         can :show, :receipt_no
         can :show, :shiftsale
         can :show, :credit_payment
         can :show, :void_sale
+        can :show, :waste_and_spoilage
+        can :show, :product_sale
 
     elsif user.role == "supervisor"
 

From 835231bd61c0d3b75934e010933db08b27f8b1a9 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 20 Apr 2018 20:27:08 +0630
Subject: [PATCH 640/651] edit api cntr

---
 app/controllers/api/api_controller.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb
index 2340abd4..2c3c0df1 100755
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -41,6 +41,21 @@ class Api::ApiController < ActionController::API
     end    
   end
 
+  def website_connection(license)
+    default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
+    :username => license.dbusername, :password => license.dbpassword)
+
+  end
+
+  def reconnect_default_db
+    ActiveRecord::Base.establish_connection(Rails.env)
+  end
+
+  # Regular database.yml configuration hash
+  def default_connection
+    @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
+  end
+
   def cache_license(url, lookup)    
     @license = License.new(url, lookup)        
 

From 1fe48b57d0aa4880d87d8cabbde9b492dd17c570 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sun, 22 Apr 2018 14:11:04 +0630
Subject: [PATCH 641/651] update action cable for order resservation

---
 .../javascripts/channels/order_reservation.js | 38 +++++++++++++++++++
 app/assets/javascripts/order_reservation.js   |  2 -
 app/channels/order_reservation_channel.rb     | 10 +++++
 .../order_reservation_controller.rb           |  4 ++
 app/models/sale.rb                            |  3 ++
 .../origami/order_reservation/index.html.erb  |  2 +-
 6 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/channels/order_reservation.js
 create mode 100644 app/channels/order_reservation_channel.rb

diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js
new file mode 100644
index 00000000..605afe16
--- /dev/null
+++ b/app/assets/javascripts/channels/order_reservation.js
@@ -0,0 +1,38 @@
+App.checkin = App.cable.subscriptions.create('OrderReservationChannel', {
+//  App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {    
+    var order  = data.data;
+    var rowCount = $('.order_reserve_cable tbody tr').length+1;
+
+    var date = new Date(order.requested_time); 
+    var requested_time = date.getHours()+ ':' + date.getMinutes()+ '-' + date.getMinutes();
+    
+    var isPM = date.getHours() >= 12;
+    var isMidday = date.getHours() == 12;
+    var result = document.querySelector('#result');
+    var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), 
+            date.getMinutes() || '00'].join(':') +
+           (isPM ? ' PM' : 'AM');
+
+    row = '<tr class="custom-tr first-'+rowCount+'" style="" data-id="'+order.order_reservation_id+'" data-sr-no="'+rowCount+'">'
+          +'<td width ="5%" class="align-left">'+rowCount
+          +'</td>'
+          +'<td width ="30%" class="align-center">'+time
+          +'</td>'
+          +'<td width ="30%" class="align-center">'+order.grand_total
+          +'</td>'
+          +'<td width ="30%" class="align-center">'
+            +'<span class="font-10 col-blue">'+ order.status +'</span>'
+          +'</td>'
+        +' </tr>'
+    
+    $('.order_reserve_cable tbody').append(row);
+
+  }
+});
+
diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 63760798..9b7c3fbb 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -62,7 +62,6 @@ $(function() {
         // console.log(data);
         var delivery = data["delivery"];
         var items    = data["order_items"];
-console.log(data)
         var item_list = $('.summary-items');
         item_list.empty();
 
@@ -158,7 +157,6 @@ console.log(data)
             data: {'order_id': order_id, 'status': status},
             dataType: "json",
             success: function(data) {
-              console.log(data);
               if (data.status) {
                 swal({
                   title: 'Information',
diff --git a/app/channels/order_reservation_channel.rb b/app/channels/order_reservation_channel.rb
new file mode 100644
index 00000000..a461615e
--- /dev/null
+++ b/app/channels/order_reservation_channel.rb
@@ -0,0 +1,10 @@
+class OrderReservationChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "order_reservation_channel"
+  end
+
+  def unsubscribed
+    stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index 2dfc29aa..42768d58 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -57,6 +57,10 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 
 		if status == true
 			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(params)
+
+			order_reservation = OrderReservation.find(order_reservation_id)
+			ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
+			
 			if flag
 				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
 			else
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 0e090073..cc3ab4bb 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -128,6 +128,9 @@ class Sale < ApplicationRecord
       self.save!
 
       #compute sales summary
+      if order_source.nil?
+        order_source = order.order_source
+      end
       compute(order_source)
 
       #Update the order items that is billed
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index f693946e..15f173ce 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -22,7 +22,7 @@
         <div class="tab-pane active" id="pending" role="tabpanel">
           <div class="card-block font-13">
             <div id="menu-slimscroll" data-height="50">
-              <table class="table table-stripe custom-table">
+              <table class="table table-stripe custom-table order_reserve_cable">
                 <tbody>
                   <% i=1
                    @order.each do |order| %>

From def208bc75745398f5002ca62b22cfeb78def3a3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sun, 22 Apr 2018 14:43:32 +0630
Subject: [PATCH 642/651] update requestBill

---
 app/models/sale.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index cc3ab4bb..522fcd62 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -129,7 +129,7 @@ class Sale < ApplicationRecord
 
       #compute sales summary
       if order_source.nil?
-        order_source = order.order_source
+        order_source = order.source
       end
       compute(order_source)
 

From 880602779375e759040b4b50c0291b65a205f82b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sun, 22 Apr 2018 16:38:52 +0630
Subject: [PATCH 643/651] update bugs for demo

---
 app/controllers/origami/waste_spoile_controller.rb |  3 ++-
 app/pdf/receipt_bill_pdf.rb                        |  5 +++--
 app/views/origami/payments/show.html.erb           | 14 ++++++++++++--
 app/views/origami/table_invoices/show.html.erb     |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/controllers/origami/waste_spoile_controller.rb b/app/controllers/origami/waste_spoile_controller.rb
index c94b33bb..2b2d9c33 100755
--- a/app/controllers/origami/waste_spoile_controller.rb
+++ b/app/controllers/origami/waste_spoile_controller.rb
@@ -92,7 +92,8 @@ class Origami::WasteSpoileController < BaseOrigamiController
         if customer.membership_id != nil && rebate
           member_info = Customer.get_member_account(customer)
           rebate_amount  = Customer.get_membership_transactions(customer,sale.receipt_no)
-          current_balance = SaleAudit.paymal_search(sale_id)
+          # current_balance = SaleAudit.paymal_search(sale_id)
+           current_balance = 0
         end
 
         # get printer info
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index a04cfcad..7ebe5997 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -84,7 +84,7 @@ class ReceiptBillPdf < Prawn::Document
 
         #start for individual payment
         if !sale_data.equal_persons.nil?
-            individual_payment(sale_data, printer_settings.precision, delimiter)
+            individual_payment(sale_data,sale_data.equal_persons, printer_settings.precision, delimiter)
         end
         #end for individual payment
 
@@ -487,7 +487,8 @@ class ReceiptBillPdf < Prawn::Document
 
     #individual payment per person
     def individual_payment(sale_data, survey, precision, delimiter)
-        per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+        # per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
+         per_person = sale_data.grand_total.to_f / survey.to_i
         stroke_horizontal_rule
         move_down line_move
         y_position = cursor
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 28b3f2ea..100b1425 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -523,14 +523,24 @@ var customer_name = "<%= @customer.name %>";
         
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
+          console.log(payment_type)
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
             } else{
               $("#credit_payment").show();
             }
-
-            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1, parseInt(jQuery.inArray("PAYMAL", payment_type)) !=-1 || parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Alipay", payment_type)) !=-1 || parseInt(jQuery.inArray("DINGA", payment_type)) !=-1){
+console.log(jQuery.inArray("Master", payment_type))
+            if(parseInt(jQuery.inArray("MPU", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("VISA", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("JCB", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("Master", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("UNIONPAY", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("Redeem", payment_type)) != -1 ||
+              parseInt(jQuery.inArray("PAYMAL", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("Alipay", payment_type)) != -1 || 
+              parseInt(jQuery.inArray("DINGA", payment_type)) != -1){
               $("#card_payment").show();   
             } else{
              $("#card_payment").hide();
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index f6317dc3..fc19f909 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -361,7 +361,7 @@ $('#pay').on('click',function() {
 $('#back').on('click',function(){
   var lookup_split_bill = '<%= @split_bill %>';
   if(lookup_split_bill == '1'){
-    window.location.href = '/origami/table/<%= @table.id %>/split_bills';
+    window.location.href = '/origami/table/<%= @table.id %>/cashier/split_bills';
   }else{
     window.location.href = '/origami/table/<%= @table.id %>';
   }

From 509d3a2b181fecc537a5efb5ad326030d8e2e699 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Apr 2018 11:49:36 +0630
Subject: [PATCH 644/651] add mysql config option wait timeout

---
 app/models/my_aes_crypt.rb            | 5 +++--
 config/initializers/mysql2_adapter.rb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb
index 20f747c9..7c86b158 100644
--- a/app/models/my_aes_crypt.rb
+++ b/app/models/my_aes_crypt.rb
@@ -62,8 +62,9 @@ class MyAesCrypt
 
 		shop_json = JSON.parse(shop_data)	
 		shop_json["data"].each do |j|
-			if j["lookup"] == from				
-				if(j["value"]["key"] == token)
+			if j["lookup"] == from			
+				# add [0...44] for production cloud for remove \n
+				if(j["value"]["key"][0...44] == token)
 					return true
 				end
 			end
diff --git a/config/initializers/mysql2_adapter.rb b/config/initializers/mysql2_adapter.rb
index 09424ddf..6a8e43fa 100755
--- a/config/initializers/mysql2_adapter.rb
+++ b/config/initializers/mysql2_adapter.rb
@@ -24,7 +24,7 @@ module ActiveRecord
       end
 
       client = Mysql2::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:wait_timeout], 0]
       ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
     end
   end

From cbb7a14621243f39185bc2bd01b2f63bb6ac4134 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Apr 2018 14:17:56 +0630
Subject: [PATCH 645/651] update action cable for cloud

---
 app/controllers/origami/addorders_controller.rb      | 4 ++--
 app/controllers/origami/second_display_controller.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index e3122ded..499c20a7 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -184,11 +184,11 @@ puts items_arr.to_json
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
           # for second display 
-           if ENV["SERVER_MODE"] != 'cloud'
+           # if ENV["SERVER_MODE"] != 'cloud'
 
             ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
             
-          end
+          # end
           result = {:status=> @status, :data => @sale }
           render :json => result.to_json
         end
diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb
index 4f2c06f8..611b49a9 100644
--- a/app/controllers/origami/second_display_controller.rb
+++ b/app/controllers/origami/second_display_controller.rb
@@ -13,9 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
    else
      tax_profiles = nil
    end
-    if ENV["SERVER_MODE"] != 'cloud'
+   if ENV["SERVER_MODE"] != 'cloud'
       ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
-    end
+   end
   end
   #Shop Name in Navbor
   helper_method :shop_detail

From b92889fb237e3b7867c2b6f38580274cde593410 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 23 Apr 2018 14:41:07 +0630
Subject: [PATCH 646/651] change base url settings

---
 README.md                                      |  3 +++
 app/controllers/concerns/token_verification.rb |  3 ++-
 app/models/order_reservation.rb                | 14 +++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fcc35040..712d61a9 100755
--- a/README.md
+++ b/README.md
@@ -184,6 +184,9 @@ For MoveTablePdf in print settings
 Add Kitchen Role of  Employee 
    => 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen }
 
+Add Base URL for DOEMAL
+	1) settings/lookups => { type:order_reservation, name: BaseURL, value:'{doemal url}' }
+
 * ToDo list
 
 1. Migration
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index b49ef597..85c9b858 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -24,7 +24,8 @@ module TokenVerification
         end
       end
 
-      @user = Employee.authenticate_by_token(token)
+      @user = Employee.
+      (token)
       if @user
         return true
         #Maybe log - login?
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 2fa99cf4..2d931d36 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -219,7 +219,19 @@ class OrderReservation < ApplicationRecord
     end
 
     def self.send_status_to_ordering(url,ref_no,status)
-    	base_url = "http://192.168.1.186:3002"
+    	base_url = 'https://api.doemal.com'
+    	order_reservation = Lookup.collection_of("order_reservation")
+    	if !order_reservation.empty?
+    		order_reservation.each do |order_reserve|
+				if order_reserve[0] == 'BaseURL'
+					base_url = order_reserve[1]
+				end
+			end
+    	else
+    		Rails.logger.debug "Add order reservation BaseURL "
+    		response = {status: false}
+    	end
+    	Rails.logger.debug "Doemal URL" + base_url
     	post_url = base_url + url
 
     	begin

From 5ea950f5aa75108223d3abc53345983c772dc8a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Apr 2018 14:43:27 +0630
Subject: [PATCH 647/651] update addore cable for second display closed

---
 app/controllers/origami/addorders_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 499c20a7..2eab460a 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -184,11 +184,11 @@ puts items_arr.to_json
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
           # for second display 
-           # if ENV["SERVER_MODE"] != 'cloud'
+            if ENV["SERVER_MODE"] != 'cloud'
 
             ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
             
-          # end
+           end
           result = {:status=> @status, :data => @sale }
           render :json => result.to_json
         end

From 2255fcd2d473d2ac694285bd5ed121de0db0a748 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 23 Apr 2018 15:09:04 +0630
Subject: [PATCH 648/651] add token in lookups

---
 README.md                       | 1 +
 app/models/order_reservation.rb | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 712d61a9..43a2091e 100755
--- a/README.md
+++ b/README.md
@@ -186,6 +186,7 @@ Add Kitchen Role of  Employee
 
 Add Base URL for DOEMAL
 	1) settings/lookups => { type:order_reservation, name: BaseURL, value:'{doemal url}' }
+	2) settings/lookups => { type:order_reservation, name: Token, value:'{doemal token}' }
 
 * ToDo list
 
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 2d931d36..5aab27ba 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -220,11 +220,14 @@ class OrderReservation < ApplicationRecord
 
     def self.send_status_to_ordering(url,ref_no,status)
     	base_url = 'https://api.doemal.com'
+    	token = '3T-tnlYtFJ-5Z1vY6XQqxQ'
     	order_reservation = Lookup.collection_of("order_reservation")
     	if !order_reservation.empty?
     		order_reservation.each do |order_reserve|
 				if order_reserve[0] == 'BaseURL'
 					base_url = order_reserve[1]
+				elsif order_reserve[0] == 'Token'
+					token = order_reserve[1]
 				end
 			end
     	else
@@ -234,11 +237,12 @@ class OrderReservation < ApplicationRecord
     	Rails.logger.debug "Doemal URL" + base_url
     	post_url = base_url + url
 
+
     	begin
 	      response = HTTParty.post(post_url,
 	              :body => { id: ref_no, status: status}.to_json,
 	              :headers => {
-	                        'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ',
+	                        'Authorization' => 'Token token='+token,
 	                        'Content-Type' => 'application/json',
 	                        'Accept' => 'application/json; version=3'
 	              }, :timeout => 10

From 6e3a5300a69733b36548725719d407bd8cfb1341 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Apr 2018 15:39:56 +0630
Subject: [PATCH 649/651] close cable in cloud mode

---
 app/controllers/api/bill_controller.rb             |  4 +++-
 app/controllers/api/call_waiters_controller.rb     |  5 +++--
 .../order_reserve/order_reservation_controller.rb  |  5 +++--
 .../origami/request_bills_controller.rb            |  4 +++-
 app/controllers/origami/split_bill_controller.rb   |  6 +++---
 app/models/dining_facility.rb                      |  8 ++++++--
 app/models/order.rb                                | 14 +++++++++++---
 app/models/sale_payment.rb                         |  4 +++-
 8 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 994f6fe4..a4c8b383 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -47,7 +47,9 @@ class Api::BillController < Api::ApiController
       Promotion.promo_activate(@sale)
 
       #BillBroadcastJob.perform_later(table)
-      ActionCable.server.broadcast "bill_channel",table: table
+      if ENV["SERVER_MODE"] != 'cloud'
+        ActionCable.server.broadcast "bill_channel",table: table
+      end
     else
       @status = false
       @error_message = "No Current Open Shift"
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index b695dc33..d0a0e3df 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -6,8 +6,9 @@ class Api::CallWaitersController < ActionController::API
     @time     = params[:time]
     @table    = DiningFacility.find(@table_id)
     # CallWaiterJob.perform_later(@table,@time)
-    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
-
+    if ENV["SERVER_MODE"] != 'cloud'
+      ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
+    end
     # get printer info
     @shop          = Shop.first 
     unique_code    = "CallWaiterPdf" 
diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index 42768d58..486e0c9e 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -59,8 +59,9 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(params)
 
 			order_reservation = OrderReservation.find(order_reservation_id)
-			ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
-			
+			if ENV["SERVER_MODE"] != 'cloud'
+				ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
+			end
 			if flag
 				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
 			else
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 05dbdce4..8c1d3a43 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -39,7 +39,9 @@ class Origami::RequestBillsController < ApplicationController
       # Promotion Activation
       Promotion.promo_activate(@sale)
       #bill channel
-      ActionCable.server.broadcast "bill_channel",table: table
+      if ENV["SERVER_MODE"] != 'cloud'
+        ActionCable.server.broadcast "bill_channel",table: table
+      end
       if order.source == "quick_service"
         result = {:status=> @status, :data => @sale.sale_id }
           render :json => result.to_json
diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb
index 8cd68d9c..547a8a7e 100755
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -335,9 +335,9 @@ class Origami::SplitBillController < BaseOrigamiController
 	    	end
 
 			Promotion.promo_activate(sale)
-
-			ActionCable.server.broadcast "bill_channel",table: table
-
+			if ENV["SERVER_MODE"] != 'cloud'
+			  ActionCable.server.broadcast "bill_channel",table: table
+			end
 			render :json => { status: status }
 	    else
 	      render :json => { status: false, error_message: 'No Current Open Shift!'}
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 50fc6a52..793ba287 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -156,13 +156,17 @@ class DiningFacility < ApplicationRecord
     table = DiningFacility.find(table_id)
     #Send to background job for processing
     # CheckInBookingJob.perform_later(table)
-    ActionCable.server.broadcast "check_in_booking_channel",table: table
+     if ENV["SERVER_MODE"] != 'cloud'
+      ActionCable.server.broadcast "check_in_booking_channel",table: table
+    end
   end
 
   def self.checkin_time
     table = DiningFacility.get_checkin_booking
     if table.length > 0
-      ActionCable.server.broadcast "checkin_channel",table: table
+      if ENV["SERVER_MODE"] != 'cloud'
+        ActionCable.server.broadcast "checkin_channel",table: table
+      end
   end
   end
   
diff --git a/app/models/order.rb b/app/models/order.rb
index e4ab883b..a4f27778 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -321,7 +321,9 @@ class Order < ApplicationRecord
           end
         else
           msg = ' Print Error ! Please contact to service'
-          ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+           if ENV["SERVER_MODE"] != 'cloud'
+            ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+           end
             if !sidekiq.nil?
             OrderQueueProcessorJob.perform_later(self.id, self.table_id)
             else
@@ -335,7 +337,9 @@ class Order < ApplicationRecord
         end
       end
       assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-      ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+       if ENV["SERVER_MODE"] != 'cloud'
+        ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+      end
     end
     
   end
@@ -372,7 +376,9 @@ class Order < ApplicationRecord
       type  = 'order'
       #Send to background job for processing
       # OrderBroadcastJob.perform_later(table,type)
+      if ENV["SERVER_MODE"] != 'cloud'
       ActionCable.server.broadcast "order_channel",table: table,type:type
+      end
     end
   end
 
@@ -526,7 +532,9 @@ class Order < ApplicationRecord
         end
       end
     end
-     ActionCable.server.broadcast "second_display_channel",data: @data_array,status:@status
+     if ENV["SERVER_MODE"] != 'cloud'
+      ActionCable.server.broadcast "second_display_channel",data: @data_array,status:@status
+     end
   end
 
   private
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 29d755d7..098b5733 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -607,7 +607,9 @@ class SalePayment < ApplicationRecord
         type  = 'payment'
         #Send to background job for processing
         # OrderBroadcastJob.perform_later(table,type)
-        ActionCable.server.broadcast "order_channel",table: table,type:type
+        if ENV["SERVER_MODE"] != 'cloud'
+          ActionCable.server.broadcast "order_channel",table: table,type:type
+        end
       end
     end
   end

From 3d39e398df07dd0028a0bddc86258841ef69246e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 23 Apr 2018 16:16:41 +0630
Subject: [PATCH 650/651] remove actioncable

---
 .../api/order_reserve/order_reservation_controller.rb       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index 486e0c9e..c3c9f39b 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -59,9 +59,9 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(params)
 
 			order_reservation = OrderReservation.find(order_reservation_id)
-			if ENV["SERVER_MODE"] != 'cloud'
-				ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
-			end
+			# if ENV["SERVER_MODE"] != 'cloud'
+			# 	ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
+			# end
 			if flag
 				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
 			else

From 403f70480dab70e5e0b954db336d0c0f9b9fd9c2 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Apr 2018 16:23:00 +0630
Subject: [PATCH 651/651] api cloud update

---
 app/controllers/api/api_controller.rb    | 73 ++++++++++++------------
 app/models/license.rb                    |  4 +-
 app/models/my_aes_crypt.rb               |  2 +-
 config/initializers/action_controller.rb | 61 ++++++++++++++++++++
 config/secrets.yml                       |  2 +-
 5 files changed, 101 insertions(+), 41 deletions(-)

diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb
index 2c3c0df1..a5112ffe 100755
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -23,46 +23,45 @@ class Api::ApiController < ActionController::API
     @employee = Employee.find_by_token_session(current_token)
   end
 
-  def lookup_domain     
-    if request.subdomain.present? && request.subdomain != "www" 
-      from = request.subdomain.downcase  + "." + request.domain.downcase    
-      @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
-      if (!@license.nil?)
-        logger.info "Location - " + @license.dbhost        
-        ActiveRecord::Base.establish_connection(website_connection(@license))    
-        # authenticate_session_token    
-        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else
-        # reconnect_default_db
-        logger.info 'License is nil'
-        # redirect_to root_url(:host => request.domain) + "store_error"
-         render :json => [{ status: false, message: 'Invalid Access!'}]
-      end                   
-    end    
-  end
+  # def lookup_domain  
+  #   if request.subdomain.present? && request.subdomain != "www" 
+  #     from = request.subdomain.downcase  + "." + request.domain.downcase    
+  #     @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
+  #     if (!@license.nil?)
+  #       logger.info "Location - " + @license.dbhost     
+  #       ActiveRecord::Base.establish_connection(website_connection(@license))    
+  #       # authenticate_session_token    
+  #       # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
+  #     else
+  #       # reconnect_default_db
+  #       logger.info 'License is nil'
+  #       # redirect_to root_url(:host => request.domain) + "store_error"
+  #        render :json => [{ status: false, message: 'Invalid Access!'}]
+  #     end                   
+  #   end    
+  # end
 
-  def website_connection(license)
-    default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
-    :username => license.dbusername, :password => license.dbpassword)
+  # def website_connection(license)    
+  #   default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
+  #   :username => license.dbusername, :password => license.dbpassword)
+  # end
 
-  end
+  # def reconnect_default_db
+  #   ActiveRecord::Base.establish_connection(Rails.env)
+  # end
 
-  def reconnect_default_db
-    ActiveRecord::Base.establish_connection(Rails.env)
-  end
+  # # Regular database.yml configuration hash
+  # def default_connection
+  #   @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
+  # end
 
-  # Regular database.yml configuration hash
-  def default_connection
-    @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
-  end
+  # def cache_license(url, lookup)    
+  #   @license = License.new(url, lookup)        
 
-  def cache_license(url, lookup)    
-    @license = License.new(url, lookup)        
-
-    if (@license.detail_with_local_cache(lookup) == true)
-      return @license
-    else
-      return nil
-    end
-  end
+  #   if (@license.detail_with_local_cache(lookup) == true)
+  #     return @license
+  #   else
+  #     return nil
+  #   end
+  # end
 end
diff --git a/app/models/license.rb b/app/models/license.rb
index 13931376..9ef7d956 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -60,8 +60,8 @@ class License
         return true
       end
     else         
-      # @license = Marshal.load(cache_license)
-      # assign(aes_key, aes_iv)
+      @license = Marshal.load(cache_license)
+      assign(aes_key, aes_iv)
       # Rails.logger.info 'API License'           
       return true
     end
diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb
index 7c86b158..8f3cde09 100644
--- a/app/models/my_aes_crypt.rb
+++ b/app/models/my_aes_crypt.rb
@@ -64,7 +64,7 @@ class MyAesCrypt
 		shop_json["data"].each do |j|
 			if j["lookup"] == from			
 				# add [0...44] for production cloud for remove \n
-				if(j["value"]["key"][0...44] == token)
+				if(j["value"]["key"] == token)
 					return true
 				end
 			end
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 8a149cb7..a3b19ebe 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -86,3 +86,64 @@ class ActionController::Base
   end  
 
 end
+
+class ActionController::API
+  before_action :lookup_domain
+
+  private
+
+  def lookup_domain   
+    if request.subdomain.present? && request.subdomain != "www" 
+      from = request.subdomain.downcase  + "." + request.domain.downcase    
+      @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
+      if (!@license.nil?)
+        # logger.info "Location - " + @license.dbhost     
+        ActiveRecord::Base.establish_connection(website_connection(@license))    
+        # authenticate_session_token    
+        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
+      else
+        # reconnect_default_db
+        logger.info 'License is nil'
+        # redirect_to root_url(:host => request.domain) + "store_error"
+         render :json => [{ status: false, message: 'Invalid Access!'}]
+      end                   
+    end    
+  end 
+
+  def cache_license(url, lookup)    
+    @license = License.new(url, lookup)        
+
+    if (@license.detail_with_local_cache(lookup) == true)
+      return @license
+    else
+      return nil
+    end
+  end
+
+  def website_connection(license)
+    default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
+    :username => license.dbusername, :password => license.dbpassword)
+
+  end
+
+  def reconnect_default_db
+    ActiveRecord::Base.establish_connection(Rails.env)
+  end
+
+  # Regular database.yml configuration hash
+  def default_connection
+    @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
+  end
+
+  #change locallization
+  def set_locale
+    I18n.locale = params[:locale] || I18n.default_locale
+  end
+
+  # RESTful url for localize
+  def default_url_options
+    { locale: I18n.locale }
+  end  
+
+end
+
diff --git a/config/secrets.yml b/config/secrets.yml
index 218234f1..b0d7c5c8 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L