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

merge with phyu sin

Browse Source
This commit is contained in:
Yan
2017-10-27 18:40:58 +06:30
parent 6feb524db8
commit 6f6c037e9e
33 changed files with 170 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,15 @@
<div class="container-fluid">
<div class='row clearfix'>
<div class='col-md-10'>
<h1>Close Cashier</h1>
<h1><%= t :close_cashier %></h1>
<br>
<table class='table table-striped'>
<tr>
<td>Shift Started At</td>
<td><%= t :shift_started_at %></td>
<td><%= @shift.shift_started_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></td>
</tr>
<tr>
<td>Cashier Name</td>
<td><%= t :cashier_name %></td>
<td><%= @shift.employee.name rescue ''%></td>
</tr>
@@ -17,7 +17,7 @@
<hr>
<div class='row clearfix '>
<div class='col-md-5'>
<span style='font-size:20px;'><b>Closing Balance</b></span>
<span style='font-size:20px;'><b><%= t :closing_balance %></b></span>
</div>
<div class='col-md-6'>
<span style='font-size:20px;'><b><input type='text' class="form-control" id='closing_balance_amount' value=''></b></span>
@@ -25,8 +25,8 @@
</div>
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<button type="button" class="btn bg-default btn-block" id='back'> Back </button>
<button type="button" class="btn bg-blue btn-block green" id='close_cashier'> Close Cashier </button>
<button type="button" class="btn bg-default btn-block" id='back'> <%= 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>
</div>