Merge branch 'fix-issue' into 'master'

fix app_url and quantity validation issue See merge request mohit.panjvani/crater-web!97
crater-invoice-inc · Dec 2, 2019 · 7b50148 · 7b50148
2 parents dad71b0 + aef6da8
commit 7b50148
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/resources/assets/js/helpers/utilities.js b/resources/assets/js/helpers/utilities.js
@@ -87,5 +87,16 @@ export default {
     } catch (e) {
       console.log(e)
     }
+  },
+
+  checkValidUrl (url) {
+    let pattern = new RegExp('^(https?:\\/\\/)?' + // protocol
+      '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
+      '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
+      '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
+      '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
+      '(\\#[-a-z\\d_]*)?$', 'i') // fragment locator
+
+    return !!pattern.test(url)
   }
 }
diff --git a/resources/assets/js/views/estimates/Item.vue b/resources/assets/js/views/estimates/Item.vue
@@ -36,7 +36,7 @@
               <base-input
                 v-model="item.quantity"
                 :invalid="$v.item.quantity.$error"
-                type="number"
+                type="text"
                 small
                 @keyup="updateItem"
                 @input="$v.item.quantity.$touch()"

diff --git a/resources/assets/js/views/invoices/Item.vue b/resources/assets/js/views/invoices/Item.vue
@@ -36,7 +36,7 @@
               <base-input
                 v-model="item.quantity"
                 :invalid="$v.item.quantity.$error"
-                type="number"
+                type="text"
                 small
                 @keyup="updateItem"
                 @input="$v.item.quantity.$touch()"

diff --git a/resources/assets/js/views/wizard/Database.vue b/resources/assets/js/views/wizard/Database.vue
@@ -18,7 +18,7 @@
             <span v-if="!$v.databaseData.app_url.required" class="text-danger">
               {{ $tc('validation.required') }}
             </span>
-            <span v-if="!$v.databaseData.app_url.url" class="text-danger">
+            <span v-if="!$v.databaseData.app_url.isUrl" class="text-danger">
               {{ $tc('validation.invalid_url') }}
             </span>
           </div>
@@ -184,7 +184,9 @@ export default {
       },
       app_url: {
         required,
-        url
+        isUrl (val) {
+          return this.$utils.checkValidUrl(val)
+        }
       }
     }
   },