Reza Taghizadeh
8e0358b0c4
feat: cash-back settings (v2.103.23)
2025-12-12 18:20:06 +03:30
Reza Taghizadeh
aa9bb13c67
Merge branches 'reza-dev' and 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev
2025-12-12 15:54:27 +03:30
71d492d935
accounting and giftcard modified
2025-12-11 21:01:44 +03:30
Reza Taghizadeh
00e3c33e63
fix: resolve somebugs (v2.102.23)
2025-12-11 19:07:36 +03:30
Reza Taghizadeh
212ffed202
fix: resolve somebugs (v2.102.23)
2025-12-11 19:04:08 +03:30
Reza Taghizadeh
0b172e8405
Merge pull request #55 from sinmajidi/reza-dev
...
feat: add check time slot customer (v2.102.21)
2025-12-11 17:34:17 +03:30
Reza Taghizadeh
2b18eef6f6
feat: add check time slot customer (v2.102.21)
2025-12-11 17:33:10 +03:30
Reza Taghizadeh
b4ca51fcf8
Merge pull request #54 from sinmajidi/reza-dev
...
Reza dev
2025-12-11 13:36:22 +03:30
Reza Taghizadeh
7b8f4dbe8b
fix: resolve somebugs in chalender (v2.101.20)
2025-12-11 13:35:49 +03:30
Reza Taghizadeh
8d8fbc765d
fix: resolve somebugs in chalender (v2.101.20)
2025-12-11 13:35:03 +03:30
Reza Taghizadeh
dff9ad1cf2
Merge pull request #53 from sinmajidi/reza-dev
...
Reza dev
2025-12-10 22:41:48 +03:30
Reza Taghizadeh
f80ad62c76
feat: add store and resolve calendar-management and quick-appointments challendare and links issues (v2.101.19)
2025-12-10 22:41:09 +03:30
acf6a0d039
(fix) - gift card modified
...
(fix) - store modified
2025-12-10 18:16:39 +03:30
f090aac545
(feat) - advertisement added
...
(fix) - color guide added to CalendarManagement
(fix) - calender modified
(fix) - done in appointment modified
2025-12-10 13:18:09 +03:30
56208d91f8
Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev
2025-12-10 10:05:23 +03:30
3950f3bf1b
appointment history and Done appointment fixed
2025-12-10 01:47:48 +03:30
Reza Taghizadeh
e3960b4c3a
Merge pull request #52 from sinmajidi/reza-dev
...
fix version issue bild bugs (v2.100.17)
2025-12-09 22:47:02 +03:30
Reza Taghizadeh
666ca94592
fix version issue bild bugs (v2.100.17)
2025-12-09 22:46:10 +03:30
Reza Taghizadeh
9d92903de9
Merge pull request #51 from sinmajidi/reza-dev
...
Reza dev
2025-12-09 21:34:08 +03:30
Reza Taghizadeh
3a3002c743
fix bild bugs
2025-12-09 21:33:36 +03:30
Reza Taghizadeh
0241e9ef1c
fix bild bugs
2025-12-09 21:25:11 +03:30
Reza Taghizadeh
deac7cdc4c
Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev
2025-12-09 21:21:59 +03:30
Reza Taghizadeh
34d2c530cc
feat: add more feater to callendare (v3.0.17)
2025-12-09 21:21:47 +03:30
e57fb90686
(fix) - advance APT modified
...
(fix) - business card modified
(fix) - rose pictures replaced
2025-12-09 19:50:54 +03:30
Reza Taghizadeh
8a2af29241
Merge pull request #50 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 19:22:20 +03:30
Reza Taghizadeh
70a2931f5e
feat: add filter to callendare (v2.99.17)
2025-12-08 19:21:51 +03:30
Reza Taghizadeh
34bd2a9c5c
Merge pull request #49 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 19:09:53 +03:30
Reza Taghizadeh
9689309d77
feat: add filter to callendare (v2.99.17)
2025-12-08 19:09:10 +03:30
Reza Taghizadeh
63d395f96c
Merge pull request #48 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 19:08:55 +03:30
Reza Taghizadeh
9621ee5d75
feat: add filter to callendare (v2.99.17)
2025-12-08 19:08:02 +03:30
Reza Taghizadeh
fe882d8c71
Merge pull request #47 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 17:51:28 +03:30
Reza Taghizadeh
0cae42c87a
fix: resolve some routes bugs (v2.98.17)
2025-12-08 17:50:51 +03:30
Reza Taghizadeh
70d7bf5605
Merge pull request #46 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 13:27:34 +03:30
Reza Taghizadeh
92df997d51
fix: resolve some routes bugs (v2.98.16)
2025-12-08 13:26:54 +03:30
Reza Taghizadeh
82ce187911
Merge pull request #45 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 13:19:17 +03:30
Reza Taghizadeh
7babb1466f
fix: resolve some routes bugs (v2.98.15)
2025-12-08 13:18:02 +03:30
Reza Taghizadeh
f58ea97cce
Merge pull request #44 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 13:04:22 +03:30
Reza Taghizadeh
4c82ef51c4
fix: resolve some bugs (v2.98.15)
2025-12-08 13:03:56 +03:30
Reza Taghizadeh
956c6f8152
Merge pull request #43 from sinmajidi/reza-dev
...
Reza dev
2025-12-08 13:03:21 +03:30
Reza Taghizadeh
25dd338bed
fix: resolve some bugs (v2.98.15)
2025-12-08 13:02:51 +03:30
Reza Taghizadeh
01d4418b24
fix: resolve some bugs (v2.98.15)
2025-12-08 13:01:51 +03:30
Reza Taghizadeh
e76d0d4ee6
Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev
2025-12-08 11:45:02 +03:30
Reza Taghizadeh
db26ea79c3
fix: resolve some bugs
2025-12-08 11:44:27 +03:30
37a2d1ee3d
2.98.13
2025-12-07 20:03:29 +03:30
c249a2e1a4
Cleanup images and add educational banner
...
(fix) - Removed unused images
(fix) - Added educational banner
(fix) - Checked and fixed most input fields
(fix) - Added phone number display in advanced appointments
(fix) - Fixed bug in the appointment bar
(fix) - Updated UI for customer self-appointment registration
(fix) - Fixed card design selection: the current card is pre-selected until user clicks
(fix) - Fixed multiple error messages when activating/deactivating business cards
(fix) - Improved advanced appointment calendar:
- Previous/Next month buttons moved to top next to month
- More space at bottom, selected time visible without scrolling
(fix) - Set keyboard to Persian when entering phone number in "Add Customer"
(fix) - Fixed "Save" button in "Add Customer" from advanced appointment (was inactive and caused repeated errors)
(fix) - Improved customer club page: top image now loads faster
2025-12-07 20:01:02 +03:30
Reza Taghizadeh
42301d9bfa
Merge pull request #42 from sinmajidi/reza-dev
...
Reza dev
2025-12-07 13:56:52 +03:30
Reza Taghizadeh
b765a28cf8
fix: resolve some bugs
2025-12-07 13:55:36 +03:30
Reza Taghizadeh
ff81fb12ff
fix: resolve some bugs
2025-12-07 13:47:52 +03:30
Reza Taghizadeh
780d47c5b5
Merge pull request #41 from sinmajidi/reza-dev
...
Reza dev
2025-12-07 13:38:39 +03:30
Reza Taghizadeh
4b262ed558
fix: resolve some bugs
2025-12-07 13:37:28 +03:30
