Merge remote-tracking branch 'origin/master'

This commit is contained in:
shaulascr
2025-05-22 10:35:30 +07:00
3 changed files with 35 additions and 35 deletions

View File

@ -11,6 +11,39 @@ data class OrderListResponse(
val message: String? = null
)
data class OrderItemsItem(
@field:SerializedName("order_item_id")
val orderItemId: Int? = null,
@field:SerializedName("review_id")
val reviewId: Any? = null,
@field:SerializedName("quantity")
val quantity: Int? = null,
@field:SerializedName("price")
val price: Int? = null,
@field:SerializedName("subtotal")
val subtotal: Int? = null,
@field:SerializedName("product_image")
val productImage: String? = null,
@field:SerializedName("product_id")
val productId: Int? = null,
@field:SerializedName("store_name")
val storeName: String? = null,
@field:SerializedName("product_price")
val productPrice: Int? = null,
@field:SerializedName("product_name")
val productName: String? = null
)
data class OrdersItem(
@field:SerializedName("receipt_num")
@ -130,36 +163,3 @@ data class OrdersItem(
@field:SerializedName("city_id")
val cityId: Int? = null
)
data class OrderItemsItem(
@field:SerializedName("order_item_id")
val orderItemId: Int? = null,
@field:SerializedName("review_id")
val reviewId: Any? = null,
@field:SerializedName("quantity")
val quantity: Int? = null,
@field:SerializedName("price")
val price: Int? = null,
@field:SerializedName("subtotal")
val subtotal: Int? = null,
@field:SerializedName("product_image")
val productImage: String? = null,
@field:SerializedName("product_id")
val productId: Int? = null,
@field:SerializedName("store_name")
val storeName: String? = null,
@field:SerializedName("product_price")
val productPrice: Int? = null,
@field:SerializedName("product_name")
val productName: String? = null
)

View File

@ -108,7 +108,7 @@ class SellsAdapter(
Log.d("SellsAdapter", "Adjusting display for status: $status")
when (status) {
"unpaid" -> {
"pending" -> {
layoutOrders.visibility = View.VISIBLE
layoutPayments.visibility = View.GONE
layoutShipments.visibility = View.GONE

View File

@ -9,7 +9,7 @@ class SellsViewPagerAdapter(fragmentActivity: FragmentActivity)
private val sellsStatuses = listOf(
"all", // Semua Pesanan
"unpaid", // Pesanan Masuk
"pending", // Pesanan Masuk
"processed", // Konfirmasi Pembayaran
"paid", // Perlu Dikirim
"shipped", // Dikirim