From d4eacf6c7c1192707b3ca511e10362169c44f74e Mon Sep 17 00:00:00 2001 From: shaulascr Date: Tue, 12 Aug 2025 16:28:18 +0700 Subject: [PATCH] fix detail order, kecamata, bank name, checkbox tnc --- .../data/api/dto/OrdersItem.kt | 2 +- .../customer/order/OrderDetailResponse.kt | 2 +- .../customer/product/StoreResponse.kt | 2 +- .../store/profile/StoreDataResponse.kt | 2 +- .../store/sells/OrderDetailResponse.kt | 2 +- .../response/store/sells/OrderListResponse.kt | 2 +- .../ui/order/history/OrderHistoryAdapter.kt | 9 +++++++- .../ui/order/history/OrderProductAdapter.kt | 11 +++++---- .../profile/mystore/RegisterStoreActivity.kt | 4 +++- .../res/layout/activity_register_store.xml | 23 +++++++++++++++++++ 10 files changed, 46 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/dto/OrdersItem.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/dto/OrdersItem.kt index 439b949..f2acc27 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/dto/OrdersItem.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/dto/OrdersItem.kt @@ -90,7 +90,7 @@ data class OrdersItem( val orderId: Int, @field:SerializedName("city_id") - val cityId: Int, + val cityId: String, var displayStatus: String? = null ) diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/order/OrderDetailResponse.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/order/OrderDetailResponse.kt index 0156579..99226f6 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/order/OrderDetailResponse.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/order/OrderDetailResponse.kt @@ -119,7 +119,7 @@ data class Orders( val orderId: Int, @field:SerializedName("city_id") - val cityId: Int + val cityId: String ) data class OrderListItemsItem( diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/product/StoreResponse.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/product/StoreResponse.kt index 3e3b358..9828543 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/product/StoreResponse.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/customer/product/StoreResponse.kt @@ -114,7 +114,7 @@ data class Store( val storeDescription: String, @field:SerializedName("city_id") - val cityId: Int + val cityId: String ) data class ShippingItem( diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/profile/StoreDataResponse.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/profile/StoreDataResponse.kt index fa7ad97..cddab4e 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/profile/StoreDataResponse.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/profile/StoreDataResponse.kt @@ -35,7 +35,7 @@ data class Store( val detail: String, @SerializedName("is_store_location") val isStoreLocation: Boolean, @SerializedName("user_id") val userId: Int, - @SerializedName("city_id") val cityId: Int, + @SerializedName("city_id") val cityId: String, @SerializedName("province_id") val provinceId: Int, val phone: String?, val recipient: String?, diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderDetailResponse.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderDetailResponse.kt index 745df63..125548f 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderDetailResponse.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderDetailResponse.kt @@ -132,5 +132,5 @@ data class Orders( val username: String? = null, @field:SerializedName("city_id") - val cityId: Int? = null + val cityId: String? = null ) \ No newline at end of file diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt index 5efc65d..d11accf 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt @@ -129,7 +129,7 @@ data class OrdersItem( val status: String? = null, @field:SerializedName("city_id") - val cityId: Int? = null, + val cityId: String? = null, var displayStatus: String? = null ) diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt index 34ba43a..dad73a6 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt @@ -32,6 +32,7 @@ import com.google.android.material.button.MaterialButton import com.google.android.material.textfield.TextInputLayout import com.google.gson.Gson import java.io.File +import java.text.NumberFormat import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale @@ -88,7 +89,8 @@ class OrderHistoryAdapter( tvStoreName.text = storeName // Set total amount - tvTotalAmount.text = order.totalAmount + tvTotalAmount.text = formatCurrency(order.totalAmount.toDouble()) + // Set item count val itemCount = order.orderItems.size @@ -599,6 +601,11 @@ class OrderHistoryAdapter( } } + private fun formatCurrency(amount: Double): String { + val formatter = NumberFormat.getCurrencyInstance(Locale("in", "ID")) + return formatter.format(amount).replace(",00", "") + } + } companion object { diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderProductAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderProductAdapter.kt index da1a17c..3fe5f6b 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderProductAdapter.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderProductAdapter.kt @@ -10,6 +10,8 @@ import com.alya.ecommerce_serang.BuildConfig.BASE_URL import com.alya.ecommerce_serang.R import com.alya.ecommerce_serang.data.api.response.customer.order.OrderItemsItem import com.bumptech.glide.Glide +import java.text.NumberFormat +import java.util.Locale class OrderProductAdapter : RecyclerView.Adapter() { @@ -46,7 +48,7 @@ class OrderProductAdapter : RecyclerView.Adapter { @@ -65,10 +67,9 @@ class OrderProductAdapter : RecyclerView.Adapter { Log.d(TAG, "setupobservers: Subdistrict loaded successfullti: ${state.data.size} subdistrict") + binding.subdistrictProgressBar.visibility = View.GONE binding.spinnerSubdistrict.isEnabled = true subdistrictAdapter.updateData(state.data) @@ -460,7 +463,6 @@ class RegisterStoreActivity : AppCompatActivity() { } } - bankAdapter = BankAdapter(this) binding.spinnerBankName.adapter = bankAdapter binding.spinnerBankName.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected( diff --git a/app/src/main/res/layout/activity_register_store.xml b/app/src/main/res/layout/activity_register_store.xml index 3fb06f4..d4517bb 100644 --- a/app/src/main/res/layout/activity_register_store.xml +++ b/app/src/main/res/layout/activity_register_store.xml @@ -344,6 +344,29 @@ + + + + + + + +