Commit Graph

767 Commits

Author SHA1 Message Date
d3806d6d40 (fix) - accounting modified (add service in income)
- Limit staff description to 200 characters; show error if exceeded.
- Restrict service price input to a maximum value for rental-type activities.
- Show informational modal when trying to toggle survey subscription without an active subscription; prevent toggle action.
2026-01-04 17:52:03 +03:30
5d37752f5c confluct fixed 2026-01-04 13:25:35 +03:30
118655e656 (err) - tour guid added to calender management 2026-01-04 13:21:55 +03:30
Reza Taghizadeh
620732bbb0 Merge pull request #104 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.135)
2026-01-04 13:13:14 +03:30
Reza Taghizadeh
20bffd5ebb fix: reslove some bugs (v2.117.135) 2026-01-04 13:12:53 +03:30
Reza Taghizadeh
6bd633ef46 Merge pull request #103 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.135)
2026-01-04 13:11:39 +03:30
Reza Taghizadeh
996038d848 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2026-01-04 13:11:02 +03:30
Reza Taghizadeh
f75397f188 fix: reslove some bugs (v2.117.135) 2026-01-04 13:10:55 +03:30
f83e9bf62c Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2026-01-03 17:40:53 +03:30
9e55332602 Fix personnel schedule calendar and gift card
(fix) - Show a message prompting the user to select a personnel before displaying the schedule calendar
(fix) - Improve gift card design carousel navigation to make additional designs clearly visible
2026-01-03 17:06:13 +03:30
Reza Taghizadeh
6f48052be8 Merge pull request #102 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.117)
2026-01-03 16:44:57 +03:30
Reza Taghizadeh
f56a746d02 fix: reslove some bugs (v2.117.128) 2026-01-03 16:44:04 +03:30
Reza Taghizadeh
a075f75cc6 fix: reslove some bugs (v2.117.128) 2026-01-03 16:43:32 +03:30
Reza Taghizadeh
da21057848 Merge pull request #101 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.117)
2026-01-03 15:23:50 +03:30
Reza Taghizadeh
6a2fad07f8 fix: reslove some bugs (v2.117.125) 2026-01-03 15:22:48 +03:30
95299b495d 2.117.118 2026-01-02 18:48:03 +03:30
0ef420d175 fix: resolve multiple UI, state, and localStorage issues
(fix) - Fixed leftover values in localStorage by properly clearing persisted state
(fix) - Disabled page scrolling in Quick Appointment when customer time selection shows an empty screen
(fix) - Fixed Quick Appointment SMS count not updating in real time
(fix) - Fixed general booking link opening on incorrect month due to persisted date in localStorage
(fix) - Fixed working hours update showing success without any actual change when time range is not selected
(fix) - Fixed service price being auto-filled when adding a new service in personnel management
(fix) - Fixed scrolling issues in personnel service management
(fix) - Prevented services from being auto-selected when opening personnel service management
(fix) - Fixed submit/edit button being disabled when rental price or percentage is marked optional
(fix) - Fixed newly added service not being auto-selected in personnel service management
2026-01-02 18:45:11 +03:30
Reza Taghizadeh
84305b3295 Merge pull request #100 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.117)
2026-01-01 22:55:11 +03:30
Reza Taghizadeh
156c60dabc fix: reslove some bugs (v2.117.117) 2026-01-01 22:54:32 +03:30
Reza Taghizadeh
477ef31fb9 Merge pull request #99 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.116)
2026-01-01 18:13:49 +03:30
Reza Taghizadeh
74f96fa743 fix: reslove some bugs (v2.117.116) 2026-01-01 18:13:16 +03:30
Reza Taghizadeh
6bf3346280 Merge pull request #98 from sinmajidi/reza-dev
Reza dev
2026-01-01 16:03:10 +03:30
Reza Taghizadeh
d1b98eaafe Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2026-01-01 16:00:51 +03:30
Reza Taghizadeh
1b8e01b5c1 feat: add more personnels settings and fix cards bug (v2.117.115) 2026-01-01 16:00:45 +03:30
Reza Taghizadeh
1579176963 feat: add more personnels settings and fix cards bug (v2.117.115) 2026-01-01 16:00:01 +03:30
Reza Taghizadeh
ce127ee093 feat: add more personnels settings and fix cards bug (v2.117.115) 2026-01-01 15:58:13 +03:30
5b4c7eae34 (feat) - guid added to general link
(feat) - guid added to quick appointments
(fix) - gift card modified
2025-12-31 17:44:17 +03:30
d43ce96066 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-12-31 09:56:42 +03:30
bbf5979086 (fix) -sms settings modified 2025-12-30 19:31:35 +03:30
Reza Taghizadeh
dc6e3bf1c3 Merge pull request #97 from sinmajidi/reza-dev
Reza dev
2025-12-30 18:46:34 +03:30
Reza Taghizadeh
d894828a30 fix: reslove some bugs (v2.115.109) 2025-12-30 18:45:05 +03:30
Reza Taghizadeh
0aac2ead68 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-12-30 18:37:39 +03:30
Reza Taghizadeh
65be68d4e2 feat: add more personnels page to links and calendare (v2.115.108) 2025-12-30 18:37:25 +03:30
Reza Taghizadeh
452804422e feat: add personnel to advance appointments (v2.115.108) 2025-12-30 18:36:56 +03:30
56d0830aab (fix) - profile modified
(fix) - help customer modal modified in general an costume link
(fix) - custom tour component deleted :(
(fix) - report issue solved
2025-12-30 18:09:00 +03:30
3e7269575c Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-12-30 14:07:04 +03:30
1f63291aa0 (fix) - edit profile modified - scroll for buttons 2025-12-30 14:06:39 +03:30
Reza Taghizadeh
1ab21f9c5f Merge pull request #95 from sinmajidi/reza-dev
feat: add personnel to advance appointments (v2.112.106)
2025-12-30 13:15:41 +03:30
Reza Taghizadeh
a454834c01 feat: add personnel to advance appointments (v2.112.106) 2025-12-30 13:15:00 +03:30
Reza Taghizadeh
6c444b69eb feat: add personnel to advance appointments (v2.112.106) 2025-12-30 13:13:52 +03:30
Reza Taghizadeh
ffdf7f67ed Merge pull request #93 from sinmajidi/reza-dev
Reza dev
2025-12-30 12:06:35 +03:30
Reza Taghizadeh
cc116a77ce fix: reslove some bugs (v2.111.105) 2025-12-30 12:05:49 +03:30
f7b608de84 (fix) - long press for navigation bar disabled 2025-12-30 11:14:50 +03:30
Reza Taghizadeh
2d8830714e Merge pull request #92 from sinmajidi/reza-dev
Reza dev
2025-12-29 16:58:13 +03:30
Reza Taghizadeh
4c2b6d3b55 feat: add helper to general link (v2.111.104) 2025-12-29 16:57:43 +03:30
Reza Taghizadeh
42a5bf6536 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-12-29 16:56:36 +03:30
a475653707 (feat) - guid added to general link 2025-12-29 16:52:25 +03:30
Reza Taghizadeh
d5b8548f44 fix: reslove some bugs (v2.110.104) 2025-12-29 16:51:16 +03:30
Reza Taghizadeh
73b4c7b9ee feat: add personnel to fast appointment (v2.110.103) 2025-12-29 16:49:57 +03:30
Reza Taghizadeh
51fdf63a36 feat: add personnel calendare management (v2.109.102) 2025-12-29 16:07:42 +03:30