|
|
904e70cd84
|
debug amount unit problem in confirm forms
|
2024-01-02 11:08:59 +03:30 |
|
AmirHossein Mahmoodi
|
cbe1a7f7e9
|
Merge branch 'main' into 'develop'
Merge branch 'develop' into 'main'
See merge request witel-front-end/loan-facilities/expert!132
|
2023-12-31 10:06:32 +00:00 |
|
AmirHossein Mahmoodi
|
ba52418893
|
Merge branch 'develop' into 'main'
Develop
See merge request witel-front-end/loan-facilities/expert!131
|
2023-12-31 10:02:39 +00:00 |
|
AmirHossein Mahmoodi
|
7aea56f8d7
|
Merge branch 'main' into 'develop'
Main
See merge request witel-front-end/loan-facilities/expert!130
|
2023-12-31 09:58:38 +00:00 |
|
AmirHossein Mahmoodi
|
2cdcaecb2e
|
add print form a and b
|
2023-12-31 13:18:27 +03:30 |
|
AmirHossein Mahmoodi
|
1db5dcfca3
|
Merge branch 'develop' into 'main'
Develop
See merge request witel-front-end/loan-facilities/expert!129
|
2023-12-30 04:59:39 +00:00 |
|
AmirHossein Mahmoodi
|
e0613a6beb
|
Merge branch 'feature/amiriis_prints' into 'develop'
add print form b
See merge request witel-front-end/loan-facilities/expert!128
|
2023-12-30 04:56:10 +00:00 |
|
|
|
06aff1699e
|
add print form b
|
2023-12-30 08:22:32 +03:30 |
|
AmirHossein Mahmoodi
|
850b3aae98
|
Merge branch 'develop' into 'main'
Develop
See merge request witel-front-end/loan-facilities/expert!127
|
2023-12-30 01:40:47 +00:00 |
|
|
|
00a7ef3ad9
|
Merge branch 'feature/yasi_add_extra_file' into 'develop'
Feature/yasi add extra file
See merge request witel-front-end/loan-facilities/expert!126
|
2023-12-27 09:54:38 +00:00 |
|
Yasiu1376
|
f7d3c6a099
|
remove conflicts
|
2023-12-27 13:10:03 +03:30 |
|
Yasiu1376
|
9fee220789
|
Merge branch 'develop' of https://gitlab.com/witel-front-end/loan-facilities/expert into feature/yasi_add_extra_file
|
2023-12-27 12:52:38 +03:30 |
|
|
|
51108aa597
|
Merge branch 'feature/mohammad_change_upload_type' into 'develop'
Feature/mohammad change upload type
See merge request witel-front-end/loan-facilities/expert!125
|
2023-12-27 08:33:53 +00:00 |
|
|
|
3db1ee674e
|
complete show files by accordian
|
2023-12-27 11:48:39 +03:30 |
|
Yasiu1376
|
48e8691d53
|
change back
|
2023-12-27 11:44:05 +03:30 |
|
Yasiu1376
|
898ea094ef
|
update reject and confirm form
|
2023-12-26 14:13:44 +03:30 |
|
AmirHossein Mahmoodi
|
28097bad96
|
Merge branch 'feature/yasi_add_confirmation_check' into 'develop'
Feature/yasi add confirmation check
See merge request witel-front-end/loan-facilities/expert!121
|
2023-12-26 07:16:31 +00:00 |
|
AmirHossein Mahmoodi
|
e10907c390
|
Merge branch 'develop' into 'feature/yasi_add_confirmation_check'
# Conflicts:
# src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
|
2023-12-26 07:13:56 +00:00 |
|
|
|
930e1c397f
|
Merge branch 'develop' of https://gitlab.com/witel-front-end/loan-facilities-expert into feature/mohammad_change_upload_type
|
2023-12-26 10:04:06 +03:30 |
|
AmirHossein Mahmoodi
|
7b261f1085
|
Merge branch 'feature/Amin_sakht_tanafos_period' into 'develop'
amin sakht tanafos period
See merge request witel-front-end/loan-facilities/expert!124
|
2023-12-25 10:25:15 +00:00 |
|
|
|
51cb76e089
|
Merge branch 'develop' of https://gitlab.com/witel-front-end/loan-facilities/expert into feature/Amin_sakht_tanafos_period
|
2023-12-25 13:50:42 +03:30 |
|
|
|
d51d7ffb6d
|
delete logs
|
2023-12-25 13:44:22 +03:30 |
|
|
|
51d79f4fed
|
complete upload file changes in tabsare18 (navgan province manager) cartable
|
2023-12-25 13:43:12 +03:30 |
|
|
|
05c15e3a91
|
complete upload file changes in tabsare18 cartable
|
2023-12-25 13:40:55 +03:30 |
|
AmirHossein Mahmoodi
|
85e42800b0
|
Merge branch 'feature/Amin_sakht_tanafos_period' into 'develop'
Amin sakht tanafos period
See merge request witel-front-end/loan-facilities/expert!123
|
2023-12-25 09:59:32 +00:00 |
|
AmirHossein Mahmoodi
|
aafebe8ec8
|
Merge branch 'develop' into 'feature/Amin_sakht_tanafos_period'
# Conflicts:
# src/components/dashboard/loan-history/index.jsx
|
2023-12-25 09:56:58 +00:00 |
|
|
|
0735b3d59a
|
complete upload file changes in gheimat gozari cartable
|
2023-12-25 11:55:34 +03:30 |
|
|
|
65a1ed2716
|
add sakht and tanafos columns in loan history and sync cartables with backend
|
2023-12-25 11:32:07 +03:30 |
|
Yasiu1376
|
7a08df3150
|
upload image
|
2023-12-24 16:41:20 +03:30 |
|
AmirHossein Mahmoodi
|
f8da988e17
|
Merge tag 'v1.25.6' into develop
v1.25.6
|
2023-12-24 14:35:59 +03:30 |
|
AmirHossein Mahmoodi
|
f379caa3ff
|
Merge branch 'release/v1.25.6'
|
2023-12-24 14:35:44 +03:30 |
|
AmirHossein Mahmoodi
|
0647d02e8f
|
change version
|
2023-12-24 14:35:12 +03:30 |
|
AmirHossein Mahmoodi
|
4a1d7dbf47
|
Merge branch 'feature/Amin_province_loan_history' into 'develop'
add province column and filter
See merge request witel-front-end/loan-facilities/expert!122
|
2023-12-24 11:00:21 +00:00 |
|
|
|
37317469bf
|
delete update row in loan history
|
2023-12-24 14:17:31 +03:30 |
|
|
|
b3f02593f3
|
add province column and filter
|
2023-12-24 13:45:13 +03:30 |
|
|
|
3077ed1d63
|
sync name with back end
|
2023-12-24 11:30:27 +03:30 |
|
Yasiu1376
|
4c3a402920
|
confirmation checkbox
|
2023-12-24 11:19:30 +03:30 |
|
Yasiu1376
|
c73568bee4
|
add upload div
|
2023-12-24 11:14:12 +03:30 |
|
|
|
7639898c3a
|
confirm navgan province manager show tanafos and sakht period
|
2023-12-24 10:52:37 +03:30 |
|
Yasiu1376
|
16bd6d249e
|
confirmation
|
2023-12-24 10:48:33 +03:30 |
|
|
|
6bfaf6f73b
|
confirm transportation assistance show tanafos and sakht period
|
2023-12-24 10:43:43 +03:30 |
|
|
|
7ca32df7d1
|
confirm passenger boss show tanafos and sakht period
|
2023-12-24 10:30:23 +03:30 |
|
|
|
361127bf0c
|
confirm machinary tanafos and sakht period
|
2023-12-24 10:24:05 +03:30 |
|
AmirHossein Mahmoodi
|
bd319992bb
|
Merge tag '1.25.4' into develop
v1.25.4
|
2023-12-20 15:21:01 +03:30 |
|
AmirHossein Mahmoodi
|
6ca0c22168
|
Merge branch 'release/1.25.4'
|
2023-12-20 15:20:49 +03:30 |
|
AmirHossein Mahmoodi
|
47cbc90d3e
|
change version
|
2023-12-20 15:20:24 +03:30 |
|
AmirHossein Mahmoodi
|
4a99933c42
|
fixed bug
|
2023-12-20 15:18:06 +03:30 |
|
AmirHossein Mahmoodi
|
2d22f12dc4
|
change sidebar
|
2023-12-19 12:07:31 +03:30 |
|
AmirHossein Mahmoodi
|
4cc54bf91d
|
change sidebar
|
2023-12-19 12:04:29 +03:30 |
|
AmirHossein Mahmoodi
|
94b1c734e7
|
change titles
|
2023-12-19 11:18:14 +03:30 |
|
