diff --git a/changelog.txt b/changelog.txt index ef25fd9..638a102 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,5 @@ +-0.0.99 + - check webcam initialization ( start only , when https..) -0.0.98 - frontend - add disable/enable doorlog in reception -0.0.97 diff --git a/common/config/params.php b/common/config/params.php index 1057725..5dcae5c 100644 --- a/common/config/params.php +++ b/common/config/params.php @@ -5,7 +5,7 @@ return [ 'supportEmail' => 'rocho02@gmail.com', 'infoEmail' => 'info@rocho-net.hu', 'user.passwordResetTokenExpire' => 3600, - 'version' => 'v0.0.98', + 'version' => 'v0.0.99', 'company' => 'movar',//gyor 'company_name' => "Freimann Kft.", 'product_visiblity' => 'account',// on reception which products to display. account or global diff --git a/frontend/web/js/customer.js b/frontend/web/js/customer.js index 81009b9..73a5f2d 100644 --- a/frontend/web/js/customer.js +++ b/frontend/web/js/customer.js @@ -8,27 +8,35 @@ function Customer(o){ init(); function init(){ - - defaults = $.extend(defaults,o); - - Webcam.set({ - width: 160, - height: 120, - dest_width: 320, - dest_height: 240, - image_format: 'jpeg', - jpeg_quality: 90, -// force_flash: false, -// flip_horiz: true, -// fps: 45 - }); - - Webcam.attach( '#my_camera' ); - - $("#snap").click(snap); - - preventSubmit( '#customerupdate-replacementcardnumber' ); - preventSubmit( '#customercreate-cardnumber' ); + + defaults = $.extend(defaults,o); + var url = location.href; + var initCamera; + console.info(url); + if ( url.indexOf("https") >= 0){ + initCamera = true; + }else if ( url.indexOf("localhost") >= 0 ){ + initCamera = true; + } + if ( initCamera ){ + Webcam.set({ + width: 160, + height: 120, + dest_width: 320, + dest_height: 240, + image_format: 'jpeg', + jpeg_quality: 90 + }); + Webcam.attach( '#my_camera' ); + $("#snap").click(snap); + }else{ + $("#snap").hide(); + } + + + + preventSubmit( '#customerupdate-replacementcardnumber' ); + preventSubmit( '#customercreate-cardnumber' ); } function preventSubmit($selector){