shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2892 from mervekaraman/master

Browse Source 
Confirm button cannot remove problem
This commit is contained in:
Cüneyt Şentürk 2023-02-17 11:07:10 +03:00 committed by GitHub
commit 25a9751e42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Livewire/Notification/Browser.php
View File

@ -26,11 +26,11 @@ class Browser extends Component
$this->status = false; $this->status = false;
} }
} elseif (Str::contains($user_agent, 'Edg')) { } elseif (Str::contains($user_agent, 'Edg')) {
// $view = 'livewire.notification.browser.chrome';
} elseif (Str::contains($user_agent, 'Safari')) {
// $view = 'livewire.notification.browser.edge'; // $view = 'livewire.notification.browser.edge';
} elseif (Str::contains($user_agent, 'Chrome')) { } elseif (Str::contains($user_agent, 'Safari')) {
// $view = 'livewire.notification.browser.safari'; // $view = 'livewire.notification.browser.safari';
} elseif (Str::contains($user_agent, 'Chrome')) {
// $view = 'livewire.notification.browser.chrome';
} elseif (Str::contains($user_agent, 'Opera')) { } elseif (Str::contains($user_agent, 'Opera')) {
// $view = 'livewire.notification.browser.opera'; // $view = 'livewire.notification.browser.opera';
} }

25
resources/views/livewire/notification/browser/firefox.blade.php
View File

@ -2,7 +2,7 @@
<div <div
data-modal-handle data-modal-handle
@class([ @class([
'modal w-full h-full fixed top-0 left-0 right-0 z-50 overflow-y-auto overflow-hidden fade justify-center items-start', 'firefox-confirm-modal modal w-full h-full fixed top-0 left-0 right-0 z-50 overflow-y-auto overflow-hidden fade justify-center items-start',
'show flex flex-wrap modal-background' => ! $status, 'show flex flex-wrap modal-background' => ! $status,
'hidden' => $status, 'hidden' => $status,
]) ])
@ -24,8 +24,12 @@
</div> </div>
<div class="p-5 bg-body rounded-bl-lg rounded-br-lg border-gray-300"> <div class="p-5 bg-body rounded-bl-lg rounded-br-lg border-gray-300">
<div class="flex items-center justify-end"> <div class="flex items-center justify-end space-x-2">
<button wire:click="firefoxConfirm" class="relative px-6 py-1.5 bg-green hover:bg-green-700 text-white rounded-lg disabled:bg-green-100"> <button onclick="closeConfirmFirefox()" class="relative px-6 py-1.5 hover:bg-gray-100 rounded-lg disabled:bg-green-100">
{{ trans('general.cancel') }}
</button>
<button onclick="closeConfirmFirefox()" class="relative px-6 py-1.5 bg-green hover:bg-green-700 text-white rounded-lg disabled:bg-green-100">
{{ trans('general.confirm') }} {{ trans('general.confirm') }}
</button> </button>
</div> </div>
@ -34,3 +38,18 @@
</div> </div>
</div> </div>
</div> </div>
@push('scripts_start')
<script>
function closeConfirmFirefox() {
const d = new Date();
d.setTime(d.getTime() + (86400 * 90 * 90 * 90 * 30));
let expires = "expires="+ d.toUTCString();
document.cookie = "firefox-icon-notification-confirm=true;" + expires + ";path=/";
document.querySelector('.firefox-confirm-modal').remove();
}
</script>
@endpush