Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
This commit is contained in:
Yan
@@ -163,7 +163,6 @@ For CloseCashierCustomisePdf in lookups
|
|||||||
1) settings/print_settings
|
1) settings/print_settings
|
||||||
2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 }
|
2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 }
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
<---- Extra Fields Script ----->
|
<---- Extra Fields Script ----->
|
||||||
For MoveTablePdf in lookups
|
For MoveTablePdf in lookups
|
||||||
*** Both Table and Room Moving ***
|
*** Both Table and Room Moving ***
|
||||||
@@ -175,13 +174,12 @@ For MoveTablePdf in print settings
|
|||||||
ii) Unique Code: MoveTablePdf
|
ii) Unique Code: MoveTablePdf
|
||||||
iii)Template: ...
|
iii)Template: ...
|
||||||
iv) Font: Zawgyi-One v) Printer: #printer name
|
iv) Font: Zawgyi-One v) Printer: #printer name
|
||||||
=======
|
|
||||||
/* Tax Profile Group Types in lookups */
|
/* Tax Profile Group Types in lookups */
|
||||||
1) settings/lookups => { type:tax_profiles, name: Cashier, value:cashier }
|
1) settings/lookups => { type:tax_profiles, name: Cashier, value:cashier }
|
||||||
2) settings/lookups => { type:tax_profiles, name: Quick Service, value: quick_service }
|
2) settings/lookups => { type:tax_profiles, name: Quick Service, value: quick_service }
|
||||||
3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal }
|
3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal }
|
||||||
/* Tax Profile Group Types in lookups */
|
/* Tax Profile Group Types in lookups */
|
||||||
>>>>>>> 1c13b0469758fb968c0dfcc1f0a876ed2c5e395a
|
|
||||||
|
|
||||||
Add Kitchen Role of Employee
|
Add Kitchen Role of Employee
|
||||||
=> 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen }
|
=> 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen }
|
||||||
|
|||||||
@@ -974,7 +974,7 @@ console.log(d_option)
|
|||||||
dataType: "json",
|
dataType: "json",
|
||||||
success:function(result){
|
success:function(result){
|
||||||
if (result.status) {
|
if (result.status) {
|
||||||
|
console.log(result)
|
||||||
if (result.data == null){
|
if (result.data == null){
|
||||||
swal({
|
swal({
|
||||||
title: "Please Open Shift !",
|
title: "Please Open Shift !",
|
||||||
@@ -987,6 +987,8 @@ console.log(d_option)
|
|||||||
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{
|
}else{
|
||||||
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
|
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
|
||||||
}
|
}
|
||||||
|
|||||||
12
app/controllers/origami/order_reservation_controller.rb
Normal file
12
app/controllers/origami/order_reservation_controller.rb
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
class Origami::OrderReservationController < BaseOrigamiController
|
||||||
|
|
||||||
|
def index
|
||||||
|
@webview = check_mobile
|
||||||
|
@shop = Shop::ShopDetail
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
end
|
||||||
@@ -155,6 +155,9 @@ class Origami::QuickServiceController < ApplicationController
|
|||||||
result = {:status=> true, :data => @sale }
|
result = {:status=> true, :data => @sale }
|
||||||
render :json => result.to_json
|
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
|
else
|
||||||
result = {:status=> true, :data => nil }
|
result = {:status=> true, :data => nil }
|
||||||
render :json => result.to_json
|
render :json => result.to_json
|
||||||
|
|||||||
@@ -16,7 +16,12 @@ class Origami::RequestBillsController < ApplicationController
|
|||||||
bk_order = BookingOrder.find_by_order_id(order_id)
|
bk_order = BookingOrder.find_by_order_id(order_id)
|
||||||
order = Order.find(order_id)
|
order = Order.find(order_id)
|
||||||
check_booking = Booking.find_by_booking_id(bk_order.booking_id)
|
check_booking = Booking.find_by_booking_id(bk_order.booking_id)
|
||||||
|
if check_booking.dining_facility_id.to_i > 0
|
||||||
table = DiningFacility.find(check_booking.dining_facility_id)
|
table = DiningFacility.find(check_booking.dining_facility_id)
|
||||||
|
else
|
||||||
|
table = nil
|
||||||
|
end
|
||||||
|
|
||||||
if check_booking.sale_id.nil?
|
if check_booking.sale_id.nil?
|
||||||
# Create Sale if it doesn't exist
|
# 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)
|
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
|
||||||
|
|||||||
@@ -2592,6 +2592,7 @@ end
|
|||||||
query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
|
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")
|
.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")
|
query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
|
||||||
|
.group("sales.sale_id")
|
||||||
end
|
end
|
||||||
def self.pending_order
|
def self.pending_order
|
||||||
query = Booking.all
|
query = Booking.all
|
||||||
|
|||||||
@@ -34,6 +34,14 @@
|
|||||||
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
|
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
<!-- #END# Widgets -->
|
<!-- #END# Widgets -->
|
||||||
<% if !@current_user.nil? && @current_user.role != 'waiter' %>
|
<% if !@current_user.nil? && @current_user.role != 'waiter' %>
|
||||||
@@ -200,7 +208,10 @@
|
|||||||
$(".qs_view").on('click', function() {
|
$(".qs_view").on('click', function() {
|
||||||
document.getElementById('second_view').click();
|
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 () {
|
$("#second_view").on('click', function () {
|
||||||
|
|||||||
471
app/views/origami/order_reservation/index.html.erb
Normal file
471
app/views/origami/order_reservation/index.html.erb
Normal file
@@ -0,0 +1,471 @@
|
|||||||
|
<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;">
|
||||||
|
<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>
|
||||||
|
<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>
|
||||||
|
<li class="nav-item" data-color="#03A9F4" 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>
|
||||||
|
|
||||||
|
<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 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>
|
||||||
|
|
||||||
|
<!--- Panel 3 - Orders -->
|
||||||
|
<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 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>
|
||||||
|
<!--- 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" style="margin:0px -5px !important ">
|
||||||
|
<div class="card">
|
||||||
|
<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">
|
||||||
|
<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="footer-td align-left">
|
||||||
|
SUB TOTAL
|
||||||
|
</td>
|
||||||
|
<td width ="30%" class="footer-td align-right">1400.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>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<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="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>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
|
</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 ;
|
||||||
|
}
|
||||||
|
|
||||||
|
.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>
|
||||||
@@ -202,13 +202,13 @@ $(document).ready(function(){
|
|||||||
// Bill Request
|
// Bill Request
|
||||||
$('#request_bills').click(function () {
|
$('#request_bills').click(function () {
|
||||||
var order_id = $('#save_order_id').val();
|
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({
|
$.ajax({
|
||||||
type: "GET",
|
type: "GET",
|
||||||
url: ajax_url,
|
url: ajax_url,
|
||||||
// data: 'order_id='+ order_id,
|
// data: 'order_id='+ order_id,
|
||||||
success: function (result) {
|
success: function (result) {
|
||||||
console.log(result)
|
|
||||||
if (!result.status) {
|
if (!result.status) {
|
||||||
swal("Information!", result.error_message);
|
swal("Information!", result.error_message);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,11 +20,11 @@ class ActionController::Base
|
|||||||
end
|
end
|
||||||
else
|
else
|
||||||
#check for license file
|
#check for license file
|
||||||
# if check_license
|
if check_license
|
||||||
# current_license(ENV["SX_PROVISION_URL"])
|
current_license(ENV["SX_PROVISION_URL"])
|
||||||
# else
|
else
|
||||||
# redirect_to activate_path
|
redirect_to activate_path
|
||||||
# end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ en:
|
|||||||
date_time: "DateTime"
|
date_time: "DateTime"
|
||||||
dine_in_cashier: "Dine-in Cashier"
|
dine_in_cashier: "Dine-in Cashier"
|
||||||
quick_service: "Quick Service"
|
quick_service: "Quick Service"
|
||||||
|
order_reservation: "Order & Reservation"
|
||||||
|
|
||||||
views:
|
views:
|
||||||
btn:
|
btn:
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ mm:
|
|||||||
date_time: "ရက်စွဲအချိန်"
|
date_time: "ရက်စွဲအချိန်"
|
||||||
dine_in_cashier: "Dine-in Cashier"
|
dine_in_cashier: "Dine-in Cashier"
|
||||||
quick_service: "Quick Service"
|
quick_service: "Quick Service"
|
||||||
|
order_reservation: "Order & Reservation"
|
||||||
|
|
||||||
views:
|
views:
|
||||||
btn:
|
btn:
|
||||||
|
|||||||
@@ -263,6 +263,8 @@ scope "(:locale)", locale: /en|mm/ do
|
|||||||
|
|
||||||
post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
|
post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
|
||||||
|
|
||||||
|
#order and reservation
|
||||||
|
resources :order_reservation
|
||||||
end
|
end
|
||||||
|
|
||||||
#--------- Waiter/Ordering Station ------------#
|
#--------- Waiter/Ordering Station ------------#
|
||||||
|
|||||||
Reference in New Issue
Block a user