erp/web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Viet An
2026-07-01 10:59:23 +07:00
parent e9e4fbe24f
commit 68872d3f06
12 changed files with 66 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/TopMenu.vue
View File

@@ -140,9 +140,9 @@ if (topmenus.length === 0) {
topmenus.forEach((topmenu) => {
let submenus = $filter($store.common, { category: "submenu", classify: topmenu.code });
if ($store.rights.length > 0) {
submenus = submenus.filter((x) => $findIndex($store.rights, { setting: x.id }) >= 0);
}
// if ($store.rights.length > 0) {
// submenus = submenus.filter((x) => $findIndex($store.rights, { setting: x.id }) >= 0);
// }
topmenu.submenu = submenus.length > 0 ? submenus : null;
});

11
app/components/pos/composables/usePlaceOrder.js
View File

@@ -4,6 +4,11 @@ import useOrderInfo from "~/components/pos/composables/useOrderInfo";
export default function usePlaceOrder({ onSuccess }) {
const { $dayjs, $id, $getdata, $insertapi, $patchapi, $deleteapi, $snackbar } = useNuxtApp();
const store = useStore();
const pendingInvoiceStatus = store.Invoice_Status.find(({ code }) => code === "DRAFT");
const pendingPaymentStatus = store.Payment_Status.find(({ code }) => code === "PENDING");
const pendingDeliveryStatus = store.Delivery_Status.find(({ code }) => code === "PENDING");
const posStore = usePosStore();
const { invalidCartItems, orderInfo } = storeToRefs(posStore);
const { activeCart, activeCartItems, subtotal } = useActiveCart();
@@ -51,8 +56,8 @@ export default function usePlaceOrder({ onSuccess }) {
discount_amount: 0,
final_amount: total.value,
order_type: "pos",
status: "pending",
payment_status: 1,
invoice_status: pendingInvoiceStatus.id,
payment_status: pendingPaymentStatus.id,
staff: 1,
ordered_at: new Date(),
paid_at: null,
@@ -167,7 +172,7 @@ export default function usePlaceOrder({ onSuccess }) {
shipping_fee: orderInfo.value.shipping_fee,
carrier: orderInfo.value.deliveryMethod.id,
tracking_code: $id(),
status: "pending",
delivery_status: pendingDeliveryStatus.id,
staff: 1,
};