From cab19d691fec6cd87bf54ae60deb2d4314ffd659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <53110792+CihanSenturk@users.noreply.github.com> Date: Tue, 21 Jun 2022 10:00:20 +0300 Subject: [PATCH 01/14] item name initinals added --- app/Models/Common/Item.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Models/Common/Item.php b/app/Models/Common/Item.php index 2599e5e33..77091aac6 100644 --- a/app/Models/Common/Item.php +++ b/app/Models/Common/Item.php @@ -4,6 +4,7 @@ namespace App\Models\Common; use App\Abstracts\Model; use App\Models\Document\Document; +use App\Utilities\Str; use App\Traits\Currencies; use App\Traits\Media; use Bkwld\Cloner\Cloneable; @@ -138,6 +139,11 @@ class Item extends Model ->select('items.*'); } + public function getInitialsAttribute($value) + { + return Str::getInitials($this->name); + } + /** * Get the current balance. * From 68460f02ffa8ccdad35df6ff9f0b4edbff8ccd2f Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 22 Jun 2022 11:26:23 +0300 Subject: [PATCH 02/14] added static width for item title in document form --- resources/views/components/documents/form/items.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/documents/form/items.blade.php b/resources/views/components/documents/form/items.blade.php index 9df614518..00f6497a1 100644 --- a/resources/views/components/documents/form/items.blade.php +++ b/resources/views/components/documents/form/items.blade.php @@ -77,7 +77,7 @@ @stack('remove_th_start') - +
From 6a3e96364f34f52aab812a1515712812c921566f Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 22 Jun 2022 13:27:29 +0300 Subject: [PATCH 03/14] code refactoring --- .../assets/js/components/AkauntingSearch.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index 2c27fe295..b8f0026e2 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -388,9 +388,9 @@ export default { this.show_icon = false; this.current_value = value; this.range = false; - - this.dynamicPlaceholder = this.selectPlaceholder; + this.onChangeSearchAndFilterText(this.selectPlaceholder); + let option = false; let option_url = false; @@ -522,7 +522,7 @@ export default { this.show_close_icon = true; let select_value = false; - this.dynamicPlaceholder = this.enterPlaceholder; + this.onChangeSearchAndFilterText(this.enterPlaceholder); for (let i = 0; i < this.values.length; i++) { if (this.values[i].key == value) { @@ -582,7 +582,7 @@ export default { this.show_date = false; if (this.filter_index == 0) { - this.dynamicPlaceholder = this.defaultPlaceholder; + this.onChangeSearchAndFilterText(this.defaultPlaceholder); } this.filter_last_step = 'options'; @@ -597,6 +597,10 @@ export default { this.onInputConfirm(); }, + onChangeSearchAndFilterText(arg) { + this.dynamicPlaceholder = arg; + }, + convertOption(options) { let values = []; @@ -765,6 +769,9 @@ export default { }, mounted() { + if (this.filter_index > 0) { + this.onChangeSearchAndFilterText(this.enterPlaceholder); + } }, computed: { From 0c492dbeaf577b8f3b7d283ed632e750fd6ed01b Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 22 Jun 2022 15:09:49 +0300 Subject: [PATCH 04/14] code refactoring --- resources/assets/js/components/AkauntingSearch.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index b8f0026e2..ebf00d8bd 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -385,11 +385,10 @@ export default { }, onOptionSelected(value) { - this.show_icon = false; this.current_value = value; this.range = false; - this.onChangeSearchAndFilterText(this.selectPlaceholder); + this.onChangeSearchAndFilterText(this.selectPlaceholder, false); let option = false; let option_url = false; @@ -522,7 +521,7 @@ export default { this.show_close_icon = true; let select_value = false; - this.onChangeSearchAndFilterText(this.enterPlaceholder); + this.onChangeSearchAndFilterText(this.enterPlaceholder, false); for (let i = 0; i < this.values.length; i++) { if (this.values[i].key == value) { @@ -582,7 +581,7 @@ export default { this.show_date = false; if (this.filter_index == 0) { - this.onChangeSearchAndFilterText(this.defaultPlaceholder); + this.onChangeSearchAndFilterText(this.defaultPlaceholder, true); } this.filter_last_step = 'options'; @@ -597,8 +596,9 @@ export default { this.onInputConfirm(); }, - onChangeSearchAndFilterText(arg) { + onChangeSearchAndFilterText(arg, param) { this.dynamicPlaceholder = arg; + this.show_icon = param; }, convertOption(options) { @@ -770,7 +770,7 @@ export default { mounted() { if (this.filter_index > 0) { - this.onChangeSearchAndFilterText(this.enterPlaceholder); + this.onChangeSearchAndFilterText(this.enterPlaceholder, false); } }, From 392719048df44cdc5ab9bfd3454b5537e939ba7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 22 Jun 2022 16:20:22 +0300 Subject: [PATCH 05/14] Added: Transaction form other section description changes ( #31eq3qj ) --- resources/lang/en-GB/transactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en-GB/transactions.php b/resources/lang/en-GB/transactions.php index a1dbd1b07..6a45cfa8d 100644 --- a/resources/lang/en-GB/transactions.php +++ b/resources/lang/en-GB/transactions.php @@ -15,7 +15,7 @@ return [ 'general' => 'Here you can enter the general information of transaction such as date, amount, account, description, etc.', 'assign_income' => 'Select a category and customer to make your reports more detailed.', 'assign_expense' => 'Select a category and vendor to make your reports more detailed.', - 'other' => 'Enter a reference to keep the transaction linked to your records.', + 'other' => 'Enter a number and reference to keep the transaction linked to your records.', ], 'slider' => [ From 1c9563bdce03690c79ad442f0622dd141610fb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 22 Jun 2022 16:23:01 +0300 Subject: [PATCH 06/14] typo --- .../js/components/CreditCard/CardForm.vue | 23 +++++++---- resources/assets/js/mixins/global.js | 12 ++++++ .../index/bulkaction/index.blade.php | 28 ++++++------- .../payment_method/hosted.blade.php | 2 +- .../views/components/tabs/nav-link.blade.php | 1 + resources/views/components/tabs/nav.blade.php | 1 + resources/views/components/tabs/tab.blade.php | 7 +++- .../views/portal/invoices/show.blade.php | 39 +++++++++++-------- 8 files changed, 73 insertions(+), 40 deletions(-) diff --git a/resources/assets/js/components/CreditCard/CardForm.vue b/resources/assets/js/components/CreditCard/CardForm.vue index fc9ab38ef..ca079669e 100644 --- a/resources/assets/js/components/CreditCard/CardForm.vue +++ b/resources/assets/js/components/CreditCard/CardForm.vue @@ -260,7 +260,7 @@ v-for="n in 12" v-bind:disabled="n < minCardMonth" v-bind:key="n" - >{{generateMonthValue(n)}} + >{{ generateMonthValue(n) }} @@ -278,7 +278,7 @@ v-bind:value="$index + minCardYear" v-for="(n, $index) in 12" v-bind:key="n" - >{{$index + minCardYear}} + >{{ $index + minCardYear }} @@ -312,7 +312,7 @@ - @else - {{ $category->name }} + + {{ $item->name }} + + @endif + + @if (! $item->enabled) + @endif - @if (! empty($types[$category->type])) - {{ $types[$category->type] }} + @if (! empty($types[$item->type])) + {{ $types[$item->type] }} @else @endif - circle + circle - + - @foreach($category->sub_categories as $sub_category) - @include('settings.categories.sub_category', ['parent_category' => $category, 'sub_category' => $sub_category, 'tree_level' => 1]) + @foreach($item->sub_categories as $sub_category) + @include('settings.categories.sub_category', ['parent_category' => $item, 'sub_category' => $sub_category, 'tree_level' => 1]) @endforeach @endforeach diff --git a/resources/views/settings/categories/sub_category.blade.php b/resources/views/settings/categories/sub_category.blade.php index be9afa002..204778ecf 100644 --- a/resources/views/settings/categories/sub_category.blade.php +++ b/resources/views/settings/categories/sub_category.blade.php @@ -31,15 +31,15 @@ - @if (! empty($types[$category->type])) - {{ $types[$category->type] }} + @if (! empty($types[$item->type])) + {{ $types[$item->type] }} @else @endif - circle + circle From 248f760f3da274bfc635bbfd353e8517eee30e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 22 Jun 2022 17:16:47 +0300 Subject: [PATCH 09/14] for sub category status.. --- resources/views/settings/categories/sub_category.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/settings/categories/sub_category.blade.php b/resources/views/settings/categories/sub_category.blade.php index 204778ecf..4523c724e 100644 --- a/resources/views/settings/categories/sub_category.blade.php +++ b/resources/views/settings/categories/sub_category.blade.php @@ -28,6 +28,10 @@ {{ $sub_category->name }} @endif + + @if (! $sub_category->enabled) + + @endif From cda1664ab226b1a0b6113806358b75066e83c630 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 23 Jun 2022 14:56:31 +0300 Subject: [PATCH 10/14] code refactoring for search component --- resources/assets/js/components/AkauntingSearch.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index ebf00d8bd..3cd583b70 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -582,6 +582,8 @@ export default { if (this.filter_index == 0) { this.onChangeSearchAndFilterText(this.defaultPlaceholder, true); + } else { + this.show_icon = false; } this.filter_last_step = 'options'; From 9d21351fae643882c0a43ed19c719bb481890485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 23 Jun 2022 15:30:41 +0300 Subject: [PATCH 11/14] typo --- resources/views/widgets/account_balance.blade.php | 7 +++++-- resources/views/widgets/cash_flow.blade.php | 8 ++++++-- resources/views/widgets/currencies.blade.php | 5 ++++- .../views/widgets/receivables_payables.blade.php | 15 +++++++++++---- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/resources/views/widgets/account_balance.blade.php b/resources/views/widgets/account_balance.blade.php index 7a5d3ad76..2f5e5ea02 100644 --- a/resources/views/widgets/account_balance.blade.php +++ b/resources/views/widgets/account_balance.blade.php @@ -4,8 +4,11 @@
    @foreach($accounts as $item)
  • - {{ $item->name }} - {{ $item->balance_formatted }} + {{ $item->title }} + + + {{ $item->balance_formatted }} +
    • @endforeach
diff --git a/resources/views/widgets/cash_flow.blade.php b/resources/views/widgets/cash_flow.blade.php index 2150cd559..2c392ec6e 100644 --- a/resources/views/widgets/cash_flow.blade.php +++ b/resources/views/widgets/cash_flow.blade.php @@ -12,7 +12,9 @@ {{ $totals['incoming'] }} - {{ trans('general.incoming') }} + + {{ trans('general.incoming') }} + remove @@ -22,7 +24,9 @@ {{ $totals['outgoing'] }} - {{ trans('general.outgoing') }} + + {{ trans('general.outgoing') }} + drag_handle diff --git a/resources/views/widgets/currencies.blade.php b/resources/views/widgets/currencies.blade.php index f787b6e6c..301850ad9 100644 --- a/resources/views/widgets/currencies.blade.php +++ b/resources/views/widgets/currencies.blade.php @@ -5,7 +5,10 @@ @foreach($currencies as $item)
  • {{ $item->name }} - {{ $item->rate }} + + + {{ $item->rate }} +
    • @endforeach diff --git a/resources/views/widgets/receivables_payables.blade.php b/resources/views/widgets/receivables_payables.blade.php index e55d3d06d..a1cbbd78c 100644 --- a/resources/views/widgets/receivables_payables.blade.php +++ b/resources/views/widgets/receivables_payables.blade.php @@ -28,17 +28,24 @@ @@ -26,15 +26,18 @@
    {!! $notification->data['title'] !!} - {{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }} + + + {{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }} +
    @if ($notification->type != 'updates') - - - + + + @endif
    From 08bd4690578056a6c53d79bb9c44678f7303df29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Jun 2022 09:41:24 +0300 Subject: [PATCH 14/14] Module uninstall message issue solved ( #32w9cbt ) --- app/Http/Controllers/Modules/Item.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index 6f279a1c7..096ed6771 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -276,10 +276,10 @@ class Item extends Controller public function uninstall($alias) { try { - $this->dispatch(new UninstallModule($alias, company_id())); - $name = module($alias)->getName(); + $this->dispatch(new UninstallModule($alias, company_id())); + $message = trans('modules.uninstalled', ['module' => $name]); flash($message)->success(); @@ -295,10 +295,10 @@ class Item extends Controller public function enable($alias) { try { - $this->dispatch(new EnableModule($alias, company_id())); - $name = module($alias)->getName(); + $this->dispatch(new EnableModule($alias, company_id())); + $message = trans('modules.enabled', ['module' => $name]); flash($message)->success(); @@ -314,10 +314,10 @@ class Item extends Controller public function disable($alias) { try { - $this->dispatch(new DisableModule($alias, company_id())); - $name = module($alias)->getName(); + $this->dispatch(new DisableModule($alias, company_id())); + $message = trans('modules.disabled', ['module' => $name]); flash($message)->success();