From af7c67312f026b4ce44a30e43b861967bde3928a Mon Sep 17 00:00:00 2001 From: jilhanhaura Date: Fri, 8 Sep 2023 13:57:36 +0700 Subject: [PATCH] update --- public/assets/js/page/modules-datatables.js | 60 +++++++++---------- resources/views/Admin/layout/main.blade.php | 40 +++++++++++++ resources/views/Admin/profile/index.blade.php | 1 - .../Admin/refund/history-refund.blade.php | 2 +- .../transaction/History_Transaction.blade.php | 2 +- .../views/Admin/users/list-user.blade.php | 2 +- 6 files changed, 73 insertions(+), 34 deletions(-) diff --git a/public/assets/js/page/modules-datatables.js b/public/assets/js/page/modules-datatables.js index 5f91805a..9eb02d85 100644 --- a/public/assets/js/page/modules-datatables.js +++ b/public/assets/js/page/modules-datatables.js @@ -1,40 +1,40 @@ "use strict"; -$("[data-checkboxes]").each(function() { - var me = $(this), - group = me.data('checkboxes'), - role = me.data('checkbox-role'); +$("[data-checkboxes]").each(function () { + var me = $(this), + group = me.data('checkboxes'), + role = me.data('checkbox-role'); - me.change(function() { - var all = $('[data-checkboxes="' + group + '"]:not([data-checkbox-role="dad"])'), - checked = $('[data-checkboxes="' + group + '"]:not([data-checkbox-role="dad"]):checked'), - dad = $('[data-checkboxes="' + group + '"][data-checkbox-role="dad"]'), - total = all.length, - checked_length = checked.length; + me.change(function () { + var all = $('[data-checkboxes="' + group + '"]:not([data-checkbox-role="dad"])'), + checked = $('[data-checkboxes="' + group + '"]:not([data-checkbox-role="dad"]):checked'), + dad = $('[data-checkboxes="' + group + '"][data-checkbox-role="dad"]'), + total = all.length, + checked_length = checked.length; - if(role == 'dad') { - if(me.is(':checked')) { - all.prop('checked', true); - }else{ - all.prop('checked', false); - } - }else{ - if(checked_length >= total) { - dad.prop('checked', true); - }else{ - dad.prop('checked', false); - } - } - }); + if (role == 'dad') { + if (me.is(':checked')) { + all.prop('checked', true); + } else { + all.prop('checked', false); + } + } else { + if (checked_length >= total) { + dad.prop('checked', true); + } else { + dad.prop('checked', false); + } + } + }); }); $("#table-1").dataTable({ - "columnDefs": [ - { "sortable": false, "targets": [2,3] } - ] + "columnDefs": [ + { "sortable": false, "targets": [2] } + ] }); $("#table-2").dataTable({ - "columnDefs": [ - { "sortable": false, "targets": [0,2,3] } - ] + "columnDefs": [ + { "sortable": false, "targets": [0, 2, 3] } + ] }); diff --git a/resources/views/Admin/layout/main.blade.php b/resources/views/Admin/layout/main.blade.php index 7c7f48b3..4e12f172 100644 --- a/resources/views/Admin/layout/main.blade.php +++ b/resources/views/Admin/layout/main.blade.php @@ -64,6 +64,7 @@ gtag('config', 'UA-94034622-3'); + + diff --git a/resources/views/Admin/profile/index.blade.php b/resources/views/Admin/profile/index.blade.php index dc28af59..d79b5a8d 100644 --- a/resources/views/Admin/profile/index.blade.php +++ b/resources/views/Admin/profile/index.blade.php @@ -10,7 +10,6 @@
- {{--
--}}

diff --git a/resources/views/Admin/refund/history-refund.blade.php b/resources/views/Admin/refund/history-refund.blade.php index 6d57602d..1291537d 100644 --- a/resources/views/Admin/refund/history-refund.blade.php +++ b/resources/views/Admin/refund/history-refund.blade.php @@ -59,7 +59,7 @@ diff --git a/resources/views/Admin/transaction/History_Transaction.blade.php b/resources/views/Admin/transaction/History_Transaction.blade.php index 76336b0f..1884f162 100644 --- a/resources/views/Admin/transaction/History_Transaction.blade.php +++ b/resources/views/Admin/transaction/History_Transaction.blade.php @@ -61,7 +61,7 @@ Details Tracking - Delete + Delete diff --git a/resources/views/Admin/users/list-user.blade.php b/resources/views/Admin/users/list-user.blade.php index 3553a0e4..5796c931 100644 --- a/resources/views/Admin/users/list-user.blade.php +++ b/resources/views/Admin/users/list-user.blade.php @@ -60,7 +60,7 @@