From 010f315debab76cfe2ff7684f992cf17599aff7c Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 18 Jul 2022 15:02:07 +0300 Subject: [PATCH 01/15] dialogue styling for portal --- resources/views/portal/invoices/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/portal/invoices/index.blade.php b/resources/views/portal/invoices/index.blade.php index f405bbe23..9109732f4 100644 --- a/resources/views/portal/invoices/index.blade.php +++ b/resources/views/portal/invoices/index.blade.php @@ -117,12 +117,12 @@ @stack('document_number_td_inside_start') - + {{ $item->document_number }} -
+
From 8da6fae80c0b36ce19b21b082bc7f92aa249e60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <53110792+CihanSenturk@users.noreply.github.com> Date: Mon, 18 Jul 2022 16:45:19 +0300 Subject: [PATCH 02/15] transaction export date format column updated --- app/Exports/Banking/Transactions.php | 2 +- app/Exports/Purchases/Sheets/BillTransactions.php | 2 +- app/Exports/Sales/Sheets/InvoiceTransactions.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Exports/Banking/Transactions.php b/app/Exports/Banking/Transactions.php index 78c098a87..aee773b3b 100644 --- a/app/Exports/Banking/Transactions.php +++ b/app/Exports/Banking/Transactions.php @@ -47,7 +47,7 @@ class Transactions extends Export implements WithColumnFormatting public function columnFormats(): array { return [ - 'B' => NumberFormat::FORMAT_DATE_YYYYMMDD, + 'C' => NumberFormat::FORMAT_DATE_YYYYMMDD, ]; } } diff --git a/app/Exports/Purchases/Sheets/BillTransactions.php b/app/Exports/Purchases/Sheets/BillTransactions.php index c70b0e48b..ee1b43e0f 100644 --- a/app/Exports/Purchases/Sheets/BillTransactions.php +++ b/app/Exports/Purchases/Sheets/BillTransactions.php @@ -53,7 +53,7 @@ class BillTransactions extends Export implements WithColumnFormatting public function columnFormats(): array { return [ - 'B' => NumberFormat::FORMAT_DATE_YYYYMMDD, + 'C' => NumberFormat::FORMAT_DATE_YYYYMMDD, ]; } } diff --git a/app/Exports/Sales/Sheets/InvoiceTransactions.php b/app/Exports/Sales/Sheets/InvoiceTransactions.php index 060fd4ce2..42f3e1aa6 100644 --- a/app/Exports/Sales/Sheets/InvoiceTransactions.php +++ b/app/Exports/Sales/Sheets/InvoiceTransactions.php @@ -53,7 +53,7 @@ class InvoiceTransactions extends Export implements WithColumnFormatting public function columnFormats(): array { return [ - 'B' => NumberFormat::FORMAT_DATE_YYYYMMDD, + 'C' => NumberFormat::FORMAT_DATE_YYYYMMDD, ]; } } From d9e70682fabdad09874351f23b5ef12b46f47614 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 18 Jul 2022 17:18:27 +0300 Subject: [PATCH 03/15] live search developmet for app pages --- public/css/app.css | 4 +++ resources/assets/js/views/modules/apps.js | 34 +++++++++++++++++++ .../components/layouts/modules/bar.blade.php | 21 +++++++++++- 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/public/css/app.css b/public/css/app.css index 17c504e04..f9dff92a9 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47449,6 +47449,10 @@ 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)); } +.hover\:rounded-lg:hover{ + border-radius: 0.5rem; +} + .hover\:bg-gray-100:hover{ --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); diff --git a/resources/assets/js/views/modules/apps.js b/resources/assets/js/views/modules/apps.js index 12ff89136..4cafe1a30 100644 --- a/resources/assets/js/views/modules/apps.js +++ b/resources/assets/js/views/modules/apps.js @@ -29,6 +29,10 @@ const app = new Vue({ AkauntingSlider }, + created() { + document.addEventListener('click', this.closeIfClickedOutside); + }, + mounted() { if (typeof app_slug !== 'undefined') { this.onReleases(1); @@ -84,6 +88,9 @@ const app = new Vue({ addToCartLoading: false, loadMoreLoading: false, + live_search_modal: false, + live_search_data: [], + route_url: url } }, @@ -288,5 +295,32 @@ const app = new Vue({ this.loadMoreLoading = false; }); }, + + closeIfClickedOutside(event) { + let el = this.$refs.liveSearchModal; + let target = event.target; + + if (el !== target && target.contains(el)) { + this.live_search_modal = false; + } + }, + + onLiveSearch(event) { + let target_length = event.target.value.length; + + if (target_length > 2) { + window.axios.get(url + '/apps/paid') + .then(response => { + this.live_search_data = response.data.data.data; + this.live_search_modal = true; + }) + .catch(error => { + this.live_search_modal = false; + console.log(error); + }) + } else if (target_length == 0) { + this.live_search_modal = false; + } + } } }); diff --git a/resources/views/components/layouts/modules/bar.blade.php b/resources/views/components/layouts/modules/bar.blade.php index b5ba09a00..0dd6c21af 100644 --- a/resources/views/components/layouts/modules/bar.blade.php +++ b/resources/views/components/layouts/modules/bar.blade.php @@ -73,6 +73,7 @@ value="{{ isset($keyword) ? $keyword : '' }}" placeholder="{{ trans('general.search_placeholder') }}" autocomplete="off" + v-on:keyup="onLiveSearch($event)" /> @@ -104,4 +105,22 @@ - + +
+ +
+ \ No newline at end of file From 545303b04b68fba1b6e254d967151fa71675b332 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 18 Jul 2022 17:58:08 +0300 Subject: [PATCH 04/15] endpoint edited --- app/Http/Controllers/Modules/Tiles.php | 2 +- public/css/app.css | 4 ---- resources/assets/js/views/modules/apps.js | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Modules/Tiles.php b/app/Http/Controllers/Modules/Tiles.php index 54d2c2ab6..8af4e94de 100644 --- a/app/Http/Controllers/Modules/Tiles.php +++ b/app/Http/Controllers/Modules/Tiles.php @@ -155,7 +155,7 @@ class Tiles extends Controller $modules = $this->getSearchModules($data); $installed = Module::all()->pluck('enabled', 'alias')->toArray(); - return view('modules.tiles.index', compact('title', 'modules', 'keyword', 'installed')); + return $this->response('modules.tiles.index', compact('modules', 'title', 'keyword', 'installed')); } public function loadMore($type, Request $request) diff --git a/public/css/app.css b/public/css/app.css index f9dff92a9..17c504e04 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47449,10 +47449,6 @@ 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)); } -.hover\:rounded-lg:hover{ - border-radius: 0.5rem; -} - .hover\:bg-gray-100:hover{ --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); diff --git a/resources/assets/js/views/modules/apps.js b/resources/assets/js/views/modules/apps.js index 4cafe1a30..91b2cbd6b 100644 --- a/resources/assets/js/views/modules/apps.js +++ b/resources/assets/js/views/modules/apps.js @@ -309,7 +309,7 @@ const app = new Vue({ let target_length = event.target.value.length; if (target_length > 2) { - window.axios.get(url + '/apps/paid') + window.axios.get(url + '/apps/search?keyword=' + event.target.value) .then(response => { this.live_search_data = response.data.data.data; this.live_search_modal = true; From c7731bfd9b533ec71b85741eada2e4464785ca8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 19 Jul 2022 02:28:47 +0300 Subject: [PATCH 05/15] fixed accounts show page --- app/Http/Controllers/Banking/Accounts.php | 13 +++--- .../views/banking/accounts/show.blade.php | 40 ++++++------------- 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php index 0c7f55bbe..f3529fd4f 100644 --- a/app/Http/Controllers/Banking/Accounts.php +++ b/app/Http/Controllers/Banking/Accounts.php @@ -10,9 +10,9 @@ use App\Jobs\Banking\UpdateAccount; use App\Models\Banking\Account; use App\Models\Banking\Transaction; use App\Models\Banking\Transfer; -use App\Utilities\Reports as Utility; +use App\Utilities\Date; +use App\Utilities\Reports; use App\Models\Setting\Currency; -use Date; class Accounts extends Controller { @@ -35,11 +35,10 @@ class Accounts extends Controller */ public function show(Account $account) { - // Handle transactions - $transactions = Transaction::with('account', 'category')->where('account_id', $account->id)->collect('paid_at'); + $transactions = Transaction::with('category', 'contact', 'document')->where('account_id', $account->id)->collect(['paid_at'=> 'desc']); - $transfers = Transfer::with('expense_transaction', 'income_transaction')->get()->filter(function ($transfer) use($account) { - if ($transfer->expense_account->id == $account->id || $transfer->income_account->id == $account->id) { + $transfers = Transfer::with('expense_transaction', 'expense_transaction.account', 'income_transaction', 'income_transaction.account')->get()->filter(function ($transfer) use($account) { + if (($transfer->expense_transaction->account->id == $account->id) || ($transfer->income_transaction->account->id == $account->id)) { return true; } @@ -248,7 +247,7 @@ class Accounts extends Controller 'account_id' => $account->id, ]; - $report = Utility::getClassInstance('App\Reports\IncomeExpenseSummary'); + $report = Reports::getClassInstance('App\Reports\IncomeExpenseSummary'); if (empty($report) || empty($report->model)) { $message = trans('accounts.create_report'); diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php index 060163ee0..10418dc77 100644 --- a/resources/views/banking/accounts/show.blade.php +++ b/resources/views/banking/accounts/show.blade.php @@ -225,7 +225,7 @@ - + @@ -243,11 +243,7 @@ - - - - -