From 6d14e93c384d63a6fc778186e50d06d88e67bfd2 Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com> Date: Mon, 19 Sep 2022 16:59:28 +0300 Subject: [PATCH 1/7] Bulk action buttons issue fixed --- resources/assets/js/plugins/bulk-action.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/plugins/bulk-action.js b/resources/assets/js/plugins/bulk-action.js index 365ee8f60..ab2c3ff30 100644 --- a/resources/assets/js/plugins/bulk-action.js +++ b/resources/assets/js/plugins/bulk-action.js @@ -62,7 +62,7 @@ export default class BulkAction { } change(type) { - let action = document.getElementById('button-bulk-action-' + type); + let action = document.getElementById('index-bulk-actions-' + type); this.value = type; From e24b87095529903a07296c2a43309e5a68c971a3 Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com> Date: Mon, 19 Sep 2022 17:01:09 +0300 Subject: [PATCH 2/7] Duplicate icon added to bulk actions --- app/Abstracts/BulkAction.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Abstracts/BulkAction.php b/app/Abstracts/BulkAction.php index 3f49455c4..ab8d60f71 100644 --- a/app/Abstracts/BulkAction.php +++ b/app/Abstracts/BulkAction.php @@ -44,6 +44,7 @@ abstract class BulkAction 'enable' => 'check_circle', 'disable' => 'hide_source', 'delete' => 'delete', + 'duplicate' => 'file_copy', 'export' => 'file_download', 'reconcile' => 'published_with_changes', 'unreconcile' => 'layers_clear', From 300d4e8f53d98923dbc37e70193fcea6004fa54d Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 20 Sep 2022 10:17:14 +0300 Subject: [PATCH 3/7] added pointer-event-none --- app/View/Presenters/Menu.php | 20 ++++++------- .../views/banking/accounts/show.blade.php | 2 +- .../banking/transactions/index.blade.php | 2 +- .../views/banking/transfers/index.blade.php | 2 +- .../views/common/dashboards/show.blade.php | 2 +- resources/views/common/items/index.blade.php | 2 +- .../views/common/reports/index.blade.php | 2 +- .../contacts/index/more-buttons.blade.php | 2 +- .../contacts/show/more-buttons.blade.php | 2 +- .../views/components/delete-button.blade.php | 2 +- .../documents/index/more-buttons.blade.php | 2 +- .../documents/show/more-buttons.blade.php | 2 +- .../components/layouts/admin/menu.blade.php | 28 +++++++++---------- .../components/layouts/portal/menu.blade.php | 18 ++++++------ .../views/components/table/actions.blade.php | 4 +-- .../transactions/show/more-buttons.blade.php | 2 +- .../transfers/show/more-buttons.blade.php | 2 +- .../views/components/widgets/header.blade.php | 2 +- .../views/settings/categories/index.blade.php | 2 +- .../views/settings/taxes/index.blade.php | 2 +- 20 files changed, 51 insertions(+), 51 deletions(-) diff --git a/app/View/Presenters/Menu.php b/app/View/Presenters/Menu.php index e12551a92..1d0faf2a7 100644 --- a/app/View/Presenters/Menu.php +++ b/app/View/Presenters/Menu.php @@ -34,11 +34,11 @@ class Menu extends Presenter */ public function getMenuWithoutDropdownWrapper($item) { - return '
  • - getAttributes() . '> + return '
  • + getAttributes() . '> ' . $this->getIcon($item) . ' - ' . $item->title . ' - + ' . $item->title . ' +
    • ' . PHP_EOL; @@ -104,9 +104,9 @@ class Menu extends Presenter return '
    getActiveStateOnChild($item) . '> -
    +
    ' . $this->getIcon($item) . ' - ' . $item->title . ' + ' . $item->title . ' ' . $this->getChevron($item) . '
    @@ -132,10 +132,10 @@ class Menu extends Presenter return '
    -
    +
    ' . $this->getIcon($item) . ' - ' . $item->title . ' - + ' . $item->title . ' + ' . $this->getChevron($item) . '
    @@ -226,7 +226,7 @@ class Menu extends Presenter $icon_content = '' . $item->icon . ''; } - return '
    + return '
    ' . $icon_content . '
    ' . PHP_EOL; } diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php index 55d4922f9..ded360508 100644 --- a/resources/views/banking/accounts/show.blade.php +++ b/resources/views/banking/accounts/show.blade.php @@ -73,7 +73,7 @@ - more_horiz + more_horiz @stack('see_performance_button_start') diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index 9d63277d4..f469aa217 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -24,7 +24,7 @@ - more_horiz + more_horiz @can('create-banking-transactions') diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index d37e6c2f0..88c1dba61 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -20,7 +20,7 @@ - more_horiz + more_horiz @can('create-banking-transfers') diff --git a/resources/views/common/dashboards/show.blade.php b/resources/views/common/dashboards/show.blade.php index bc3eb41e7..7284177b5 100644 --- a/resources/views/common/dashboards/show.blade.php +++ b/resources/views/common/dashboards/show.blade.php @@ -103,7 +103,7 @@ - more_vert + more_vert diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php index 0c9e8005f..52037ca4b 100644 --- a/resources/views/common/items/index.blade.php +++ b/resources/views/common/items/index.blade.php @@ -18,7 +18,7 @@ - more_horiz + more_horiz @can('create-common-items') diff --git a/resources/views/common/reports/index.blade.php b/resources/views/common/reports/index.blade.php index b3c00040d..9bdc67bfc 100644 --- a/resources/views/common/reports/index.blade.php +++ b/resources/views/common/reports/index.blade.php @@ -61,7 +61,7 @@ - more_vert + more_vert diff --git a/resources/views/components/contacts/index/more-buttons.blade.php b/resources/views/components/contacts/index/more-buttons.blade.php index 76c542b83..af09eca7a 100644 --- a/resources/views/components/contacts/index/more-buttons.blade.php +++ b/resources/views/components/contacts/index/more-buttons.blade.php @@ -1,6 +1,6 @@ - more_horiz + more_horiz @if ($checkPermissionCreate) diff --git a/resources/views/components/contacts/show/more-buttons.blade.php b/resources/views/components/contacts/show/more-buttons.blade.php index 92cdc1f9a..6314d681a 100644 --- a/resources/views/components/contacts/show/more-buttons.blade.php +++ b/resources/views/components/contacts/show/more-buttons.blade.php @@ -3,7 +3,7 @@ @if (! $hideActionsDropdown) - more_horiz + more_horiz @stack('delete_button_start') diff --git a/resources/views/components/delete-button.blade.php b/resources/views/components/delete-button.blade.php index 086ccdd51..95b10ff0f 100644 --- a/resources/views/components/delete-button.blade.php +++ b/resources/views/components/delete-button.blade.php @@ -8,7 +8,7 @@ @if ($slot->isNotEmpty()) {!! $slot !!} @else - delete + delete @@ -165,7 +165,7 @@ @elseif (is_object(user()->picture)) {{ user()->name }} @else - account_circle + account_circle @endif @stack('navbar_profile_welcome') @@ -183,7 +183,7 @@ @can('read-notifications')
    - notifications + notifications
    {{ trans_choice('general.your_notifications', 2) }} @@ -196,7 +196,7 @@
    - settings + settings
    {{ trans_choice('general.settings', 2) }} @@ -208,7 +208,7 @@
    - add_circle_outline + add_circle_outline
    {{ trans('general.new_more') }} @@ -219,10 +219,10 @@
    - +
    diff --git a/resources/views/components/layouts/portal/menu.blade.php b/resources/views/components/layouts/portal/menu.blade.php index 41ae344a1..1c11b7b8f 100644 --- a/resources/views/components/layouts/portal/menu.blade.php +++ b/resources/views/components/layouts/portal/menu.blade.php @@ -19,7 +19,7 @@ class="flex flex-col items-center justify-center mb-5 cursor-pointer menu-button" data-menu="profile-menu" > -
    @@ -136,7 +136,7 @@ @elseif (is_object(user()->picture)) {{ user()->name }} @else - account_circle + account_circle @endif @stack('navbar_profile_welcome') @@ -154,7 +154,7 @@ @can('read-notifications')
    - notifications + notifications
    {{ trans_choice('general.your_notifications', 2) }} @@ -166,10 +166,10 @@ @endcan - +
    diff --git a/resources/views/components/table/actions.blade.php b/resources/views/components/table/actions.blade.php index 77ca1af84..575cb32e8 100644 --- a/resources/views/components/table/actions.blade.php +++ b/resources/views/components/table/actions.blade.php @@ -20,7 +20,7 @@ @switch($type) @case('button')
    diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue index 51f0618f9..3f3b16c39 100644 --- a/resources/assets/js/views/wizard/Currencies.vue +++ b/resources/assets/js/views/wizard/Currencies.vue @@ -227,7 +227,7 @@
    diff --git a/resources/assets/js/views/wizard/Taxes.vue b/resources/assets/js/views/wizard/Taxes.vue index ceaf5ccb4..e94114812 100644 --- a/resources/assets/js/views/wizard/Taxes.vue +++ b/resources/assets/js/views/wizard/Taxes.vue @@ -101,7 +101,7 @@
    diff --git a/resources/views/common/dashboards/show.blade.php b/resources/views/common/dashboards/show.blade.php index 7284177b5..3ad0db193 100644 --- a/resources/views/common/dashboards/show.blade.php +++ b/resources/views/common/dashboards/show.blade.php @@ -108,19 +108,19 @@ @can('create-common-widgets') - - +
    + {{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }} - - - + +
    + @endcan diff --git a/resources/views/components/delete-link.blade.php b/resources/views/components/delete-link.blade.php index f935ae829..ed6b8c0f8 100644 --- a/resources/views/components/delete-link.blade.php +++ b/resources/views/components/delete-link.blade.php @@ -1,26 +1,27 @@ - - +
    + + @if ($slot->isNotEmpty()) {!! $slot !!} @else {!! $label !!} @endif - - - - + + + +
    diff --git a/resources/views/components/dropdown/button.blade.php b/resources/views/components/dropdown/button.blade.php index 1147f5d64..e66692610 100644 --- a/resources/views/components/dropdown/button.blade.php +++ b/resources/views/components/dropdown/button.blade.php @@ -1,5 +1,5 @@ - + +
    diff --git a/resources/views/components/dropdown/link.blade.php b/resources/views/components/dropdown/link.blade.php index d49b96e5f..ccb3a1aa5 100644 --- a/resources/views/components/dropdown/link.blade.php +++ b/resources/views/components/dropdown/link.blade.php @@ -1,5 +1,5 @@ - - +
    + {!! $slot !!} - - + +
    diff --git a/resources/views/components/table/actions.blade.php b/resources/views/components/table/actions.blade.php index 575cb32e8..f294c58fc 100644 --- a/resources/views/components/table/actions.blade.php +++ b/resources/views/components/table/actions.blade.php @@ -91,11 +91,11 @@ @case('button') @php $divider = false; @endphp - + +
    @break @case('delete') @@ -121,11 +121,11 @@ @default @php $divider = false; @endphp - - +
    + {{ $action['title'] }} - - + +
    @endswitch @endforeach
    diff --git a/resources/views/components/transactions/show/more-buttons.blade.php b/resources/views/components/transactions/show/more-buttons.blade.php index 5a7185f61..31699d0fc 100644 --- a/resources/views/components/transactions/show/more-buttons.blade.php +++ b/resources/views/components/transactions/show/more-buttons.blade.php @@ -25,14 +25,16 @@ @if ($transaction->is_splittable && empty($transaction->document_id) && empty($transaction->recurring) && $transaction->isNotTransferTransaction()) @if (! $hideButtonConnect) @can($permissionCreate) +
    +
    @endcan @endif @endif diff --git a/resources/views/components/transfers/show/more-buttons.blade.php b/resources/views/components/transfers/show/more-buttons.blade.php index feb1d6ccb..360588533 100644 --- a/resources/views/components/transfers/show/more-buttons.blade.php +++ b/resources/views/components/transfers/show/more-buttons.blade.php @@ -45,11 +45,11 @@ @stack('choose_button_start') - + +
    @stack('choose_button_end') diff --git a/resources/views/components/widgets/header.blade.php b/resources/views/components/widgets/header.blade.php index 94307a5f4..74cae8c1c 100644 --- a/resources/views/components/widgets/header.blade.php +++ b/resources/views/components/widgets/header.blade.php @@ -22,18 +22,18 @@ @can('update-common-widgets') - - +
    + {{ trans('general.edit') }} - - + +
    @endcan @can('delete-common-widgets') From fb7cd477a8111aa425e3f6116aab8d5852a51f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 21 Sep 2022 10:22:33 +0300 Subject: [PATCH 5/7] composer lock --- composer.lock | 253 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 210 insertions(+), 43 deletions(-) diff --git a/composer.lock b/composer.lock index b5356113a..bda461c70 100644 --- a/composer.lock +++ b/composer.lock @@ -907,16 +907,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.235.8", + "version": "3.235.12", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "cc33d53d735a3835adff212598f2a20ee9ac9531" + "reference": "e0ebecfb0284dc44dc99a172cd9c68c40739904c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc33d53d735a3835adff212598f2a20ee9ac9531", - "reference": "cc33d53d735a3835adff212598f2a20ee9ac9531", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e0ebecfb0284dc44dc99a172cd9c68c40739904c", + "reference": "e0ebecfb0284dc44dc99a172cd9c68c40739904c", "shasum": "" }, "require": { @@ -995,9 +995,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.235.8" + "source": "https://github.com/aws/aws-sdk-php/tree/3.235.12" }, - "time": "2022-09-14T18:18:31+00:00" + "time": "2022-09-20T18:18:07+00:00" }, { "name": "balping/json-raw-encoder", @@ -2455,20 +2455,30 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -2500,9 +2510,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" }, - "time": "2021-12-25T01:21:49+00:00" + "time": "2022-09-18T07:06:19+00:00" }, { "name": "fruitcake/laravel-cors", @@ -4479,16 +4489,16 @@ }, { "name": "laravel/framework", - "version": "v9.30.0", + "version": "v9.31.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2ca2b168a3e995a8ec6ea2805906379095d20080" + "reference": "75013d4fffe3b24748d313fbbea53206351214f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2ca2b168a3e995a8ec6ea2805906379095d20080", - "reference": "2ca2b168a3e995a8ec6ea2805906379095d20080", + "url": "https://api.github.com/repos/laravel/framework/zipball/75013d4fffe3b24748d313fbbea53206351214f7", + "reference": "75013d4fffe3b24748d313fbbea53206351214f7", "shasum": "" }, "require": { @@ -4518,6 +4528,7 @@ "symfony/mime": "^6.0", "symfony/process": "^6.0", "symfony/routing": "^6.0", + "symfony/uid": "^6.0", "symfony/var-dumper": "^6.0", "tijsverkoyen/css-to-inline-styles": "^2.2.2", "vlucas/phpdotenv": "^5.4.1", @@ -4660,7 +4671,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-09-13T14:06:14+00:00" + "time": "2022-09-20T13:32:50+00:00" }, { "name": "laravel/sanctum", @@ -5239,16 +5250,16 @@ }, { "name": "league/flysystem", - "version": "3.3.0", + "version": "3.5.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "d8295793b3e2f91aa39e1feb2d5bfce772891ae2" + "reference": "f14993c6e394450ac4649da35264df0544d0234e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d8295793b3e2f91aa39e1feb2d5bfce772891ae2", - "reference": "d8295793b3e2f91aa39e1feb2d5bfce772891ae2", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f14993c6e394450ac4649da35264df0544d0234e", + "reference": "f14993c6e394450ac4649da35264df0544d0234e", "shasum": "" }, "require": { @@ -5310,7 +5321,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.3.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.5.1" }, "funding": [ { @@ -5326,20 +5337,20 @@ "type": "tidelift" } ], - "time": "2022-09-09T11:11:42+00:00" + "time": "2022-09-18T18:23:19+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.3.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "c9402e0b8d89d36b1b88ecf88c2a80b6d61fd114" + "reference": "adb6633f325c934c15a099c363dc5362bdcb07a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/c9402e0b8d89d36b1b88ecf88c2a80b6d61fd114", - "reference": "c9402e0b8d89d36b1b88ecf88c2a80b6d61fd114", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/adb6633f325c934c15a099c363dc5362bdcb07a2", + "reference": "adb6633f325c934c15a099c363dc5362bdcb07a2", "shasum": "" }, "require": { @@ -5380,7 +5391,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.3.0" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.5.0" }, "funding": [ { @@ -5396,7 +5407,7 @@ "type": "tidelift" } ], - "time": "2022-09-09T10:03:42+00:00" + "time": "2022-09-17T21:00:35+00:00" }, { "name": "league/mime-type-detection", @@ -8576,16 +8587,16 @@ }, { "name": "ramsey/uuid", - "version": "4.5.0", + "version": "4.5.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "ef842484ba57f163c6d465ab744bfecb872a11d4" + "reference": "a161a26d917604dc6d3aa25100fddf2556e9f35d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/ef842484ba57f163c6d465ab744bfecb872a11d4", - "reference": "ef842484ba57f163c6d465ab744bfecb872a11d4", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/a161a26d917604dc6d3aa25100fddf2556e9f35d", + "reference": "a161a26d917604dc6d3aa25100fddf2556e9f35d", "shasum": "" }, "require": { @@ -8654,7 +8665,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.5.0" + "source": "https://github.com/ramsey/uuid/tree/4.5.1" }, "funding": [ { @@ -8666,7 +8677,7 @@ "type": "tidelift" } ], - "time": "2022-09-15T01:44:53+00:00" + "time": "2022-09-16T03:22:46+00:00" }, { "name": "riverskies/laravel-mobile-detect", @@ -10645,6 +10656,88 @@ ], "time": "2022-05-24T11:49:31+00:00" }, + { + "name": "symfony/polyfill-uuid", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-uuid.git", + "reference": "a41886c1c81dc075a09c71fe6db5b9d68c79de23" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/a41886c1c81dc075a09c71fe6db5b9d68c79de23", + "reference": "a41886c1c81dc075a09c71fe6db5b9d68c79de23", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-uuid": "*" + }, + "suggest": { + "ext-uuid": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Uuid\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Grégoire Pineau", + "email": "lyrixx@lyrixx.info" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for uuid functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "uuid" + ], + "support": { + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.26.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-24T11:49:31+00:00" + }, { "name": "symfony/process", "version": "v6.0.11", @@ -11134,6 +11227,80 @@ ], "time": "2022-06-27T17:10:44+00:00" }, + { + "name": "symfony/uid", + "version": "v6.0.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/uid.git", + "reference": "7ae9cb6ad0728f9a425499112929575c0b2cc09f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/uid/zipball/7ae9cb6ad0728f9a425499112929575c0b2cc09f", + "reference": "7ae9cb6ad0728f9a425499112929575c0b2cc09f", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/polyfill-uuid": "^1.15" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Uid\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Grégoire Pineau", + "email": "lyrixx@lyrixx.info" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to generate and represent UIDs", + "homepage": "https://symfony.com", + "keywords": [ + "UID", + "ulid", + "uuid" + ], + "support": { + "source": "https://github.com/symfony/uid/tree/v6.0.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-07-20T13:45:53+00:00" + }, { "name": "symfony/var-dumper", "version": "v6.0.11", @@ -13880,27 +14047,27 @@ }, { "name": "spatie/laravel-ignition", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "29deea5d9cf921590184be6956e657c4f4566440" + "reference": "192962f4d84526f6868c512530c00633e3165749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/29deea5d9cf921590184be6956e657c4f4566440", - "reference": "29deea5d9cf921590184be6956e657c4f4566440", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/192962f4d84526f6868c512530c00633e3165749", + "reference": "192962f4d84526f6868c512530c00633e3165749", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "illuminate/support": "^8.77|^9.0", + "illuminate/support": "^8.77|^9.27", "monolog/monolog": "^2.3", "php": "^8.0", "spatie/flare-client-php": "^1.0.1", - "spatie/ignition": "^1.2.4", + "spatie/ignition": "^1.4.1", "symfony/console": "^5.0|^6.0", "symfony/var-dumper": "^5.0|^6.0" }, @@ -13966,7 +14133,7 @@ "type": "github" } ], - "time": "2022-09-01T11:31:14+00:00" + "time": "2022-09-16T13:45:54+00:00" }, { "name": "theseer/tokenizer", From f18f83b11045c47cc5bb3de79f5e3a30329163a9 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 21 Sep 2022 12:25:36 +0300 Subject: [PATCH 6/7] vue v-model refactoring for mobile phones --- .../assets/js/components/AkauntingContactCard.vue | 10 ++++++---- .../assets/js/components/AkauntingDocumentButton.vue | 8 +++++--- resources/assets/js/components/AkauntingItemButton.vue | 8 +++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue index dd494aef5..5dee23121 100644 --- a/resources/assets/js/components/AkauntingContactCard.vue +++ b/resources/assets/js/components/AkauntingContactCard.vue @@ -26,9 +26,9 @@ autocapitalize="default" autocorrect="ON" :placeholder="placeholder" :ref="'input-contact-field-' + _uid" - v-model="search" - @input="onInput" - @keyup.enter="onInput" + :value="search" + @input="onInput($event)" + @keyup.enter="onInput($event)" />
    @@ -304,7 +304,9 @@ export default { }); }, - onInput() { + onInput(event) { + this.search = event.target.value; + window.axios.get(this.searchRoute + '?search="' + this.search + '" enabled:1 limit:10') .then(response => { this.contact_list = []; diff --git a/resources/assets/js/components/AkauntingDocumentButton.vue b/resources/assets/js/components/AkauntingDocumentButton.vue index 8961ae918..871ab80a6 100644 --- a/resources/assets/js/components/AkauntingDocumentButton.vue +++ b/resources/assets/js/components/AkauntingDocumentButton.vue @@ -18,8 +18,8 @@ autocapitalize="default" autocorrect="ON" :placeholder="placeholder" - v-model="search" - @input="onInput" + :value="search" + @input="onInput($event)" :ref="'input-item-field-' + _uid" />
    @@ -213,7 +213,9 @@ export default { }.bind(this), 100); }, - onInput() { + onInput(event) { + this.search = event.target.value; + //to optimize performance we kept the condition that checks for if search exists or not if (!this.search) { return; diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue index 81cf6f2f0..4e1098f39 100644 --- a/resources/assets/js/components/AkauntingItemButton.vue +++ b/resources/assets/js/components/AkauntingItemButton.vue @@ -16,8 +16,8 @@ autocapitalize="default" autocorrect="ON" :placeholder="placeholder" - v-model="search" - @input="onInput" + :value="search" + @input="onInput($event)" :ref="'input-item-field-' + _uid" @keydown.enter="inputEnterEvent" /> @@ -282,7 +282,9 @@ export default { }.bind(this), 100); }, - onInput() { + onInput(event) { + this.search = event.target.value; + this.isItemMatched = false; //to optimize performance we kept the condition that checks for if search exists or not if (!this.search) { From 6424b29580ea96e221b490a5b72cf3ba9db8dbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 22 Sep 2022 00:57:54 +0300 Subject: [PATCH 7/7] updated info --- app/Utilities/Info.php | 18 ++++++++++++++++-- composer.json | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php index 903bc96a0..47bcbcde7 100644 --- a/app/Utilities/Info.php +++ b/app/Utilities/Info.php @@ -4,8 +4,10 @@ namespace App\Utilities; use App\Models\Auth\User; use App\Models\Common\Company; +use App\Models\Common\Contact; +use App\Models\Document\Document; use Composer\InstalledVersions; -use DB; +use Illuminate\Support\Facades\DB; class Info { @@ -13,8 +15,11 @@ class Info { return array_merge(static::versions(), [ 'api_key' => setting('apps.api_key'), + 'ip' => static::ip(), 'companies' => Company::count(), 'users' => User::count(), + 'invoices' => Document::invoice()->count(), + 'customers' => Contact::customer()->count(), 'php_extensions' => static::phpExtensions(), ]); } @@ -23,10 +28,12 @@ class Info { return [ 'akaunting' => version('short'), - 'laravel' => app()->version(), + 'laravel' => InstalledVersions::getPrettyVersion('laravel/framework'), 'php' => static::phpVersion(), 'mysql' => static::mysqlVersion(), + 'guzzle' => InstalledVersions::getPrettyVersion('guzzlehttp/guzzle'), 'livewire' => InstalledVersions::getPrettyVersion('livewire/livewire'), + 'omnipay' => InstalledVersions::getPrettyVersion('league/omnipay'), ]; } @@ -54,4 +61,11 @@ class Info return 'N/A'; } + + public static function ip() + { + return request()->header('CF_CONNECTING_IP') + ? request()->header('CF_CONNECTING_IP') + : request()->ip(); + } } diff --git a/composer.json b/composer.json index cd3735b0b..093763a76 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,7 @@ "ext-xml": "*", "ext-zip": "*", "akaunting/laravel-apexcharts": "^2.0", + "akaunting/laravel-debugbar-collector": "^2.0", "akaunting/laravel-firewall": "^2.0", "akaunting/laravel-language": "^1.0", "akaunting/laravel-menu": "^2.0", @@ -37,7 +38,6 @@ "akaunting/laravel-setting": "^1.2", "akaunting/laravel-sortable": "^1.0", "akaunting/laravel-version": "^1.0", - "akaunting/laravel-debugbar-collector": "^2.0", "akaunting/module-offline-payments": "^3.0", "akaunting/module-paypal-standard": "^3.0", "barryvdh/laravel-debugbar": "^3.6",