Commit Graph

657 Commits

Author SHA1 Message Date
5acd0366b2 2.117.181
(fix) - issue fixed
2026-01-16 01:41:03 +03:30
96fb7736e2 (feat) - personnel banner added to explore page
(fix) - personnel page modified base on new design
2026-01-16 01:33:03 +03:30
4f85a1ef9f Merge branch 'reza-dev' of https://epic-greider-g-uobcqyk.liara.run/sinamj/salona_ui into farnoosh-dev 2026-01-15 15:00:23 +03:30
a990eaccbd sth added 2026-01-15 14:55:44 +03:30
Reza Taghizadeh
b35be418c2 fix: reslove some bugs (v2.117.173) 2026-01-07 17:41:31 +03:30
Reza Taghizadeh
8bb30e4102 fix: reslove some bugs (v2.117.173) 2026-01-07 17:40:31 +03:30
Reza Taghizadeh
964c5180c5 fix: reslove some bugs (v2.117.173) 2026-01-07 17:35:41 +03:30
Reza Taghizadeh
7d650d9334 fix: reslove some bugs (v2.117.173) 2026-01-07 17:35:31 +03:30
Reza Taghizadeh
dd3d74c576 fix: reslove some bugs (v2.117.173) 2026-01-07 17:34:20 +03:30
54e2204dae Fix issues with discount code persistence,
subscription access, and survey UI

- Preserve entered discount value and validity days after app restart
- Fix locked refund and repair actions not redirecting to subscription purchase
- Reset selected items after sending discount SMS
- Fix missing image issue in survey form header
2026-01-07 16:47:18 +03:30
Reza Taghizadeh
ac801de422 fix: reslove some bugs (v2.117.170) 2026-01-07 14:50:58 +03:30
Reza Taghizadeh
d866072da5 fix: reslove some bugs (v2.117.164) 2026-01-07 12:45:37 +03:30
Reza Taghizadeh
9c200937a8 fix: reslove some bugs (v2.117.164) 2026-01-07 12:45:11 +03:30
Reza Taghizadeh
ac551b5b02 fix: reslove some bugs (v2.117.163) 2026-01-07 12:38:21 +03:30
Reza Taghizadeh
1c1a0613a7 fix: reslove some bugs (v2.117.162) 2026-01-07 12:34:50 +03:30
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