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

update conflix sarb rb

Browse Source
This commit is contained in:
Aung Myo
2017-11-06 14:17:47 +06:30
parent ce49f81440 6a8bf490d8
commit 3aacc63b82
29 changed files with 425 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/home/dashboard.html.erb
View File

@@ -95,7 +95,6 @@
<% end %>
</div>
<!-- <script src="js/Chart.js"></script> -->
<script>
$(document).ready(function(){
var top_products = JSON.parse('<%= @top_products.to_json.html_safe %>');

2
app/views/layouts/_header.html.erb
View File

@@ -21,8 +21,6 @@
</a>
</div>
<!-- Start Delete confirrm text !-->
<div class="navbar-right">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<% if current_login_employee %>

1
app/views/layouts/application.html.erb
View File

@@ -7,6 +7,7 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<title>SmartSales : Restaurant</title>
<%= csrf_meta_tags %>
<!-- Favicon-->
<link rel="icon" href="/favicon.ico" type="image/x-icon">

2
app/views/oqs/home/index.html.erb
View File

@@ -187,6 +187,7 @@
</div>
</div>
</div>
<!-- <script type="text/javascript">
$(document).ready(function(){
@@ -414,3 +415,4 @@
});
});
</script> -->
>>>>>>> 01c4eeca81e1eac7bf7fe5854142a9663e104249

6
app/views/origami/addorders/detail.html.erb
View File

@@ -26,7 +26,11 @@
</div>
<div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
<button type="button" class="btn btn-default btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br>
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
<i class="material-icons">reply</i>
Back
</button>
<br>
<div class="card-header">
<div>
<strong id="order-title">ORDER DETAILS </strong>| Table<%=@table.name%>

5
app/views/origami/addorders/index.html.erb
View File

@@ -52,7 +52,10 @@
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" id='back' >Back</button>
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
<i class="material-icons">reply</i>
Back
</button>
</div>
</div>
<script>

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

@@ -314,36 +314,39 @@
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons -->
<button type="button" class="btn btn-block btn-default waves-effect" id='back'><i class="fa fa-arrow-left"></i> Back</button>
<button type="button" id="add_order" class="btn btn-block btn- bg-blue waves-effect">Add Order</button>
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
<i class="material-icons">reply</i>
Back
</button>
<button type="button" id="add_order" class="btn btn-block bg-blue waves-effect">Add Order</button>
<% if @dining.status != "available" %>
<% if @status_order == 'order' %>
<button type="button" id="customer" class="btn btn-block btn- bg-blue waves-effect" disabled>Customer</button>
<button type="button" class="btn btn-block btn- bg-blue waves-effect" disabled>Edit</button>
<button type="button" id="discount" class="btn btn-block btn- bg-blue waves-effect" disabled>Discount</button>
<button type="button" id="other-charges" class="btn btn-block btn- bg-blue waves-effect" disabled>Charges</button>
<button type="button" class="btn btn-block btn- bg-blue waves-effect" id='move'>Move</button>
<button type="button" id="request_bills" class="btn btn-block btn- bg-blue waves-effect">Req.Bill</button>
<button type="button" id="first_bill" class="btn btn-block btn- bg-blue waves-effect" disabled>First Bill</button>
<button type="button" id="pay" class="btn btn-block btn- bg-blue waves-effect" disabled>Pay</button>
<button type="button" class="btn btn-block btn- bg-blue waves-effect" disabled> Void</button>
<button type="button" id="customer" class="btn btn-block bg-blue waves-effect" disabled>Customer</button>
<button type="button" class="btn btn-block bg-blue waves-effect" disabled>Edit</button>
<button type="button" id="discount" class="btn btn-block bg-blue waves-effect" disabled>Discount</button>
<button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect" disabled>Charges</button>
<button type="button" class="btn btn-block bg-blue waves-effect" id='move'>Move</button>
<button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
<button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect" disabled>First Bill</button>
<button type="button" id="pay" class="btn btn-block bg-blue waves-effect" disabled>Pay</button>
<button type="button" class="btn btn-block bg-blue waves-effect" disabled> Void</button>
<% end %>
<% if @status_sale == 'sale' %>
<button type="button" id="customer" class="btn btn-block btn- bg-blue waves-effect">Customer</button>
<button type="button" class="btn btn-block btn- bg-blue waves-effect" id='edit'>Edit</button>
<button type="button" id="discount" class="btn btn-block btn- bg-blue waves-effect">Discount</button>
<button type="button" id="other-charges" class="btn btn-block btn- bg-blue waves-effect">Charges</button>
<button type="button" id="commissions" class="btn btn-block btn- bg-blue waves-effect">Commissions</button>
<button type="button" id="in_duties" class="btn btn-block btn- bg-blue waves-effect">In Duties</button>
<button type="button" class="btn btn-block btn- bg-blue waves-effect" id='move' disabled="">Move</button>
<button type="button" id="request_bills" class="btn btn-block btn- bg-blue waves-effect" disabled> Req.Bill</button>
<button type="button" id="first_bill" class="btn btn-block btn- bg-blue waves-effect">First Bill</button>
<button type="button" id="pay" class="btn btn-block btn- bg-blue waves-effect">Pay</button>
<button type="button" id="void" class="btn btn-block btn- bg-blue waves-effect"> Void</button>
<button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
<button type="button" class="btn btn-block bg-blue waves-effect" id='edit'>Edit</button>
<button type="button" id="discount" class="btn btn-block bg-blue waves-effect">Discount</button>
<button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
<button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
<button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
<button type="button" class="btn btn-block bg-blue waves-effect" id='move' disabled="">Move</button>
<button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect" disabled> Req.Bill</button>
<button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
<button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
<button type="button" id="void" class="btn btn-block bg-blue waves-effect"> Void</button>
<% end %>
<!-- Cashier Buttons -->
<!-- <button type="button" id="re-print" class="btn btn-block btn- bg-blue waves-effect" >Re.Print</button> -->
<!-- <button type="button" id="re-print" class="btn btn-block bg-blue waves-effect" >Re.Print</button> -->
<% end %>
</div>
</div>

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

@@ -30,7 +30,7 @@
</div>
<div class='col-md-8'>
<div class="row">
<div class="col-lg-6 col-md-1 col-sm-1">
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom">
<div class=" cashier_number " data-value="1" data-type="num">1</div>
<div class=" cashier_number left" data-value="2" data-type="num">2</div>