diff --git a/app/components/orders/InvoiceRow.vue b/app/components/orders/InvoiceRow.vue
index c21ab1d..6de4170 100644
--- a/app/components/orders/InvoiceRow.vue
+++ b/app/components/orders/InvoiceRow.vue
@@ -3,7 +3,7 @@ const props = defineProps({
invoice: Object,
});
-const { $getdata, $dayjs, $shortenCurrency } = useNuxtApp();
+const { $getdata } = useNuxtApp();
const paymentRecords = ref([]);
onMounted(async () => {
paymentRecords.value = await $getdata("Payment_Record", {
@@ -59,9 +59,12 @@ function openModal() {
- {{ invoice.status }}
+ {{ invoice.invoice_status__name }}
|
@@ -70,8 +73,8 @@ function openModal() {
|
-
- {{ invoice.delivery__status }}
+
+ {{ invoice.delivery__delivery_status__name }}
|
diff --git a/app/components/orders/OrderDeliveryTab.vue b/app/components/orders/OrderDeliveryTab.vue
index a54ef20..23f8e55 100644
--- a/app/components/orders/OrderDeliveryTab.vue
+++ b/app/components/orders/OrderDeliveryTab.vue
@@ -29,7 +29,7 @@ const props = defineProps({
- {{ capitalize(invoice.delivery__status) }}
+ {{ capitalize(invoice.delivery__delivery_status__name) }}
{{ unit }}
-
+
diff --git a/app/components/orders/OrderHighlights.vue b/app/components/orders/OrderHighlights.vue
new file mode 100644
index 0000000..206f8cd
--- /dev/null
+++ b/app/components/orders/OrderHighlights.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
diff --git a/app/components/orders/OrderKanbanCard.vue b/app/components/orders/OrderKanbanCard.vue
index 724020f..77af321 100644
--- a/app/components/orders/OrderKanbanCard.vue
+++ b/app/components/orders/OrderKanbanCard.vue
@@ -1,20 +1,17 @@
@@ -38,16 +11,16 @@ const phases = [
Pipeline đơn hàng
Tổng đơn hàng
- {{ phases.reduce((prev, curr) => prev + curr.value, 0) }}
+ {{ invoices.length }}
diff --git a/app/components/orders/Orders.vue b/app/components/orders/Orders.vue
index dcf0e04..c4d5adf 100644
--- a/app/components/orders/Orders.vue
+++ b/app/components/orders/Orders.vue
@@ -1,42 +1,10 @@
@@ -90,15 +53,7 @@ provide("orders", {
-
+
diff --git a/app/components/orders/OrdersKanban.vue b/app/components/orders/OrdersKanban.vue
index d2427bc..356bdaf 100644
--- a/app/components/orders/OrdersKanban.vue
+++ b/app/components/orders/OrdersKanban.vue
@@ -6,14 +6,14 @@ const props = defineProps({
statuses: Array,
});
-const emit = defineEmits(["selectOrder", "unselect"]);
+const store = useStore();
- {{ orders.filter((o) => o.status === status.id).length }}
+ {{ orders.filter((o) => o.invoice_status === status.id).length }}
import { pull } from "es-toolkit";
+import { useInvoices } from "~/components/orders/composables/useInvoices";
import InvoiceRow from "~/components/orders/InvoiceRow.vue";
import OrdersKanban from "~/components/orders/OrdersKanban.vue";
@@ -7,8 +8,9 @@ const props = defineProps({
viewMode: String,
});
-const { $findapi, $getapi, $dayjs } = useNuxtApp();
-const { invoices } = inject("orders");
+const { $getdata, $dayjs } = useNuxtApp();
+const { invoices, isPending } = useInvoices();
+const store = useStore();
const statuses = [
{
@@ -33,15 +35,10 @@ const statuses = [
},
];
-const paymentStatuses = ref([]);
const employees = ref([]);
onMounted(async () => {
- const apis = $findapi(["Payment_Status", "Staff"]);
- const [paymentStatusRes, staffRes] = await $getapi(apis);
-
- paymentStatuses.value = paymentStatusRes.data.rows || [];
- employees.value = staffRes.data.rows || [];
+ employees.value = await $getdata("Staff");
});
const input = ref();
@@ -65,7 +62,7 @@ const filteredInvoices = computed(() => {
const filteredByStatuses = filteredByInput.filter((order) => {
if (selectedStatuses.value.length === 0) return true;
- return selectedStatuses.value.includes(order.status);
+ return selectedStatuses.value.includes(order.invoice_status);
});
const filteredByPaymentStatuses = filteredByStatuses.filter((order) => {
@@ -148,7 +145,7 @@ function toggleStatus(id) {
|