TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 21:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'password-length' into 'master'

Browse Source 
fix the password length

See merge request mohit.panjvani/crater-web!17
This commit is contained in:
Mohit Panjwani
2019-11-14 06:22:59 +00:00
parent 9672f3fa12 4edd9a4190
commit 4b3823982d
6 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/js/plugins/es.js
View File

@ -556,6 +556,16 @@ export default {
action: 'Acción',
add_currency: 'Agregar moneda'
},
mail: {
host: 'Host de correo',
port: 'Puerto de correo',
driver: 'Conductor de correo',
password: 'Contraseña de correo',
username: 'Nombre de usuario de correo',
mail_config: 'Configuración de correo',
encryption: 'Cifrado de correo',
mail_config_desc: 'Los detalles a continuación se utilizarán para actualizar el entorno de correo. También puede cambiar los detalles en cualquier momento después de iniciar sesión.'
},
pdf: {
title: 'Configuración de PDF',
footer_text: 'Texto de pie de página',
@ -749,7 +759,7 @@ export default {
numbers_only: 'Solo numeros.',
characters_only: 'Solo personajes.',
password_incorrect: 'Las contraseñas deben ser idénticas',
password_length: 'La contraseña debe tener 6 caracteres de longitud.',
password_length: 'La contraseña debe tener 5 caracteres de longitud.',
qty_must_greater_than_zero: 'La cantidad debe ser mayor que cero.',
price_greater_than_zero: 'El precio debe ser mayor que cero.',
payment_greater_than_zero: 'El pago debe ser mayor que cero.',

2
resources/assets/js/plugins/fr.js
View File

@ -752,7 +752,7 @@ export default {
numbers_only: 'Chiffres uniquement.',
characters_only: 'Caractères seulement.',
password_incorrect: 'Les mots de passe doivent être identiques',
password_length: 'Le mot de passe doit comporter 6 caractères.',
password_length: 'Le mot de passe doit comporter 5 caractères.',
qty_must_greater_than_zero: 'La quantité doit être supérieure à zéro.',
price_greater_than_zero: 'Le prix doit être supérieur à zéro.',
payment_greater_than_zero: 'Le paiement doit être supérieur à zéro.',

2
resources/assets/js/views/auth/Login.vue
View File

@ -98,7 +98,7 @@ export default {
},
password: {
required,
minLength: minLength(8)
minLength: minLength(5)
}
}
},

2
resources/assets/js/views/settings/UserProfile.vue
View File

@ -106,7 +106,7 @@ export default {
email
},
password: {
minLength: minLength(8)
minLength: minLength(5)
},
confirm_password: {
required: requiredIf('isRequired'),

18
resources/assets/js/views/wizard/CompanyInfo.vue
View File

@ -94,17 +94,27 @@
<div class="col-md-6">
<label class="form-label">{{ $t('wizard.address') }}</label>
<base-text-area
:invalid="$v.companyData.address_street_1.$error"
v-model.trim="companyData.address_street_1"
:placeholder="$t('general.street_1')"
name="billing_street1"
rows="2"
@input="$v.companyData.address_street_1.$touch()"
/>
<div v-if="$v.companyData.address_street_1.$error">
<span v-if="!$v.companyData.address_street_1.maxLength" class="text-danger">{{ $t('validation.description_maxlength') }}</span>
</div>
<base-text-area
:invalid="$v.companyData.address_street_2.$error"
v-model="companyData.address_street_2"
:placeholder="$t('general.street_2')"
name="billing_street2"
rows="2"
@input="$v.companyData.address_street_2.$touch()"
/>
<div v-if="$v.companyData.address_street_2.$error">
<span v-if="!$v.companyData.address_street_2.maxLength" class="text-danger">{{ $t('validation.description_maxlength') }}</span>
</div>
</div>
<div class="col-md-6">
<div class="row">
@ -146,7 +156,7 @@ import MultiSelect from 'vue-multiselect'
import AvatarCropper from 'vue-avatar-cropper'
import { validationMixin } from 'vuelidate'
import Ls from '../../services/ls'
const { required, minLength, email } = require('vuelidate/lib/validators')
const { required, minLength, email, maxLength } = require('vuelidate/lib/validators')
export default {
components: {
@ -197,6 +207,12 @@ export default {
},
country_id: {
required
},
address_street_1: {
maxLength: maxLength(255)
},
address_street_2: {
maxLength: maxLength(255)
}
}
},

2
resources/assets/js/views/wizard/UserProfile.vue
View File

@ -108,7 +108,7 @@ export default {
},
password: {
required,
minLength: minLength(8)
minLength: minLength(5)
},
confirm_password: {
required: requiredIf('isRequired'),