From c42bc58e4e880e343045d7158613a3b4e0c2aee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <53110792+CihanSenturk@users.noreply.github.com> Date: Fri, 2 Dec 2022 11:08:32 +0300 Subject: [PATCH 01/19] Added delete widget to module uninstall listener --- app/Listeners/Module/FinishUninstallation.php | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/Listeners/Module/FinishUninstallation.php b/app/Listeners/Module/FinishUninstallation.php index 3d947b1c4..484d9981e 100644 --- a/app/Listeners/Module/FinishUninstallation.php +++ b/app/Listeners/Module/FinishUninstallation.php @@ -6,9 +6,11 @@ use App\Events\Module\Uninstalled as Event; use App\Exceptions\Common\LastDashboard; use App\Jobs\Common\DeleteDashboard; use App\Jobs\Common\DeleteReport; +use App\Jobs\Common\DeleteWidget; use App\Jobs\Setting\DeleteEmailTemplate; use App\Models\Common\Dashboard; use App\Models\Common\Report; +use App\Models\Common\Widget; use App\Models\Setting\EmailTemplate; use App\Traits\Jobs; use Throwable; @@ -26,6 +28,7 @@ class FinishUninstallation public function handle(Event $event) { $this->deleteDashboards($event->alias); + $this->deleteWidgets($event->alias); $this->deleteEmailTemplates($event->alias); $this->deleteReports($event->alias); } @@ -51,6 +54,23 @@ class FinishUninstallation }); } + /** + * Delete any widget created by the module. + * + * @param string $alias + * @return void + */ + protected function deleteWidgets($alias) + { + Widget::alias($alias)->get()->each(function ($widget) { + try { + $this->dispatch(new DeleteWidget($widget)); + } catch (Throwable $e) { + report($e); + } + }); + } + /** * Delete any email template created by the module. * From c910e06d9e21279f3694dd4cb62876c82196bc68 Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com> Date: Fri, 2 Dec 2022 11:57:12 +0300 Subject: [PATCH 02/19] Fixed the position of stacks so they don't break the style --- .../views/banking/accounts/show.blade.php | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php index ce15c52b1..ba7c86f6c 100644 --- a/resources/views/banking/accounts/show.blade.php +++ b/resources/views/banking/accounts/show.blade.php @@ -143,7 +143,13 @@ - @stack('account_number_start') + @stack('type_input_start') + @stack('type_input_end') + + @stack('name_input_start') + @stack('name_input_end') + + @stack('number_input_start')
{{ trans('accounts.number') }} @@ -151,9 +157,9 @@ {{ $account->number }}
- @stack('account_number_end') + @stack('number_input_end') - @stack('account_currency_start') + @stack('currency_code_input_start')
{{ trans_choice('general.currencies', 1) }} @@ -163,9 +169,9 @@ {{ $account->currency->name }}
- @stack('account_currency_end') + @stack('currency_code_input_end') - @stack('account_starting_balance_start') + @stack('opening_balance_input_start')
{{ trans('accounts.opening_balance') }} @@ -175,9 +181,15 @@
- @stack('account_starting_balance_end') + @stack('opening_balance_input_end') - @stack('account_phone_start') + @stack('default_account_input_start') + @stack('default_account_input_end') + + @stack('bank_name_input_start') + @stack('bank_name_input_end') + + @stack('bank_phone_input_start') @if ($account->bank_phone)
@@ -189,9 +201,9 @@
@endif - @stack('account_phone_end') + @stack('bank_phone_input_end') - @stack('account_address_start') + @stack('bank_address_input_start') @if ($account->bank_address)
@@ -203,7 +215,7 @@
@endif - @stack('account_address_end') + @stack('bank_address_input_end') From 2680222116f9cd8e773a5247d74bb705d8cca19a Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 2 Dec 2022 14:06:03 +0300 Subject: [PATCH 03/19] finish steps styling --- public/css/app.css | 12 ++++++++++++ resources/assets/js/views/wizard/Finish.vue | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 0ed27091b..33820d6f1 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -55570,6 +55570,12 @@ body{ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } +[dir="ltr"] .ltr\:items-start{ + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; +} + [dir="ltr"] .ltr\:space-x-2 > :not([hidden]) ~ :not([hidden]){ --tw-space-x-reverse: 0; margin-right: calc(0.5rem * var(--tw-space-x-reverse)); @@ -56581,6 +56587,12 @@ body{ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } +[dir="rtl"] .rtl\:items-end{ + -webkit-box-align: end; + -ms-flex-align: end; + align-items: flex-end; +} + [dir="rtl"] .rtl\:space-x-reverse > :not([hidden]) ~ :not([hidden]){ --tw-space-x-reverse: 1; } diff --git a/resources/assets/js/views/wizard/Finish.vue b/resources/assets/js/views/wizard/Finish.vue index a941305ee..7523c16dc 100644 --- a/resources/assets/js/views/wizard/Finish.vue +++ b/resources/assets/js/views/wizard/Finish.vue @@ -1,5 +1,5 @@