From 8ba47d154528cb1ce9a7bdac2fd3d05faddc00f6 Mon Sep 17 00:00:00 2001 From: merve karaman <107546467+mervekaraman@users.noreply.github.com> Date: Fri, 25 Aug 2023 10:50:17 +0300 Subject: [PATCH 1/6] Installation page is overflowing --- resources/views/components/layouts/install.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/layouts/install.blade.php b/resources/views/components/layouts/install.blade.php index ead0551701f..34c8992cac3 100644 --- a/resources/views/components/layouts/install.blade.php +++ b/resources/views/components/layouts/install.blade.php @@ -6,7 +6,7 @@ - + @stack('body_start')
From 3e61b3381125f9ba407e91c713d6e19cd26e04fd Mon Sep 17 00:00:00 2001 From: merve karaman <107546467+mervekaraman@users.noreply.github.com> Date: Fri, 25 Aug 2023 11:09:49 +0300 Subject: [PATCH 2/6] Auth page is overflowing --- resources/views/components/layouts/auth.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/layouts/auth.blade.php b/resources/views/components/layouts/auth.blade.php index 33ddf4d3bb1..d1d23b31673 100644 --- a/resources/views/components/layouts/auth.blade.php +++ b/resources/views/components/layouts/auth.blade.php @@ -9,7 +9,7 @@ @mobile @elsemobile - + @endmobile @stack('body_start') From e7f803c308a5059fc4fe8c3a0d9eb885f72b803c Mon Sep 17 00:00:00 2001 From: merve karaman <107546467+mervekaraman@users.noreply.github.com> Date: Fri, 25 Aug 2023 11:26:30 +0300 Subject: [PATCH 3/6] Update overflowing problem --- resources/views/components/layouts/auth.blade.php | 4 ++-- resources/views/components/layouts/install.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/components/layouts/auth.blade.php b/resources/views/components/layouts/auth.blade.php index d1d23b31673..f3c6da8219e 100644 --- a/resources/views/components/layouts/auth.blade.php +++ b/resources/views/components/layouts/auth.blade.php @@ -1,5 +1,5 @@ - + {!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!} @@ -9,7 +9,7 @@ @mobile @elsemobile - + @endmobile @stack('body_start') diff --git a/resources/views/components/layouts/install.blade.php b/resources/views/components/layouts/install.blade.php index 34c8992cac3..5f6bbbb61f1 100644 --- a/resources/views/components/layouts/install.blade.php +++ b/resources/views/components/layouts/install.blade.php @@ -1,12 +1,12 @@ - + {!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!} - + @stack('body_start')
From df4aba266aa8914258d48b871d32023f4218e5da Mon Sep 17 00:00:00 2001 From: merve karaman <107546467+mervekaraman@users.noreply.github.com> Date: Fri, 25 Aug 2023 17:18:17 +0300 Subject: [PATCH 4/6] Progress bar is not visible and scroll is showing problem solved --- resources/assets/js/bootstrap.js | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 475393da1e2..582784bf44c 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -23,6 +23,7 @@ window.axios.defaults.headers.common['Content-Type'] = 'multipart/form-data'; // #start NProgress integration // Added nprogress to use nprogress bar import NProgress from "nprogress"; +import 'nprogress/nprogress.css'; window.axios.interceptors.request.use(function (config) { // Do something before request is sent From a83d446141981c5a0be10a31250c9160d0680231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 28 Aug 2023 13:46:17 +0300 Subject: [PATCH 5/6] remove class.. --- resources/views/components/layouts/auth.blade.php | 2 +- resources/views/components/layouts/install.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/components/layouts/auth.blade.php b/resources/views/components/layouts/auth.blade.php index f3c6da8219e..33ddf4d3bb1 100644 --- a/resources/views/components/layouts/auth.blade.php +++ b/resources/views/components/layouts/auth.blade.php @@ -1,5 +1,5 @@ - + {!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!} diff --git a/resources/views/components/layouts/install.blade.php b/resources/views/components/layouts/install.blade.php index 5f6bbbb61f1..ead0551701f 100644 --- a/resources/views/components/layouts/install.blade.php +++ b/resources/views/components/layouts/install.blade.php @@ -1,5 +1,5 @@ - + {!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!} From 8387830ecd39102815c063c2b98dd18b4d9df50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 28 Aug 2023 15:40:55 +0300 Subject: [PATCH 6/6] close #2975 Fixed: Recurring Invoice Custom Interval --- .../Components/Documents/Show/Schedule.php | 8 +++-- app/View/Components/Form/Group/Recurring.php | 32 ++++++++++++++++--- .../js/components/AkauntingRecurring.vue | 6 ++++ resources/lang/en-GB/recurring.php | 1 + .../recurring_transactions/edit.blade.php | 1 + .../recurring_transactions/index.blade.php | 15 ++++++++- .../documents/form/recurring.blade.php | 1 + .../index/recurring_templates.blade.php | 15 ++++++++- .../components/form/group/recurring.blade.php | 2 ++ 9 files changed, 73 insertions(+), 8 deletions(-) diff --git a/app/View/Components/Documents/Show/Schedule.php b/app/View/Components/Documents/Show/Schedule.php index 7a88011efba..381f38cee74 100644 --- a/app/View/Components/Documents/Show/Schedule.php +++ b/app/View/Components/Documents/Show/Schedule.php @@ -22,10 +22,14 @@ public function render() ->first(); $started_date = '' . company_date($recurring->started_at) . ''; - $frequency = Str::lower(trans('recurring.' . str_replace('ly', 's', $recurring->frequency))); + $frequency = Str::lower(trans('recurring.' . str_replace(['daily', 'ly'], ['days', 's'], $recurring->frequency))); $invertal = $recurring->interval; - $this->description = trans('transactions.slider.schedule', ['frequency' => $frequency, 'interval' => $invertal, 'date' => $started_date]); + $this->description = trans('transactions.slider.schedule', [ + 'frequency' => $frequency, + 'interval' => $invertal, + 'date' => $started_date + ]); return view('components.documents.show.schedule', compact('recurring')); } diff --git a/app/View/Components/Form/Group/Recurring.php b/app/View/Components/Form/Group/Recurring.php index 68b5873cf6a..6fcf4939e86 100644 --- a/app/View/Components/Form/Group/Recurring.php +++ b/app/View/Components/Form/Group/Recurring.php @@ -12,6 +12,8 @@ class Recurring extends Component public $frequency; public $frequencies = []; + public $interval = ''; + public $customFrequency = ''; public $customFrequencies = []; @@ -35,6 +37,8 @@ public function __construct( $frequency = '', $frequencies = [], + $interval = '', + $customFrequency = '', $customFrequencies = [], @@ -49,10 +53,13 @@ public function __construct( $sendEmail = false ) { $this->type = $this->getType($type); - $this->frequency = $this->getFrequency($frequency); + + $this->interval = $this->getInterval($interval); + + $this->frequency = $this->getFrequency($frequency, $interval); $this->frequencies = $this->getFrequencies($frequencies); - $this->customFrequency = $this->getCustomFrequency($customFrequency); + $this->customFrequency = $this->getCustomFrequency($frequency, $customFrequency, $interval); $this->customFrequencies = $this->getCustomFrequencies($customFrequencies); $this->limit = $this->getLimit($limit); @@ -85,8 +92,12 @@ protected function getType($type) return 'invoice'; } - protected function getFrequency($frequency) + protected function getFrequency($frequency, $interval = 0) { + if ($interval > 1) { + return 'custom'; + } + if (! empty($frequency)) { return $frequency; } @@ -109,8 +120,21 @@ protected function getFrequencies($frequencies) ]; } - protected function getCustomFrequency($customFrequency) + protected function getInterval($interval) + { + if (! empty($interval)) { + return $interval; + } + + return ''; + } + + protected function getCustomFrequency($frequency, $customFrequency, $interval = 0) { + if ($interval > 1) { + return $frequency; + } + if (! empty($customFrequency)) { return $customFrequency; } diff --git a/resources/assets/js/components/AkauntingRecurring.vue b/resources/assets/js/components/AkauntingRecurring.vue index d62c492e7ba..c472d3aa1d7 100644 --- a/resources/assets/js/components/AkauntingRecurring.vue +++ b/resources/assets/js/components/AkauntingRecurring.vue @@ -198,6 +198,11 @@ export default { default: 'monthly', description: "Default reccuring type" }, + intervalValue: { + type: String, + default: '', + description: 'Default interval value' + }, invertalError: { type: String, default: null, @@ -310,6 +315,7 @@ export default { mounted() { this.frequency = this.frequencyValue; + this.interval = this.intervalValue; this.customFrequency = this.customFrequencyValue; this.started_at = this.startedValue; diff --git a/resources/lang/en-GB/recurring.php b/resources/lang/en-GB/recurring.php index 75d8cb49e09..57239be5c92 100644 --- a/resources/lang/en-GB/recurring.php +++ b/resources/lang/en-GB/recurring.php @@ -32,6 +32,7 @@ 'send_email_auto' => 'Send email automatically', 'frequency_type' => 'Repeat this :type', + 'custom_frequency_desc' => 'Repeat every :interval :frequency', 'limit_date' => 'Create first :type on', 'limit_middle' => 'and end', diff --git a/resources/views/banking/recurring_transactions/edit.blade.php b/resources/views/banking/recurring_transactions/edit.blade.php index 902478dc8ea..9b6b4aef768 100644 --- a/resources/views/banking/recurring_transactions/edit.blade.php +++ b/resources/views/banking/recurring_transactions/edit.blade.php @@ -59,6 +59,7 @@ - {{ trans('recurring.' . $item->recurring->frequency) }} + @if ($item->recurring->interval > 1) + + {{ trans('recurring.custom') }} + + @else + {{ trans('recurring.' . $item->recurring->frequency) }} + @endif @if ($item->recurring->limit_by == 'count') diff --git a/resources/views/components/documents/form/recurring.blade.php b/resources/views/components/documents/form/recurring.blade.php index e8294ad8a2a..cc2231c9c25 100644 --- a/resources/views/components/documents/form/recurring.blade.php +++ b/resources/views/components/documents/form/recurring.blade.php @@ -10,6 +10,7 @@ - {{ trans('recurring.' . $item->recurring->frequency) }} + @if ($item->recurring->interval > 1) + + {{ trans('recurring.custom') }} + + @else + {{ trans('recurring.' . $item->recurring->frequency) }} + @endif @if ($item->recurring->limit_by == 'count') diff --git a/resources/views/components/form/group/recurring.blade.php b/resources/views/components/form/group/recurring.blade.php index 69f65db1ffe..5b4fe91173a 100644 --- a/resources/views/components/form/group/recurring.blade.php +++ b/resources/views/components/form/group/recurring.blade.php @@ -21,6 +21,8 @@ :custom-frequencies="{{ json_encode($customFrequencies) }}" custom-frequency-value="{{ $customFrequency }}" :custom-frequency-error="form.errors.get('recurring_custom_frequency')" + + interval-value="{{ $interval }}" @if ($attributes->has('@interval')) @interval="form.recurring_interval = $event;{{ $attributes['@interval'] }}" @else