waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

This commit is contained in:
Cüneyt Şentürk 2025-11-09 12:54:48 +00:00
parent dee95e412e ac58f4d0ae
commit e76c84e46c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Sales/RecurringInvoices.php
View File

@ -80,7 +80,9 @@ class RecurringInvoices extends Controller
*/
public function store(Request $request)
{
$response = $this->ajaxDispatch(new CreateDocument($request->merge(['issued_at' => $request->get('recurring_started_at')])));
$request->merge(['issued_at' => $request->get('recurring_started_at')]);
$response = $this->ajaxDispatch(new CreateDocument($request));
if ($response['success']) {
$response['redirect'] = route('recurring-invoices.show', $response['data']->id);
@ -163,7 +165,9 @@ class RecurringInvoices extends Controller
*/
public function update(Document $recurring_invoice, Request $request)
{
$response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request->merge(['issued_at' => $request->get('recurring_started_at')])));
$request->merge(['issued_at' => $request->get('recurring_started_at')]);
$response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request));
if ($response['success']) {
$response['redirect'] = route('recurring-invoices.show', $response['data']->id);

2
app/Traits/Documents.php
View File

@ -28,7 +28,7 @@ trait Documents
public function isNotRecurringDocument(): bool
{
return ! $this->isRecurring();
return ! $this->isRecurringDocument();
}
public function getRecurringDocumentTypes() : array

4
app/Traits/Transactions.php
View File

@ -42,7 +42,7 @@ trait Transactions
public function isNotRecurringTransaction(): bool
{
return ! $this->isRecurring();
return ! $this->isRecurringTransaction();
}
public function isTransferTransaction(): bool
@ -194,7 +194,7 @@ trait Transactions
'add_an' => trans('general.form.add_an', ['field' => trans_choice('general.' . Str::plural($document_type), 1)]),
'transaction' => trans_choice('general.' . Str::plural($type), 1),
'difference' => trans('general.difference'),
'connect_tax' => trans('messages.warning.connect_tax', ['type' => $type]),
'connect_tax' => trans('messages.warning.connect_tax', ['type' => $type]),
];
}