Commit Graph

169 Commits

Author SHA1 Message Date
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
7bebd40f81 feat: setting manager for a deal 2024-11-17 13:55:58 +04:00
0442935bd9 feat: deal group and stuff 2024-11-17 11:38:33 +03:00
873ab7e2bb fix: fixed wrapping on statistics page 2024-11-17 01:33:11 +04:00
3b8c75d3d3 feat: profit table and division of charts in statistics 2024-11-17 01:23:04 +04:00
3c7c0601ec feat: locking group with bill request 2024-11-15 21:01:59 +04:00
70aff26dcd feat: billing for groups of deals 2024-11-15 20:29:59 +04:00
608a063369 feat: profit chart in statistics 2024-11-15 15:19:14 +04:00
90530f0530 feat: deal group and stuff 2024-11-11 17:42:56 +03:00
c8b8629be5 refactoring of deal documents 2024-11-09 17:10:33 +04:00
33dd65c497 feat: deal group and stuff 2024-11-09 08:50:13 +03:00
1ee8135508 feat: deal group and stuff 2024-11-09 02:33:17 +03:00
1fa0f63c82 feat: deal group and stuff 2024-11-09 02:29:15 +03:00
a151e39c5e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/pages/LeadsPage/tabs/ProductAndServiceTab/components/ProductView/ProductView.tsx
2024-11-08 17:06:16 +03:00
f5ead70051 feat: deal group and stuff 2024-11-08 17:05:17 +03:00
7f769f84fb feat: deal product comments 2024-11-07 21:39:02 +04:00
a4f4d467e9 fix: changed barcode image uploader label 2024-11-07 08:06:34 +04:00
7e7ae791be fix: uploading barcode pdf files instead of images 2024-11-06 15:36:07 +04:00
1d0095c7c4 refactor kal 2024-11-05 00:02:04 +03:00
e900901765 feat: barcode image output in PrintBarcodeModal 2024-11-02 00:55:12 +04:00
a3fdefb774 feat: CRUD for product barcode images 2024-11-01 17:25:06 +04:00
bc0c767a15 feat: increase of the deal comment field 2024-10-28 22:46:10 +04:00
bb34f12274 feat: total services amount and recalculating 2024-10-22 19:31:59 +03:00
aa6f0364b5 fix: scrolls and context for deal prefilling 2024-10-18 12:28:22 +04:00
c1b9031672 removed crap 2024-10-18 05:48:56 +03:00
5bd779560e removed crap 2024-10-18 05:48:01 +03:00
6904364d99 Merge remote-tracking branch 'origin/dealPrefilling' 2024-10-18 05:46:22 +03:00
2bd4fddfa7 feat: deal prefilling 2024-10-15 21:34:39 +04:00
b1f3df5c05 feat: add comment, creating refactor 2024-10-15 07:41:43 +03:00
f1566cdf44 feat: .env removed 2024-10-11 21:41:05 +03:00
871aa8efe3 feat: export services 2024-10-11 21:40:36 +03:00
35951c7019 feat: service category deleting 2024-10-09 02:25:37 +03:00
891b6cff9f feat: service deleting and rest categories placeholders 2024-10-09 02:03:52 +03:00
dea1221016 feat: crappy reordering 2024-10-08 00:03:43 +03:00
223ed0577a feat: crappy reordering 2024-10-07 23:42:01 +03:00
ae0d4ff6f0 feat: fix 2024-10-03 06:03:58 +03:00