fixed it..

akaunting · Jun 20, 2021 · 4912890 · 4912890
1 parent 94e8d35
commit 4912890
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 59 deletions.
diff --git a/resources/views/common/notifications/index.blade.php b/resources/views/common/notifications/index.blade.php
@@ -44,10 +44,14 @@
     <script type="text/javascript">
         var hash_split = location.hash.split('#');
 
-        if (hash_split[1] != undefined) {
+        if (hash_split[1] != undefined && document.getElementById(hash_split[1]) != null) {
             document.getElementById(hash_split[1]).scrollIntoView({
                 behavior: 'smooth'
             });
         }
     </script>
+@endpush
+
+@push('scripts_start')
+    <script src="{{ asset('public/vendor/bootstrap-notify/bootstrap-notify.min.js') }}"></script>
 @endpush
diff --git a/resources/views/livewire/common/notifications/exports.blade.php b/resources/views/livewire/common/notifications/exports.blade.php
@@ -78,11 +78,6 @@
             </div>
         @endif
     </div>
-@endif
-
-@push('scripts_start')
-    <script src="{{ asset('public/vendor/bootstrap-notify/bootstrap-notify.min.js') }}"></script>
-@endpush
 
 @push('body_js')
     <script type="text/javascript">
@@ -103,3 +98,5 @@
         });
     </script>
 @endpush
+
+@endif
diff --git a/resources/views/livewire/common/notifications/imports.blade.php b/resources/views/livewire/common/notifications/imports.blade.php
@@ -79,28 +79,24 @@
             </div>
         @endif
     </div>
-@endif
-
-@push('scripts_start')
-    <script src="{{ asset('public/vendor/bootstrap-notify/bootstrap-notify.min.js') }}"></script>
-@endpush
 
-@push('body_js')
-    <script type="text/javascript">
-        window.addEventListener('mark-read', event => {
-            if (event.detail.type == 'import') {
-                $.notify(event.detail.message, {
-                    type: 'success',
-                });
-            }
-        });
-
-        window.addEventListener('mark-read-all', event => {
-            if (event.detail.type == 'import') {
-                $.notify(event.detail.message, {
-                    type: 'success',
-                });
-            }
-        });
-    </script>
-@endpush
+    @push('body_js')
+        <script type="text/javascript">
+            window.addEventListener('mark-read', event => {
+                if (event.detail.type == 'import') {
+                    $.notify(event.detail.message, {
+                        type: 'success',
+                    });
+                }
+            });
+    
+            window.addEventListener('mark-read-all', event => {
+                if (event.detail.type == 'import') {
+                    $.notify(event.detail.message, {
+                        type: 'success',
+                    });
+                }
+            });
+        </script>
+    @endpush
+@endif
diff --git a/resources/views/livewire/common/notifications/recurring.blade.php b/resources/views/livewire/common/notifications/recurring.blade.php
@@ -222,28 +222,24 @@
             </div>
         @endif
     </div>
-@endif
 
-@push('scripts_start')
-    <script src="{{ asset('public/vendor/bootstrap-notify/bootstrap-notify.min.js') }}"></script>
-@endpush
-
-@push('body_js')
-    <script type="text/javascript">
-        window.addEventListener('mark-read', event => {
-            if (event.detail.type == 'recurring-{{ $type }}') {
-                $.notify(event.detail.message, {
-                    type: 'success',
-                });
-            }
-        });
-
-        window.addEventListener('mark-read-all', event => {
-            if (event.detail.type == 'recurring-{{ $type }}') {
-                $.notify(event.detail.message, {
-                    type: 'success',
-                });
-            }
-        });
-    </script>
-@endpush
+    @push('body_js')
+        <script type="text/javascript">
+            window.addEventListener('mark-read', event => {
+                if (event.detail.type == 'recurring-{{ $type }}') {
+                    $.notify(event.detail.message, {
+                        type: 'success',
+                    });
+                }
+            });
+    
+            window.addEventListener('mark-read-all', event => {
+                if (event.detail.type == 'recurring-{{ $type }}') {
+                    $.notify(event.detail.message, {
+                        type: 'success',
+                    });
+                }
+            });
+        </script>
+    @endpush
+@endif
diff --git a/resources/views/livewire/common/notifications/reminder.blade.php b/resources/views/livewire/common/notifications/reminder.blade.php
@@ -222,11 +222,6 @@
             </div>
         @endif
     </div>
-@endif
-
-@push('scripts_start')
-    <script src="{{ asset('public/vendor/bootstrap-notify/bootstrap-notify.min.js') }}"></script>
-@endpush
 
 @push('body_js')
     <script type="text/javascript">
@@ -247,3 +242,5 @@
         });
     </script>
 @endpush
+
+@endif