Commit Graph

320 Commits

Author SHA1 Message Date
Reza Taghizadeh
ebb30b616d fix: fix some bugs (v2.96.03) 2025-12-02 18:05:25 +03:30
Reza Taghizadeh
85ea86a46f Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-12-02 12:37:17 +03:30
Reza Taghizadeh
61d3fbb955 fix: fix some bugs (v2.96.02) 2025-12-02 12:36:08 +03:30
77a334f61d Fix notifications and modules list; update appointment options and banner
(fix) - Notifications fixed
(fix) - Modules list fixed
(fix) - Removed top quick/advanced/request options; added 4 options (Advanced, Quick, Schedule, Requests) in new design
(fix) - Updated Quick Appointment: “Set time by me or customer” button redesigned with draggable feature
(fix) - Added banner for remaining SMS with button to increase count
(fix) - Removed motivational sentences at the end of app
(fix) - Updated About Us section
2025-12-01 19:29:00 +03:30
Reza Taghizadeh
09bfbcdf86 Merge pull request #35 from sinmajidi/reza-dev
Reza dev
2025-11-30 18:28:27 +03:30
Reza Taghizadeh
cce0d96640 feat: fix some bugs (v2.96.01) 2025-11-30 18:27:53 +03:30
Reza Taghizadeh
c30aa7a485 Merge pull request #34 from sinmajidi/reza-dev
Reza dev
2025-11-30 18:08:35 +03:30
Reza Taghizadeh
89f0ad7254 feat: fix some bugs (v2.96.01) 2025-11-30 18:07:46 +03:30
Reza Taghizadeh
b0bc56d179 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-11-30 18:06:09 +03:30
Reza Taghizadeh
e63d33edf2 feat: add iran holidays and fix somebugs (v2.96.0) 2025-11-30 17:56:41 +03:30
ed4221c1e6 (fix) - edit information modified
(fix) - policy modified
(fix) - login and register form modified
(fix) - question page modified
(fix) - select specialization component modified
2025-11-30 17:13:37 +03:30
d381a3607f fix(UI/UX): fix dialog and scroll issues in profile and business cards
(fix) - Fix incomplete error box display when registering with a duplicate phone number
(fix) - Prevent background scrolling when dialogs are open in profile editing
(fix) - Correct display of partially visible search box in specialties
(fix) - Sort default specialties alphabetically for easier search
(fix) - Update warning, success, and error dialog styles to match Figma
(fix) - Allow closing dialogs by clicking outside, not just with close/cancel buttons
(fix) - Make emoji selection optional when adding services
(fix) - Fix back button behavior in online business card preview (navigate to correct step)
(fix) - Translate card activation/deactivation notifications to Persian
2025-11-29 17:06:59 +03:30
f728d87d74 merged 2025-11-29 12:41:40 +03:30
947f6b8aa5 modals modified 2025-11-29 12:39:09 +03:30
Reza Taghizadeh
03155f3789 Merge pull request #33 from sinmajidi/reza-dev
Reza dev
2025-11-29 04:19:21 +03:30
Reza Taghizadeh
880b58bd0e fix: fix holidays and add tooltipe animated (v2.95.99) 2025-11-29 04:18:49 +03:30
Reza Taghizadeh
4f9f195807 fix: fix holidays and add tooltipe animated (v2.95.99) 2025-11-29 04:16:24 +03:30
Reza Taghizadeh
da43bb6ce0 fix: fix holidays and add tooltipe animated (v2.95.99) 2025-11-29 04:11:01 +03:30
Reza Taghizadeh
7c01f47a89 fix: fix holidays and add tooltipe animated 2025-11-29 04:09:05 +03:30
Reza Taghizadeh
f9cc5e78d4 Merge pull request #31 from sinmajidi/reza-dev
Reza dev
2025-11-26 20:37:34 +03:30
Reza Taghizadeh
51d14a18df fix: resolve project bugs (v2.95.98) 2025-11-26 20:36:48 +03:30
Reza Taghizadeh
5e5f5b2709 fix: resolve project bugs (v2.95.98) 2025-11-26 20:32:56 +03:30
Reza Taghizadeh
b833769600 fix: resolve project bugs 2025-11-26 20:31:17 +03:30
83fd94f659 Fix multiple UI/UX issues:
(fix) - Enable opening rose assistant page by clicking anywhere on the banner.
(fix) - Fix “Add Services” modal in Advanced Appointment moving too high and hiding the close button.
(fix) - Allow editing profile photo by tapping on the profile picture.
(fix) - Close modals when tapping outside of them.
(fix) - Remove service search from Quick Appointment.
(fix) - Remove “Add Customer” from Quick Appointment.
(fix) - Resize rose image in Terms & Conditions (image was too wide).
2025-11-26 19:17:55 +03:30
8ee18c218c (Fix) banners layout, update notifications behavior,
and update Dockerfile

