diff --git a/app/Rules/UniqueAccountNumber.php b/app/Rules/UniqueAccountNumber.php index 326871125d..ece7aabfb6 100644 --- a/app/Rules/UniqueAccountNumber.php +++ b/app/Rules/UniqueAccountNumber.php @@ -33,15 +33,16 @@ use Illuminate\Contracts\Validation\ValidationRule; */ class UniqueAccountNumber implements ValidationRule { - private ?Account $account; - private ?string $expectedType; + private ?Account $account; + private ?string $expectedType; /** * Create a new rule instance. */ public function __construct(?Account $account, ?string $expectedType) { - app('log')->debug('Constructed UniqueAccountNumber'); + app('log') + ->debug('Constructed UniqueAccountNumber'); $this->account = $account; $this->expectedType = $expectedType; // a very basic fix to make sure we get the correct account type: @@ -62,7 +63,7 @@ class UniqueAccountNumber implements ValidationRule */ public function message(): string { - return (string)trans('validation.unique_account_number_for_user'); + return (string) trans('validation.unique_account_number_for_user'); } /** @@ -125,12 +126,11 @@ class UniqueAccountNumber implements ValidationRule private function countHits(string $type, string $accountNumber): int { $query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id') - ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') - ->where('accounts.user_id', auth()->user()->id) - ->where('account_types.type', $type) - ->where('account_meta.name', '=', 'account_number') - ->where('account_meta.data', json_encode($accountNumber)) - ; + ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') + ->where('accounts.user_id', auth()->user()->id) + ->where('account_types.type', $type) + ->where('account_meta.name', '=', 'account_number') + ->where('account_meta.data', json_encode($accountNumber)); if (null !== $this->account) { $query->where('accounts.id', '!=', $this->account->id); diff --git a/public/marker-icon-2x.png b/public/marker-icon-2x.png new file mode 100644 index 0000000000..88f9e50188 Binary files /dev/null and b/public/marker-icon-2x.png differ diff --git a/public/marker-shadow.png b/public/marker-shadow.png new file mode 100644 index 0000000000..9fd2979532 Binary files /dev/null and b/public/marker-shadow.png differ