diff --git a/resources/js/components/admin/manage/orders/OrderGroupedTable.vue b/resources/js/components/admin/manage/orders/OrderGroupedTable.vue index 65f8e64..a69ec3d 100644 --- a/resources/js/components/admin/manage/orders/OrderGroupedTable.vue +++ b/resources/js/components/admin/manage/orders/OrderGroupedTable.vue @@ -2,6 +2,7 @@ import { Link } from '@inertiajs/vue3'; import { computed } from 'vue'; import DataTableActions from '@/components/admin/manage/orders/data-table-actions.vue'; +import { formatRupiah } from '@/lib/rupiah'; import DataTableToolbar from '@/components/data-table/DataTableToolbar.vue'; import { Badge } from '@/components/ui/badge'; import { Button } from '@/components/ui/button'; @@ -128,6 +129,12 @@ function statusVariant(status: string): 'default' | 'secondary' | 'destructive' order.shipping_cost_formatted }} Total {{ order.total_amount_formatted }} + + Potongan Marketplace -{{ formatRupiah(order.marketplace_settings_snapshot.total_fee_amount) }} + + + Total Bersih {{ formatRupiah(order.marketplace_settings_snapshot.net_amount) }} +

{{ order.notes }} diff --git a/resources/js/types/order.ts b/resources/js/types/order.ts index 12cd3c9..4fb9eab 100644 --- a/resources/js/types/order.ts +++ b/resources/js/types/order.ts @@ -54,6 +54,7 @@ export type OrderListItem = { discount_formatted: string; shipping_cost: number; shipping_cost_formatted: string; + total_amount: number; total_amount_formatted: string; notes: string | null; created_at_formatted: string; @@ -68,6 +69,22 @@ export type OrderListItem = { } | null; }; items: OrderItemListItem[]; + marketplace_settings_snapshot?: { + platform: string; + is_affiliate: boolean; + base_amount: number; + total_fee_amount: number; + net_amount: number; + fees: Record; + results: Record; + } | null; }; export type OrderCartItem = {