Commit Graph

297 Commits

Author SHA1 Message Date
Reza Taghizadeh
b833769600 fix: resolve project bugs 2025-11-26 20:31:17 +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
baca636c99 fixed 2025-11-18 14:35:56 +03:30
Reza Taghizadeh
291fe3278c get pull from farnoosh dev 2025-11-18 12:50:03 +03:30
Reza Taghizadeh
e2279eb958 get pull from farnoosh dev 2025-11-18 12:42:13 +03:30
Reza Taghizadeh
cea0caaafe fix: resolve profile bugs 2025-11-18 12:35:18 +03:30
d51502a0fa Update Home page services, fix UI issues, and resolve multiple bugs
- Home page: updated today's and tomorrow's appointments service and changed appearance
- Fixed UI issue with business card
- Resolved bugs:
  1. Support page and tickets no longer scroll horizontally - UI modified
  2. Saved events accessible from profile without large CTA button
  3. Profile page no longer shakes horizontally
  4. Loyalty card displays default image when customer photo is missing
  5. Transaction and module list images properly scaled
  6. Service cost shows amount in Toman in words under input
  7. Top bar now correctly reflects element color (not fixed purple)
- Reports: added delete, edit, and done functionality for appointments
- Restored previous app behavior for report day counts
- Modals consistent across app with blur background
- Gift card sharing now works as expected
2025-11-17 19:21:23 +03:30
bd90a8a383 (fix) - gift card modified
(fix) - bookmark events added to profile
(fix) - header color changed
(fix) - view gift card url added to QRcode
(fix) - pictures modified
2025-11-15 17:46:19 +03:30
Reza Taghizadeh
bd7067bf05 Merge pull request #26 from sinmajidi/reza-dev
Reza dev
2025-11-12 19:46:46 +03:30
Reza Taghizadeh
67a53af0b1 fix build bugs 2025-11-12 19:45:23 +03:30
Reza Taghizadeh
9935ddb671 fix build bugs 2025-11-12 19:41:43 +03:30
Reza Taghizadeh
19300857b6 feat: add custom toast to tabs (v2.90.8) 2025-11-12 19:38:57 +03:30
Reza Taghizadeh
440f153e24 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-11-12 19:28:34 +03:30
Reza Taghizadeh
972cf00c5f fix: resolve advance turn issues (v2.89.8) 2025-11-12 19:28:24 +03:30
8efc3c9b26 (feat): update QR code design and fix related issues
(fix) - Updated QR code appearance
(feat) - Added allowed image formats and allowed domains for QR codes
(fix) - Fixed issues in the QR code field input section
(feat) - Updated icons for appointment and request buttons
(fix) - Improved gift card layout
(fix) - Adjusted banner spacing and image sizes (width no longer changes)
2025-11-12 17:02:28 +03:30
Reza Taghizadeh
5482a9153d get pull 2025-11-12 14:18:34 +03:30
Reza Taghizadeh
d2bd9252c6 feat: add disable to tabs (v2.89.7) 2025-11-12 14:17:48 +03:30
7a2d7b3bc5 (fix) - UI modified 2025-11-11 17:34:14 +03:30
Reza Taghizadeh
1e93dc43b0 fix: resolve cashback issues (v2.88.7) 2025-11-11 10:58:46 +03:30
Reza Taghizadeh
bc41d7d150 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-11-10 18:56:08 +03:30
Reza Taghizadeh
f110d32313 fix: resolve animate headers bugs (v2.88.6) 2025-11-10 18:56:00 +03:30
c0fca8676b Fix request page flow, gift card issues, header style, and image stretching
(feat) - request page flow: if no phone number, redirect to add customer page before advanced appointment
(fix) - Corrected gift card related issues
() - Adjusted header styling from pure white
(fix) - Fixed image stretching problems
2025-11-10 18:16:21 +03:30
Reza Taghizadeh
95924a0546 fix: resolve bugs and errors (v2.88.5) 2025-11-08 02:21:47 +03:30
Reza Taghizadeh
f563ecf14a get pull 2025-11-08 01:55:01 +03:30
Reza Taghizadeh
8f64db28d2 update 2025-11-08 01:52:37 +03:30