From e43d5067a77f7211af6563b9a67c563772f631f5 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 28 Mar 2023 09:20:35 +0200 Subject: [PATCH] wip #5822 @0.5 --- app/Jobs/DownloadBase.php | 2 +- app/Mail/FluidbookQuoteAssign.php | 1 - .../fluidbook/toolbox/css/context-menu.less | 10 ++++++ .../fluidbook/toolbox/js/contextdownload.js | 36 +++++++++---------- .../fluidbook_publication/download.blade.php | 11 ++++++ 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/app/Jobs/DownloadBase.php b/app/Jobs/DownloadBase.php index dc1581868..17b7cc8d9 100644 --- a/app/Jobs/DownloadBase.php +++ b/app/Jobs/DownloadBase.php @@ -78,7 +78,7 @@ class DownloadBase extends Base $converter = new CommonMarkConverter(); $mail = new DeferredDownload(); - //$mail->setUser($this->user); + $mail->to($this->user->email); $mail->subject($subject); $mail->html($converter->convertToHtml($body)); Mail::send($mail); diff --git a/app/Mail/FluidbookQuoteAssign.php b/app/Mail/FluidbookQuoteAssign.php index 99218c295..e763714f5 100644 --- a/app/Mail/FluidbookQuoteAssign.php +++ b/app/Mail/FluidbookQuoteAssign.php @@ -17,7 +17,6 @@ class FluidbookQuoteAssign extends Base $reseller = User::where('id', $quote->reseller)->first(); $resselerLocale = $reseller->locale; $user = User::where('id', $quote->user)->first(); - //$this->to($reseller->email); $this->to($reseller->email); $this->bcc('tech@fluidbook.com'); $this->subject('[Fluidbook Workshop] ' . __('Demande de devis', [], $resselerLocale)); diff --git a/public/packages/fluidbook/toolbox/css/context-menu.less b/public/packages/fluidbook/toolbox/css/context-menu.less index 0edd22355..5ac842d20 100644 --- a/public/packages/fluidbook/toolbox/css/context-menu.less +++ b/public/packages/fluidbook/toolbox/css/context-menu.less @@ -7,3 +7,13 @@ } } } + +.btn-swal-context { + margin: 0 15px; + box-shadow: none !important; +} + +.swal2-icon.swal2-info { + border-color: #9ec400 !important; + color: #9ec400 !important; +} diff --git a/public/packages/fluidbook/toolbox/js/contextdownload.js b/public/packages/fluidbook/toolbox/js/contextdownload.js index e6f05e192..91688a571 100644 --- a/public/packages/fluidbook/toolbox/js/contextdownload.js +++ b/public/packages/fluidbook/toolbox/js/contextdownload.js @@ -22,7 +22,7 @@ $(function () { if (action.target === undefined) { action.target = '_self'; } - action.disabled =(key == disabledOption); + action.disabled = (key == disabledOption); action.isHtmlName = true; } actions[key] = action; @@ -55,28 +55,26 @@ $(function () { if (confirm === null || confirm === undefined) { return ok(); } - swal({ + const swalWithBootstrapButtons = Swal.mixin({ + customClass: { + confirmButton: 'btn btn-swal-context bg-success', + cancelButton: 'btn btn-swal-context bg-secondary' + }, + buttonsStyling: false + }) + swalWithBootstrapButtons.fire({ title: confirm.title, text: replaceVariables(confirm.text, actions[key].label), icon: "info", - buttons: { - cancel: { - text: confirm.cancel, - value: null, - visible: true, - className: "bg-secondary", - closeModal: true, - }, - delete: { - text: confirm.confirm, - value: true, - visible: true, - className: "bg-success", - } - }, - }).then((value) => { - if (value) { + showCancelButton: true, + confirmButtonText: confirm.confirm, + cancelButtonText: confirm.cancel, + reverseButtons: true, + }).then((result) => { + if (result.isConfirmed) { ok(); + } else { + } }); diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php index 02da15523..aa876be0d 100644 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php @@ -58,11 +58,22 @@ } } + $confirm=[ + 'title'=>'', + 'text'=>__('En téléchargeant la publication, vous confirmez que vous l\'avez testé et validé. Elle vous sera donc facturée selon les conditions stipulées dans votre contrat.'), + 'confirm'=>__('Confirmer'), + 'cancel'=>__('Annuler') + ]; + @endphp @if($entry->allowsDownload()) + status==1 && !can('fluidbook-publication:admin')) + data-context-confirm="{{json_encode($confirm)}}" + @endif title="{{__('Télécharger la publication')}}" data-context-actions="{{json_encode($actions)}}" data-context-route="{{$crud->route}}/$id/download/$action" -- 2.39.5