Commit Graph

893 Commits

Author SHA1 Message Date
Reza Taghizadeh
692554c24e fix: reslove some bugs (v2.117.161) 2026-01-07 11:50:40 +03:30
Reza Taghizadeh
49f288cdb1 fix: reslove some bugs (v2.117.160) 2026-01-07 11:47:36 +03:30
3a4e51bb64 conflict solved 2026-01-07 11:46:16 +03:30
1fe98de62e input and textarea checked and so on... 2026-01-06 19:16:15 +03:30
Reza Taghizadeh
722cc99df4 Merge pull request #110 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.155)
2026-01-06 14:35:21 +03:30
Reza Taghizadeh
c952dd9f9f fix: reslove some bugs (v2.117.155) 2026-01-06 14:35:04 +03:30
Reza Taghizadeh
922c4fd290 Merge pull request #109 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.155)
2026-01-06 14:34:45 +03:30
Reza Taghizadeh
d2b36ec44c fix: reslove some bugs (v2.117.155) 2026-01-06 14:34:15 +03:30
Reza Taghizadeh
1462b0e524 Merge pull request #108 from sinmajidi/reza-dev
Reza dev
2026-01-05 23:56:33 +03:30
Reza Taghizadeh
42a303f8b8 fix: reslove some bugs (v2.117.150) 2026-01-05 23:53:44 +03:30
Reza Taghizadeh
1b48027e8f Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2026-01-05 23:52:05 +03:30
Reza Taghizadeh
23d137f256 fix: reslove some bugs (v2.117.150) 2026-01-05 23:51:37 +03:30
c246be7680 fix: correct discount code pattern and
fix overflow in SMS discount display

- Fixed discount code pattern issue: now '562' is sent correctly instead of 'amount'.
- Fixed overflow issue in SMS section when entering large discount amounts in Toman.
2026-01-05 21:15:02 +03:30
416f24eb78 conflict fixed - income change accepted 2026-01-05 20:02:42 +03:30
dc17342b27 fix: resolve input limits, text overflow, and navigation issues across multiple sections
- Fixed discount input not accepting keyboard input in personnel refund flow
- Added character length limits for service name in service management (create/edit) to prevent UI truncation issues
- Improved text rendering and animations consistency across personnel service management
- Fixed error when entering high prices in personnel repair settings by enforcing maximum price limits
- Prevented silent truncation of customer club descriptions over 100 characters and added proper validation
- Fixed text overflow issues in customer profile descriptions
- Enforced upper price limits in repair settings to avoid validation errors on extremely large values
- Updated terminology from "service" to "services" across scheduling tables and related sections
- Fixed accounting lock navigation to correctly redirect to subscription purchase page
- Fixed accordion content overflow issue when adding long descriptions in personnel creation
2026-01-05 19:57:22 +03:30
Reza Taghizadeh
42ce7bd092 Merge pull request #107 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.146)
2026-01-05 16:27:31 +03:30
Reza Taghizadeh
a897c5e8af fix: reslove some bugs (v2.117.146) 2026-01-05 16:26:43 +03:30
Reza Taghizadeh
87ff703106 Merge pull request #106 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.140)
2026-01-04 18:19:23 +03:30
Reza Taghizadeh
322061880d fix: reslove some bugs (v2.117.140) 2026-01-04 18:18:50 +03:30
01dd6eb024 (fix) - bug fixed in accounting types 2026-01-04 18:11:17 +03:30
61d298b7fc Merge branch 'reza-dev' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2026-01-04 18:03:10 +03:30
Reza Taghizadeh
7d0a5d3629 fix: reslove some bugs (v2.117.140) 2026-01-04 17:59:59 +03:30
Reza Taghizadeh
5044c51e6a Merge pull request #105 from sinmajidi/reza-dev
fix: reslove some bugs (v2.117.140)
2026-01-04 17:59:17 +03:30
Reza Taghizadeh
263b500c56 fix: reslove some bugs (v2.117.140) 2026-01-04 17:58:43 +03:30
Reza Taghizadeh
f1051cb2ff fix: reslove some bugs (v2.117.140) 2026-01-04 17:56:37 +03:30
Reza Taghizadeh
a80dce0650 fix: reslove some bugs (v2.117.140) 2026-01-04 17:54:39 +03:30
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