Skip to content

Commit 3dfe175

Browse files
authored
Merge pull request #2423 from Blair2004/v6.0.x
V6.0.x
2 parents e2b525c + 39c71d5 commit 3dfe175

File tree

9 files changed

+88
-10
lines changed

9 files changed

+88
-10
lines changed

.github/instructions/nexopos.instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
applyTo: '**'
33
---
44
NexoPOS is a point of sale system built on top of Laravel. it uses Vue.js (3) and Tailwind CSS. This document describes how the applications is structured and works.

config/nexopos.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This is the core version of NexoPOS. This is used to displays on the
1010
* dashboard and to ensure a compatibility with the modules.
1111
*/
12-
'version' => '6.0.2',
12+
'version' => '6.0.3',
1313

1414
/**
1515
* --------------------------------------------------------------------

public/build/assets/ns-pos-4ad0e33f.js renamed to public/build/assets/ns-pos-65dde796.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/ns-pos-cart-107bf7c7.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/build/assets/ns-pos-cart-3cf3b976.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/pos-566d8de2.js renamed to public/build/assets/pos-a6e5903b.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/pos-init-10a907b5.js renamed to public/build/assets/pos-init-4d2e1b8d.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
"src": "resources/ts/pages/dashboard/pos/header-buttons/ns-pos-reset-button.vue"
658658
},
659659
"resources/ts/pages/dashboard/pos/ns-pos-cart.vue": {
660-
"file": "assets/ns-pos-cart-107bf7c7.js",
660+
"file": "assets/ns-pos-cart-3cf3b976.js",
661661
"imports": [
662662
"resources/ts/bootstrap.ts",
663663
"_currency-5dcbb44b.js",
@@ -693,7 +693,7 @@
693693
"src": "resources/ts/pages/dashboard/pos/ns-pos-grid.vue"
694694
},
695695
"resources/ts/pages/dashboard/pos/ns-pos.vue": {
696-
"file": "assets/ns-pos-4ad0e33f.js",
696+
"file": "assets/ns-pos-65dde796.js",
697697
"imports": [
698698
"resources/ts/pages/dashboard/pos/ns-pos-cart.vue",
699699
"resources/ts/pages/dashboard/pos/ns-pos-grid.vue",
@@ -1106,7 +1106,7 @@
11061106
"resources/ts/pages/dashboard/pos/header-buttons/ns-pos-reset-button.vue",
11071107
"resources/ts/pages/dashboard/pos/header-buttons/ns-pos-registers-button.vue"
11081108
],
1109-
"file": "assets/pos-init-10a907b5.js",
1109+
"file": "assets/pos-init-4d2e1b8d.js",
11101110
"imports": [
11111111
"_preload-helper-a4192956.js",
11121112
"_ns-pos-shipping-popup-3cba4976.js",
@@ -1129,7 +1129,7 @@
11291129
"resources/ts/pages/dashboard/pos/ns-pos-cart.vue",
11301130
"resources/ts/pages/dashboard/pos/ns-pos-grid.vue"
11311131
],
1132-
"file": "assets/pos-566d8de2.js",
1132+
"file": "assets/pos-a6e5903b.js",
11331133
"imports": [
11341134
"_preload-helper-a4192956.js",
11351135
"_time-583d4bf1.js",
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// vite.config.js
2+
import { defineConfig, loadEnv } from "file:///var/www/html/default-v6/node_modules/vite/dist/node/index.js";
3+
import laravel from "file:///var/www/html/default-v6/node_modules/laravel-vite-plugin/dist/index.js";
4+
import mkcert from "file:///var/www/html/default-v6/node_modules/vite-plugin-mkcert/dist/mkcert.mjs";
5+
import { resolve } from "path";
6+
import vuePlugin from "file:///var/www/html/default-v6/node_modules/@vitejs/plugin-vue/dist/index.mjs";
7+
import tailwindcss from "file:///var/www/html/default-v6/node_modules/@tailwindcss/vite/dist/index.mjs";
8+
var __vite_injected_original_dirname = "/var/www/html/default-v6";
9+
var vite_config_default = ({ mode }) => {
10+
process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
11+
return defineConfig({
12+
base: "./",
13+
server: {
14+
port: 3331,
15+
host: "127.0.0.1",
16+
hmr: {
17+
protocol: "wss",
18+
host: "localhost"
19+
},
20+
https: true
21+
},
22+
resolve: {
23+
alias: [
24+
{
25+
find: "&",
26+
replacement: resolve(__vite_injected_original_dirname, "resources")
27+
},
28+
{
29+
find: "~",
30+
replacement: resolve(__vite_injected_original_dirname, "resources/ts")
31+
}
32+
]
33+
},
34+
plugins: [
35+
tailwindcss(),
36+
laravel({
37+
input: [
38+
"resources/ts/bootstrap.ts",
39+
"resources/ts/app.ts",
40+
"resources/ts/auth.ts",
41+
"resources/ts/pos.ts",
42+
"resources/ts/pos-init.ts",
43+
"resources/ts/setup.ts",
44+
"resources/ts/update.ts",
45+
"resources/ts/cashier.ts",
46+
"resources/ts/lang-loader.ts",
47+
"resources/ts/dev.ts",
48+
"resources/ts/popups.ts",
49+
"resources/ts/widgets.ts",
50+
"resources/ts/wizard.ts",
51+
"resources/css/app.css",
52+
"resources/css/grid.css",
53+
"resources/css/animations.css",
54+
"resources/css/fonts.css",
55+
"resources/scss/line-awesome/1.3.0/scss/line-awesome.scss",
56+
// themes
57+
"resources/css/light.css",
58+
"resources/css/dark.css",
59+
"resources/css/phosphor.css"
60+
],
61+
refresh: true
62+
}),
63+
mkcert(),
64+
vuePlugin({
65+
template: {
66+
transformAssetUrls: {
67+
base: null,
68+
includeAbsolute: false
69+
}
70+
}
71+
})
72+
]
73+
});
74+
};
75+
export {
76+
vite_config_default as default
77+
};
78+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvdmFyL3d3dy9odG1sL2RlZmF1bHQtdjZcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIi92YXIvd3d3L2h0bWwvZGVmYXVsdC12Ni92aXRlLmNvbmZpZy5qc1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vdmFyL3d3dy9odG1sL2RlZmF1bHQtdjYvdml0ZS5jb25maWcuanNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcsIGxvYWRFbnYgfSBmcm9tICd2aXRlJztcblxuLy8gaW1wb3J0IGZzIGZyb20gJ2ZzJztcbmltcG9ydCBsYXJhdmVsIGZyb20gJ2xhcmF2ZWwtdml0ZS1wbHVnaW4nO1xuaW1wb3J0IG1rY2VydCBmcm9tICd2aXRlLXBsdWdpbi1ta2NlcnQnO1xuaW1wb3J0IHsgcmVzb2x2ZSB9IGZyb20gJ3BhdGgnO1xuLy8gaW1wb3J0IHBhdGggZnJvbSAncGF0aCc7XG5pbXBvcnQgdnVlUGx1Z2luIGZyb20gJ0B2aXRlanMvcGx1Z2luLXZ1ZSc7XG5pbXBvcnQgdGFpbHdpbmRjc3MgZnJvbSBcIkB0YWlsd2luZGNzcy92aXRlXCI7XG5cblxuZXhwb3J0IGRlZmF1bHQgKHsgbW9kZSB9KSA9PiB7XG4gICAgcHJvY2Vzcy5lbnYgPSB7Li4ucHJvY2Vzcy5lbnYsIC4uLmxvYWRFbnYobW9kZSwgcHJvY2Vzcy5jd2QoKSl9O1xuXG4gICAgcmV0dXJuIGRlZmluZUNvbmZpZyh7XG4gICAgICAgIGJhc2U6ICcuLycsXG4gICAgICAgIHNlcnZlcjoge1xuICAgICAgICAgICAgcG9ydDogMzMzMSxcbiAgICAgICAgICAgIGhvc3Q6ICcxMjcuMC4wLjEnLFxuICAgICAgICAgICAgaG1yOiB7XG4gICAgICAgICAgICAgICAgcHJvdG9jb2w6ICd3c3MnLFxuICAgICAgICAgICAgICAgIGhvc3Q6ICdsb2NhbGhvc3QnLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIGh0dHBzOiB0cnVlLFxuICAgICAgICB9LFxuICAgICAgICByZXNvbHZlOiB7XG4gICAgICAgICAgICBhbGlhczogW1xuICAgICAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgICAgICAgZmluZDogJyYnLFxuICAgICAgICAgICAgICAgICAgICByZXBsYWNlbWVudDogcmVzb2x2ZSggX19kaXJuYW1lLCAncmVzb3VyY2VzJyApLFxuICAgICAgICAgICAgICAgIH0sIHtcbiAgICAgICAgICAgICAgICAgICAgZmluZDogJ34nLFxuICAgICAgICAgICAgICAgICAgICByZXBsYWNlbWVudDogcmVzb2x2ZSggX19kaXJuYW1lLCAncmVzb3VyY2VzL3RzJyApLFxuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICBdXG4gICAgICAgIH0sXG4gICAgICAgIHBsdWdpbnM6IFtcbiAgICAgICAgICAgIHRhaWx3aW5kY3NzKCksXG4gICAgICAgICAgICBsYXJhdmVsKHtcbiAgICAgICAgICAgICAgICBpbnB1dDogW1xuICAgICAgICAgICAgICAgICAgICAncmVzb3VyY2VzL3RzL2Jvb3RzdHJhcC50cycsXG4gICAgICAgICAgICAgICAgICAgICdyZXNvdXJjZXMvdHMvYXBwLnRzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy90cy9hdXRoLnRzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy90cy9wb3MudHMnLFxuICAgICAgICAgICAgICAgICAgICAncmVzb3VyY2VzL3RzL3Bvcy1pbml0LnRzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy90cy9zZXR1cC50cycsXG4gICAgICAgICAgICAgICAgICAgICdyZXNvdXJjZXMvdHMvdXBkYXRlLnRzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy90cy9jYXNoaWVyLnRzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy90cy9sYW5nLWxvYWRlci50cycsXG4gICAgICAgICAgICAgICAgICAgICdyZXNvdXJjZXMvdHMvZGV2LnRzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy90cy9wb3B1cHMudHMnLFxuICAgICAgICAgICAgICAgICAgICAncmVzb3VyY2VzL3RzL3dpZGdldHMudHMnLFxuICAgICAgICAgICAgICAgICAgICAncmVzb3VyY2VzL3RzL3dpemFyZC50cycsXG4gICAgXG4gICAgICAgICAgICAgICAgICAgICdyZXNvdXJjZXMvY3NzL2FwcC5jc3MnLFxuICAgICAgICAgICAgICAgICAgICAncmVzb3VyY2VzL2Nzcy9ncmlkLmNzcycsXG4gICAgICAgICAgICAgICAgICAgICdyZXNvdXJjZXMvY3NzL2FuaW1hdGlvbnMuY3NzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy9jc3MvZm9udHMuY3NzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy9zY3NzL2xpbmUtYXdlc29tZS8xLjMuMC9zY3NzL2xpbmUtYXdlc29tZS5zY3NzJyxcblxuICAgICAgICAgICAgICAgICAgICAvLyB0aGVtZXNcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy9jc3MvbGlnaHQuY3NzJyxcbiAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlcy9jc3MvZGFyay5jc3MnLFxuICAgICAgICAgICAgICAgICAgICAncmVzb3VyY2VzL2Nzcy9waG9zcGhvci5jc3MnLFxuICAgICAgICAgICAgICAgIF0sXG4gICAgICAgICAgICAgICAgcmVmcmVzaDogdHJ1ZSxcbiAgICAgICAgICAgIH0pLFxuICAgICAgICAgICAgbWtjZXJ0KCksXG4gICAgICAgICAgICB2dWVQbHVnaW4oe1xuICAgICAgICAgICAgICAgIHRlbXBsYXRlOiB7XG4gICAgICAgICAgICAgICAgICAgIHRyYW5zZm9ybUFzc2V0VXJsczoge1xuICAgICAgICAgICAgICAgICAgICAgICAgYmFzZTogbnVsbCxcbiAgICAgICAgICAgICAgICAgICAgICAgIGluY2x1ZGVBYnNvbHV0ZTogZmFsc2UsXG4gICAgICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIH0pLFxuICAgICAgICBdLFxuICAgIH0pO1xufSJdLAogICJtYXBwaW5ncyI6ICI7QUFBMFAsU0FBUyxjQUFjLGVBQWU7QUFHaFMsT0FBTyxhQUFhO0FBQ3BCLE9BQU8sWUFBWTtBQUNuQixTQUFTLGVBQWU7QUFFeEIsT0FBTyxlQUFlO0FBQ3RCLE9BQU8saUJBQWlCO0FBUnhCLElBQU0sbUNBQW1DO0FBV3pDLElBQU8sc0JBQVEsQ0FBQyxFQUFFLEtBQUssTUFBTTtBQUN6QixVQUFRLE1BQU0sRUFBQyxHQUFHLFFBQVEsS0FBSyxHQUFHLFFBQVEsTUFBTSxRQUFRLElBQUksQ0FBQyxFQUFDO0FBRTlELFNBQU8sYUFBYTtBQUFBLElBQ2hCLE1BQU07QUFBQSxJQUNOLFFBQVE7QUFBQSxNQUNKLE1BQU07QUFBQSxNQUNOLE1BQU07QUFBQSxNQUNOLEtBQUs7QUFBQSxRQUNELFVBQVU7QUFBQSxRQUNWLE1BQU07QUFBQSxNQUNWO0FBQUEsTUFDQSxPQUFPO0FBQUEsSUFDWDtBQUFBLElBQ0EsU0FBUztBQUFBLE1BQ0wsT0FBTztBQUFBLFFBQ0g7QUFBQSxVQUNJLE1BQU07QUFBQSxVQUNOLGFBQWEsUUFBUyxrQ0FBVyxXQUFZO0FBQUEsUUFDakQ7QUFBQSxRQUFHO0FBQUEsVUFDQyxNQUFNO0FBQUEsVUFDTixhQUFhLFFBQVMsa0NBQVcsY0FBZTtBQUFBLFFBQ3BEO0FBQUEsTUFDSjtBQUFBLElBQ0o7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNMLFlBQVk7QUFBQSxNQUNaLFFBQVE7QUFBQSxRQUNKLE9BQU87QUFBQSxVQUNIO0FBQUEsVUFDQTtBQUFBLFVBQ0E7QUFBQSxVQUNBO0FBQUEsVUFDQTtBQUFBLFVBQ0E7QUFBQSxVQUNBO0FBQUEsVUFDQTtBQUFBLFVBQ0E7QUFBQSxVQUNBO0FBQUEsVUFDQTtBQUFBLFVBQ0E7QUFBQSxVQUNBO0FBQUEsVUFFQTtBQUFBLFVBQ0E7QUFBQSxVQUNBO0FBQUEsVUFDQTtBQUFBLFVBQ0E7QUFBQTtBQUFBLFVBR0E7QUFBQSxVQUNBO0FBQUEsVUFDQTtBQUFBLFFBQ0o7QUFBQSxRQUNBLFNBQVM7QUFBQSxNQUNiLENBQUM7QUFBQSxNQUNELE9BQU87QUFBQSxNQUNQLFVBQVU7QUFBQSxRQUNOLFVBQVU7QUFBQSxVQUNOLG9CQUFvQjtBQUFBLFlBQ2hCLE1BQU07QUFBQSxZQUNOLGlCQUFpQjtBQUFBLFVBQ3JCO0FBQUEsUUFDSjtBQUFBLE1BQ0osQ0FBQztBQUFBLElBQ0w7QUFBQSxFQUNKLENBQUM7QUFDTDsiLAogICJuYW1lcyI6IFtdCn0K

0 commit comments

Comments
 (0)