Remove unnecessary code from webqr.js and qrcode template

app/Http/Controllers/EventQrcodeCheckInController.php

@@ -60,10 +60,11 @@ class EventQrcodeCheckInController extends Controller
                     ])->first();
 
         if(is_null($attendee)){
-            return response()->json(['status'  => 'error', 'message' => "Invalid Ticket !"]);
+            return response()->json(['status'  => 'error', 'message' => "Invalid Ticket! Please try again."]);
         }
 
-        $relatedAttendesCount = Attendee::where([
+        $relatedAttendesCount = Attendee::where('id', '!=', $attendee->id)
+                                ->where([
                                     'order_id' => $attendee->order_id,
                                     'has_arrived' => false
                                 ])->count();
@@ -79,7 +80,7 @@ class EventQrcodeCheckInController extends Controller
         if ($attendee->has_arrived) {
             return response()->json([
                         'status'  => 'error',
-                        'message' => 'Warning: This Attendee Has Already Been Checked In at '. $attendee->arrival_time->format('H:i A, F j'). '.' . $appendedText
+                        'message' => 'Warning: This attendee has already been checked in at '. $attendee->arrival_time->format('H:i A, F j'). '.' . $appendedText
             ]);
         }
 

public/vendor/qrcode-scan/webqr.js

@@ -13,59 +13,8 @@ var v=null;
 
 var beepSound = new Audio('/mp3/beep.mp3');
 
-var imghtml='<div id="qrfile"><canvas id="out-canvas" width="320" height="240"></canvas>'+
-    '<div id="imghelp">Drag and drop a QRCode here'+
-    '<br>or select a file<br><br><br>'+
-    '<input type="file" onchange="handleFiles(this.files)"/>'+
-    '</div>'+
-'</div>';
-
 var vidhtml = '<video id="v" autoplay></video>';
 
-function dragenter(e) {
-  e.stopPropagation();
-  e.preventDefault();
-}
-
-function dragover(e) {
-  e.stopPropagation();
-  e.preventDefault();
-}
-function drop(e) {
-  e.stopPropagation();
-  e.preventDefault();
-
-  var dt = e.dataTransfer;
-  var files = dt.files;
-  if(files.length>0)
-  {
-    handleFiles(files);
-  }
-  else
-  if(dt.getData('URL'))
-  {
-    qrcode.decode(dt.getData('URL'));
-  }
-}
-
-function handleFiles(f)
-{
-    var o=[];
-
-    for(var i =0;i<f.length;i++)
-    {
-        var reader = new FileReader();
-        reader.onload = (function(theFile) {
-        return function(e) {
-            gCtx.clearRect(0, 0, gCanvas.width, gCanvas.height);
-
-            qrcode.decode(e.target.result);
-        };
-        })(f[i]);
-        reader.readAsDataURL(f[i]);
-    }
-}
-
 function initCanvas(w,h)
 {
     gCanvas = document.getElementById("qr-canvas");
@@ -115,7 +64,7 @@ function read(qrcode_token)
     $.ajax({
         type: "POST",
         url: Attendize.qrcodeCheckInRoute,
-        data: {qrcode_token: qrcode_token},
+        data: {qrcode_token: htmlEntities(qrcode_token)},
         cache: false,
         complete: function(){
             beepSound.play();
@@ -132,6 +81,7 @@ function isCanvasSupported(){
   var elem = document.createElement('canvas');
   return !!(elem.getContext && elem.getContext('2d'));
 }
+
 function success(stream) {
     if(webkit)
         v.src = window.webkitURL.createObjectURL(stream);
@@ -201,18 +151,3 @@ function setwebcam()
     stype=1;
     setTimeout(captureToCanvas, 500);
 }
-function setimg()
-{
-    document.getElementById("help-text").style.display = "none";
-    document.getElementById("result").innerHTML='Waiting for a QRCode&nbsp;&nbsp;<i class="fa fa-spinner fa-spin"></i>';
-    if(stype==2)
-        return;
-    document.getElementById("outdiv").innerHTML = imghtml;
-    document.getElementById("qrimg").style.opacity=1.0;
-    document.getElementById("webcamimg").style.opacity=0.2;
-    var qrfile = document.getElementById("qrfile");
-    qrfile.addEventListener("dragenter", dragenter, false);
-    qrfile.addEventListener("dragover", dragover, false);
-    qrfile.addEventListener("drop", drop, false);
-    stype=2;
-}

resources/views/ManageEvent/QrcodeCheckIn.blade.php

@@ -60,14 +60,6 @@
         <tr>
          <td valign="top" align="center" width="50%">
           <table class="tsel" border="0">
-            <tr>
-              <td>
-                <img class="selector" id="webcamimg" src="{{ asset('/assets/images/vid.png') }}" onclick="setwebcam()" align="left" />
-              </td>
-              <td>
-                <img class="selector" id="qrimg" src="{{ asset('/assets/images/cam.png') }}" onclick="setimg()" align="right"/>
-              </td>
-            </tr>
             <tr>
               <td colspan="2" align="center">
                 <div id="outdiv">
@@ -79,7 +71,7 @@
         </tr>
         <tr>
           <td colspan="3" align="center">
-            <p id="help-text">Put the QR code in front of your Camera</p>
+            <p id="help-text">Put the QR code in front of your Camera (Not too close)</p>
           </td>
         </tr>
         <tr>