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

discount ui changed

Browse Source
This commit is contained in:
Yan
2017-06-21 10:50:16 +06:30
parent 6207f1ce24
commit e3c83cdd44
2 changed files with 85 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,19 @@
background:#A9F5F2; background:#A9F5F2;
} }
.action-btn {
height: 60px;
margin-bottom: 5px;
}
.bottom-5 {
margin-bottom: 5px;
}
.fluid {
width: 100%;
}
.long{ .long{
width:49%; width:49%;
} }

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

@@ -1,7 +1,6 @@
<div class="row"> <div class="row">
<!-- Column One --> <!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<!-- Order Details --> <!-- Order Details -->
<div class="card" > <div class="card" >
<!-- <div class="card-header"> <!-- <div class="card-header">
@@ -75,7 +74,7 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- Column One --> <!-- Column One -->
@@ -84,7 +83,7 @@
<!-- Discount Amount --> <!-- Discount Amount -->
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<div><strong id="order-title">Overall Discount</strong></div> <div><strong id="order-title">Discount Control</strong></div>
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title"> <div class="card-title">
@@ -100,22 +99,16 @@
<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" /> <input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
</div> </div>
</div> --> </div> -->
<div class="form-group"> <div class="col-md-12">
<div class="col-md-5"> <div class="form-group">
<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" /> <input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
</div> </div>
<div class="col-md-7"> <div class="form-group">
<% <%
@accounts.each do |acc| @accounts.each do |acc|
%> %>
<button id="<%= acc.title %>" class="btn btn-default"><%= acc.title %></button> <button id="<%= acc.title %>" class="btn btn-default"><%= acc.title %></button>
<% end %> <% end %>
</div>
</div>
<div class="form-group">
<div class="col-md-12">
<button id="net-discount" class="btn btn-primary long">Net Discount</button>
<button id="percentage-discount" class="btn btn-primary long">Percentage Discount</button>
</div> </div>
</div> </div>
</div> </div>
@@ -123,71 +116,71 @@
<hr /> <hr />
<div class="col-md-12"> <div class="row">
<div class="row"> <div class="col-md-9">
<div class="col-md-5"> <div class="row bottom">
<div class="col-md-12 cashier_number long" data-value="5" data-type="add">5%</div> <div class="col-md-3">
</div> <div class="fluid cashier_number" data-value="5" data-type="add">5%</div>
<div class="col-md-7"> </div>
<div class="row bottom"> <div class="col-md-9">
<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div> <div class="col-md-4 cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div> <div class="col-md-4 left cashier_number" data-value="2" data-type="num">2</div>
<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div> <div class="col-md-4 left cashier_number" data-value="3" data-type="num">3</div>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row bottom">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="10" data-type="add">10%</div> <div class="fluid cashier_number" data-value="10" data-type="add">10%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row bottom"> <div class="col-md-4 cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div> <div class="col-md-4 left cashier_number" data-value="5" data-type="num">5</div>
<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div> <div class="col-md-4 left cashier_number" data-value="6" data-type="num">6</div>
<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div> </div>
</div> </div>
</div>
</div>
<div class="row"> <div class="row bottom">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="20" data-type="add">20%</div> <div class="fluid cashier_number" data-value="20" data-type="add">20%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row bottom"> <div class="col-md-4 cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div> <div class="col-md-4 left cashier_number" data-value="8" data-type="num">8</div>
<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div> <div class="col-md-4 left cashier_number" data-value="9" data-type="num">9</div>
<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div> </div>
</div> </div>
</div>
</div>
<div class="row"> <div class="row bottom">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="30" data-type="add">30%</div> <div class="fluid cashier_number" data-value="30" data-type="add">30%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row bottom"> <div class="col-md-4 cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div> <div class="col-md-4 left cashier_number" data-value="." data-type="num">.</div>
<div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div> <div class="col-md-4 left cashier_number" data-value="00" data-type="num">00</div>
<div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div> </div>
</div> </div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="50" data-type="add">50%</div> <div class="fluid cashier_number" data-value="50" data-type="add">50%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row"> <div class="col-md-4 cashier_number"></div>
<div class="col-md-3 cashier_number"></div> <div class="col-md-4 left cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 left cashier_number red" data-type="del">DEL</div> <div class="col-md-4 left cashier_number green" data-type="clr">CLR</div>
<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-md-3">
<div class="form-group">
<button id="net" class="btn btn-warning fluid action-btn">Net</button>
<button id="percentage" class="btn btn-primary fluid action-btn">Percentage</button>
<button id="pay-discount" class="btn btn-danger fluid action-btn">Enter</button>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>