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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-09 12:04:32 +06:30
parent 66ae94c3e2 0813cb5722
commit eba30f6566
18 changed files with 820 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/addorder.js
View File

@@ -664,7 +664,7 @@ $(function(){
success:function(result){
$("#loading_wrapper").hide();
swal({
title: "Infomation !",
title: "Information !",
text: 'Order has been successfully created',
confirmButtonColor: "green",
confirmButtonText: "Yes!",

10
app/assets/stylesheets/origami.scss
View File

@@ -104,6 +104,16 @@ select.form-control {
color:white;
}
.move_table{
width: 100%;
height:74px;
line-height:74px;
text-align:center;
font-size:20px;
color:white;
}
.payment{
height:50px;
line-height:50px;

5
app/views/origami/cash_ins/new.html.erb
View File

@@ -45,8 +45,9 @@
</table>
</div>
<div class="col-lg-2 col-md-2 col-sm-2 ">
<div class="button-demo">
<button type="button" class="btn bg-default waves-effect btn-" id='back'> <%= t("views.btn.back") %> </button>
<br>
<div class="button-demo m-t-40">
<button type="button" class="btn bg-default waves-effect btn-" id='back'><i class="material-icons">reply</i> <%= t("views.btn.back") %> </button>
<button type="button" class="btn bg-blue waves-effect btn-" id='cash_in'> <%= t("views.btn.cash_in") %> </button>
</div>

2
app/views/origami/cash_outs/new.html.erb
View File

@@ -19,7 +19,7 @@
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<br><br>
<button type="button" class="btn bg-default btn-block" id='back'> <%= t("views.btn.back") %> </button>
<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" id='cash_out'> <%= t("views.btn.cash_out") %> </button>
</div>
</div>

4
app/views/origami/discounts/index.html.erb
View File

@@ -21,7 +21,7 @@
<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="custom-slimscroll">
<div id="order-detail-slimscroll" data-height="160">
<div class="card-text dining">
<table class="table table-default" id="order-items-table">
<thead>
@@ -209,7 +209,7 @@
<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';"><i class="fa fa-arrow-left"></i> Back </button>
<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami';"><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>

2
app/views/origami/home/show.html.erb
View File

@@ -154,7 +154,7 @@
</div>
</div>
</div>
<div id="order-detail-slimscroll">
<div id="order-detail-slimscroll" data-height="160">
<div class="card-text order-info" >
<table class="table table-striped" id="order-items-table">
<thead>

2
app/views/origami/in_duties/index.html.erb
View File

@@ -40,7 +40,7 @@
</div>
<div class="col-md-1">
<button type="button" class="btn btn-default btn-block" id='back'>Back</button>
<button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
</div>
</div>
<script type="text/javascript">

28
app/views/origami/moveroom/move_dining.html.erb
View File

@@ -1,3 +1,4 @@
<div class="container-fluid">
<div class="row">
<!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6">
@@ -14,11 +15,9 @@
</ul>
<!-- Nav tabs - End -->
<div class="tab-content" style="max-height:570px; overflow:auto">
<div id="order-detail-slimscroll" data-height="130">
<div class="tab-content" style="">
<!--- Panel 0 - Completed Orders -->
<!--- Panel 1 - Table Orders -->
<div class="tab-pane " id="tables" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
@@ -60,10 +59,8 @@
<% end %>
</div>
</div>
<!--- Panel 3 - s -->
</div>
</div>
<!-- tabs - End -->
</div>
@@ -79,14 +76,14 @@
<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">
<p class="m-l-10"> Receipt No: <span id="receipt_no">
<% if @status_sale == 'sale' %>
<%= @obj_sale.receipt_no rescue '' %>
<% end %>
</span></p>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
<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">
@@ -95,13 +92,14 @@
</div>
</div>
<div class="card-text" style="min-height:500px; max-height:500px; overflow:auto" >
<div id="order-detail-slimscroll" data-height="130">
<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</td>
<th class="item-attr">Price</td>
<th class="item-attr">QTY</th>
<th class="item-attr">Price</th>
</tr>
</thead>
<tbody>
@@ -143,9 +141,10 @@
</tbody>
</table>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="pay purple" id="move_table">MOVE TABLE</div>
<div class="move_table purple" id="move_table">MOVE TABLE</div>
</div>
</div>
</div>
@@ -155,11 +154,12 @@
<!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons -->
<button type="button" class="btn bg-default btn-block" id='back'>Back</button>
<button type="button" class="btn bg-default btn-block" id='back'> <i class="material-icons">reply</i>Back</button>
</div>
</div>
</div>
<script>
$(document).ready(function(){
$(".tables").on('click', function(){

30
app/views/origami/movetable/move_dining.html.erb
View File

@@ -1,4 +1,5 @@
<div class="row">
<div class="container-fluid">
<div class="row clearfix">
<!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6">
@@ -14,11 +15,8 @@
</ul>
<!-- Nav tabs - End -->
<div class="tab-content" style="max-height:570px; overflow:auto">
<!--- Panel 0 - Completed Orders -->
<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;" >
@@ -62,8 +60,7 @@
</div>
<!--- Panel 3 - s -->
</div>
</div>
<!-- tabs - End -->
</div>
@@ -79,14 +76,14 @@
<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">
<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>Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
<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">
@@ -95,14 +92,15 @@
</div>
</div>
<div class="card-text" style="min-height:500px; max-height:500px; overflow:auto" >
<div id="order-detail-slimscroll" data-height="130">
<div class="card-text" style="" >
<table class="table table-striped" id="order-items-table">
<thead>
<tr>
<th>#</th>
<th class="item-name">Items</th>
<th class="item-attr">QTY</td>
<th class="item-attr">Price</td>
<th class="item-attr">QTY</th>
<th class="item-attr">Price</th>
</tr>
</thead>
<tbody>
@@ -153,6 +151,7 @@
</tbody>
</table>
</div>
</div>
<%
if @status_sale == 'sale'
unless @order_items.nil?
@@ -196,7 +195,7 @@
%>
<div class="row">
<div class="col-md-12">
<div class="pay purple" id="move_table">MOVE TABLE</div>
<div class="move_table purple" id="move_table">MOVE TABLE</div>
</div>
</div>
</div>
@@ -206,9 +205,10 @@
<!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons -->
<button type="button" class="btn btn-default btn-block" id='back'>Back</button>
<button type="button" class="btn btn-default btn-block" id='back'> <i class="material-icons">reply</i>Back</button>
</div>
</div>
</div>
<script>

16
app/views/origami/orders/show.html.erb
View File

@@ -22,7 +22,7 @@
<div id="custom-slimscroll">
<div class="tab-content">
<!--- Panel 0 - Completed Orders -->
<div class="tab-pane " id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
<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 %>">
@@ -35,7 +35,7 @@
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane " id="tables" role="tabpanel" style="max-height:600px; overflow:auto">
<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' %>
@@ -61,7 +61,7 @@
</div>
<!--- Panel 2 - Room Orders -->
<div class="tab-pane" id="rooms" role="tabpanel" style="max-height:600px; overflow:auto">
<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' %>
@@ -87,7 +87,7 @@
</div>
<!--- Panel 3 - Orders -->
<div class="tab-pane active" id="orders" role="tabpanel" style="max-height:600px; overflow:auto">
<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 %>">
@@ -142,13 +142,14 @@
</div>
</div>
<div class="card-text" style="max-height:500px; overflow:auto">
<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</td>
<th class="item-attr">Price</td>
<th class="item-attr">QTY</th>
<th class="item-attr">Price</th>
</tr>
</thead>
<tbody>
@@ -170,6 +171,7 @@
</tbody>
</table>
</div>
</div>
<div class="card-footer">
<table class="table" id="order-charges-table" border="0">
<tr>

2
app/views/origami/other_charges/index.html.erb
View File

@@ -18,7 +18,7 @@
<p>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">
<div id="order-detail-slimscroll" data-height="160">
<div class="card-text dining">
<table class="table table-default" id="order-items-table">
<thead>

2
app/views/origami/payments/show.html.erb
View File

@@ -40,7 +40,7 @@
</table>
</div>
</div>
<div id="order-detail-slimscroll" data-height="300">
<div id="order-detail-slimscroll" data-height="280">
<!-- <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll"> -->
<div id="table-details" class="card-text m-t--10" >
<table class="table" id="append-table">

4
app/views/origami/product_commissions/load_commissioners.html.erb
View File

@@ -48,6 +48,7 @@
</div>
<div id="order-detail-slimscroll">
<!-- <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll"> -->
<div id="order-detail-slimscroll" data-height="160">
<div class="card-text">
<table class="table " id="order-items-table">
<thead>
@@ -96,6 +97,7 @@
</table>
</div>
</div>
</div>
<div class="card-footer">
<table class="table" id="order-charges-table" border="0">
<tr>
@@ -112,7 +114,7 @@
<!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons -->
<button type="button" class="btn btn-default btn-block" id='back'>Back</button>
<button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
<!--<button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>-->
</div>
</div>

6
app/views/origami/rooms/show.html.erb
View File

@@ -155,14 +155,15 @@
</div>
</div>
<div id="order-detail-slimscroll" data-height="160">
<div class="card-text order-info">
<table class="table table-striped" id="order-items-table">
<thead>
<tr>
<th></th>
<th class="item-name">Items</th>
<th class="item-attr">QTY</td>
<th class="item-attr">Price</td>
<th class="item-attr">QTY</th>
<th class="item-attr">Price</th>
</tr>
</thead>
<tbody>
@@ -217,6 +218,7 @@
</tbody>
</table>
</div>
</div>
<div class="card-footer">
<table class="table" id="order-charges-table" border="0">
<tr>

14
app/views/origami/sales/show.html.erb
View File

@@ -35,7 +35,7 @@
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane " id="tables" role="tabpanel" style="max-height:600px; overflow:auto">
<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' %>
@@ -61,7 +61,7 @@
</div>
<!--- Panel 2 - Room Orders -->
<div class="tab-pane" id="rooms" role="tabpanel" style="max-height:600px; overflow:auto">
<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' %>
@@ -87,7 +87,7 @@
</div>
<!--- Panel 3 - Orders -->
<div class="tab-pane" id="orders" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="tab-pane" 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 bg-red text-white" data-id = "<%= order.order_id %>">
@@ -129,13 +129,14 @@
</div>
</div>
<div class="card-text" style="max-height:400px; overflow:auto">
<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</td>
<th class="item-attr">Price</td>
<th class="item-attr">QTY</th>
<th class="item-attr">Price</th>
</tr>
</thead>
<tbody>
@@ -160,6 +161,7 @@
</tbody>
</table>
</div>
</div>
<div class="card-footer">
<table class="table" id="order-charges-table" border="0">
<tr>

2
app/views/origami/shifts/show.html.erb
View File

@@ -25,7 +25,7 @@
</div>
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<button type="button" class="btn bg-default btn-block" id='back'> <%= t("views.btn.back") %> </button>
<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>
</div>
</div>

8
app/views/origami/table_invoices/show.html.erb
View File

@@ -45,14 +45,15 @@
</div>
</div>
<div class="card-text" style="max-height:600px; overflow:auto">
<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>#</th>
<th class="item-name">Items</th>
<th class="item-attr">QTY</td>
<th class="item-attr">Price</td>
<th class="item-attr">QTY</th>
<th class="item-attr">Price</th>
</tr>
</thead>
<tbody>
@@ -103,6 +104,7 @@
</tbody>
</table>
</div>
</div>
<div class="card-footer">
<table class="table" id="order-charges-table" border="0">
<tr>

66
db/sym_master.sql
View File

@@ -84,6 +84,7 @@ insert into sym_node_group_link (source_node_group_id, target_node_group_id, dat
insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('store', '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);
@@ -113,6 +114,7 @@ insert into sym_trigger
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);
@@ -129,7 +131,6 @@ 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)
@@ -258,7 +259,24 @@ 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);
# Create Trigger for Order Channel
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);
@@ -267,6 +285,10 @@ 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);
@@ -619,6 +641,22 @@ insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('shift_sales','store_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','store_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','store_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','store_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','store_2_sx', 200, current_timestamp, current_timestamp);
# Sale Channel # From SX to Store
insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -651,6 +689,22 @@ values('payment_journals','sx_2_store', 200, current_timestamp, current_timestam
insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('shift_sales','sx_2_store', 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_store', 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_store', 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_store', 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_store', 200, current_timestamp, current_timestamp);
# End Sale Channel
# Oqs Channel # From Store to Sx
@@ -662,6 +716,10 @@ insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('cashier_terminals','store_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','store_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','store_2_sx', 200, current_timestamp, current_timestamp);
@@ -683,6 +741,10 @@ insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('cashier_terminals','sx_2_store', 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_store', 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_store', 200, current_timestamp, current_timestamp);