sina_majidi/salona
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
948 Commits 8 Branches 0 Tags
2bbfe86cb139ddd360f3d35fddea5f2d5d9dadc1
Commit Graph

948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Reza Taghizadeh
2bbfe86cb1 fix: reslove some bugs (v3.122.490) 2026-02-24 16:03:59 +03:30
Reza Taghizadeh
a1d77cf84c Merge branch 'reza-dev' of https://github.com/sinmajidi/Salona-new-version into production 2026-02-23 19:16:22 +03:30
Reza Taghizadeh
9e5d23d747 Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2026-02-23 19:10:30 +03:30
farnoosh-krm
80c8493718 bugs fixed 2026-02-23 18:47:18 +03:30
Reza Taghizadeh
67eeb8e1bc fix: reslove some bugs (v3.122.486) 2026-02-23 18:39:54 +03:30
Reza Taghizadeh
1992f2da4c Merge pull request #151 from sinmajidi/reza-dev 
Reza dev
 2026-02-23 18:34:56 +03:30
Reza Taghizadeh
3b27fe6f4a fix: reslove some bugs (v3.122.486) 2026-02-23 18:34:32 +03:30
Reza Taghizadeh
6a299f9f01 fix: reslove some bugs (v3.122.486) 2026-02-23 18:32:32 +03:30
farnoosh-krm
a5a79e2dd6 some bugs fixed 2026-02-23 18:27:09 +03:30
Reza Taghizadeh
a88440cc2d fix: reslove some bugs (v3.122.486) 2026-02-23 18:23:07 +03:30
farnoosh-krm
c2c8f34170 feat: Add customer photos to multiple sections and 
fix city selection

- Add customer photos to appointment history, requests, rose assistant, reports, surveys, and loyalty card using new API
- Fix missing "Fooladshahr" city in Isfahan province for business card creation
- Fix missing notes and amounts in individual mode reports
 2026-02-23 14:55:24 +03:30
Reza Taghizadeh
4e486b7db1 Merge pull request #150 from sinmajidi/reza-dev 
fix: reslove some bugs (v3.122.478)
 2026-02-23 14:53:56 +03:30
Reza Taghizadeh
d893df34a7 fix: reslove some bugs (v3.122.478) 2026-02-23 14:53:32 +03:30
Reza Taghizadeh
7b505ac29d Merge pull request #149 from sinmajidi/reza-dev 
fix: reslove some bugs (v3.122.478)
 2026-02-23 14:41:15 +03:30
Reza Taghizadeh
932765f794 fix: reslove some bugs (v3.122.478) 2026-02-23 14:40:01 +03:30
Reza Taghizadeh
6d7c036c8c Update .env 2026-02-23 14:04:35 +03:30
Reza Taghizadeh
e3ca0215b0 Update vite.config.ts 2026-02-23 14:02:26 +03:30
Reza Taghizadeh
1a2c85ef4f Merge pull request #147 from sinmajidi/reza-dev 
Reza dev
 2026-02-22 20:12:10 +03:30
Reza Taghizadeh
db796888ab fix: reslove some bugs (v3.122.478) 2026-02-22 20:11:42 +03:30
Reza Taghizadeh
b7b9628ca3 fix: reslove some bugs (v3.122.478) 2026-02-22 20:10:54 +03:30
Reza Taghizadeh
5e98b232a0 fix: reslove some bugs (v3.122.478) 2026-02-22 20:10:18 +03:30
Reza Taghizadeh
88f055a8a3 Merge pull request #146 from sinmajidi/reza-dev 
fix: reslove some bugs (v3.122.475)
 2026-02-22 18:52:25 +03:30
Reza Taghizadeh
3c86a0b57c fix: reslove some bugs (v3.122.475) 2026-02-22 18:52:04 +03:30
Reza Taghizadeh
06e70823e8 Merge pull request #145 from sinmajidi/reza-dev 
fix: reslove some bugs (v3.122.475)
 2026-02-22 18:50:13 +03:30
Reza Taghizadeh
a984c81f48 fix: reslove some bugs (v3.122.475) 2026-02-22 18:49:42 +03:30
Reza Taghizadeh
5f623ca8bc Merge pull request #144 from sinmajidi/reza-dev 
Reza dev
 2026-02-22 16:51:39 +03:30
