diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/orders/OrderListResponse.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/orders/OrderListResponse.kt index e9b00c3..c1a8f1d 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/orders/OrderListResponse.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/orders/OrderListResponse.kt @@ -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 -) diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt index ce83b01..2e1e579 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt @@ -314,7 +314,7 @@ interface ApiService { suspend fun getListProv( ): Response - @GET("order/{status}") + @GET("mystore/orders/{status}") suspend fun getSellList( @Path("status") status: String ): Response diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt index a2d9c02..053dc48 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt @@ -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 diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsViewPagerAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsViewPagerAdapter.kt index 7d9962c..d8fbe2b 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsViewPagerAdapter.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsViewPagerAdapter.kt @@ -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