Commit Graph

204 Commits

Author SHA1 Message Date
0948a1da4a feat: showing users in work time tab instead of hiding 2025-01-19 18:49:28 +04:00
9dab596e87 feat: nested department sections, attaching department sections in the user editor 2025-01-19 12:02:35 +04:00
58ab96bdb1 Merge remote-tracking branch 'origin/master' 2025-01-17 17:01:20 +04:00
a4279edda9 fix: fixed key letter in residual qr codes 2025-01-17 17:01:02 +04:00
0dce7e4af2 feat: sasha ochko 2025-01-17 06:40:10 +03:00
8f583122a8 feat: sasha ochko 2025-01-17 06:30:37 +03:00
1b9880a65a feat: user search in select on departments tab 2025-01-15 17:08:14 +04:00
c45d2ac20a feat: residues accounting 2025-01-14 21:35:06 +04:00
fec6b13972 Merge remote-tracking branch 'origin/fillingDealsFromExcelFile' into excelMerge 2025-01-10 14:39:04 +03:00
30de0d8e8a feat: disabling accounting for deals and groups 2025-01-03 20:47:00 +04:00
71cab887d2 feat: filling deals from excel file 2024-12-25 21:16:10 +04:00
d3c4ed3fc6 fix: client tab in deal edit drawer 2024-12-24 00:42:41 +04:00
db21801cc1 fix: renamed assignments table to deal_employees 2024-12-20 12:55:12 +04:00
b3919c785b feat: assignment of employees to deals 2024-12-20 00:27:39 +04:00
9167fd0586 feat: empty boxes, ids for shipping pdfs 2024-12-17 20:19:47 +04:00
31a959236c feat: departments and department sections 2024-12-17 12:43:33 +04:00
43bba73f06 feat: eslint 2024-12-16 04:15:42 +03:00
20d8b7298f feat: eslint 2024-12-16 04:10:34 +03:00
38597b8f16 feat: income 2024-12-12 20:23:38 +04:00
d5598a10b8 feat: hide statistics, work time, expenses and finances from regular users 2024-12-09 20:17:32 +04:00
2ee0ef3a52 feat: pallets and boxes for deals 2024-12-09 16:45:48 +04:00
de4885274b Merge remote-tracking branch 'origin/master' 2024-12-08 23:23:50 +03:00
894e135be7 feat: open deal by id 2024-12-08 23:23:34 +03:00
e92fcb5eb8 fix: removed console log in work shifts table 2024-12-04 21:09:36 +04:00
2cb62a4e0b feat: passport images for user 2024-12-04 20:21:01 +04:00
1795cacc5b feat: work shift pauses 2024-12-04 11:02:32 +04:00
900427275f feat: work shifts history 2024-11-28 18:01:47 +04:00
f41083d2a8 fix: fix pagination info schema 2024-11-27 17:02:15 +04:00
886eef4c0d feat: fix 2024-11-27 15:44:36 +03:00
431bc35d8b feat: tags for expenses, filters by tags in statistics 2024-11-27 15:57:56 +04:00
564895c26f feat: additional expenses 2024-11-26 01:37:15 +04:00
e3146832a5 feat: expenses in statistics 2024-11-24 19:23:33 +04:00
2007ecd2f2 feat: default deal status in statistics 2024-11-24 00:07:52 +04:00
de55f9fa1c feat: time tracking in minutes 2024-11-22 21:43:07 +04:00
20616d9e81 feat: patronymic and passport data for user 2024-11-22 15:14:18 +04:00
dc882ccd9c Merge remote-tracking branch 'origin/master' 2024-11-21 21:11:49 +04:00
0758d14a9a fix: made statistic dates PATRIOTIC 2024-11-21 21:11:26 +04:00
877d373ee8 feat: new lines checking for scanning modal 2024-11-21 17:50:38 +03:00
9c56ef180f feat: filtering and grouping by manager 2024-11-21 18:12:48 +04:00
77aedb514f feat: filters for profit statistics table 2024-11-21 17:25:09 +04:00
c81ee2fdb8 feat: total values in statistics page 2024-11-21 15:40:55 +04:00
8c2cef6f48 fix: QR code scanning stop on "\n" 2024-11-21 15:04:02 +04:00
db99868b32 feat: merging complete 2024-11-21 02:12:14 +03:00
270e83ece2 Merge remote-tracking branch 'origin/statistics'
# Conflicts:
#	src/client/models/DealSchema.ts
2024-11-21 02:05:01 +03:00
f73f754403 fix: scanning modal fixed close on scan 2024-11-21 01:20:52 +04:00
165a9f5bfb fix: sorting only by dates in active work shifts table 2024-11-20 13:30:57 +04:00
39f746f435 feat: work shifts by QR codes 2024-11-20 13:09:55 +04:00
bf774f5c04 feat: schizo sorting 2024-11-18 18:56:37 +03:00
085ff7a37c feat: schizo sorting 2024-11-18 15:50:33 +03:00
90b11a5250 feat: schizo sorting 2024-11-18 01:30:36 +03:00