diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index aa5101f0..39b97f91 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -33,7 +33,9 @@ <% end %> - + @@ -95,29 +97,6 @@ $(function() { - var video = document.querySelector("#videoElement"); -  - navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia || navigator.oGetUserMedia; -   - if (navigator.getUserMedia) {       -     navigator.getUserMedia({video: true}, handleVideo, videoError); - } -   - function handleVideo(stream) { -     video.src = window.URL.createObjectURL(stream); - video.addEventListener('loadeddata', function (content) { - console.log(content); - }); - - // video.addEventListener('loadeddata', function() { - // console.log('Video dimensions: ' + video.videoWidth + ' x ' + video.videoHeight); - // }, false); - } -   - function videoError(e) { -     // do something - } - $('.datepicker').datepicker({ format : 'dd-mm-yyyy', autoclose: true @@ -138,12 +117,10 @@ $(function() { // QR Code Reader $("#qr_code").on('click', function(e){ - var code = ""; - $("#sxQRModal").show(); + var code = ""; setTimeout(function(){ - console.log("hi") - getQRCode(); - $("#sxQRModal").hide(); + console.log("hi") + getQRCode(); },100); }); @@ -154,7 +131,7 @@ $(function() { // get CardNo from Java function QRCodeNo(code){ - alert(code); + $("#search").val(code); } });