TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2026-06-09 12:32:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'item-modal-scss' into 'master'

Browse Source 
Item modal scss

See merge request mohit.panjvani/crater-web!39
This commit is contained in:
Mohit Panjwani
2019-11-16 06:24:08 +00:00
parent 5d70832f20 da800a8766
commit 6098fbe4b3
16 changed files with 34 additions and 200602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/assets/css/laraspace.css
Vendored
-18609
View File
File diff suppressed because it is too large Load Diff
public/assets/css/laraspace.css.map
-1
View File
File diff suppressed because one or more lines are too long
public/assets/js/app.js
-181958
View File
File diff suppressed because one or more lines are too long
public/assets/js/app.js.map
-1
View File
File diff suppressed because one or more lines are too long
resources/assets/js/components/base/modal/CustomerModal.vue
+2 -3
View File
@@ -374,7 +374,7 @@ import MultiSelect from 'vue-multiselect'
import { validationMixin } from 'vuelidate' import { validationMixin } from 'vuelidate'
import { mapActions, mapGetters } from 'vuex' import { mapActions, mapGetters } from 'vuex'
import AddressStub from '../../../stub/address' import AddressStub from '../../../stub/address'
const { required, minLength, email, numeric, alpha, url, maxLength } = require('vuelidate/lib/validators') const { required, minLength, email, numeric, url, maxLength } = require('vuelidate/lib/validators')
export default { export default {
components: { components: {
@@ -421,8 +421,7 @@ export default {
formData: { formData: {
name: { name: {
required, required,
minLength: minLength(3), minLength: minLength(3)
alpha
}, },
email: { email: {
email email
resources/assets/js/components/base/modal/ItemModal.vue
+1 -1
View File
@@ -142,7 +142,7 @@ export default {
required, required,
numeric, numeric,
minValue: minValue(0.1), minValue: minValue(0.1),
maxLength: maxLength(10) maxLength: maxLength(20)
}, },
description: { description: {
maxLength: maxLength(255) maxLength: maxLength(255)
resources/assets/js/plugins/en.js
+4 -4
View File
@@ -780,15 +780,15 @@ export default {
price_greater_than_zero: 'Price must be greater than zero.', price_greater_than_zero: 'Price must be greater than zero.',
payment_greater_than_zero: 'Payment must be greater than zero.', payment_greater_than_zero: 'Payment must be greater than zero.',
payment_greater_than_due_amount: 'Entered Payment is more than due amount of this invoice.', payment_greater_than_due_amount: 'Entered Payment is more than due amount of this invoice.',
quantity_maxlength: 'Quantity should not be greater than 10 digits.', quantity_maxlength: 'Quantity should not be greater than 20 digits.',
price_maxlength: 'Price should not be greater than 10 digits.', price_maxlength: 'Price should not be greater than 20 digits.',
price_minvalue: 'Price should be greater than 0.', price_minvalue: 'Price should be greater than 0.',
amount_maxlength: 'Amount should not be greater than 10 digits.', amount_maxlength: 'Amount should not be greater than 20 digits.',
amount_minvalue: 'Amount should be greater than 0.', amount_minvalue: 'Amount should be greater than 0.',
description_maxlength: 'Description should not be greater than 255 characters.', description_maxlength: 'Description should not be greater than 255 characters.',
maximum_options_error: 'Maximum of {max} options selected. First remove a selected option to select another.', maximum_options_error: 'Maximum of {max} options selected. First remove a selected option to select another.',
notes_maxlength: 'Notes should not be greater than 255 characters.', notes_maxlength: 'Notes should not be greater than 255 characters.',
address_maxlength: 'Address should not be greater than 255 characters.', address_maxlength: 'Address should not be greater than 255 characters.',
ref_number_maxlength: 'Ref Number should not be greater than 10 digits' ref_number_maxlength: 'Ref Number should not be greater than 255 characters.'
} }
} }
resources/assets/js/plugins/es.js
+4 -4
View File
@@ -774,15 +774,15 @@ export default {
price_greater_than_zero: 'El precio 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.', payment_greater_than_zero: 'El pago debe ser mayor que cero.',
payment_greater_than_due_amount: 'El pago ingresado es mayor al monto adeudado de esta factura.', payment_greater_than_due_amount: 'El pago ingresado es mayor al monto adeudado de esta factura.',
quantity_maxlength: 'La cantidad no debe ser mayor de 10 dígitos.', quantity_maxlength: 'La cantidad no debe ser mayor de 20 dígitos.',
price_maxlength: 'El precio no debe ser mayor de 10 dígitos.', price_maxlength: 'El precio no debe ser mayor de 20 dígitos.',
price_minvalue: 'El precio debe ser mayor que 0 dígitos', price_minvalue: 'El precio debe ser mayor que 0 dígitos',
amount_maxlength: 'La cantidad no debe ser mayor de 10 dígitos.', amount_maxlength: 'La cantidad no debe ser mayor de 20 dígitos.',
amount_minvalue: 'La cantidad debe ser mayor que 0 dígitos', amount_minvalue: 'La cantidad debe ser mayor que 0 dígitos',
description_maxlength: 'La descripción no debe tener más de 255 caracteres.', description_maxlength: 'La descripción no debe tener más de 255 caracteres.',
maximum_options_error: 'Máximo de {max} opciones seleccionadas. Primero elimine una opción seleccionada para seleccionar otra.', maximum_options_error: 'Máximo de {max} opciones seleccionadas. Primero elimine una opción seleccionada para seleccionar otra.',
notes_maxlength: 'Las notas no deben tener más de 255 caracteres.', notes_maxlength: 'Las notas no deben tener más de 255 caracteres.',
address_maxlength: 'La dirección no debe tener más de 255 caracteres.', address_maxlength: 'La dirección no debe tener más de 255 caracteres.',
ref_number_maxlength: 'El número de referencia no debe tener más de 10 dígitos.' ref_number_maxlength: 'El número de referencia no debe tener más de 255 caracteres.'
} }
} }
resources/assets/js/plugins/fr.js
+4 -4
View File
@@ -777,15 +777,15 @@ export default {
price_greater_than_zero: 'Le prix doit être supérieur à 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.', payment_greater_than_zero: 'Le paiement doit être supérieur à zéro.',
payment_greater_than_due_amount: 'Le paiement entré est plus que le montant dû de cette facture.', payment_greater_than_due_amount: 'Le paiement entré est plus que le montant dû de cette facture.',
quantity_maxlength: 'La quantité ne doit pas dépasser 10 chiffres.', quantity_maxlength: 'La quantité ne doit pas dépasser 20 chiffres.',
price_maxlength: 'Le prix ne doit pas dépasser 10 chiffres.', price_maxlength: 'Le prix ne doit pas dépasser 20 chiffres.',
price_minvalue: 'Le prix doit être supérieur à 0 chiffre', price_minvalue: 'Le prix doit être supérieur à 0 chiffre',
amount_maxlength: 'Le montant ne doit pas dépasser 10 chiffres.', amount_maxlength: 'Le montant ne doit pas dépasser 20 chiffres.',
amount_minvalue: 'Le montant doit être supérieur à 0 chiffre', amount_minvalue: 'Le montant doit être supérieur à 0 chiffre',
description_maxlength: 'La description ne doit pas dépasser 255 caractères.', description_maxlength: 'La description ne doit pas dépasser 255 caractères.',
maximum_options_error: 'Maximum de {max} options sélectionnées. Commencez par supprimer une option sélectionnée pour en sélectionner une autre.', maximum_options_error: 'Maximum de {max} options sélectionnées. Commencez par supprimer une option sélectionnée pour en sélectionner une autre.',
notes_maxlength: 'Les notes ne doivent pas dépasser 255 caractères.', notes_maxlength: 'Les notes ne doivent pas dépasser 255 caractères.',
address_maxlength: "L'adresse ne doit pas dépasser 255 caractères.", address_maxlength: "L'adresse ne doit pas dépasser 255 caractères.",
ref_number_maxlength: 'Le numéro de référence ne doit pas dépasser 10 chiffres.' ref_number_maxlength: 'Le numéro de référence ne doit pas dépasser 255 caractères.'
} }
} }
resources/assets/js/views/estimates/Create.vue
+1 -2
View File
@@ -141,7 +141,6 @@
v-model="newEstimate.reference_number" v-model="newEstimate.reference_number"
:invalid="$v.newEstimate.reference_number.$error" :invalid="$v.newEstimate.reference_number.$error"
icon="hashtag" icon="hashtag"
type="number"
@input="$v.newEstimate.reference_number.$touch()" @input="$v.newEstimate.reference_number.$touch()"
/> />
<div v-if="$v.newEstimate.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div> <div v-if="$v.newEstimate.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div>
@@ -383,7 +382,7 @@ export default {
maxLength: maxLength(255) maxLength: maxLength(255)
}, },
reference_number: { reference_number: {
maxLength: maxLength(10) maxLength: maxLength(255)
} }
}, },
selectedCustomer: { selectedCustomer: {
resources/assets/js/views/estimates/Item.vue
+2 -2
View File
@@ -305,12 +305,12 @@ export default {
quantity: { quantity: {
required, required,
minValue: minValue(1), minValue: minValue(1),
maxLength: maxLength(10) maxLength: maxLength(20)
}, },
price: { price: {
required, required,
minValue: minValue(1), minValue: minValue(1),
maxLength: maxLength(10) maxLength: maxLength(20)
}, },
discount_val: { discount_val: {
between: between(0, this.maxDiscount) between: between(0, this.maxDiscount)
resources/assets/js/views/expenses/Create.vue
+5 -5
View File
@@ -90,16 +90,16 @@
<label>{{ $t('expenses.amount') }}</label> <span class="text-danger"> * </span> <label>{{ $t('expenses.amount') }}</label> <span class="text-danger"> * </span>
<div class="base-input"> <div class="base-input">
<money <money
:class="{'invalid' : $v.formData.amount.$error}"
v-model="amount" v-model="amount"
v-bind="defaultCurrencyForInput" v-bind="defaultCurrencyForInput"
:class="{'invalid' : $v.formData.amount.$error}"
class="input-field" class="input-field"
/> />
</div> </div>
<div v-if="$v.formData.amount.$error"> <div v-if="$v.formData.amount.$error">
<span v-if="!$v.formData.amount.required" class="text-danger">{{ $t('validation.required') }} </span> <span v-if="!$v.formData.amount.required" class="text-danger">{{ $t('validation.required') }} </span>
<span v-if="!$v.formData.amount.maxLength" class="text-danger">{{ $t('validation.amount_maxlength') }}</span> <span v-if="!$v.formData.amount.maxLength" class="text-danger">{{ $t('validation.price_maxlength') }}</span>
<span v-if="!$v.formData.amount.maxValue" class="text-danger">{{ $t('validation.amount_minvalue') }}</span> <span v-if="!$v.formData.amount.minValue" class="text-danger">{{ $t('validation.price_minvalue') }}</span>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@@ -198,8 +198,8 @@ export default {
}, },
amount: { amount: {
required, required,
maxLength: maxLength(10), minValue: minValue(0.1),
minValue: minValue(0.1) maxLength: maxLength(20)
}, },
notes: { notes: {
maxLength: maxLength(255) maxLength: maxLength(255)
resources/assets/js/views/invoices/Create.vue
+1 -2
View File
@@ -141,7 +141,6 @@
v-model="newInvoice.reference_number" v-model="newInvoice.reference_number"
:invalid="$v.newInvoice.reference_number.$error" :invalid="$v.newInvoice.reference_number.$error"
icon="hashtag" icon="hashtag"
type="number"
@input="$v.newInvoice.reference_number.$touch()" @input="$v.newInvoice.reference_number.$touch()"
/> />
<div v-if="$v.newInvoice.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div> <div v-if="$v.newInvoice.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div>
@@ -384,7 +383,7 @@ export default {
maxLength: maxLength(255) maxLength: maxLength(255)
}, },
reference_number: { reference_number: {
maxLength: maxLength(10) maxLength: maxLength(255)
} }
}, },
selectedCustomer: { selectedCustomer: {
resources/assets/js/views/invoices/Item.vue
+2 -2
View File
@@ -306,12 +306,12 @@ export default {
quantity: { quantity: {
required, required,
minValue: minValue(1), minValue: minValue(1),
maxLength: maxLength(10) maxLength: maxLength(20)
}, },
price: { price: {
required, required,
minValue: minValue(1), minValue: minValue(1),
maxLength: maxLength(10) maxLength: maxLength(20)
}, },
discount_val: { discount_val: {
between: between(0, this.maxDiscount) between: between(0, this.maxDiscount)
resources/assets/js/views/items/Create.vue
+2 -2
View File
@@ -92,7 +92,7 @@
<script> <script>
import { validationMixin } from 'vuelidate' import { validationMixin } from 'vuelidate'
import { mapActions, mapGetters } from 'vuex' import { mapActions, mapGetters } from 'vuex'
const { required, minLength, numeric, alpha, minValue, maxLength } = require('vuelidate/lib/validators') const { required, minLength, numeric, minValue, maxLength } = require('vuelidate/lib/validators')
export default { export default {
mixins: { mixins: {
@@ -163,7 +163,7 @@ export default {
price: { price: {
required, required,
numeric, numeric,
maxLength: maxLength(10), maxLength: maxLength(20),
minValue: minValue(0.1) minValue: minValue(0.1)
}, },
description: { description: {
resources/assets/sass/components/item-modal.scss
Vendored
+4
View File
@@ -1,3 +1,7 @@
.base-modal .modal-body {
overflow: visible !important;
}
.item-modal { .item-modal {
.card-footer { .card-footer {