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

adding qr

Browse Source
This commit is contained in:
Yan
2017-09-13 18:38:05 +06:30
parent 807d472c01
commit 6482f05218
1 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/views/crm/customers/index.html.erb
View File

@@ -33,7 +33,9 @@
</div> </div>
<% end %> <% end %>
<button id="member_acc_no" class="btn btn-success btn-md"><span class="fa fa-credit-card"></span> Member Card</button> <button id="member_acc_no" class="btn btn-success btn-md"><span class="fa fa-credit-card"></span> Member Card</button>
<button id="qr_code" class="btn btn-danger btn-md" data-toggle="modal" data-target="#myModal"><span class="fa fa-credit-card"></span> QR CODE</button> <button id="qr_code" class="btn btn-danger btn-md">
<span class="fa fa-credit-card"></span> QR CODE
</button>
</td> </td>
@@ -95,29 +97,6 @@
$(function() { $(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({ $('.datepicker').datepicker({
format : 'dd-mm-yyyy', format : 'dd-mm-yyyy',
autoclose: true autoclose: true
@@ -139,11 +118,9 @@ $(function() {
// QR Code Reader // QR Code Reader
$("#qr_code").on('click', function(e){ $("#qr_code").on('click', function(e){
var code = ""; var code = "";
$("#sxQRModal").show();
setTimeout(function(){ setTimeout(function(){
console.log("hi") console.log("hi")
getQRCode(); getQRCode();
$("#sxQRModal").hide();
},100); },100);
}); });
@@ -154,7 +131,7 @@ $(function() {
// get CardNo from Java // get CardNo from Java
function QRCodeNo(code){ function QRCodeNo(code){
alert(code); $("#search").val(code);
} }
}); });