From d10d330a7b78d152a0502fdfffae753f22936657 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Fri, 19 Jun 2026 22:23:41 +0700 Subject: [PATCH] refactor: update price and subtotal labels in OrderGroupedTable.vue, PurchaseGroupedTable.vue, and RawMaterialGroupedTable.vue to use consistent text-primary styling for improved UI consistency --- .../admin/manage/orders/OrderGroupedTable.vue | 10 ++++----- .../manage/purchases/PurchaseGroupedTable.vue | 6 ++--- .../raw-materials/RawMaterialGroupedTable.vue | 22 ++++++++++--------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/resources/js/components/admin/manage/orders/OrderGroupedTable.vue b/resources/js/components/admin/manage/orders/OrderGroupedTable.vue index ddd8ec3..65f8e64 100644 --- a/resources/js/components/admin/manage/orders/OrderGroupedTable.vue +++ b/resources/js/components/admin/manage/orders/OrderGroupedTable.vue @@ -116,15 +116,15 @@ function statusVariant(status: string): 'default' | 'secondary' | 'destructive'

Oleh {{ order.created_by?.profile?.full_name ?? order.created_by?.username }}

- Tipe Harga {{ order.price_type_label + Tipe Harga {{ order.price_type_label }} - Pembayaran {{ order.payment_type_label + Pembayaran {{ order.payment_type_label }} - Subtotal {{ order.subtotal_formatted + Subtotal {{ order.subtotal_formatted }} - Diskon {{ order.discount_formatted + Diskon {{ order.discount_formatted }} - Ongkir {{ + Ongkir {{ order.shipping_cost_formatted }} Total {{ order.total_amount_formatted }} diff --git a/resources/js/components/admin/manage/purchases/PurchaseGroupedTable.vue b/resources/js/components/admin/manage/purchases/PurchaseGroupedTable.vue index 8551221..dc9cf3a 100644 --- a/resources/js/components/admin/manage/purchases/PurchaseGroupedTable.vue +++ b/resources/js/components/admin/manage/purchases/PurchaseGroupedTable.vue @@ -113,11 +113,11 @@ function getGroupedItems(items: any[]): GroupedPurchaseItems[] {

- Subtotal {{ purchase.subtotal_formatted + Subtotal {{ purchase.subtotal_formatted }} - Diskon {{ purchase.discount_formatted + Diskon {{ purchase.discount_formatted }} - Ongkir {{ + Ongkir {{ purchase.shipping_cost_formatted }} Total {{ purchase.total_formatted }}
diff --git a/resources/js/components/admin/master/raw-materials/RawMaterialGroupedTable.vue b/resources/js/components/admin/master/raw-materials/RawMaterialGroupedTable.vue index 9c95a46..52ddd75 100644 --- a/resources/js/components/admin/master/raw-materials/RawMaterialGroupedTable.vue +++ b/resources/js/components/admin/master/raw-materials/RawMaterialGroupedTable.vue @@ -88,18 +88,20 @@ function rowNumber(index: number): number { {{ material.unit_label }} -
-

- Total stok: {{material.prices.reduce((acc, price) => acc + +

+ + Total stok {{material.prices.reduce((acc, price) => acc + Number(price.stock), 0) - }} - {{ material.unit_abbreviation }} -

-

- Total harga: Rp {{formatRupiah(material.prices.reduce((acc, price) => acc + + }} + {{ material.unit_abbreviation }} + + + + Total harga Rp {{formatRupiah(material.prices.reduce((acc, price) => acc + Number(price.stock) * Number(price.price), 0)) - }} -

+ }} + +