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

merge with origin

Browse Source
This commit is contained in:
Yan
2017-10-27 17:06:07 +06:30
parent 0f24cc0999
commit 5c27dcff66
15 changed files with 135 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@
<div class="card-header">
<div><strong id="order-title">COMMISSIONERS </strong></div>
</div>
<div class="card-block">
<div class="card-columns" id="commissioners" style="float: left; padding-top:10px; column-gap: 1.2rem; min-height:600px; max-height:600px; overflow-x:scroll;">
<div class="card-block" id="custom-slimscroll">
<div class="card-columns" id="commissioners" style="float: left; padding-top:10px; column-gap: 1.2rem; ">
<div style="color: gray"><i>* Select One Item</i></div>
<% @commissioners.each do |commissioner| %>
<div class="card tables green text-white commissioner" data-commissioner-id="<%= commissioner.id %>" data-commissioner-name="<%= commissioner.name %>">
@@ -30,12 +30,12 @@
<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="p-l-10 "> Receipt No: <span id="receipt_no">
<%= @saleobj.receipt_no rescue '' %>
</span></p>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date:
<p class="p-r-10">Date:
<span id="receipt_date"><%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
</p>
</div>
@@ -112,7 +112,7 @@
<!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
<button type="button" class="btn btn-default btn-block" id='back'>Back</button>
<!--<button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>-->
</div>
</div>