MahanCh
|
b92aaaffa0
|
fix: enable and manage customize checkout options in client menu
|
2025-08-18 11:55:34 +03:30 |
|
MahanCh
|
366ad25a3a
|
add conflict indication for salary aids in checkout process
|
2025-08-12 12:44:48 +03:30 |
|
MahanCh
|
463e4bc080
|
Merge branch 'refs/heads/master' into Feature/Chcekout/AddHasConflict
|
2025-08-12 12:43:12 +03:30 |
|
MahanCh
|
b77538218f
|
add conflict indicator for employee customize checkout records
|
2025-08-12 11:17:02 +03:30 |
|
MahanCh
|
e877aca832
|
Merge branch 'Main' into Feature/Chcekout/AddHasConflict
|
2025-08-12 09:56:50 +03:30 |
|
MahanCh
|
4aa710b7d6
|
add search
|
2025-08-11 15:13:31 +03:30 |
|
MahanCh
|
25903856b2
|
add has conflict in List for checkout
|
2025-08-10 11:02:16 +03:30 |
|
MahanCh
|
d1b7e0c3e1
|
changes
|
2025-08-09 15:15:38 +03:30 |
|
MahanCh
|
ac4bd3453a
|
Merge branch 'master' into Main
# Conflicts:
# CompanyManagment.Application/SalaryAidApplication.cs
|
2025-08-09 14:46:36 +03:30 |
|
MahanCh
|
a9008beb24
|
Change CreateAsync For SalaryAid
|
2025-08-09 14:45:04 +03:30 |
|
MahanCh
|
290e1639e8
|
Merge branch 'master' into Main
|
2025-08-09 14:10:33 +03:30 |
|
MahanCh
|
3650b46b8e
|
fix 404 Error on sending data for checkout exists in SalaryAid
|
2025-08-09 14:10:12 +03:30 |
|
MahanCh
|
8432b2660e
|
Merge branch 'Feature/Chcekout/AddHasConflict' into Main
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/FinancialStatementController.cs
|
2025-08-06 14:11:06 +03:30 |
|
MahanCh
|
6d6ce93f74
|
some changes
|
2025-08-05 14:25:32 +03:30 |
|
MahanCh
|
a71433f751
|
add AmountConflict in checkout
|
2025-08-05 13:11:12 +03:30 |
|
MahanCh
|
8da9f09663
|
add debt alert for users who don't have permissions
|
2025-07-31 14:09:16 +03:30 |
|
MahanCh
|
5ae31b9cea
|
add "debt" section for mobile
|
2025-07-28 16:17:53 +03:30 |
|
MahanCh
|
e87733f5cb
|
Add Client Menu changes and add "debt" section in header
|
2025-07-28 14:20:36 +03:30 |
|
MahanCh
|
e8fd8bdace
|
change the menu for new items
|
2025-07-28 11:39:53 +03:30 |
|
MahanCh
|
313579cdee
|
add fake api - disable employeeReport in Menu
|
2025-07-27 13:16:21 +03:30 |
|
MahanCh
|
3254db4a62
|
change financial preivew method to post
|
2025-07-22 12:22:03 +03:30 |
|
MahanCh
|
8325752355
|
add userType to login data
|
2025-07-22 11:09:42 +03:30 |
|
MahanCh
|
d080b093e8
|
change mediaType for CreateApi
|
2025-07-21 16:49:17 +03:30 |
|
MahanCh
|
f2717de5bf
|
merge from CreateApi for GetDetailsByPublicId
|
2025-07-21 15:11:18 +03:30 |
|
MahanCh
|
e5fa554971
|
change Get details by public Id Name
|
2025-07-21 15:03:26 +03:30 |
|
MahanCh
|
6932ba7b79
|
add query for getting data from sms preview
|
2025-07-21 14:57:36 +03:30 |
|
MahanCh
|
194323004b
|
refactor: add redirect from backend to payment gateway
|
2025-07-21 11:43:29 +03:30 |
|
MahanCh
|
3c6e83a967
|
merge from CreateApiPaymentGateWay
|
2025-07-20 14:56:19 +03:30 |
|
MahanCh
|
bfd6632940
|
change the step from paymentCallBack - set transactionId on create PaymentGateway
|
2025-07-20 14:53:50 +03:30 |
|
MahanCh
|
8ac15191ad
|
merge from create api payment gateway
|
2025-07-19 15:02:32 +03:30 |
|
MahanCh
|
a177d6063d
|
fix api url bug
|
2025-07-19 15:01:50 +03:30 |
|
MahanCh
|
f8a1aa596d
|
merge from api createApigateway
|
2025-07-19 13:25:58 +03:30 |
|
MahanCh
|
64422755f2
|
complete payment gateway
|
2025-07-19 13:11:46 +03:30 |
|
MahanCh
|
62bcd4d6b6
|
add payment for api gateway
|
2025-07-17 15:20:34 +03:30 |
|
MahanCh
|
af2c71ea09
|
add select workshop for admin api
|
2025-07-16 14:48:27 +03:30 |
|
MahanCh
|
558021ac6a
|
feat: add debt amount in client profile
|
2025-07-16 14:24:39 +03:30 |
|
MahanCh
|
a63fed8c4a
|
add workshopSlug in login controller
|
2025-07-16 09:50:28 +03:30 |
|
MahanCh
|
5ebcbcf774
|
add get profileMethod
|
2025-07-15 16:00:49 +03:30 |
|
MahanCh
|
2bdfdb366e
|
fix create employee by client
|
2025-07-15 15:39:32 +03:30 |
|
MahanCh
|
358544e56c
|
Merge branch 'master' into API
|
2025-07-13 14:58:30 +03:30 |
|
MahanCh
|
fb52e99c68
|
add financial statement controller
|
2025-07-13 14:17:52 +03:30 |
|
MahanCh
|
2714732750
|
Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir
|
2025-07-08 13:51:59 +03:30 |
|
MahanCh
|
2a78a9dc1a
|
change employee upload picture change name style
|
2025-07-08 13:51:52 +03:30 |
|
MahanCh
|
0d66a79d49
|
fix some bugs
|
2025-07-03 15:39:24 +03:30 |
|
MahanCh
|
73732cfe67
|
fix: create employee upload picture create bug
|
2025-07-01 16:24:53 +03:30 |
|
MahanCh
|
80c0ec28d5
|
finishOffDayOfWeek for CWS
|
2025-06-29 14:01:47 +03:30 |
|
MahanCh
|
b133aa67d2
|
merge fom master
|
2025-06-29 13:25:23 +03:30 |
|
MahanCh
|
4415cb8128
|
change checkout styles
|
2025-06-25 16:07:02 +03:30 |
|
MahanCh
|
fcfe7c7e58
|
delete friday work
|
2025-06-24 10:45:41 +03:30 |
|
SamSys
|
fcad12d3ef
|
ClientCreateEmployee change merged
|
2025-06-22 15:11:51 +03:30 |
|