git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update booking status and view

Browse Source
This commit is contained in:
Aung Myo
2017-06-03 13:32:13 +06:30
parent 2374fedca5
commit 7529d23147
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/order.rb
View File

@@ -23,7 +23,7 @@ class Order < ApplicationRecord
if self.new_booking if self.new_booking
booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
:checkin_at => Time.now.utc, :checkin_by => self.employee_name, :checkin_at => Time.now.utc, :checkin_by => self.employee_name,
:booking_status => "new" }) :booking_status => "assign" })
else else
if (self.booking_id.to_i > 0 ) if (self.booking_id.to_i > 0 )
booking = Booking.find(self.booking_id) booking = Booking.find(self.booking_id)

13
app/views/crm/home/_booking.html.erb
View File

@@ -21,10 +21,10 @@
<div class="card-footer"> <div class="card-footer">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<button id="assign" data-id="<%= booking.id %>" data-type="complete" class="btn assign btn-primary btn-sm btn-block">ASSIGN</button>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<button id="cancel" data-id="<%= booking.id %>" data-type="cancel" class="btn btn-danger cancel btn-sm btn-block">CANCLE</button>
</div> </div>
</div> </div>
</div> </div>
@@ -38,19 +38,21 @@ $(function(){
$(".booking_click").on("click", function(){ $(".booking_click").on("click", function(){
$(".summary-items tbody tr").remove(); $(".summary-items tbody tr").remove();
$("#cancel").removeAttr("disabled");
$("#assign").removeAttr("disabled");
var url = $(this).attr('data-ref'); var url = $(this).attr('data-ref');
show_details(url); show_details(url);
}); });
$('.assign').click(function(e){ $('.assign').click(function(e){
var booking_id = $(this).attr("data-id") var booking_id = $(this).val()
var type = $(this).attr("data-type") var type = $(this).attr("data-type")
update_booking(booking_id,type) update_booking(booking_id,type)
}); });
$('.cancel').click(function(e){ $('.cancel').click(function(e){
var booking_id = $(this).attr("data-id") var booking_id = $(this).val()
var type = $(this).attr("data-type") var type = $(this).attr("data-type")
update_booking(booking_id,type) update_booking(booking_id,type)
@@ -71,7 +73,8 @@ function show_details(url_item){
$("#table").text(data.table_name) $("#table").text(data.table_name)
$("#order_at").text(data.checkin_at) $("#order_at").text(data.checkin_at)
$("#order_by").text(data.checkin_by) $("#order_by").text(data.checkin_by)
$("#assign").val(data.id)
$("#cancel").val(data.id)
for(var field in item_data) { for(var field in item_data) {
if (item_data[field].item_name){ if (item_data[field].item_name){
var price = parseFloat(item_data[field].price).toFixed(2); var price = parseFloat(item_data[field].price).toFixed(2);

2
app/views/crm/home/_queue.html.erb
View File

@@ -2,7 +2,7 @@
<% @i = 0 %> <% @i = 0 %>
<% @booking.each do |booking| %> <% @booking.each do |booking| %>
<% if booking.booking_status == "complete" %> <% if booking.booking_status == "assign" %>
<div class="card booking_click" data-ref="<%= api_booking_path booking.id%>" id="booking_block"> <div class="card booking_click" data-ref="<%= api_booking_path booking.id%>" id="booking_block">
<div class="card-block" id="card-block" style="width:100%;"> <div class="card-block" id="card-block" style="width:100%;">
<h4 class="card-title"> <h4 class="card-title">

4
app/views/crm/home/index.html.erb
View File

@@ -5,7 +5,7 @@
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#completed" role="tab">Queue <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","complete").count %></span></a> <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Queue <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","assign").count %></span></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Bookings <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","new").count %></span></a> <a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Bookings <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","new").count %></span></a>
@@ -94,6 +94,8 @@
<!-- OQS Buttons --> <!-- OQS Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print</button> <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button> <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button>
<button id="assign" value="" disabled="disabled" data-type="assign" class="btn assign btn-primary btn-lg btn-block">ASSIGN</button>
<button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCLE</button>
</div> </div>
</div> </div>