Merge pull request #2963 from rahulcs0082/development

Issue #2949 and #2950
bagisto · Apr 29, 2020 · 4899f90 · 4899f90
2 parents c88ca31 + 6118cab
commit 4899f90
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
diff --git a/packages/Webkul/Velocity/publishable/assets/mix-manifest.json b/packages/Webkul/Velocity/publishable/assets/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/js/velocity.js": "/js/velocity.js?id=08fbd43328947b542230",
+    "/js/velocity.js": "/js/velocity.js?id=a0421440e72113e0ce0d",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
     "/css/velocity.css": "/css/velocity.css?id=494f7330df616e1ba3db"
 }
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/app.js b/packages/Webkul/Velocity/src/Resources/assets/js/app.js
@@ -11,14 +11,13 @@ window.jQuery = window.$ = require("jquery");
 window.BootstrapSass = require("bootstrap-sass");
 
 Vue.use(VueToast);
-Vue.use(VeeValidate);
 Vue.use(VueCarousel);
 Vue.use(BootstrapSass);
 Vue.prototype.$http = axios;
 
 Vue.use(VeeValidate, {
     dictionary: {
-        ar: { messages: messagesAr }
+        ar: messagesAr
     }
 });
 

diff --git a/public/installer/EnvConfig.php b/public/installer/EnvConfig.php
@@ -27,11 +27,11 @@
     if (empty($_POST['host_name']))
         $errors['host_name'] = 'Host Name is required.';
 
-    if (empty($_POST['database_name']))
-        $errors['database_name'] = 'Database Name is required.';
+    // if (empty($_POST['database_name']))
+    //     $errors['database_name'] = 'Database Name is required.';
 
-    if (empty($_POST['user_name']))
-        $errors['user_name'] = 'User Name is required.';
+    // if (empty($_POST['user_name']))
+    //     $errors['user_name'] = 'User Name is required.';
 
     if (empty($_POST['port_name']))
         $errors['port_name'] = 'Port Name is required.';