Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage

# Conflicts: # package-lock.json # package.json # resources/assets/js/pages/settings/admin-supplier.vue # vendor/composer/autoload_static.php
2026-08-22 05:44:13 +00:00 · 2018-07-05 11:52:38 +08:00
parent 340381d0b3 09f2dcf579
commit 560035be09
20 changed files with 15804 additions and 247 deletions
@@ -76,6 +76,7 @@ class RegisterController extends Controller

        $role = Role::where('name','=','member')->first();
        $user = new User();
+        $user->name = $data['name'];
        $user->email = $data['email'];
        $user->password = bcrypt($data['password']);