Commit Graph

894 Commits

Author SHA1 Message Date
1f1f1d897e Merge branch 'reza-dev' of https://github.com/sinmajidi/Salona-new-version into farnoosh-dev 2026-02-10 10:57:52 +03:30
a69ffcd09e simple time display modified 2026-02-10 10:56:24 +03:30
Reza Taghizadeh
93111644f7 fix: reslove some bugs (v3.121.335) 2026-02-10 03:11:05 +03:30
a9df4f8087 3.121.325 2026-02-09 18:03:03 +03:30
c4f4b16894 3.121.325 2026-02-09 17:57:39 +03:30
92aeaad360 3.121.324 2026-02-09 17:56:32 +03:30
452a542a1f 3.121.323 2026-02-09 17:54:33 +03:30
3481d35686 bugs fixed 2026-02-09 17:54:02 +03:30
27cd276668 (fix) - service management added to home
(feat) - show time table added
(feat) - create time table added
2026-02-09 17:35:35 +03:30
d7a8bbdc77 3.121.319 2026-02-09 15:31:53 +03:30
5da4aaa3f2 bugs fixed 2026-02-09 15:31:15 +03:30
Reza Taghizadeh
1678848f78 fix: reslove some bugs (v3.121.316) 2026-02-08 18:22:22 +03:30
Reza Taghizadeh
b978306a34 fix: reslove some bugs (v3.121.315) 2026-02-08 18:12:44 +03:30
Reza Taghizadeh
90b8ca963b fix: reslove some bugs (v3.121.315) 2026-02-08 18:12:18 +03:30
1bb51d527a 3.121.310 2026-02-08 17:54:23 +03:30
0bbeb5030f fix some bugs: "3.121.310"
fix(service-management): change service cost field to "required" when no personnel is active
fix(service-management): connect service input to selected personnel when personnel is active
feat(training-vector): keep training vector position bottom-right even when personnel is active
2026-02-08 17:50:51 +03:30
Reza Taghizadeh
681c66da6c fix: reslove some bugs (v3.121.308) 2026-02-08 16:08:00 +03:30
947c0f966e bugs in personnel general fixed 2026-02-08 11:33:48 +03:30
82fe85ebb1 3.121.303 2026-02-08 11:12:44 +03:30
7eb2fc6ea2 conflict solved 2026-02-08 11:12:00 +03:30
Reza Taghizadeh
c7740ea4ab fix: reslove some bugs (v3.121.302) 2026-02-07 23:33:39 +03:30
Reza Taghizadeh
9735d03c8a fix: reslove some bugs (v3.121.301) 2026-02-07 18:54:30 +03:30
04aa1af89f 3.121.299 2026-02-07 17:50:01 +03:30
991209c7f5 3.121.299 2026-02-07 17:45:17 +03:30
7c26099c07 feat: Automatically select newly added customer in
discount code section
fix: Prevent page from auto-scrolling after canceling prize claim in the "Win" section
fix: Adjust support vector position in general link to avoid overlapping with OTP input field
fix: Smooth horizontal scrolling for service lists across all sections (consistent with appointment table behavior)
fix: Remove incorrect save confirmation message in restoration settings before process completion
fix: Add mandatory validation for service name to prevent empty entries and enable deletion
2026-02-07 17:43:03 +03:30
Reza Taghizadeh
646f5597b8 fix: reslove some bugs (v3.121.298) 2026-02-07 13:38:09 +03:30
Reza Taghizadeh
e6ab2681ed fix: reslove some bugs (v3.121.295) 2026-02-06 18:14:09 +03:30
331250d848 3.121.280 2026-02-03 21:31:44 +03:30
1926581d58 fix some bugs:
Fixed error when creating quick staff appointment with manual booking toggle
Fixed month navigation issue caused by description overlay in appointment request
Fixed auto left-scroll of services list when staff is inactive in new scheduling system
Removed time range selection when staff is inactive and service hours are defined
Fixed unwanted right auto-scroll when selecting a service in appointment request with active staff
Made horizontal service list scrolling smooth across all sections
Added success notification and auto-exit after manual quick appointment booking
Fixed repair reminder settings being saved without required selections
Preserved selected fields after validation error in staff refund form
New staff/service items now appear at the top of lists instead of the bottom
Disabled time range configuration in service management when staff-based scheduling is active
Added time range selection when no staff is active and services are empty in scheduling flows
2026-02-03 21:30:32 +03:30
fad27598e9 3.121.275 2026-02-03 17:58:52 +03:30
0744196f95 fix some bugs:
(fix) - Removed unused “delete one hour” and “clear all” options from scheduling table
(fix) - Fixed scheduling table not updating immediately after adding or editing time slots
(fix) - Fixed advanced appointment booking getting stuck at final step without feedback
(fix) - Fixed work hours not displaying correctly when deselecting multiple days in schedule table
(fix) - Hide time range selection when no personnel is active but service hours are defined
(fix) - Fixed auto horizontal scroll issue in scheduling table when no personnel is active
(fix) - Hide price and duration fields in service management when personnel is active
(fix) - Temporarily commented out shop and events sections on home page
2026-02-03 17:56:50 +03:30
fd5a7cab82 3.121.271 2026-02-03 11:44:42 +03:30
29eaa9791a conflict solved 2026-02-03 11:40:09 +03:30
Reza Taghizadeh
37f4646914 Merge pull request #120 from sinmajidi/reza-dev
Reza dev
2026-02-02 18:09:20 +03:30
Reza Taghizadeh
c08502500e fix: reslove some bugs (v3.121.270) 2026-02-02 18:00:49 +03:30
Reza Taghizadeh
5b10b5e99a fix: reslove some bugs (v3.121.270) 2026-02-02 17:49:27 +03:30
060ab06b4a 3.121.268 2026-02-02 17:36:12 +03:30
19401a37cb Fix: User can now book appointments without SMS
credits when all SMS toggles are off
Fix: Fixed SMS credit error preventing quick appointment booking with all SMS notifications disabled
Fix: Added 4 common duration options (45min, 1h, 1.5h, 2h) to service time slots management
2026-02-02 17:32:22 +03:30
Reza Taghizadeh
fc67b85ceb fix: reslove some bugs (v3.121.267) 2026-02-02 14:43:00 +03:30
Reza Taghizadeh
283158590a Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2026-02-02 14:18:21 +03:30
Reza Taghizadeh
d6f089c36e fix: reslove some bugs (v3.121.267) 2026-02-02 14:18:03 +03:30
Farnoosh Karimi
a4b4e943e4 Merge pull request #117 from sinmajidi/farnoosh-dev
Farnoosh dev
2026-02-01 17:03:48 +03:30
cb7d482eb3 Merge branch 'main' of https://github.com/sinmajidi/Salona-new-version into farnoosh-dev 2026-02-01 16:49:37 +03:30
Reza Taghizadeh
650c7ce381 fix: reslove some bugs (v3.121.266) 2026-02-01 16:44:16 +03:30
Reza Taghizadeh
783be950eb fix: reslove some bugs (v3.121.265) 2026-02-01 16:31:47 +03:30
Reza Taghizadeh
b39b786b1e fix: reslove some bugs (v3.121.265) 2026-02-01 16:30:40 +03:30
Reza Taghizadeh
c2bfea0515 Merge pull request #116 from sinmajidi/reza-dev
Reza dev
2026-01-31 18:57:19 +03:30
Reza Taghizadeh
e74192a477 Merge branch 'farnoosh-dev' of https://epic-greider-g-uobcqyk.liara.run/sinamj/salona_ui into reza-dev 2026-01-31 18:53:12 +03:30
Reza Taghizadeh
3f171f54fb fix: reslove some bugs (v3.121.260) 2026-01-31 18:53:02 +03:30
f0c5118665 (fix) - sms-kade -> information modified
(fix) - repair personnel modified- alert shows when personnel doesn't select
2026-01-31 18:27:44 +03:30