diff --git a/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue b/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue index c4de479e..c0268195 100644 --- a/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue +++ b/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue @@ -84,7 +84,7 @@ const redirect = (path) => { diff --git a/src/components/forms/department/pos/SelectProductsFormPOS.vue b/src/components/forms/department/pos/SelectProductsFormPOS.vue index f69415a7..fe564ce5 100644 --- a/src/components/forms/department/pos/SelectProductsFormPOS.vue +++ b/src/components/forms/department/pos/SelectProductsFormPOS.vue @@ -355,6 +355,7 @@ const unselectProduct = () => { selectedProduct.value = null; }, 100); }; + diff --git a/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPosOrder.vue b/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPosOrder.vue index 7207ea3d..1b101016 100644 --- a/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPosOrder.vue +++ b/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPosOrder.vue @@ -39,6 +39,7 @@ const stripeModule = ref([]); const AddOrderItemsVisible = ref(false); const draftInvoice = ref([]); const errors = ref([]); +const closed_at = ref(null); const loadOrder = async () => { isLoading.value = true; @@ -52,6 +53,7 @@ const loadOrder = async () => { cashier.value = response.data.includes.cashier; // Get the cashier economicModule.value = response.data.includes.economicModuleOrders; // Get the economic module orders stripeModule.value = response.data.includes.stripeModuleOrders; // Get the stripe module orders + closed_at.value = response.data.data.closed_at; isLoading.value = false; setOrderId(orderId.value); selectCustomer(customer.value.economic_customer); @@ -128,7 +130,7 @@ loadOrder(); // Make sure the order isn't invoiced, and the user has permission to edit the order items const isEditPossible = () => { - return !isInvoicedWithEconomic() && !isInvoicedWithStripe() && SessionUser.hasPermission('edit_order_items'); + return !isInvoicedWithEconomic() && !isInvoicedWithStripe() && SessionUser.hasPermission('edit_order_items') && !closed_at.value; }; const isInvoiced = () => { @@ -178,7 +180,7 @@ const isBookedWithEconomic = () => { Ikke faktureret - Gemt til samlet fakturering + Gemt til fakturering #{{ order.invoice_collection_id }} @@ -312,7 +314,7 @@ const isBookedWithEconomic = () => { - +