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

fix ui

Browse Source
This commit is contained in:
Yan
2017-11-01 15:48:32 +06:30
parent a569e9b5a2
commit bb668e1070
5 changed files with 64 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,24 @@
/* Reset */
.col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col-auto, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-auto, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md-auto, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-auto, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl-auto {
padding-left: 5px;
padding-right: 5px;
}
.col-lg-1, .col-md-1, .col-sm-1,col-xl-1{
padding-left: 1px ;
padding-right: 1px ;
}
.ls-closed section.content {
margin-left: 5px;
}
section.content {
margin: 70px 5px 0 225px;
}
.table {
margin-bottom: 0px;
}
@@ -29,8 +47,18 @@ select.form-control {
font-size: 18px !important;
}
@media (min-width:769px) and (max-width:1024px) {
.btn-block {
font-size: 11px !important;
}
}
/* End Reset */
#back {
padding: 0px 0px 7px 0px;
}
.order-info {
min-height:300px;
max-height:500px;

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>