kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Code fixes.

Browse Source
This commit is contained in:
James Cole
2021-05-24 08:06:56 +02:00
parent 3b1b353b79
commit 2bff7750b4
45 changed files with 331 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
View File

@@ -76,8 +76,6 @@ class MoveTransactionsRequest extends FormRequest
}
if ($originalCurrency->code !== $destinationCurrency->code) {
$validator->errors()->add('title', (string)trans('validation.same_account_currency'));
return;
}
}
}

2
app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
View File

@@ -135,8 +135,6 @@ class StoreRequest extends FormRequest
*/
public function rules(): array
{
$today = Carbon::now()->addDay();
return [
'type' => 'required|in:withdrawal,transfer,deposit',
'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title',

4
app/Api/V1/Requests/Models/Transaction/StoreRequest.php
View File

@@ -53,15 +53,13 @@ class StoreRequest extends FormRequest
public function getAll(): array
{
Log::debug('get all data in TransactionStoreRequest');
$data = [
return [
'group_title' => $this->string('group_title'),
'error_if_duplicate_hash' => $this->boolean('error_if_duplicate_hash'),
'apply_rules' => $this->boolean('apply_rules', true),
'transactions' => $this->getTransactionData(),
];
// TODO location
return $data;
}
/**

2
app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
View File

@@ -366,7 +366,7 @@ class UpdateRequest extends FormRequest
$this->validateJournalIds($validator, $transactionGroup);
// all transaction types must be equal:
$this->validateTransactionTypesForUpdate($validator, $transactionGroup);
$this->validateTransactionTypesForUpdate($validator);
// validate source/destination is equal, depending on the transaction journal type.
$this->validateEqualAccountsForUpdate($validator, $transactionGroup);

6
app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php
View File

@@ -54,10 +54,8 @@ class UpdateRequest extends FormRequest
'enabled' => ['enabled', 'boolean'],
];
$return = $this->getAllData($fields);
return $return;
return $this->getAllData($fields);
// return $return;
}
/**