Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 13:44:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for contact password not sticking on update

Browse Source
This commit is contained in:
David Bomba 2020-09-12 19:53:28 +10:00
parent dcaaa53ae6
commit 89dcd43e47
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -81,6 +81,9 @@ class UpdateClientRequest extends Request
'email' => ctrans('validation.email', ['attribute' => 'email']), 'email' => ctrans('validation.email', ['attribute' => 'email']),
'name.required' => ctrans('validation.required', ['attribute' => 'name']), 'name.required' => ctrans('validation.required', ['attribute' => 'name']),
'required' => ctrans('validation.required', ['attribute' => 'email']), 'required' => ctrans('validation.required', ['attribute' => 'email']),
'contacts.*.password.min' => ctrans('texts.password_strength'),
'contacts.*.password.regex' => ctrans('texts.password_strength'),
'contacts.*.password.string' => ctrans('texts.password_strength'),
]; ];
} }
@ -109,11 +112,12 @@ class UpdateClientRequest extends Request
if (strlen($contact['password']) == 0) { if (strlen($contact['password']) == 0) {
$input['contacts'][$key]['password'] = ''; $input['contacts'][$key]['password'] = '';
} else { } else {
$contact['password'] = str_replace('*', '', $contact['password']); $input['contacts'][$key]['password'] = str_replace('*', '', $contact['password']);
if (strlen($contact['password']) == 0) { if (strlen($contact['password']) == 0) {
unset($input['contacts'][$key]['password']); unset($input['contacts'][$key]['password']);
} }
} }
} }
} }

10
app/Repositories/ClientContactRepository.php
View File

@ -58,12 +58,10 @@ class ClientContactRepository extends BaseRepository
$update_contact->fill($contact); $update_contact->fill($contact);
if (array_key_exists('password', $contact)) { if (array_key_exists('password', $contact) && strlen($contact['password']) > 1) {
if (strlen($contact['password']) == 0) {
$update_contact->password = ''; $update_contact->password = Hash::make($contact['password']);
} else {
$update_contact->password = Hash::make($contact['password']);
}
} }
$update_contact->save(); $update_contact->save();

4
database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
View File

@ -66,6 +66,10 @@ class AddIsPublicToDocumentsTable extends Migration
Schema::table('companies', function ($table) { Schema::table('companies', function ($table) {
$table->enum('default_auto_bill', ['off', 'always', 'optin', 'optout'])->default('off'); $table->enum('default_auto_bill', ['off', 'always', 'optin', 'optout'])->default('off');
}); });
Schema::table('recurring_invoices', function (Blueprint $table) {
$table->integer('remaining_cycles')->nullable()->change();
});
} }
/** /**

1
resources/lang/en/texts.php
View File

@ -3269,4 +3269,5 @@ return [
'payment_due' => 'Payment due', 'payment_due' => 'Payment due',
'account_balance' => 'Account balance', 'account_balance' => 'Account balance',
'password_strength' => 'Password strength too weak',
]; ];