Merge pull request #1033 from uasoft-indonesia/task/v3/address

add address badaso users
uasoft-indonesia · Sep 28, 2023 · 9195638 · 9195638
2 parents d7d6616 + 84d9f37
commit 9195638
Show file tree

Hide file tree

Showing 13 changed files with 355 additions and 34 deletions.
diff --git a/src/Controllers/BadasoAuthController.php b/src/Controllers/BadasoAuthController.php
@@ -165,14 +165,18 @@ public function register(Request $request)
                 'phone'    => 'required|numeric|min:6',
                 'email'    => 'required|string|email|max:255|unique:Uasoft\Badaso\Models\User',
                 'password' => 'required|string|min:6|confirmed',
+                'address' => 'required|string|max:255',
+                'gender'   => 'required|string',
             ]);
 
             $user = User::create([
                 'name'     => $request->get('name'),
                 'username' => $request->get('username'),
                 'phone' => $request->get('phone'),
+                'address' => $request->get('address'),
                 'email'    => $request->get('email'),
                 'password' => Hash::make($request->get('password')),
+                'gender'  => $request->get('gender'),
             ]);
 
             $role = $this->getCustomerRole();
@@ -522,14 +526,20 @@ public function updateProfile(Request $request)
                 'name'      => 'required|string|max:255',
                 'username'  => "required|string|max:255|alpha_num|unique:Uasoft\Badaso\Models\User,username,{$user_id}",
                 'avatar'    => 'nullable',
+                'phone'     => 'nullable',
+                'address'   => 'nullable',
+                'gender'    => 'nullable',
             ]);
 
             $user = User::find($user->id);
 
             $user->name = $request->name;
             $user->username = $request->username;
+            $user->phone = $request->phone;
+            $user->address = $request->address;
             $user->avatar = $request->avatar;
             $user->additional_info = $request->additional_info;
+            $user->gender = $request->gender;
             $user->save();
 
             DB::commit();

diff --git a/src/Controllers/BadasoUserController.php b/src/Controllers/BadasoUserController.php
@@ -57,14 +57,20 @@ public function edit(Request $request)
                 'username'  => "required|string|max:255|alpha_num|unique:Uasoft\Badaso\Models\User,username,{$request->id}",
                 'name'      => 'required',
                 'avatar'    => 'nullable',
+                'phone'     => 'nullable',
+                'address'   => 'nullable',
+                'gender'    => 'nullable',
             ]);
 
             $user = User::find($request->id);
             $old_user = $user->toArray();
             $user->name = $request->name;
             $user->username = $request->username;
+            $user->phone = $request->phone;
+            $user->address = $request->address;
             $user->email = $request->email;
             $user->avatar = $request->avatar;
+            $user->gender = $request->gender;
             $user->additional_info = $request->additional_info;
             if ($request->password && $request->password != '') {
                 $user->password = Hash::make($request->password);
@@ -105,13 +111,19 @@ public function add(Request $request)
                 'name'      => 'required|string|max:255',
                 'username'  => 'required|string|max:255|alpha_num|unique:Uasoft\Badaso\Models\User,username',
                 'avatar'    => 'nullable',
+                'phone'     => 'required|numeric|min:6',
+                'address'   => 'nullable',
+                'gender'   => 'required|string',
             ]);
 
             $user = new User();
             $user->name = $request->name;
             $user->username = $request->username;
+            $user->phone = $request->phone;
+            $user->address = $request->address;
             $user->email = $request->email;
             $user->avatar = $request->avatar;
+            $user->gender = $request->gender;
             $user->additional_info = $request->additional_info;
             $user->password = Hash::make($request->password);
             if ($request->email_verified) {

diff --git a/src/Migrations/2023_09_25_021749_add_address_to_badaso_users_table.php b/src/Migrations/2023_09_25_021749_add_address_to_badaso_users_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAddressToBadasoUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(config('badaso.database.prefix').'users', function (Blueprint $table) {
+            $table->text('address')->nullable()->after('phone');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(config('badaso.database.prefix').'users', function (Blueprint $table) {
+            $table->dropColumn('address');
+        });
+    }
+}
diff --git a/src/Migrations/2023_09_25_091419_add_gender_to_badaso_users_table.php b/src/Migrations/2023_09_25_091419_add_gender_to_badaso_users_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddGenderToBadasoUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(config('badaso.database.prefix').'users', function (Blueprint $table) {
+            $table->enum('gender', ['man', 'woman'])->nullable()->after('additional_info');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(config('badaso.database.prefix').'users', function (Blueprint $table) {
+            $table->dropColumn('gender');
+        });
+    }
+}
diff --git a/src/Models/User.php b/src/Models/User.php
@@ -38,6 +38,8 @@ public function __construct(array $attributes = [])
         'email',
         'password',
         'avatar',
+        'address',
+        'gender',
         'additional_info',
         'last_sent_token_at',
     ];