Reza Taghizadeh
dbd46d3dc0 fix: reslove some bugs (v3.122.470) 2026-02-22 16:49:54 +03:30
Reza Taghizadeh
377ad43451 fix: reslove some bugs (v3.122.470) 2026-02-22 16:47:58 +03:30
farnoosh-krm
fd76755877 3.121.457 2026-02-22 14:05:33 +03:30
farnoosh-krm
0422840a3a (feat) - customer picture API added 
(fix) - appointment history pictures modified
 2026-02-22 13:53:11 +03:30
farnoosh-krm
f2e8d1c27d fix: Resolve custom link appointment submission error 
- Fix "error in booking reservation by user" toast when submitting custom link appointments
- Correct appointment creation flow for custom links
- Ensure successful booking confirmation without false error messages
 2026-02-22 12:25:57 +03:30
farnoosh-krm
f7c4ed00cc fix: Reset personnel selection in time slots and 
improve subscription button behavior

- Reset selected personnel to first item when re-entering time slots section (fixes persistent selection after refresh)
- Fix subscription payment button getting stuck in disabled/gray state when trying to purchase while active subscription exists
- Keep button in its normal purple state with proper error message instead of becoming unresponsive
 2026-02-22 12:03:15 +03:30
Reza Taghizadeh
0405c31731 Merge pull request #143 from sinmajidi/reza-dev 
Reza dev
 2026-02-21 19:30:23 +03:30
Reza Taghizadeh
359c4e76f1 fix: reslove some bugs (v3.121.456) 2026-02-21 19:29:19 +03:30
Reza Taghizadeh
73098c6071 fix: reslove some bugs (v3.121.456) 2026-02-21 19:16:14 +03:30
farnoosh-krm
2c374dd239 otp form modified 2026-02-21 19:13:20 +03:30
farnoosh-krm
61be6f10fb 3.121.445 2026-02-21 19:03:20 +03:30
farnoosh-krm
512032ffe8 feat: Improve subscription payment and transaction 
status display

- Add loading/pending state to subscription payment button to prevent multiple clicks
- Add new status icons for transaction types
 2026-02-21 19:02:24 +03:30
farnoosh-krm
88fecf11d1 fix: Remove duplicate error toast when SMS credit 
is 0

- Prevent redundant "SMS sending failed" toast from appearing alongside the insufficient credit modal
- Clean up notification behavior across all three SMS sections
 2026-02-21 17:36:26 +03:30
farnoosh-krm
95c668fb83 3.121.443 2026-02-21 17:07:27 +03:30
farnoosh-krm
0a2d8d5091 fix: Update tooltip text for refund settings: 
- Add clear description explaining the purpose of 1-day, 3-day, and 5-day options
- Improve user understanding of refund policy timeframes
 2026-02-21 17:06:04 +03:30
farnoosh-krm
c245ef4cb0 fix: Prevent time selection in quick appointment 
- Disable time slot selection when no service or personnel is selected
- Prevent infinite loading state in waiting screen when appointment created with incomplete data
 2026-02-21 16:27:12 +03:30
farnoosh-krm
f1ddd94393 fix: Resolve profile image, service pricing, and 
subscription issues

- Fix black screen issue when selecting profile image in digital business card
- Make service price required in non-personnel mode (both in service registration and advanced appointment price field)
- Remove placeholder text "dddddddddddddd" showing in empty customer notes for general and custom link appointments
- Fix subscription check to properly recognize active "رز" plan and prevent redirect to purchase page
 2026-02-21 16:13:51 +03:30
Reza Taghizadeh
4e91ece245 Merge pull request #142 from sinmajidi/reza-dev 
fix: reslove some bugs (v3.121.446)
 2026-02-21 14:04:34 +03:30
Reza Taghizadeh
8cfc840690 fix: reslove some bugs (v3.121.446) 2026-02-21 14:02:00 +03:30
Reza Taghizadeh
2100769253 Merge pull request #141 from sinmajidi/reza-dev 
Reza dev
 2026-02-21 13:45:47 +03:30
Reza Taghizadeh
b743a5e891 fix: reslove some bugs (v3.121.446) 2026-02-21 13:45:03 +03:30
Reza Taghizadeh
6d33de993f fix: reslove some bugs (v3.121.445) 2026-02-21 13:34:20 +03:30
Reza Taghizadeh
e3d83ed763 fix: reslove some bugs (v3.121.442) 2026-02-21 12:30:53 +03:30
Reza Taghizadeh
12fd1c2868 Merge pull request #140 from sinmajidi/reza-dev 
Reza dev
 2026-02-21 00:10:44 +03:30