Commit Graph

461 Commits

Author SHA1 Message Date
9b75a0820f Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-12-16 15:56:40 +03:30
b47a3a161b (feat) - service page completed
(fix) - customer club - type select slider modified
2025-12-16 15:54:54 +03:30
Reza Taghizadeh
8ff2245ac0 Merge pull request #68 from sinmajidi/reza-dev
Reza dev
2025-12-16 13:20:58 +03:30
Reza Taghizadeh
20c4ddb906 fix: reslove some bugs (v2.104.38) 2025-12-16 13:20:24 +03:30
Reza Taghizadeh
acca7d3cf6 Merge pull request #67 from sinmajidi/reza-dev
Reza dev
2025-12-16 13:12:56 +03:30
Reza Taghizadeh
71ee151768 fix: reslove some bugs (v2.104.38) 2025-12-16 13:12:22 +03:30
Reza Taghizadeh
b35bf71e85 Merge pull request #66 from sinmajidi/reza-dev
Reza dev
2025-12-15 19:59:45 +03:30
Reza Taghizadeh
2502003fd0 fix: reslove some bugs (v2.104.37) 2025-12-15 19:59:10 +03:30
Reza Taghizadeh
5a592df4e7 fix: reslove some bugs (v2.104.36) 2025-12-15 19:58:02 +03:30
Reza Taghizadeh
d54dc04bb8 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-12-15 19:55:15 +03:30
Reza Taghizadeh
abccdfa7ba fix: reslove some bugs (v2.104.36) 2025-12-15 19:55:06 +03:30
03ae2d13b8 (feat) - services page added 2025-12-15 19:48:49 +03:30
1a52c8ec09 (feat) - customize cost picker added to gift card
(fix) - request detail in reserved appointment redesigned
(fix) - new medals added
2025-12-15 17:57:27 +03:30
b3729d3fac customer type modified 2025-12-15 14:41:55 +03:30
ce1303a0a4 conflict solved 2025-12-15 13:54:16 +03:30
f6f99ad53a customer type changed 2025-12-15 13:50:43 +03:30
Reza Taghizadeh
c3e94f4556 fix: reslove some bugs (v2.104.35) 2025-12-15 13:48:36 +03:30
Reza Taghizadeh
cbe3b7c6f1 Merge pull request #65 from sinmajidi/farnoosh-dev
Farnoosh dev
2025-12-14 21:28:55 +03:30
54e82b2c67 bugs in CheckTimeSlot service fixed 2025-12-14 21:16:09 +03:30
1e903a019a bugs in QA fixed 2025-12-14 21:12:16 +03:30
f5d191e339 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-12-14 20:59:51 +03:30
51d7512de1 customer information modified 2025-12-14 20:59:38 +03:30
Reza Taghizadeh
58138ff9ea Merge pull request #64 from sinmajidi/reza-dev
Reza dev
2025-12-14 19:29:08 +03:30
Reza Taghizadeh
0f96d6d4a9 fix: reslove some bugs and add feature to loyalti customer (v2.104.32) 2025-12-14 19:27:46 +03:30
Reza Taghizadeh
c5525613a1 fix: reslove some bugs and add feature to loyalti customer (v2.104.32) 2025-12-14 19:26:39 +03:30
Reza Taghizadeh
694f452831 fix: reslove some bugs and add feature to loyalti customer (v2.104.32) 2025-12-14 19:25:20 +03:30
Reza Taghizadeh
6617f61e4d fix: reslove some bugs (v2.103.31) 2025-12-14 19:23:42 +03:30
3125a2d82e some bugs fixed 2025-12-14 18:28:56 +03:30
031671d403 bugs fixed 2025-12-14 18:11:40 +03:30
6f041e0d3b (feat) - add customer modified
(feat) - edit customer modified
(fix) - apt for customer modified
2025-12-14 18:04:18 +03:30
Reza Taghizadeh
d577daec98 fix: reslove some bugs (v2.103.29) 2025-12-14 13:46:21 +03:30
Reza Taghizadeh
82bbc285d5 fix: reslove some bugs (v2.103.28) 2025-12-14 13:14:51 +03:30
ed5d691d2c Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-12-14 11:05:34 +03:30
d4ff7c2321 add customer modified 2025-12-14 11:04:32 +03:30
Reza Taghizadeh
1f286806e5 Merge pull request #63 from sinmajidi/reza-dev
Reza dev
2025-12-14 00:21:51 +03:30
Reza Taghizadeh
c2786fffe9 fix: reslove some bugs (v2.103.27) 2025-12-14 00:21:08 +03:30
Reza Taghizadeh
1d0e2a156c Merge pull request #62 from sinmajidi/reza-dev
Reza dev
2025-12-14 00:20:36 +03:30
Reza Taghizadeh
af44854320 fix: reslove some bugs (v2.103.27) 2025-12-14 00:20:10 +03:30
Reza Taghizadeh
86521ff627 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-12-14 00:18:07 +03:30
Reza Taghizadeh
4238b7f2a1 fix: reslove some bugs (v2.103.27) 2025-12-14 00:18:00 +03:30
c70fed61e6 (fix) - customer information modified 2025-12-13 19:57:39 +03:30
1d59c7bdbf (feat) - customer information added
(fix) - customer club modified
(fix) - accounting modified
(feat) - count request added
2025-12-13 18:59:14 +03:30
Reza Taghizadeh
9cf1ed9fad Merge pull request #61 from sinmajidi/reza-dev
Reza dev
2025-12-12 20:10:07 +03:30
Reza Taghizadeh
676afed966 fix: resolve build bugs (v2.103.24) 2025-12-12 20:09:45 +03:30
Reza Taghizadeh
baeabfac3d Merge pull request #60 from sinmajidi/reza-dev
Reza dev
2025-12-12 19:58:07 +03:30
Reza Taghizadeh
6a9f729bcf fix: resolve logout and switch account bugs (v2.103.24) 2025-12-12 19:57:43 +03:30
Reza Taghizadeh
21a12ded07 Merge pull request #59 from sinmajidi/reza-dev
Reza dev
2025-12-12 19:47:18 +03:30
Reza Taghizadeh
efc553cbf9 Merge branch 'reza-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-12-12 19:45:43 +03:30
Reza Taghizadeh
97209bda30 fix: resolve logout and switch account bugs (v2.103.23) 2025-12-12 19:44:28 +03:30
Reza Taghizadeh
1d0bfe5405 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-12-12 19:25:56 +03:30