diff --git a/.vscode/settings.json b/.vscode/settings.json index 774dabf..70d3d7b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,8 @@ "[vue]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "editor.formatOnSave": true } diff --git a/app/components/pos/POS.vue b/app/components/pos/POS.vue index 7659de1..9930e2a 100644 --- a/app/components/pos/POS.vue +++ b/app/components/pos/POS.vue @@ -80,7 +80,7 @@ provide("pos", { --> -
+

@@ -306,37 +303,39 @@ provide("pos", {

-
-
-

Tổng cộng

-
- - - - - - - - - - - -
- Tạm tính - ({{ activeCartItems?.length || 0 }} sản phẩm) - {{ $formatNum(subtotal, { hasUnit: true }) }}
Tổng cộng - {{ $formatNum(subtotal, { hasUnit: true }) }} -
- -
-
-
+ + + +
+
+
+ + + + + + + + + + + +
+ Tạm tính + ({{ activeCartItems?.length || 0 }} sản phẩm) + {{ $formatNum(subtotal, { hasUnit: true }) }}
Tổng cộng + {{ $formatNum(subtotal, { hasUnit: true }) }} +
+
@@ -404,8 +403,6 @@ provide("pos", { .fixed-grid { border: 1px solid var(--bulma-border); - border-bottom-left-radius: var(--bulma-radius); - border-bottom-right-radius: var(--bulma-radius); } .sidebar { border-left: 1px solid var(--bulma-border); diff --git a/nuxt.config.ts b/nuxt.config.ts index 8e884a2..bbf9360 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -37,6 +37,7 @@ export default defineNuxtConfig({ 'dayjs/plugin/weekOfYear', // CJS 'dayjs/plugin/weekday', // CJS 'es-toolkit', + 'es-toolkit/compat', 'highcharts', // CJS 'highcharts-vue', // CJS 'highcharts/modules/export-data', // CJS diff --git a/package-lock.json b/package-lock.json index 1af3533..210a8e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,6 +26,7 @@ "pinia-plugin-persistedstate": "^4.5.0", "sass": "^1.81.0", "socket.io-client": "^4.8.3", + "vnpay": "^2.5.0", "vue": "^3.5.34", "vue-advanced-cropper": "^2.8.9", "vue-router": "latest", @@ -13608,6 +13609,15 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/vnpay": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/vnpay/-/vnpay-2.5.0.tgz", + "integrity": "sha512-kyUYxG0pyEnRu/ha0gSVqkPCajmql523W2PQzgCkH4ct4XdEuzdiQnssi/k9XMcv+TvoPzuweEJG+4hWNU2DAQ==", + "license": "MIT", + "dependencies": { + "dayjs": "^1.11.13" + } + }, "node_modules/vue": { "version": "3.5.35", "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.35.tgz", diff --git a/package.json b/package.json index f4853e9..0cfd403 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "pinia-plugin-persistedstate": "^4.5.0", "sass": "^1.81.0", "socket.io-client": "^4.8.3", + "vnpay": "^2.5.0", "vue": "^3.5.34", "vue-advanced-cropper": "^2.8.9", "vue-router": "latest",