Merge remote-tracking branch 'origin/develop'

app/Http/Controllers/Assets/AssetsController.php

@@ -227,7 +227,10 @@ class AssetsController extends Controller
             }
         }
 
-        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
+        session()->put(['redirect_option' => $request->get('redirect_option'),
+                       'checkout_to_type' => $request->get('checkout_to_type'),
+                       'other_redirect' =>  'model' ]);
+
 
 
         if ($successes) {

resources/views/account/accept/create.blade.php

@@ -118,6 +118,8 @@
 
     <script nonce="{{ csrf_token() }}">
 
+        @if ($snipeSettings->require_accept_signature=='1')
+
         var wrapper = document.getElementById("signature-pad"),
             clearButton = wrapper.querySelector("[data-action=clear]"),
             saveButton = wrapper.querySelector("[data-action=save]"),
@@ -155,6 +157,7 @@
                 $('#signature_output').val(signaturePad.toDataURL());
             }
         });
+        @endif
         
         $('[name="asset_acceptance"]').on('change', function() {