update queue view

This commit is contained in:
Aung Myo
2017-11-16 19:26:52 +06:30
parent fd81cdf3ef
commit c0733d7c48
9 changed files with 233 additions and 59 deletions

View File

@@ -33,7 +33,7 @@ class Crm::CustomersController < BaseCrmController
end
end
end
@crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
@crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(15)
@crm_customer = Customer.new
@count_customer = Customer.count_customer
@@ -70,7 +70,7 @@ class Crm::CustomersController < BaseCrmController
#get customer amount
@customer = Customer.find(params[:id])
@response = Customer.get_membership_transactions(@customer)
puts @response.to_json
# @response = ""
#end customer amount

View File

@@ -7,6 +7,7 @@ class Crm::DiningQueuesController < BaseCrmController
def index
today = DateTime.now.strftime('%Y-%m-%d')
@dining_queues = DiningQueue.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and status is NULL ", today).order("queue_no asc")
@complete_queue = DiningQueue.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and status = 'Assign' ", today).order("queue_no asc")
end
# GET /crm/dining_queues/1

View File

@@ -215,7 +215,7 @@ class Origami::DiscountsController < BaseOrigamiController
else
response = {"status": false, "message": "You have no selected discount item" }
end
puts "discount"
puts "discountttttttttttt"
puts response.to_json
# Re-calc All Amount in Sale
if response["status"] == true