fix address store, add checkbox, forget password

app/src/main/AndroidManifest.xml

@@ -29,6 +29,9 @@
         android:theme="@style/Theme.Ecommerce_serang"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.auth.ResetPassActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.profile.mystore.StoreSuspendedActivity"
             android:exported="false" />

app/src/main/java/com/alya/ecommerce_serang/data/api/dto/City.kt

@@ -2,30 +2,20 @@ package com.alya.ecommerce_serang.data.api.dto
 
 import com.google.gson.annotations.SerializedName
 
-data class City(
+data class CityResponse(
-    @SerializedName("city_id")
-    val cityId: String,
 
-    @SerializedName("city_name")
+	@field:SerializedName("cities")
-    val cityName: String,
+	val cities: List<City>,
 
-    @SerializedName("province_id")
+	@field:SerializedName("message")
-    val provinceId: String,
+	val message: String
-
-    @SerializedName("province")
-    val provinceName: String,
-
-    @SerializedName("type")
-    val type: String,
-
-    @SerializedName("postal_code")
-    val postalCode: String
 )
 
-data class CityResponse(
+data class City(
-    @SerializedName("message")
-    val message: String,
 
-    @SerializedName("cities")
+	@field:SerializedName("city_name")
-    val data: List<City>
+	val cityName: String,
-)
+
+	@field:SerializedName("city_id")
+	val cityId: String
+)

app/src/main/java/com/alya/ecommerce_serang/data/api/dto/ResetPassReq.kt

@@ -0,0 +1,8 @@
+package com.alya.ecommerce_serang.data.api.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class ResetPassReq (
+    @SerializedName("emailOrPhone")
+    val emailOrPhone: String
+)

app/src/main/java/com/alya/ecommerce_serang/data/api/dto/UpdateAddressReq.kt

@@ -0,0 +1,28 @@
+package com.alya.ecommerce_serang.data.api.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class UpdateAddressReq(
+    @SerializedName("street")
+    val street: String? = "",
+
+    @SerializedName("subdistrict")
+    val subdistrict: String? = "",
+
+    @SerializedName("postal_code")
+    val postalCCode: String? = "",
+
+    @SerializedName("detail")
+    val detail: String? = "",
+
+    @SerializedName("city_id")
+    val cityId: String? = "",
+
+    @SerializedName("province_id")
+    val provId: String? = "",
+
+    @SerializedName("phone")
+    val phone: String? = ""
+
+
+)

app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt

@@ -19,6 +19,7 @@ import com.alya.ecommerce_serang.data.api.dto.OtpRequest
 import com.alya.ecommerce_serang.data.api.dto.PaymentConfirmRequest
 import com.alya.ecommerce_serang.data.api.dto.ProvinceResponse
 import com.alya.ecommerce_serang.data.api.dto.RegisterRequest
+import com.alya.ecommerce_serang.data.api.dto.ResetPassReq
 import com.alya.ecommerce_serang.data.api.dto.ReviewProductItem
 import com.alya.ecommerce_serang.data.api.dto.SearchRequest
 import com.alya.ecommerce_serang.data.api.dto.ShippingServiceRequest
@@ -36,6 +37,7 @@ import com.alya.ecommerce_serang.data.api.response.auth.LoginResponse
 import com.alya.ecommerce_serang.data.api.response.auth.OtpResponse
 import com.alya.ecommerce_serang.data.api.response.auth.RegisterResponse
 import com.alya.ecommerce_serang.data.api.response.auth.RegisterStoreResponse
+import com.alya.ecommerce_serang.data.api.response.auth.ResetPassResponse
 import com.alya.ecommerce_serang.data.api.response.auth.VerifRegisterResponse
 import com.alya.ecommerce_serang.data.api.response.chat.ChatHistoryResponse
 import com.alya.ecommerce_serang.data.api.response.chat.ChatListResponse
@@ -65,6 +67,7 @@ import com.alya.ecommerce_serang.data.api.response.customer.profile.AddressRespo
 import com.alya.ecommerce_serang.data.api.response.customer.profile.CreateAddressResponse
 import com.alya.ecommerce_serang.data.api.response.customer.profile.EditProfileResponse
 import com.alya.ecommerce_serang.data.api.response.customer.profile.ProfileResponse
+import com.alya.ecommerce_serang.data.api.response.customer.profile.UpdateAddressResponse
 import com.alya.ecommerce_serang.data.api.response.order.AddEvidenceResponse
 import com.alya.ecommerce_serang.data.api.response.order.ComplaintResponse
 import com.alya.ecommerce_serang.data.api.response.order.CompletedOrderResponse
@@ -454,6 +457,12 @@ interface ApiService {
         @Body addressData: HashMap<String, Any?>
     ): Response<StoreAddressResponse>
 
+    @PUT("profile/address/edit/{idAddress}")
+    suspend fun updateAddress(
+        @Path("id") addressId: Int,
+        @Body params: Map<String, Any>
+    ): Response<UpdateAddressResponse>
+
     @POST("search")
     suspend fun saveSearchQuery(
         @Body searchRequest: SearchRequest
@@ -524,4 +533,9 @@ interface ApiService {
     suspend fun getVillages(
         @Path("subdistrictId") subdistrictId: String
     ): Response<VillagesResponse>
+
+    @POST("resetpass")
+    suspend fun postResetPass(
+        @Body request: ResetPassReq
+    ): Response<ResetPassResponse>
 }

app/src/main/java/com/alya/ecommerce_serang/data/repository/AddressRepository.kt

@@ -1,131 +1,139 @@
 package com.alya.ecommerce_serang.data.repository
 
 import android.util.Log
-import com.alya.ecommerce_serang.data.api.dto.City
+import com.alya.ecommerce_serang.data.api.dto.CityResponse
-import com.alya.ecommerce_serang.data.api.dto.Province
+import com.alya.ecommerce_serang.data.api.dto.ProvinceResponse
-import com.alya.ecommerce_serang.data.api.dto.StoreAddress
+import com.alya.ecommerce_serang.data.api.response.customer.profile.AddressResponse
+import com.alya.ecommerce_serang.data.api.response.customer.profile.UpdateAddressResponse
 import com.alya.ecommerce_serang.data.api.retrofit.ApiService
-import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.json.JSONObject
+import retrofit2.Response
 
 class AddressRepository(private val apiService: ApiService) {
 
     private val TAG = "AddressRepository"
 
-    suspend fun getProvinces(): List<Province> = withContext(Dispatchers.IO) {
+//    suspend fun getProvinces(): List<Province> = withContext(Dispatchers.IO) {
-        Log.d(TAG, "getProvinces() called")
+//        Log.d(TAG, "getProvinces() called")
-        try {
+//        try {
-            val response = apiService.getProvinces()
+//            val response = apiService.getProvinces()
-            Log.d(TAG, "getProvinces() response: isSuccessful=${response.isSuccessful}, code=${response.code()}")
+//            Log.d(TAG, "getProvinces() response: isSuccessful=${response.isSuccessful}, code=${response.code()}")
+//
+//            // Log the raw response body for debugging
+//            val rawBody = response.raw().toString()
+//            Log.d(TAG, "Raw response: $rawBody")
+//
+//            if (response.isSuccessful) {
+//                val responseBody = response.body()
+//                Log.d(TAG, "Response body: ${Gson().toJson(responseBody)}")
+//
+//                val provinces = responseBody?.data ?: emptyList()
+//                Log.d(TAG, "getProvinces() success, got ${provinces.size} provinces")
+//                return@withContext provinces
+//            } else {
+//                val errorBody = response.errorBody()?.string() ?: "Unknown error"
+//                Log.e(TAG, "getProvinces() error: $errorBody")
+//                throw Exception("API Error (${response.code()}): $errorBody")
+//            }
+//        } catch (e: Exception) {
+//            Log.e(TAG, "Exception in getProvinces()", e)
+//            throw Exception("Network error: ${e.message}")
+//        }
+//    }
 
-            // Log the raw response body for debugging
+//    suspend fun getCities(provinceId: String): List<City> = withContext(Dispatchers.IO) {
-            val rawBody = response.raw().toString()
+//        Log.d(TAG, "getCities() called with provinceId: $provinceId")
-            Log.d(TAG, "Raw response: $rawBody")
+//        try {
+//            val response = apiService.getCities(provinceId)
+//            Log.d(TAG, "getCities() response: isSuccessful=${response.isSuccessful}, code=${response.code()}")
+//
+//            if (response.isSuccessful) {
+//                val responseBody = response.body()
+//                Log.d(TAG, "Response body: ${Gson().toJson(responseBody)}")
+//
+//                val cities = responseBody?.data ?: emptyList()
+//                Log.d(TAG, "getCities() success, got ${cities.size} cities")
+//                return@withContext cities
+//            } else {
+//                val errorBody = response.errorBody()?.string() ?: "Unknown error"
+//                Log.e(TAG, "getCities() error: $errorBody")
+//                throw Exception("API Error (${response.code()}): $errorBody")
+//            }
+//        } catch (e: Exception) {
+//            Log.e(TAG, "Exception in getCities()", e)
+//            throw Exception("Network error: ${e.message}")
+//        }
+//    }
 
-            if (response.isSuccessful) {
+    suspend fun getProvinces(): Response<ProvinceResponse> {
-                val responseBody = response.body()
+        return apiService.getProvinces()
-                Log.d(TAG, "Response body: ${Gson().toJson(responseBody)}")
-
-                val provinces = responseBody?.data ?: emptyList()
-                Log.d(TAG, "getProvinces() success, got ${provinces.size} provinces")
-                return@withContext provinces
-            } else {
-                val errorBody = response.errorBody()?.string() ?: "Unknown error"
-                Log.e(TAG, "getProvinces() error: $errorBody")
-                throw Exception("API Error (${response.code()}): $errorBody")
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Exception in getProvinces()", e)
-            throw Exception("Network error: ${e.message}")
-        }
     }
 
-    suspend fun getCities(provinceId: String): List<City> = withContext(Dispatchers.IO) {
+    suspend fun getCities(provinceId: String): Response<CityResponse> {
-        Log.d(TAG, "getCities() called with provinceId: $provinceId")
+        return apiService.getCities(provinceId)
-        try {
-            val response = apiService.getCities(provinceId)
-            Log.d(TAG, "getCities() response: isSuccessful=${response.isSuccessful}, code=${response.code()}")
-
-            if (response.isSuccessful) {
-                val responseBody = response.body()
-                Log.d(TAG, "Response body: ${Gson().toJson(responseBody)}")
-
-                val cities = responseBody?.data ?: emptyList()
-                Log.d(TAG, "getCities() success, got ${cities.size} cities")
-                return@withContext cities
-            } else {
-                val errorBody = response.errorBody()?.string() ?: "Unknown error"
-                Log.e(TAG, "getCities() error: $errorBody")
-                throw Exception("API Error (${response.code()}): $errorBody")
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Exception in getCities()", e)
-            throw Exception("Network error: ${e.message}")
-        }
     }
 
-    suspend fun getStoreAddress(): StoreAddress? = withContext(Dispatchers.IO) {
+//    suspend fun getStoreAddress(): StoreAddress? = withContext(Dispatchers.IO) {
-        Log.d(TAG, "getStoreAddress() called")
+//        Log.d(TAG, "getStoreAddress() called")
-        try {
+//        try {
-            val response = apiService.getStoreAddress()
+//            val response = apiService.getStoreAddress()
-            Log.d(TAG, "getStoreAddress() response: isSuccessful=${response.isSuccessful}, code=${response.code()}")
+//            Log.d(TAG, "getStoreAddress() response: isSuccessful=${response.isSuccessful}, code=${response.code()}")
-
+//
-            if (response.isSuccessful) {
+//            if (response.isSuccessful) {
-                val responseBody = response.body()
+//                val responseBody = response.body()
-                val rawJson = Gson().toJson(responseBody)
+//                val rawJson = Gson().toJson(responseBody)
-                Log.d(TAG, "Response body: $rawJson")
+//                Log.d(TAG, "Response body: $rawJson")
-
+//
-                val address = responseBody?.data
+//                val address = responseBody?.data
-                Log.d(TAG, "getStoreAddress() success, address: $address")
+//                Log.d(TAG, "getStoreAddress() success, address: $address")
-
+//
-                // Convert numeric strings to proper types if needed
+//                // Convert numeric strings to proper types if needed
-                address?.let {
+//                address?.let {
-                    // Handle city_id if it's a number
+//                    // Handle city_id if it's a number
-                    if (it.cityId.isBlank() && rawJson.contains("city_id")) {
+//                    if (it.cityId.isBlank() && rawJson.contains("city_id")) {
-                        try {
+//                        try {
-                            val cityId = JSONObject(rawJson).getJSONObject("store").optInt("city_id", 0)
+//                            val cityId = JSONObject(rawJson).getJSONObject("store").optInt("city_id", 0)
-                            if (cityId > 0) {
+//                            if (cityId > 0) {
-                                it.javaClass.getDeclaredField("cityId").apply {
+//                                it.javaClass.getDeclaredField("cityId").apply {
-                                    isAccessible = true
+//                                    isAccessible = true
-                                    set(it, cityId.toString())
+//                                    set(it, cityId.toString())
-                                }
+//                                }
-                                Log.d(TAG, "Updated cityId to: ${it.cityId}")
+//                                Log.d(TAG, "Updated cityId to: ${it.cityId}")
-                            }
+//                            }
-                        } catch (e: Exception) {
+//                        } catch (e: Exception) {
-                            Log.e(TAG, "Error parsing city_id", e)
+//                            Log.e(TAG, "Error parsing city_id", e)
-                        }
+//                        }
-                    }
+//                    }
-
+//
-                    // Handle province_id if it's a number
+//                    // Handle province_id if it's a number
-                    if (it.provinceId.isBlank() && rawJson.contains("province_id")) {
+//                    if (it.provinceId.isBlank() && rawJson.contains("province_id")) {
-                        try {
+//                        try {
-                            val provinceId = JSONObject(rawJson).getJSONObject("store").optInt("province_id", 0)
+//                            val provinceId = JSONObject(rawJson).getJSONObject("store").optInt("province_id", 0)
-                            if (provinceId > 0) {
+//                            if (provinceId > 0) {
-                                it.javaClass.getDeclaredField("provinceId").apply {
+//                                it.javaClass.getDeclaredField("provinceId").apply {
-                                    isAccessible = true
+//                                    isAccessible = true
-                                    set(it, provinceId.toString())
+//                                    set(it, provinceId.toString())
-                                }
+//                                }
-                                Log.d(TAG, "Updated provinceId to: ${it.provinceId}")
+//                                Log.d(TAG, "Updated provinceId to: ${it.provinceId}")
-                            }
+//                            }
-                        } catch (e: Exception) {
+//                        } catch (e: Exception) {
-                            Log.e(TAG, "Error parsing province_id", e)
+//                            Log.e(TAG, "Error parsing province_id", e)
-                        }
+//                        }
-                    }
+//                    }
-                }
+//                }
-
+//
-                return@withContext address
+//                return@withContext address
-            } else {
+//            } else {
-                val errorBody = response.errorBody()?.string() ?: "Unknown error"
+//                val errorBody = response.errorBody()?.string() ?: "Unknown error"
-                Log.e(TAG, "getStoreAddress() error: $errorBody")
+//                Log.e(TAG, "getStoreAddress() error: $errorBody")
-                throw Exception("API Error (${response.code()}): $errorBody")
+//                throw Exception("API Error (${response.code()}): $errorBody")
-            }
+//            }
-        } catch (e: Exception) {
+//        } catch (e: Exception) {
-            Log.e(TAG, "Exception in getStoreAddress()", e)
+//            Log.e(TAG, "Exception in getStoreAddress()", e)
-            throw Exception("Network error: ${e.message}")
+//            throw Exception("Network error: ${e.message}")
-        }
+//        }
-    }
+//    }
 
     suspend fun saveStoreAddress(
         provinceId: String,
@@ -171,4 +179,12 @@ class AddressRepository(private val apiService: ApiService) {
             throw Exception("Network error: ${e.message}")
         }
     }
+
+    suspend fun getStoreAddress(): Response<AddressResponse> {
+        return apiService.getAddress()
+    }
+
+    suspend fun updateAddress(addressId: Int, params: Map<String, Any>): Response<UpdateAddressResponse> {
+        return apiService.updateAddress(addressId, params)
+    }
 }

app/src/main/java/com/alya/ecommerce_serang/data/repository/UserRepository.kt

@@ -7,6 +7,7 @@ import com.alya.ecommerce_serang.data.api.dto.FcmReq
 import com.alya.ecommerce_serang.data.api.dto.LoginRequest
 import com.alya.ecommerce_serang.data.api.dto.OtpRequest
 import com.alya.ecommerce_serang.data.api.dto.RegisterRequest
+import com.alya.ecommerce_serang.data.api.dto.ResetPassReq
 import com.alya.ecommerce_serang.data.api.dto.UserProfile
 import com.alya.ecommerce_serang.data.api.dto.VerifRegisReq
 import com.alya.ecommerce_serang.data.api.response.auth.FcmTokenResponse
@@ -18,6 +19,7 @@ import com.alya.ecommerce_serang.data.api.response.auth.NotifstoreItem
 import com.alya.ecommerce_serang.data.api.response.auth.OtpResponse
 import com.alya.ecommerce_serang.data.api.response.auth.RegisterResponse
 import com.alya.ecommerce_serang.data.api.response.auth.RegisterStoreResponse
+import com.alya.ecommerce_serang.data.api.response.auth.ResetPassResponse
 import com.alya.ecommerce_serang.data.api.response.auth.VerifRegisterResponse
 import com.alya.ecommerce_serang.data.api.response.customer.order.ListCityResponse
 import com.alya.ecommerce_serang.data.api.response.customer.order.ListProvinceResponse
@@ -490,6 +492,30 @@ class UserRepository(private val apiService: ApiService) {
             Result.Error(e)
         }
     }
+
+    suspend fun resetPassword(request: ResetPassReq): Result<ResetPassResponse>{
+        return try {
+            val response = apiService.postResetPass(request)
+
+            if (response.isSuccessful){
+                val resetPassResponse = response.body()
+                if (resetPassResponse != null) {
+                        Result.Success(resetPassResponse)
+                }
+                else {
+                    Result.Error(Exception("Empty response from server"))
+                }
+            }
+            else {
+                val errorBody = response.errorBody()?.string() ?: "Unknown error"
+                Log.e(TAG, "Error RESET PASS address: $errorBody")
+                Result.Error(Exception(errorBody))
+            }
+        }
+        catch (e: Exception){
+            Result.Error(e)
+        }
+    }
     companion object{
         private const val TAG = "UserRepository"
     }

app/src/main/java/com/alya/ecommerce_serang/ui/auth/LoginActivity.kt

@@ -82,6 +82,11 @@ class LoginActivity : AppCompatActivity() {
             startActivity(Intent(this, RegisterActivity::class.java))
             finish()
         }
+
+        binding.tvForgetPassword.setOnClickListener {
+            startActivity(Intent(this, ResetPassActivity::class.java))
+            finish()
+        }
     }
 
     private fun observeLoginState() {

app/src/main/java/com/alya/ecommerce_serang/ui/auth/ResetPassActivity.kt

@@ -0,0 +1,123 @@
+package com.alya.ecommerce_serang.ui.auth
+
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
+import com.alya.ecommerce_serang.data.repository.Result
+import com.alya.ecommerce_serang.data.repository.UserRepository
+import com.alya.ecommerce_serang.databinding.ActivityResetPassBinding
+import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.viewmodel.LoginViewModel
+
+class ResetPassActivity : AppCompatActivity() {
+
+    private val TAG = "ResetPassActivity"
+    private lateinit var binding: ActivityResetPassBinding
+
+    private val loginViewModel: LoginViewModel by viewModels{
+        BaseViewModelFactory {
+            val apiService = ApiConfig.getUnauthenticatedApiService()
+            val userRepository = UserRepository(apiService)
+            LoginViewModel(userRepository, this)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityResetPassBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+//        enableEdgeToEdge()
+
+        setupToolbar()
+        setupUI()
+
+    }
+
+    private fun setupToolbar(){
+        binding.headerResetPass.headerLeftIcon.setOnClickListener{
+            finish()
+        }
+        binding.headerResetPass.headerTitle.text = "Lupa Password"
+    }
+
+    private fun setupUI(){
+        binding.btnReset.setOnClickListener {
+            val email = binding.etEmail.text.toString().trim()
+            if (email.isNotEmpty()) {
+                loginViewModel.resetPassword(email)
+            } else {
+                binding.etEmail.error = "Masukkan Email Anda"
+            }
+        }
+    }
+
+    private fun observeResetPassword() {
+        loginViewModel.resetPasswordState.observe(this) { result ->
+            when (result) {
+                is com.alya.ecommerce_serang.data.repository.Result.Loading -> {
+                    showLoading(true)
+                }
+
+                is com.alya.ecommerce_serang.data.repository.Result.Success -> {
+                    showLoading(false)
+                    handleSuccess("Silahkan cek email anda untuk melihat password anda.")
+                    Log.d(TAG, "Success rest password: ${result.data.message}")
+                }
+
+                is Result.Error -> {
+                    showLoading(false)
+                    handleError("Email anda salah atau tidak ditemukan.")
+                    Log.e(TAG, "Error reset password ${result.exception.message}")
+                }
+
+                null -> {
+                    // Initial state
+                }
+            }
+        }
+    }
+
+    private fun showLoading(isLoading: Boolean) {
+        if (isLoading) {
+            binding.progressBar.visibility = View.VISIBLE
+            binding.btnReset.isEnabled = false
+            binding.etEmail.isEnabled = false
+        } else {
+            binding.progressBar.visibility = View.GONE
+            binding.btnReset.isEnabled = true
+            binding.etEmail.isEnabled = true
+        }
+    }
+
+    private fun handleSuccess(message: String) {
+        Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+
+        // Show success dialog and navigate back to login
+        AlertDialog.Builder(this)
+            .setTitle("Berhasil Ubah Password")
+            .setMessage(message)
+            .setPositiveButton("OK") { _, _ ->
+                // Navigate back to login activity
+                finish()
+            }
+            .setCancelable(false)
+            .show()
+    }
+
+    private fun handleError(errorMessage: String) {
+        Toast.makeText(this, "Error: $errorMessage", Toast.LENGTH_LONG).show()
+
+        // Optionally show error dialog
+        AlertDialog.Builder(this)
+            .setTitle("Gagal Ubah Password")
+            .setMessage(errorMessage)
+            .setPositiveButton("OK", null)
+            .show()
+    }
+}

app/src/main/java/com/alya/ecommerce_serang/ui/order/address/AddressActivity.kt

@@ -99,6 +99,7 @@ class AddressActivity : AppCompatActivity() {
 
         viewModel.selectedAddressId.observe(this) { selectedId ->
             adapter.setSelectedAddressId(selectedId)
+            finish()
         }
     }
 

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/profile/address/DetailStoreAddressActivity.kt

@@ -1,6 +1,5 @@
 package com.alya.ecommerce_serang.ui.profile.mystore.profile.address
 
-import android.app.Activity
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -14,13 +13,14 @@ import com.alya.ecommerce_serang.BuildConfig
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.City
 import com.alya.ecommerce_serang.data.api.dto.Province
+import com.alya.ecommerce_serang.data.api.response.customer.profile.AddressesItem
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.data.api.retrofit.ApiService
 import com.alya.ecommerce_serang.data.repository.AddressRepository
 import com.alya.ecommerce_serang.databinding.ActivityDetailStoreAddressBinding
-import com.alya.ecommerce_serang.utils.viewmodel.AddressViewModel
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
+import com.alya.ecommerce_serang.utils.viewmodel.AddressViewModel
 import com.google.android.material.snackbar.Snackbar
 
 class DetailStoreAddressActivity : AppCompatActivity() {
@@ -32,6 +32,7 @@ class DetailStoreAddressActivity : AppCompatActivity() {
     private var selectedCityId: String? = null
     private var provinces: List<Province> = emptyList()
     private var cities: List<City> = emptyList()
+    private var currentAddress: AddressesItem? = null
 
     private val TAG = "StoreAddressActivity"
 
@@ -178,6 +179,7 @@ class DetailStoreAddressActivity : AppCompatActivity() {
 
         // Observe store address data
         viewModel.storeAddress.observe(this) { address ->
+            currentAddress = address
             Log.d(TAG, "Received store address: $address")
             address?.let {
                 // Set the fields
@@ -214,11 +216,12 @@ class DetailStoreAddressActivity : AppCompatActivity() {
         }
 
         // Observe save success
-        viewModel.saveSuccess.observe(this) {
+        viewModel.saveSuccess.observe(this)  { success ->
-            if (it) {
+            if (success) {
-                Toast.makeText(this, "Alamat berhasil disimpan", Toast.LENGTH_SHORT).show()
+                Log.d(TAG, "Address updated successfully")
-                setResult(Activity.RESULT_OK)
                 finish()
+            } else {
+                Log.e(TAG, "Failed to update address")
             }
         }
     }
@@ -229,8 +232,8 @@ class DetailStoreAddressActivity : AppCompatActivity() {
             val subdistrict = binding.edtSubdistrict.text.toString()
             val detail = binding.edtDetailAddress.text.toString()
             val postalCode = binding.edtPostalCode.text.toString()
-            val latitude = binding.edtLatitude.text.toString().toDoubleOrNull() ?: 0.0
+            val latitude = binding.edtLatitude.text.toString()
-            val longitude = binding.edtLongitude.text.toString().toDoubleOrNull() ?: 0.0
+            val longitude = binding.edtLongitude.text.toString()
 
             val city = cities.find { it.cityId == selectedCityId }
             val province = provinces.find { it.provinceId == selectedProvinceId }
@@ -241,12 +244,10 @@ class DetailStoreAddressActivity : AppCompatActivity() {
                 return@setOnClickListener
             }
 
-            // Save address
+            val oldAddress = currentAddress ?: return@setOnClickListener
-            viewModel.saveStoreAddress(
+            val newAddress = oldAddress.copy(
                 provinceId = selectedProvinceId!!,
-                provinceName = province?.provinceName ?: "",
                 cityId = city.cityId,
-                cityName = city.cityName,
                 street = street,
                 subdistrict = subdistrict,
                 detail = detail,
@@ -254,6 +255,20 @@ class DetailStoreAddressActivity : AppCompatActivity() {
                 latitude = latitude,
                 longitude = longitude
             )
+            viewModel.saveStoreAddress(oldAddress, newAddress)
+            // Save address
+//            viewModel.saveStoreAddress(
+//                provinceId = selectedProvinceId!!,
+//                provinceName = province?.provinceName ?: "",
+//                cityId = city.cityId,
+//                cityName = city.cityName,
+//                street = street,
+//                subdistrict = subdistrict,
+//                detail = detail,
+//                postalCode = postalCode,
+//                latitude = latitude,
+//                longitude = longitude
+//            )
         }
     }
 

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/AddressViewModel.kt

@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alya.ecommerce_serang.data.api.dto.City
 import com.alya.ecommerce_serang.data.api.dto.Province
-import com.alya.ecommerce_serang.data.api.dto.StoreAddress
+import com.alya.ecommerce_serang.data.api.response.customer.profile.AddressesItem
 import com.alya.ecommerce_serang.data.repository.AddressRepository
 import kotlinx.coroutines.launch
 
@@ -21,8 +21,8 @@ class AddressViewModel(private val addressRepository: AddressRepository) : ViewM
     private val _cities = MutableLiveData<List<City>>()
     val cities: LiveData<List<City>> = _cities
 
-    private val _storeAddress = MutableLiveData<StoreAddress?>()
+    private val _storeAddress = MutableLiveData<AddressesItem?>()
-    val storeAddress: LiveData<StoreAddress?> = _storeAddress
+    val storeAddress: LiveData<AddressesItem?> get() = _storeAddress
 
     private val _isLoading = MutableLiveData<Boolean>()
     val isLoading: LiveData<Boolean> = _isLoading
@@ -31,99 +31,219 @@ class AddressViewModel(private val addressRepository: AddressRepository) : ViewM
     val errorMessage: LiveData<String> = _errorMessage
 
     private val _saveSuccess = MutableLiveData<Boolean>()
-    val saveSuccess: LiveData<Boolean> = _saveSuccess
+    val saveSuccess: LiveData<Boolean> get() = _saveSuccess
+
 
     fun fetchProvinces() {
-        Log.d(TAG, "fetchProvinces() called")
-        _isLoading.value = true
         viewModelScope.launch {
             try {
-                Log.d(TAG, "Calling addressRepository.getProvinces()")
                 val response = addressRepository.getProvinces()
-                Log.d(TAG, "Received provinces response: ${response.size} provinces")
+                if (response.isSuccessful) {
-                _provinces.value = response
+                    _provinces.value = response.body()?.data ?: emptyList()
-                _isLoading.value = false
+                } else {
+                    Log.e("EditAddressVM", "Failed to get provinces: ${response.message()}")
+                }
             } catch (e: Exception) {
-                Log.e(TAG, "Error fetching provinces", e)
+                Log.e("EditAddressVM", "Error getting provinces: ${e.message}")
-                _errorMessage.value = "Failed to load provinces: ${e.message}"
-                _isLoading.value = false
             }
         }
     }
 
     fun fetchCities(provinceId: String) {
-        Log.d(TAG, "fetchCities() called with provinceId: $provinceId")
-        _isLoading.value = true
         viewModelScope.launch {
             try {
-                Log.d(TAG, "Calling addressRepository.getCities()")
                 val response = addressRepository.getCities(provinceId)
-                Log.d(TAG, "Received cities response: ${response.size} cities")
+                if (response.isSuccessful) {
-                _cities.value = response
+                    _cities.value = response.body()?.cities ?: emptyList()
-                _isLoading.value = false
+                } else {
+                    Log.e("EditAddressVM", "Failed to get cities: ${response.message()}")
+                }
             } catch (e: Exception) {
-                Log.e(TAG, "Error fetching cities", e)
+                Log.e("EditAddressVM", "Error getting cities: ${e.message}")
-                _errorMessage.value = "Failed to load cities: ${e.message}"
-                _isLoading.value = false
             }
         }
     }
 
+//    fun fetchProvinces() {
+//        Log.d(TAG, "fetchProvinces() called")
+//        _isLoading.value = true
+//        viewModelScope.launch {
+//            try {
+//                Log.d(TAG, "Calling addressRepository.getProvinces()")
+//                val response = addressRepository.getProvinces()
+//                Log.d(TAG, "Received provinces response: ${response.size} provinces")
+//                _provinces.value = response
+//                _isLoading.value = false
+//            } catch (e: Exception) {
+//                Log.e(TAG, "Error fetching provinces", e)
+//                _errorMessage.value = "Failed to load provinces: ${e.message}"
+//                _isLoading.value = false
+//            }
+//        }
+//    }
+
+//    fun fetchCities(provinceId: String) {
+//        Log.d(TAG, "fetchCities() called with provinceId: $provinceId")
+//        _isLoading.value = true
+//        viewModelScope.launch {
+//            try {
+//                selecte
+//                Log.d(TAG, "Calling addressRepository.getCities()")
+//                val response = addressRepository.getCities(provinceId)
+//                Log.d(TAG, "Received cities response: ${response.size} cities")
+//                _cities.value = response
+//                _isLoading.value = false
+//            } catch (e: Exception) {
+//                Log.e(TAG, "Error fetching cities", e)
+//                _errorMessage.value = "Failed to load cities: ${e.message}"
+//                _isLoading.value = false
+//            }
+//        }
+//    }
+
+//    fun fetchStoreAddress() {
+//        Log.d(TAG, "fetchStoreAddress() called")
+//        _isLoading.value = true
+//        viewModelScope.launch {
+//            try {
+//                Log.d(TAG, "Calling addressRepository.getStoreAddress()")
+//                val response = addressRepository.getStoreAddress()
+//                Log.d(TAG, "Received store address response: $response")
+//                _storeAddress.value = response
+//                _isLoading.value = false
+//            } catch (e: Exception) {
+//                Log.e(TAG, "Error fetching store address", e)
+//                _errorMessage.value = "Failed to load store address: ${e.message}"
+//                _isLoading.value = false
+//            }
+//        }
+//    }
+
+//    fun fetchStoreAddress() {
+//        viewModelScope.launch {
+//            try {
+//                val response = addressRepository.getStoreAddress()
+//                if (response.isSuccessful) {
+//                    val storeAddress = response.body()?.addresses
+//                        ?.firstOrNull { it.isStoreLocation == true }
+//
+//                    if (storeAddress != null) {
+//                        _storeAddress.value = storeAddress
+//                    } else {
+//                        Log.d("EditAddressVM", "No store address found")
+//                    }
+//                } else {
+//                    Log.e("EditAddressVM", "Failed to get addresses: ${response.message()}")
+//                }
+//            } catch (e: Exception) {
+//                Log.e("EditAddressVM", "Error: ${e.message}")
+//            }
+//        }
+//    }
+
     fun fetchStoreAddress() {
-        Log.d(TAG, "fetchStoreAddress() called")
-        _isLoading.value = true
         viewModelScope.launch {
             try {
-                Log.d(TAG, "Calling addressRepository.getStoreAddress()")
                 val response = addressRepository.getStoreAddress()
-                Log.d(TAG, "Received store address response: $response")
+                if (response.isSuccessful) {
-                _storeAddress.value = response
+                    val storeAddress = response.body()?.addresses
-                _isLoading.value = false
+                        ?.firstOrNull { it.isStoreLocation == true }
+
+                    if (storeAddress != null) {
+                        _storeAddress.value = storeAddress
+                    } else {
+                        Log.d(TAG, "No store address found")
+                    }
+                } else {
+                    Log.e(TAG, "Failed to get addresses: ${response.message()}")
+                }
             } catch (e: Exception) {
-                Log.e(TAG, "Error fetching store address", e)
+                Log.e(TAG, "Error: ${e.message}")
-                _errorMessage.value = "Failed to load store address: ${e.message}"
-                _isLoading.value = false
             }
         }
     }
 
-    fun saveStoreAddress(
+//    fun saveStoreAddress(
-        provinceId: String,
+//        provinceId: String,
-        provinceName: String,
+//        provinceName: String,
-        cityId: String,
+//        cityId: String,
-        cityName: String,
+//        cityName: String,
-        street: String,
+//        street: String,
-        subdistrict: String,
+//        subdistrict: String,
-        detail: String,
+//        detail: String,
-        postalCode: String,
+//        postalCode: String,
-        latitude: Double,
+//        latitude: Double,
-        longitude: Double
+//        longitude: Double
-    ) {
+//    ) {
-        Log.d(TAG, "saveStoreAddress() called with provinceId: $provinceId, cityId: $cityId")
+//        Log.d(TAG, "saveStoreAddress() called with provinceId: $provinceId, cityId: $cityId")
-        _isLoading.value = true
+//        _isLoading.value = true
+//        viewModelScope.launch {
+//            try {
+//                Log.d(TAG, "Calling addressRepository.saveStoreAddress()")
+//                val success = addressRepository.saveStoreAddress(
+//                    provinceId = provinceId,
+//                    provinceName = provinceName,
+//                    cityId = cityId,
+//                    cityName = cityName,
+//                    street = street,
+//                    subdistrict = subdistrict,
+//                    detail = detail,
+//                    postalCode = postalCode,
+//                    latitude = latitude,
+//                    longitude = longitude
+//                )
+//                Log.d(TAG, "Save store address result: $success")
+//                _saveSuccess.value = success
+//                _isLoading.value = false
+//            } catch (e: Exception) {
+//                Log.e(TAG, "Error saving store address", e)
+//                _errorMessage.value = "Failed to save address: ${e.message}"
+//                _isLoading.value = false
+//            }
+//        }
+//    }
+
+    fun saveStoreAddress(oldAddress: AddressesItem, newAddress: AddressesItem) {
+        val params = buildUpdateBody(oldAddress, newAddress)
+        if (params.isEmpty()) {
+            Log.d(TAG, "No changes detected")
+            _saveSuccess.value = false
+            return
+        }
+
         viewModelScope.launch {
             try {
-                Log.d(TAG, "Calling addressRepository.saveStoreAddress()")
+                val response = addressRepository.updateAddress(oldAddress.id, params)
-                val success = addressRepository.saveStoreAddress(
+                _saveSuccess.value = response.isSuccessful
-                    provinceId = provinceId,
-                    provinceName = provinceName,
-                    cityId = cityId,
-                    cityName = cityName,
-                    street = street,
-                    subdistrict = subdistrict,
-                    detail = detail,
-                    postalCode = postalCode,
-                    latitude = latitude,
-                    longitude = longitude
-                )
-                Log.d(TAG, "Save store address result: $success")
-                _saveSuccess.value = success
-                _isLoading.value = false
             } catch (e: Exception) {
-                Log.e(TAG, "Error saving store address", e)
+                Log.e(TAG, "Error: ${e.message}")
-                _errorMessage.value = "Failed to save address: ${e.message}"
+                _saveSuccess.value = false
-                _isLoading.value = false
             }
         }
     }
+
+    private fun buildUpdateBody(oldAddress: AddressesItem, newAddress: AddressesItem): Map<String, Any> {
+        val params = mutableMapOf<String, Any>()
+
+        fun addIfChanged(key: String, oldValue: Any?, newValue: Any?) {
+            if (newValue != null && newValue != oldValue) {
+                params[key] = newValue
+            }
+        }
+
+        addIfChanged("street", oldAddress.street, newAddress.street)
+        addIfChanged("province_id", oldAddress.provinceId, newAddress.provinceId)
+        addIfChanged("detail", oldAddress.detail, newAddress.detail)
+        addIfChanged("subdistrict", oldAddress.subdistrict, newAddress.subdistrict)
+        addIfChanged("city_id", oldAddress.cityId, newAddress.cityId)
+        addIfChanged("village_id", oldAddress.villageId, newAddress.villageId)
+        addIfChanged("postal_code", oldAddress.postalCode, newAddress.postalCode)
+        addIfChanged("phone", oldAddress.phone, newAddress.phone)
+        addIfChanged("recipient", oldAddress.recipient, newAddress.recipient)
+        addIfChanged("latitude", oldAddress.latitude, newAddress.latitude)
+        addIfChanged("longitude", oldAddress.longitude, newAddress.longitude)
+        addIfChanged("is_store_location", oldAddress.isStoreLocation, newAddress.isStoreLocation)
+
+        return params
+    }
 }

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/LoginViewModel.kt

@@ -7,8 +7,10 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alya.ecommerce_serang.data.api.dto.FcmReq
+import com.alya.ecommerce_serang.data.api.dto.ResetPassReq
 import com.alya.ecommerce_serang.data.api.response.auth.FcmTokenResponse
 import com.alya.ecommerce_serang.data.api.response.auth.LoginResponse
+import com.alya.ecommerce_serang.data.api.response.auth.ResetPassResponse
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.data.api.retrofit.ApiService
 import com.alya.ecommerce_serang.data.repository.Result
@@ -27,6 +29,10 @@ class LoginViewModel(private val repository: UserRepository, private val context
     private val _message = MutableLiveData<String>()
     val message: LiveData<String> = _message
 
+    private val _resetPasswordState = MutableLiveData<Result<ResetPassResponse>?>()
+    val resetPasswordState: LiveData<Result<ResetPassResponse>?> = _resetPasswordState
+
+
     private val sessionManager by lazy { SessionManager(context) }
 
     private fun getAuthenticatedApiService(): ApiService {
@@ -69,4 +75,19 @@ class LoginViewModel(private val repository: UserRepository, private val context
         }
     }
 
+    fun resetPassword(email: String) {
+        viewModelScope.launch {
+            _resetPasswordState.value = Result.Loading
+
+            val request = ResetPassReq(emailOrPhone = email)
+            val result = repository.resetPassword(request)
+
+            _resetPasswordState.value = result
+        }
+    }
+
+    fun clearState() {
+        _resetPasswordState.value = null
+    }
+
 }

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/RegisterViewModel.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alya.ecommerce_serang.data.api.dto.CreateAddressRequest
 import com.alya.ecommerce_serang.data.api.dto.RegisterRequest
+import com.alya.ecommerce_serang.data.api.dto.ResetPassReq
 import com.alya.ecommerce_serang.data.api.dto.VerifRegisReq
 import com.alya.ecommerce_serang.data.api.response.auth.LoginResponse
 import com.alya.ecommerce_serang.data.api.response.auth.OtpResponse
@@ -382,6 +383,10 @@ class RegisterViewModel(private val repository: UserRepository, private val orde
         }
     }
 
+    fun resetPass(request: ResetPassReq){
+
+    }
+
     companion object {
         private const val TAG = "RegisterViewModel"
     }

app/src/main/res/layout/activity_detail_store_address.xml

@@ -301,7 +301,8 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:layout_marginEnd="8dp">
+                    android:layout_marginEnd="8dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -327,7 +328,8 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:layout_marginStart="8dp">
+                    android:layout_marginStart="8dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"

app/src/main/res/layout/activity_login.xml

@@ -98,7 +98,7 @@
         android:textAlignment="textEnd"
         android:textColor="@android:color/holo_red_light"
         android:layout_marginBottom="16dp"
-        android:visibility="gone"
+        android:layout_marginTop="8dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/til_login_password" />

app/src/main/res/layout/activity_reset_pass.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:gravity="top">
+
+    <include
+        android:id="@+id/header_reset_pass"
+        layout="@layout/header" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Masukkan alamat email anda. Periksa email anda untuk mendapatkan password baru"
+        android:textAlignment="center"
+        android:layout_marginVertical="24dp"/>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Co: 123@gmail.com"
+            android:inputType="textEmailAddress" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/btn_reset"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Kirim Password Baru"
+        android:layout_marginBottom="16dp" />
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+</LinearLayout>

app/src/main/res/layout/fragment_register_step3.xml

@@ -245,6 +245,19 @@
                 android:textColor="@color/blue1"
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/checkbox_approve"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Saya telah membaca dan menyetujui Syarat dan Ketentuan aplikasi" />
+
+        </LinearLayout>
     </ScrollView>
 
     <!-- Register Button -->

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.12.0"
+agp = "8.9.2"
 glide = "4.16.0"
 gson = "2.11.0"
 hiltAndroid = "2.56.2"  # Updated from 2.44 for better compatibility