(fix) - Adjusted banner sizes
(fix) - Notifications no longer show on mobile if already read
(feat) - Updated Dockerfile for proper build and deployment
2025-11-25 16:35:55 +03:30
Reza Taghizadeh
3dae41fa25 Merge pull request #30 from sinmajidi/reza-dev
Reza dev
2025-11-23 21:45:36 +03:30
Reza Taghizadeh
a31942f05b fix build bugs 2025-11-23 21:45:10 +03:30
Reza Taghizadeh
8f3f5e3d65 poll from farnosh dev 2025-11-23 21:35:18 +03:30
Reza Taghizadeh
5336910a2c feat: set holiday and fix a lots of bugs (v2.94.96) 2025-11-23 21:34:32 +03:30
a146ee689c 2.93.95 2025-11-23 18:57:58 +03:30
4d746addd5 (fix) - banner in explore page modified
(err) - backbtn still has issue
(feat) - price input in advance appointment changed
2025-11-23 18:54:12 +03:30
9f28cc02fc (fix) - workday management modified 2025-11-23 12:15:37 +03:30
6eb5d6057c Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-11-23 11:37:51 +03:30
3c078b3d87 bug fixed 2025-11-23 11:37:45 +03:30
Reza Taghizadeh
7deefcc5f2 Merge pull request #29 from sinmajidi/reza-dev
Reza dev
2025-11-20 20:25:23 +03:30
Reza Taghizadeh
9abe47a227 feat: set holiday (v2.93.94) 2025-11-20 20:24:45 +03:30
Reza Taghizadeh
f07c979dff Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-11-20 20:14:13 +03:30
7ed2cc6a38 (feat) - Quick Appointment now loads timeslots from API.
(fix) - Updated appointment table to fetch previous appointments and added edit functionality.
2025-11-20 19:39:24 +03:30
Reza Taghizadeh
5b93d69a00 Merge pull request #28 from sinmajidi/reza-dev
Reza dev
2025-11-20 18:46:29 +03:30
Reza Taghizadeh
6e2f4809f0 feat: add new feature to rose and resolve some bugs 2025-11-20 18:45:34 +03:30
e1fd17172d Connect appointments table page to API:
-display work/holiday status and allow timeslot configuration.
2025-11-20 13:43:11 +03:30
Reza Taghizadeh
d26537edce fix: get pull and resolve bugs 2025-11-20 13:13:21 +03:30
51b22c07fe (feat) - workday management modified 2025-11-20 04:28:29 +03:30
Reza Taghizadeh
7142d9e113 Merge pull request #27 from sinmajidi/reza-dev
Reza dev
2025-11-19 22:54:14 +03:30
Reza Taghizadeh
d7b3695d55 fix: resolve some bugs 2025-11-19 22:53:10 +03:30
Reza Taghizadeh
e376f5ef69 fix : resolve advance turns bugs for subescriptions and patterns 2025-11-19 18:25:22 +03:30
Reza Taghizadeh
245834da46 get pull from farnoosh dev 2025-11-19 15:58:59 +03:30
Reza Taghizadeh
12ab7e8089 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-11-19 15:58:20 +03:30
b50135f2ea Implement navigation and UI improvements
- Fixed back button to navigate back only one step
- Removed redundant close buttons
- Added new page for time and holiday management
2025-11-19 11:53:17 +03:30
Reza Taghizadeh
bba368a049 feat: add search pages (v2.91.9) 2025-11-19 00:43:54 +03:30