Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant

2017-07-24 19:28:59 +06:30
parent 9c4e5bbdc8 bf9b977cd0
commit b240bbe5fe
9 changed files with 60 additions and 38 deletions
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -131,10 +131,12 @@
    $("#paypar_account_no").on('focus', function(e){ 
      var cardNo = "";
      $("#sxModal").show();   
-      setTimeout(function(){
-        getCardNo();
-        $("#sxModal").hide();
-      },100); 
+      if($(this).val() == ''){
+        setTimeout(function(){
+          getCardNo();
+          $("#sxModal").hide();
+        },100); 
+      }
    });
  });

--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -130,7 +130,7 @@
                    end
                  end
                %>
-
+                
              <!--- end of Items-->
            </div>
          </div>