Commit Graph

278 Commits

Author SHA1 Message Date
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
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
Reza Taghizadeh
e599f502e2 feat: cash back and new header section 2025-11-08 01:42:38 +03:30
f0144882fb (feat) - sms report added to report pages
(feat) - services in appointment and giftcard modified
(err) - gift card still has issue :|||
2025-11-05 20:46:29 +03:30
f0fbdb6cae (feat) - emoji added to services 2025-11-05 13:25:14 +03:30
75f5e72f12 (feat ) - add transaction page and assets
(feat) - complete request page
2025-11-04 18:15:13 +03:30
174dbf37f3 (feat) - module list completed
(feat) - request page modified
2025-11-03 16:06:32 +03:30
Reza Taghizadeh
11c31d6f58 Merge pull request #24 from sinmajidi/reza-dev
Reza dev
2025-11-03 03:07:03 +03:30
Reza Taghizadeh
c3811f433d fix: resolve some bugs in project (v2.86.4) 2025-11-03 03:04:47 +03:30
Reza Taghizadeh
a6f02be00f fix: resolve some bugs in project (v2.86.4) 2025-11-03 03:00:19 +03:30
Reza Taghizadeh
a4852f340e get pull from farnosh-dev 2025-11-03 01:23:04 +03:30
Reza Taghizadeh
da951eb715 fix: resolve some bugs in project (v2.86.3) 2025-11-03 01:21:16 +03:30
e52caae0a5 (fix) - bug fixed 2025-11-02 18:33:52 +03:30
de370344af (fix) Fixed issues in the Customer Club module.
(feat) Redesigned the appointment request form page that collects user information.
(feat) Worked on the appointment request page based on the Figma design (still in progress).
Replaced images for Invite Friends and Customer Club sections.
(feat) Added modules section to the profile (design not fully completed yet).
2025-11-02 18:23:03 +03:30
9e99a05d50 (feat): update friends invitation image
(feat): enable gift card sharing
(feat): fix balance button in panel
(feat): create loyalty club page
(err): edit customer -- issues
(err): add customer -- bug
(feat): modify weekly appointment in Rose assistant
(feat): create page to view appointment details
(feat): change cost picker component
2025-11-01 19:09:09 +03:30
Reza Taghizadeh
7609ff71b0 Merge pull request #23 from sinmajidi/reza-dev
Reza dev
2025-10-31 19:45:20 +03:30
Reza Taghizadeh
1c088d3c26 fix: change rose assistant pictures (v2.86.1) 2025-10-31 19:44:33 +03:30
Reza Taghizadeh
5d4bb66ef5 fix: change rose assistant pictures (v2.86.1) 2025-10-31 19:44:06 +03:30
Reza Taghizadeh
32fa977846 fix: resolve bugs (v2.86.0) 2025-10-31 19:31:30 +03:30
Reza Taghizadeh
aa4a913ea6 fix: resolve bugs (v2.86.0) 2025-10-31 19:24:30 +03:30
Reza Taghizadeh
d94911ced1 fix: change purchase cards theme (v2.85.9) 2025-10-31 18:01:11 +03:30