From 82ce13fcbd4e3c8ef3606cf236ad3ef22e651e45 Mon Sep 17 00:00:00 2001
From: 1Day <ownerdennis8@gmail.com>
Date: Tue, 14 Dec 2021 16:05:27 +0100
Subject: [PATCH] resolve conflicts

---
 .../views/admin/products/index.blade.php      | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/resources/views/admin/products/index.blade.php b/resources/views/admin/products/index.blade.php
index 768955af..80d6e7de 100644
--- a/resources/views/admin/products/index.blade.php
+++ b/resources/views/admin/products/index.blade.php
@@ -55,8 +55,7 @@
                             <th></th>
                         </tr>
                         </thead>
-                        <tbody>
-                        </tbody>
+                        <tbody></tbody>
                     </table>
 
                 </div>
@@ -71,37 +70,38 @@
 
     <script>
         function submitResult() {
-            return confirm("{{__('Are you sure you wish to delete?')}}") !== false;
+           return confirm("{{__('Are you sure you wish to delete?')}}") !== false;
         }
-
         document.addEventListener("DOMContentLoaded", function () {
-            $('#datatable').DataTable({
+            $("#datatable").DataTable({
                 language: {
                     url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("app.datatable_locale")}}.json'
                 },
                 processing: true,
                 serverSide: true,
                 stateSave: true,
-                order: [[ 2, "asc" ]],
-                ajax: "{{route('admin.products.datatable')}}",
-                columns: [
-                    {data: 'disabled'},
-                    {data: 'name'},
-                    {data: 'price'},
-                    {data: 'memory'},
-                    {data: 'cpu'},
-                    {data: 'swap'},
-                    {data: 'disk'},
-                    {data: 'databases'},
-                    {data: 'backups'},
-                    {data: 'nodes', sortable: false},
-                    {data: 'eggs', sortable: false},
-                    {data: 'servers', sortable: false},
-                    {data: 'created_at'},
-                    {data: 'actions', sortable: false},
+                order: [
+                    [ 2, "asc" ]
                 ],
-                fnDrawCallback: function( oSettings ) {
-                    $('[data-toggle="popover"]').popover();
+                ajax: "{{ route('admin.products.datatable') }}",
+                columns: [
+                    {data: "disabled"},
+                    {data: "name"},
+                    {data: "price"},
+                    {data: "memory"},
+                    {data: "cpu"},
+                    {data: "swap"},
+                    {data: "disk"},
+                    {data: "databases"},
+                    {data: "backups"},
+                    {data: "nodes", sortable: false},
+                    {data: "eggs", sortable: false},
+                    {data: "servers", sortable: false},
+                    {data: "created_at"},
+                    {data: "actions", sortable: false}
+                ],
+                fnDrawCallback: function (oSettings) {
+                    $("[data-toggle=\"popover\"]").popover();
                 }
             });
         });
@@ -109,4 +109,4 @@
 
 
 
-@endsection
+@endsection
\ No newline at end of file