Merge branch 'trunk'

app/Http/Controllers/Bo/TicketController.php

@@ -95,8 +95,8 @@ class TicketController extends Controller
             TicketStatusEnum::archived
         );
 
-        $tickets = $this->searchTicket($tickets, $request);
         $tickets = $this->filterTickets($tickets, $request);
+        $tickets = $this->searchTicket($tickets, $request);
         /** Custom pagination */
         $tickets = $this->customPaginate($tickets, $request->pagination);
 
@@ -489,6 +489,7 @@ class TicketController extends Controller
             Session::remove('tickets.pr');
             Session::remove('tickets.sort_col');
             Session::remove('tickets.sort_way');
+            Session::remove('tickets.search');
         }
         if ($request->assr) {
             Session::remove('tickets.ass');

resources/views/bo/pages/brands/form-inputs.blade.php

@@ -58,7 +58,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/companies/form-inputs.blade.php

@@ -35,7 +35,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/credit_accounts/form-inputs.blade.php

@@ -88,7 +88,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/credit_logs/form-inputs.blade.php

@@ -33,7 +33,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/dutyhours/form-inputs.blade.php

@@ -84,7 +84,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/informations/form-inputs.blade.php

@@ -91,7 +91,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/invoices/form-inputs.blade.php

@@ -342,7 +342,7 @@
 
 @if($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened || $invoiceModel->status === null)
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/labels/form-inputs.blade.php

@@ -62,7 +62,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/packages/form-inputs.blade.php

@@ -64,7 +64,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/projects/form-inputs.blade.php

@@ -61,7 +61,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/sites/form-inputs.blade.php

@@ -137,7 +137,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/ticket_types/form-inputs.blade.php

@@ -55,7 +55,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')

resources/views/bo/pages/users/form-inputs.blade.php

@@ -121,7 +121,7 @@
 </div>
 
 @push('scripts')
-<script>
+<script nonce="{{ $nonce }}">
     document.addEventListener("DOMContentLoaded", () => {
         // Submit button clone.
         const submit = document.getElementById('formSubmit')