This commit is contained in:
Yan
2017-07-18 16:06:36 +06:30
parent c068d702b3
commit a5546920b6
9 changed files with 54 additions and 24 deletions

View File

@@ -12,20 +12,20 @@
<div class="main-box-body clearfix" style="min-height:500px; max-height:500px; overflow-x:scroll">
<div class="table-responsive">
<table class="table table-striped">
<table id="origami-crm-table" class="table table-striped">
<thead>
<tr>
<td colspan="6">
<% path ="/origami/#{@sale_id}/customers" %>
<%= form_tag path, :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" class="form-control input-sm col-md-4">
<button type="submit" class="btn btn-primary btn-sm">Search</button>
<button class="btn btn-success"><span class="fa fa-credit-card"></span>Member Card</button>
<%= form_tag path, :id => "filter_form", :method => :get do %>
<div class="input-append col-md-7 form-group pull-left">
<input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9">
<button type="submit" class="btn btn-primary btn-sm">Search</button>
</div>
<% end %>
<button id="member_acc_no" class="btn btn-success btn-sm"><span class="fa fa-credit-card"></span> Member Card</button>
</td>
</tr>
<tr>
@@ -94,8 +94,7 @@
<div class="form-group">
<label>Paypar Account No:</label>
<div class="input-group">
<%= #f.input :paypar_account_no, :id => "paypar_account_no", :class => "form-control" %>
<input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/>
<input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
<div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
</div>
</div>
@@ -224,6 +223,23 @@
$("#sxModal").hide();
},100);
});
// Read Card Reader
$("#member_acc_no").on('click', function(e){
var cardNo = "";
var sale_id = $("#sale_id").val() || 0;
var customer_mamber_card_no = 0;
$("#sxModal").show();
setTimeout(function(){
getCardNo();
$("#sxModal").hide();
customer_mamber_card_no = $("#search").val();
if(sale_id != 0 && customer_mamber_card_no != 0){
update_sale(customer_mamber_card_no,sale_id);
}
},100);
});
});
@@ -236,6 +252,7 @@
function setCardNo(cardNo){
if(cardNo.length == 16){
$("#paypar_account_no").val(cardNo);
$("#search").val(cardNo);
}
}
@@ -253,6 +270,7 @@
var url = "customers/"+customer_id;
}
// Need To Clean?
$.ajax({
type: "GET",
url: url,

View File

@@ -107,7 +107,8 @@
<button id="refreshbutton" type="button" class="btn btn-block" style="border-radius:5px;color:#fff;background-color:red;"> Refresh off </button>
<button id="cash_in" type="button" class="btn btn-block btn-primary"> Cash In </button>
<button id="cash_out" type="button" class="btn btn-block btn-primary"> Cash Out </button>
<button id="sale_summary" type="button" class="btn btn-block btn-primary">Sale Sammary</button>
<!-- Temporary Disabled -->
<!-- <button id="sale_summary" type="button" class="btn btn-block btn-primary">Sale Sammary</button> -->
<button id="close_cashier" type="button" class="btn btn-block btn-primary"> Close Cashier </button>
</div>
</div>