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

still nfc

Browse Source
This commit is contained in:
Yan
2017-07-17 15:07:27 +06:30
parent b2ccc12e17
commit 51c14f379b
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/crm/customers/_new_form.html.erb
View File

@@ -128,12 +128,15 @@
<script type="text/javascript">
$(function() {
// Read Card Reader
$("#paypar_account_no").on('focus', function(e){
$("#paypar_account_no").on('focus', function(e){
var cardNo = "";
$("#sxModal").show();
setTimeout(function(){
getCardNo();
cardNo = getCardNo();
$("#sxModal").hide();
},100);
},100);
$(this).val(cardNo);
});
});
@@ -144,9 +147,10 @@
}
// get CardNo from Java
function setCardNo(cardNo){
if(cardNo.length == 16){
$("#paypar_account_no").val(cardNo);
}
}
// function setCardNo(cardNo){
// if(cardNo.length == 16){
// $("#paypar_account_no").val(cardNo);
// $("#search").val(cardNo);
// }
// }
</script>

17
app/views/crm/customers/index.html.erb
View File

@@ -22,10 +22,11 @@
<tr>
<td colspan="6">
<%= form_tag crm_customers_path, :method => :get do %>
<%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
<div class="input-append col-md-12 form-group pull-left">
<input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control input-xs col-md-4">
<button type="submit" class="btn btn-primary btn-md">Search</button>
<button id="member_acc_no" class="btn btn-success"><span class="fa fa-credit-card"></span> Member Card</button>
<!-- <a href="modal-window" data-toggle= "modal" data-target="#modal-window" class="btn btn-primary btn-md" id="card_read" >Read Card</a> -->
<!-- <button type="button" class="btn btn-info btn-md" data-toggle="modal" data-target="#myModal">Open Modal</button> -->
@@ -73,7 +74,6 @@
<%= paginate @crm_customers %>
</div>
</div>
<%= render 'card_read_form' %>
</div>
<%= render 'new_form', crm_customer: @crm_customer %>
@@ -97,6 +97,19 @@ $(function() {
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer');
// Read Card Reader
$("#member_acc_no").on('click', function(e){
var cardNo = "";
$("#sxModal").show();
setTimeout(function(){
cardNo = getCardNo();
$("#search").val(cardNo);
$("#sxModal").hide();
},100);
$("#filter_form").submit();
});
});
$(document).on('click',".customer_tr",function(){