shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2975 Fixed: Recurring Invoice Custom Interval

Browse Source
This commit is contained in:
Cüneyt Şentürk
2023-08-28 15:40:55 +03:00
parent a83d446141
commit 8387830ecd
9 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/View/Components/Documents/Show/Schedule.php
View File

@ -22,10 +22,14 @@ class Schedule extends Component
->first();
$started_date = '<span class="font-medium">' . company_date($recurring->started_at) . '</span>';
$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'));
}

32
app/View/Components/Form/Group/Recurring.php
View File

@ -12,6 +12,8 @@ class Recurring extends Component
public $frequency;
public $frequencies = [];
public $interval = '';
public $customFrequency = '';
public $customFrequencies = [];
@ -35,6 +37,8 @@ class Recurring extends Component
$frequency = '',
$frequencies = [],
$interval = '',
$customFrequency = '',
$customFrequencies = [],
@ -49,10 +53,13 @@ class Recurring extends Component
$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 @@ class Recurring extends Component
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 @@ class Recurring extends Component
];
}
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;
}