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

Merge branch 'doemal_ordering'

Browse Source
This commit is contained in:
Aung Myo
2018-04-11 18:06:55 +06:30
parent dab00151ef 4d92d71b5c
commit c1a6ff7230
10 changed files with 485 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/origami/order_reservation/_order_item.json.jbuilder Normal file
View File

@@ -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

25
app/views/origami/order_reservation/get_order.json.jbuilder Normal file
View File

@@ -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

434
app/views/origami/order_reservation/index.html.erb
View File

@@ -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>
</script>