andrew.ng
3d1b43e200
Merge pull request 'that-bill' ( #158 ) from that-bill into master
...
Reviewed-on: #158
2026-04-29 17:29:11 +10:00
nguyentrungthat
8d86fc2182
Update OfficeSupport.tsx
2026-04-29 14:28:56 +07:00
nguyentrungthat
54b8b9737b
Merge branch 'master' into that-bill
2026-04-29 14:13:55 +07:00
andrew.ng
42c5791da8
Merge pull request 'Update' ( #157 ) from that-bill into master
...
Reviewed-on: #157
2026-04-29 17:13:48 +10:00
nguyentrungthat
8d5199342d
Update
2026-04-29 14:13:19 +07:00
andrew.ng
beccf5796c
Merge pull request 'Add electricity bills module (API, model, PDF)' ( #156 ) from that-bill into master
...
Reviewed-on: #156
2026-04-29 16:49:41 +10:00
nguyentrungthat
baa3216c69
Add electricity bills module (API, model, PDF)
...
Introduce an Electricity Bills feature: adds ElectricityBill model, controller with CRUD + PDF export, Blade PDF template, and a migration to create the electricity_bills table. Registers routes (with admin permission middleware) and persists generated PDFs to public storage. Adds ResultSuccess/ResultError helpers to base Controller and updates composer to include dompdf and DBAL dependencies. Also includes frontend updates (Admin API, DataTable, Navbar, new OfficeSupport page and styles, route and CRUD helper adjustments) to support the new functionality.
2026-04-29 13:44:34 +07:00
joseph
de351f0877
Merge pull request 'fix(setting): update hr permission' ( #155 ) from vi into master
...
Reviewed-on: #155
2026-04-18 11:20:57 +10:00
Hoang Vi
2c94e91668
fix(setting): update hr permission
2026-04-18 07:52:39 +07:00
joseph
b22c9b9cc5
Merge pull request 'feat(setting): add setting saturday work' ( #154 ) from vi into master
...
Reviewed-on: #154
2026-04-09 19:24:31 +10:00
Hoang Vi
f494367683
feat(setting): add setting saturday work
2026-04-09 16:11:18 +07:00
joseph
61124cd9bb
Merge pull request 'fix run cron job initialize leaveDays' ( #153 ) from vi into master
...
Reviewed-on: #153
2026-01-06 20:16:40 +11:00
Nguyễn Hoàng Vĩ
78066f624e
fix run cron job initialize leaveDays
2026-01-06 16:02:24 +07:00
Nguyễn Hoàng Vĩ
d7b7a61511
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi
2026-01-06 15:59:54 +07:00
Truong Vo
8f30081e55
fix ngày phép
2026-01-05 08:20:01 +07:00
Truong Vo
a0bfb19a34
Bổ sung + thêm phép đặc biệt khi chuyển phép từ năm cũ
2026-01-02 08:18:29 +07:00
Truong Vo
7e369785d5
fix
2025-12-30 10:08:18 +07:00
Nguyễn Hoàng Vĩ
54046ac676
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi
2025-12-23 14:58:56 +07:00
zelda
9f921750fc
Merge pull request 'fix(noti): Fix notification' ( #152 ) from zelda.update-checkin-api into master
...
Reviewed-on: #152
2025-12-23 11:43:55 +11:00
Admin
bd0d4fa13b
fix(noti): Fix notification
2025-12-23 07:43:27 +07:00
Nguyễn Hoàng Vĩ
f5362e54ef
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi
2025-12-22 08:20:52 +07:00
zelda
17dc0c3374
Merge pull request 'update(fe): remove speak check in and check out' ( #151 ) from zelda.update-checkin-api into master
...
Reviewed-on: #151
2025-12-19 11:39:13 +11:00
Admin
29dc787c65
update(fe): remove speak check in and check out
2025-12-19 07:37:59 +07:00
zelda
6ccf5e9e8a
Merge pull request 'update(fe): speak name' ( #150 ) from zelda.update-checkin-api into master
...
Reviewed-on: #150
2025-12-15 17:41:55 +11:00
Admin
5736166da3
update(fe): speak name
2025-12-15 13:41:19 +07:00
zelda
7be6a12edc
Merge pull request 'update(fe): Move quantity variable to env' ( #149 ) from zelda.update-checkin-api into master
...
Reviewed-on: #149
2025-12-12 14:39:41 +11:00
Admin
70436f737f
update(fe): Move quantity variable to env
2025-12-12 10:38:39 +07:00
zelda
25162be83d
Merge pull request 'update(ttw): update auto sync user' ( #148 ) from zelda.update-checkin-api into master
...
Reviewed-on: #148
2025-12-12 14:17:33 +11:00
Admin
06027e8f23
update(ttw): update auto sync user
2025-12-12 10:16:23 +07:00
zelda
8c7a24d31c
Merge pull request 'update(ttw): run send image in backgound' ( #147 ) from zelda.update-checkin-api into master
...
Reviewed-on: #147
2025-12-11 18:56:14 +11:00
Admin
1f08e2b503
update(ttw): run send image in backgound
2025-12-11 14:55:09 +07:00
zelda
9d77dfc5d6
Merge pull request 'feat(tkw): update ui' ( #146 ) from zelda.update-static-file-tracking-tool-web into master
...
Reviewed-on: #146
2025-12-11 14:34:48 +11:00
Admin
e7aa80f14b
feat(tkw): update ui
2025-12-11 10:34:26 +07:00
zelda
24bd605b7c
Merge pull request 'feat(tkw): update file main models' ( #145 ) from zelda.update-static-file-tracking-tool-web into master
...
Reviewed-on: #145
2025-12-11 14:04:53 +11:00
Admin
2a5f7b0b25
feat(tkw): update file main models
2025-12-11 10:04:29 +07:00
zelda
9183540976
Merge pull request 'feat(tkw): update file main code' ( #144 ) from zelda.update-static-file-tracking-tool-web into master
...
Reviewed-on: #144
2025-12-11 13:35:33 +11:00
Admin
cdce726ff1
feat(tkw): update file main code
2025-12-11 09:35:01 +07:00
zelda
790cab255d
Merge pull request 'feat(tkw): Update static file' ( #143 ) from zelda.update-static-file-tracking-tool-web into master
...
Reviewed-on: #143
2025-12-11 13:31:37 +11:00
Admin
647fc455d5
feat(tkw): Update static file
2025-12-11 09:30:39 +07:00
zelda
b5f5fa1748
Merge pull request 'update client for server' ( #142 ) from zelda.push-tracking-tool-web into master
...
Reviewed-on: #142
2025-12-11 13:11:33 +11:00
Admin
5a564e3703
update client for server
2025-12-11 09:10:42 +07:00
joseph
0af2357bc2
Merge pull request 'feat(tkw): Tracking tool web' ( #141 ) from zelda.push-tracking-tool-web into master
...
Reviewed-on: #141
2025-12-10 20:29:24 +11:00
Admin
a623659b52
feat(tkw): Tracking tool web
2025-12-10 16:23:45 +07:00
joseph
b35d4d7ca5
Merge pull request 'dev' ( #140 ) from dev into master
...
Reviewed-on: #140
2025-08-05 19:13:38 +10:00
joseph
522034ab76
Merge pull request 'update timekeeping, leave UI' ( #139 ) from vi into dev
...
Reviewed-on: #139
2025-08-05 19:13:12 +10:00
dbdbd9
487f4227d8
Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi
2025-08-05 16:10:32 +07:00
dbdbd9
56d2889297
update timekeeping, leave UI
2025-08-05 16:08:48 +07:00
joseph
7c36add579
Merge pull request 'dev' ( #138 ) from dev into master
...
Reviewed-on: #138
2025-08-05 18:27:42 +10:00
joseph
6c61819f2e
Merge pull request 'update handle for separated user' ( #137 ) from vi into dev
...
Reviewed-on: #137
2025-08-05 18:26:09 +10:00
dbdbd9
f649b2a6ac
Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi
2025-08-05 15:19:15 +07:00