diff --git a/src/resources/badaso/components/BadasoSelect.vue b/src/resources/badaso/components/BadasoSelect.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import * as DOMPurify from 'dompurify';
+import DOMPurify from 'dompurify';
 export default {
   name: "BadasoSelect",
   components: {},

diff --git a/src/resources/badaso/lang/modules/en.js b/src/resources/badaso/lang/modules/en.js
@@ -41,15 +41,21 @@ export default {
       name: "Name",
       username: "Username",
       phone: "Phone",
+      address: "Address",
       email: "Email",
       password: "Password",
       passwordConfirmation: "Password Confirmation",
+      gender: "Gender",
     },
     button: "Register",
     existingAccount: {
       text: "Do you have an account?",
       link: "Login",
     },
+    gender: {
+      man: "Man",
+      woman: "Woman",
+    },
   },
 
   forgotPassword: {
@@ -125,6 +131,9 @@ export default {
     newPasswordConfirmation: "New Password Confirmation",
     name: "Name",
     avatar: "Avatar",
+    phone: "Phone Number",
+    address: "Address",
+    gender: "Gender",
     additionalInfo: "Additional info(optional)",
     token: "Verification Code",
     buttons: {
@@ -652,6 +661,14 @@ export default {
           title: "Username",
           placeholder: "Username",
         },
+        phone: {
+          title: "Phone Number",
+          placeholder: "Phone Number",
+        },
+        address: {
+          title: "Address",
+          placeholder: "Address",
+        },
         email: {
           title: "Email",
           placeholder: "Email",
@@ -668,6 +685,10 @@ export default {
           title: "Avatar",
           placeholder: "Avatar",
         },
+        gender: {
+          title: "Gender",
+          placeholder: "Gender",
+        },
         additionalInfo: {
           title: "Additional Info (JSON)",
           placeholder: "Additional Info (JSON)",
@@ -687,6 +708,18 @@ export default {
           title: "Username",
           placeholder: "Username",
         },
+        phone: {
+          title: "Phone Number",
+          placeholder: "Phone Number",
+        },
+        address: {
+          title: "Address",
+          placeholder: "Address",
+        },
+        gender: {
+          title: "Gender",
+          placeholder: "Gender",
+        },
         email: {
           title: "Email",
           placeholder: "Email",
@@ -716,6 +749,9 @@ export default {
       avatar: "Avatar",
       name: "Name",
       username: "Username",
+      phone: "Phone Number",
+      address: "Address",
+      gender: "Gender",
       email: "Email",
       additionalInfo: "Additional Info",
       emailVerified: "Is Email Verified",
@@ -733,6 +769,10 @@ export default {
         text: "Roles has been set",
       },
     },
+    gender: {
+      man: "Man",
+      woman: "Woman",
+    },
   },
 
   role: {

diff --git a/src/resources/badaso/lang/modules/id.js b/src/resources/badaso/lang/modules/id.js
@@ -40,7 +40,9 @@ export default {
     field: {
       name: "Nama",
       username: "Username",
-      phone: "Phone",
+      phone: "No Telp/Hp",
+      address: "Alamat",
+      gender: "Jenis Kelamin",
       email: "Email",
       password: "Kata sandi",
       passwordConfirmation: "Konfirmasi kata sandi",
@@ -50,6 +52,10 @@ export default {
       text: "Sudah mempunyai akun?",
       link: "Masuk",
     },
+    gender: {
+      man: "Laki-laki",
+      women: "Perempuan",
+    },
   },
 
   forgotPassword: {
@@ -125,6 +131,9 @@ export default {
     newPasswordConfirmation: "New Password Confirmation",
     name: "Name",
     avatar: "Avatar",
+    phone: "No Telp/Hp",
+    address: "Alamat",
+    gender: "Jenis Kelamin",
     additionalInfo: "Additional info(optional)",
     token: "Verification Code",
     buttons: {
@@ -648,6 +657,18 @@ export default {
           title: "Username",
           placeholder: "Username",
         },
+        phone: {
+          title: "No Telp/Hp",
+          placeholder: "No Telp/Hp",
+        },
+        address: {
+          title: "Alamat",
+          placeholder: "Alamat",
+        },
+        gender: {
+          title: "Jenis Kelamin",
+          placeholder: "Jenis Kelamin",
+        },
         password: {
           title: "Kata sandi",
           placeholder: "Kata sandi",
@@ -679,6 +700,18 @@ export default {
           title: "Username",
           placeholder: "Username",
         },
+        phone: {
+          title: "No Telp/Hp",
+          placeholder: "No Telp/Hp",
+        },
+        address: {
+          title: "Alamat",
+          placeholder: "Alamat",
+        },
+        gender: {
+          title: "Jenis Kelamin",
+          placeholder: "Jenis Kelamin",
+        },
         email: {
           title: "Email",
           placeholder: "Email",
@@ -708,7 +741,10 @@ export default {
       avatar: "Avatar",
       name: "Nama",
       username: "Username",
+      phone: "No Telp/Hp",
+      address: "Alamat",
       email: "Email",
+      gender: "Jenis Kelamin",
       additionalInfo: "Info Tambahan",
       emailVerified: "Email Diverifikasi",
     },
@@ -725,6 +761,10 @@ export default {
         text: "Wewenang telah ditetapkan",
       },
     },
+    gender: {
+      man: "Laki-laki",
+      women: "Perempuan",
+    },
   },
 
   role: {