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

recurring trait

Browse Source
This commit is contained in:
denisdulici
2018-04-27 16:01:31 +03:00
parent da4307eaf9
commit b0e9de6347
10 changed files with 79 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/Incomes/Invoices.php
View File

@ -261,18 +261,7 @@ class Invoices extends Controller
$this->increaseNextInvoiceNumber();
// Recurring
if ($request->get('recurring_frequency') != 'no') {
$frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
$interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
$invoice->recurring()->create([
'company_id' => session('company_id'),
'frequency' => $frequency,
'interval' => $interval,
'started_at' => $request['invoiced_at'],
'count' => (int) $request['recurring_count'],
]);
}
$invoice->createRecurring();
// Fire the event to make it extendible
event(new InvoiceCreated($invoice));
@ -480,26 +469,7 @@ class Invoices extends Controller
$this->addTotals($invoice, $request, $taxes, $sub_total, $discount_total, $tax_total);
// Recurring
if ($request->get('recurring_frequency') != 'no') {
$frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
$interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
if ($invoice->has('recurring')->count()) {
$function = 'update';
} else {
$function = 'create';
}
$invoice->recurring()->$function([
'company_id' => session('company_id'),
'frequency' => $frequency,
'interval' => $interval,
'started_at' => $request['invoiced_at'],
'count' => (int) $request['recurring_count'],
]);
} else {
$invoice->recurring()->delete();
}
$invoice->updateRecurring();
// Fire the event to make it extendible
event(new InvoiceUpdated($invoice));

34
app/Http/Controllers/Incomes/Revenues.php
View File

@ -99,18 +99,7 @@ class Revenues extends Controller
}
// Recurring
if ($request->get('recurring_frequency') != 'no') {
$frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
$interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
$revenue->recurring()->create([
'company_id' => session('company_id'),
'frequency' => $frequency,
'interval' => $interval,
'started_at' => $request['paid_at'],
'count' => (int) $request['recurring_count'],
]);
}
$revenue->createRecurring();
$message = trans('messages.success.added', ['type' => trans_choice('general.revenues', 1)]);
@ -212,26 +201,7 @@ class Revenues extends Controller
}
// Recurring
if ($request->get('recurring_frequency') != 'no') {
$frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
$interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
if ($revenue->has('recurring')->count()) {
$function = 'update';
} else {
$function = 'create';
}
$revenue->recurring()->$function([
'company_id' => session('company_id'),
'frequency' => $frequency,
'interval' => $interval,
'started_at' => $request['paid_at'],
'count' => (int) $request['recurring_count'],
]);
} else {
$revenue->recurring()->delete();
}
$revenue->updateRecurring();
$message = trans('messages.success.updated', ['type' => trans_choice('general.revenues', 1)]);