From a09dfe1d1f98fe5462edf9a361eb01dcf32e9e72 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 27 Dec 2018 17:00:18 +0630
Subject: [PATCH] check member search

---
 app/views/crm/customers/_new_form.html.erb | 31 ++++++++++++--------
 app/views/crm/customers/index.html.erb     |  2 ++
 app/views/origami/customers/index.html.erb | 34 ++++++++++++++--------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 5603256c..3ca71c39 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -274,23 +274,30 @@
 
   // get CardNo from Java
   function setCardNo(cardNo){
+    check_member = localStorage.getItem("member_card");
     if(cardNo.length == 16){
-      if($.inArray(cardNo, paypar_account_no) !== -1){
+      if(check_member == "true"){
         $("#paypar_account_no").val(cardNo);
         $("#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();
-        });
+        if($.inArray(cardNo, paypar_account_no) !== -1){
+          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();
+          });
+        }else{
+          $("#paypar_account_no").val(cardNo);
+          $("#search").val(cardNo);
+          $("#type").val("card");
+        }
       }
     }
   }
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 275ae672..b949291b 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -120,6 +120,7 @@
 
 <script type="text/javascript">
   $(document).ready(function () {
+    localStorage.setItem("member_card",false);
     /*$('.datepicker').datepicker({
         format : 'dd-mm-yyyy',
         autoclose: true
@@ -129,6 +130,7 @@
 
     // Read Card Reader
     $("#member_acc_no").on('click', function(e){
+      localStorage.setItem("member_card",true);
       var cardNo = "";
       $("#sxModal").show();
       setTimeout(function(){
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index e276acfc..e7d81539 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -371,6 +371,8 @@
     /* check webview loaded*/
     var webview = <%= @webview %>;
     showHideNavbar(webview);
+
+    localStorage.setItem("member_card",false);
       /*$('.datepicker').datepicker({
        setDate: '12-12-1999',
        format : 'dd-mm-yyyy',
@@ -396,6 +398,7 @@
     });
     // Read Card Reader
     $("#member_acc_no").on('click', function(e){  
+      localStorage.setItem("member_card",true);
       var cardNo = ""; 
       var customer_id = '';
       var customer_name = '';
@@ -481,23 +484,30 @@
 
   // get CardNo from Java
   function setCardNo(cardNo){
+    check_member = localStorage.getItem("member_card");
     if(cardNo.length == 16){
-      if($.inArray(cardNo, paypar_account_no) !== -1){
+      if(check_member == "true"){
         $("#paypar_account_no").val(cardNo);
         $("#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();
-        });
+        if($.inArray(cardNo, paypar_account_no) !== -1){
+          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();
+          });
+        }else{
+          $("#paypar_account_no").val(cardNo);
+          $("#search").val(cardNo);
+          $("#type").val("card");
+        }
       }
     }
   }