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

check duplicate paypar account no issue

Browse Source
This commit is contained in:
phyusin
2018-12-27 16:08:34 +06:30
parent 7a60ab91c5
commit 398f97f244
4 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/crm/customers_controller.rb
View File

@@ -45,6 +45,9 @@ class Crm::CustomersController < BaseCrmController
@filter = filter @filter = filter
#get paypar accountno
@paypar_accountno = Customer.where("paypar_account_no IS NOT NULL AND paypar_account_no != ''").pluck("paypar_account_no")
#for create customer on/off #for create customer on/off
@create_flag = true @create_flag = true
lookup_customer = Lookup.collection_of('customer_settings') lookup_customer = Lookup.collection_of('customer_settings')

3
app/controllers/origami/customers_controller.rb
View File

@@ -93,7 +93,8 @@ class Origami::CustomersController < BaseOrigamiController
# @crm_customer.valid? # @crm_customer.valid?
# end # end
@membership_types = Lookup.collection_of("member_group_type") @membership_types = Lookup.collection_of("member_group_type")
#get paypar accountno
@paypar_accountno = Customer.where("paypar_account_no IS NOT NULL AND paypar_account_no != ''").pluck("paypar_account_no")
#for create customer on/off #for create customer on/off
@create_flag = true @create_flag = true
lookup_customer = Lookup.collection_of('customer_settings') lookup_customer = Lookup.collection_of('customer_settings')

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

@@ -244,8 +244,11 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var paypar_account_no = [];
$(function() { $(function() {
paypar_account_no = JSON.parse('<%= @paypar_accountno.to_json.html_safe %>');
console.log(paypar_account_no);
// Read Card Reader // Read Card Reader
$("#paypar_account_no").on('focus', function(e){ $("#paypar_account_no").on('focus', function(e){
if($(this).val() == ''){ if($(this).val() == ''){
@@ -272,9 +275,23 @@
// get CardNo from Java // get CardNo from Java
function setCardNo(cardNo){ function setCardNo(cardNo){
if(cardNo.length == 16){ if(cardNo.length == 16){
$("#paypar_account_no").val(cardNo); if($.inArray(cardNo, paypar_account_no) !== -1){
$("#search").val(cardNo); $("#paypar_account_no").val(cardNo);
$("#type").val("card"); $("#search").val(cardNo);
$("#type").val("card");
}else{
swal({
title: 'Oops',
text: 'CardNo already registered, Please try another card!',
type: 'error',
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.reload();
});
}
} }
} }

23
app/views/origami/customers/index.html.erb
View File

@@ -364,7 +364,10 @@
<script type="text/javascript"> <script type="text/javascript">
var cashier_type = "<%= @cashier_type %>"; var cashier_type = "<%= @cashier_type %>";
var page = "<%= @page %>"; var page = "<%= @page %>";
var paypar_account_no = [];
$(function() { $(function() {
paypar_account_no = JSON.parse('<%= @paypar_accountno.to_json.html_safe %>');
console.log(paypar_account_no);
/* check webview loaded*/ /* check webview loaded*/
var webview = <%= @webview %>; var webview = <%= @webview %>;
showHideNavbar(webview); showHideNavbar(webview);
@@ -479,9 +482,23 @@
// get CardNo from Java // get CardNo from Java
function setCardNo(cardNo){ function setCardNo(cardNo){
if(cardNo.length == 16){ if(cardNo.length == 16){
$("#paypar_account_no").val(cardNo); if($.inArray(cardNo, paypar_account_no) !== -1){
$("#search").val(cardNo); $("#paypar_account_no").val(cardNo);
$("#type").val("card") $("#search").val(cardNo);
$("#type").val("card");
}else{
swal({
title: 'Oops',
text: 'CardNo already registered, Please try another card!',
type: 'error',
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.reload();
});
}
} }
} }