diff --git a/resources/js/rules.js b/resources/js/rules.js index 12d5fd1..1b0d344 100644 --- a/resources/js/rules.js +++ b/resources/js/rules.js @@ -11,5 +11,8 @@ export const rules = { }, price: value => { return (typeof value == 'number' || typeof value == 'undefined' || value === null) || 'Стоимость должна быть числом'; + }, + isNumber: value => { + return /^\d+[\.,\,]?\d*$/.test(value); } } diff --git a/resources/views/Wishlist/CreateWish.vue b/resources/views/Wishlist/CreateWish.vue index 9f4e2f9..0fe49e9 100644 --- a/resources/views/Wishlist/CreateWish.vue +++ b/resources/views/Wishlist/CreateWish.vue @@ -27,7 +27,7 @@ export default { if (this.price == ''){ this.price = null; } - if (typeof this.price == 'string' && /^\d+[\.,\,]?\d*$/.test(this.price)){ + if (typeof this.price == 'string' && rules.isNumber(this.price)){ this.price = parseFloat(this.price) } let validateName = rules.notNull(this.name); diff --git a/resources/views/Wishlist/EditWish.vue b/resources/views/Wishlist/EditWish.vue index 202bd1f..2f930e8 100644 --- a/resources/views/Wishlist/EditWish.vue +++ b/resources/views/Wishlist/EditWish.vue @@ -35,7 +35,7 @@ export default { if (this.price == ""){ this.price = null; } - if (typeof this.price == 'string' && /^\d+[\.,\,]?\d*$/.test(this.price)){ + if (typeof this.price == 'string' && rules.isNumber(this.price)){ this.price = parseFloat(this.price) } let validateId = rules.id(this.wish_id);