Commit Graph

546 Commits

Author SHA1 Message Date
AmirHossein Mahmoodi
6a5fad9ef8 Merge tag 'v1.27.9' into develop
v1.27.9
2024-01-06 14:45:11 +03:30
AmirHossein Mahmoodi
62359c8cee Merge branch 'release/v1.27.9' 2024-01-06 14:44:31 +03:30
AmirHossein Mahmoodi
1d35abd063 change version 2024-01-06 14:43:18 +03:30
AmirHossein Mahmoodi
2ba8911591 Merge tag 'v1.27.8' into develop
v1.27.8
2024-01-06 14:27:26 +03:30
AmirHossein Mahmoodi
c5ee394545 Merge branch 'release/v1.27.8' 2024-01-06 14:27:15 +03:30
AmirHossein Mahmoodi
c962b6d49e change version 2024-01-06 14:26:41 +03:30
AmirHossein Mahmoodi
e9aa69530c Merge branch 'feature/amin_statement_count' into 'develop'
add statement count column in data table

See merge request witel-front-end/loan-facilities/expert!136
2024-01-06 10:55:47 +00:00
7b9dcbea00 add statement count coloumn in data table 2024-01-06 13:55:24 +03:30
AmirHossein Mahmoodi
9ed3e1a8b0 Merge tag 'v1.26.8' into develop
v1.26.8
2024-01-06 11:46:26 +03:30
AmirHossein Mahmoodi
26c9572812 Merge branch 'release/v1.26.8' 2024-01-06 11:46:03 +03:30
AmirHossein Mahmoodi
809ef44832 change version 2024-01-06 11:43:47 +03:30
AmirHossein Mahmoodi
33d6f20e46 Merge branch 'develop' of https://gitlab.com/witel-front-end/loan-facilities/expert into develop 2024-01-03 10:23:14 +03:30
AmirHossein Mahmoodi
c1a586bb34 fixed bug 2024-01-03 10:23:00 +03:30
AmirHossein Mahmoodi
3475273f38 Merge branch 'feature/yasi_remove_number_ranje' into 'develop'
remove number ranje

See merge request witel-front-end/loan-facilities/expert!135
2024-01-02 11:07:14 +00:00
AmirHossein Mahmoodi
4c3e9335be Merge branch 'feature/Amin_columns_rebuild' into 'develop'
add score manufacture capacity columns in tables and restyle all table

See merge request witel-front-end/loan-facilities/expert!134
2024-01-02 11:04:48 +00:00
Yasiu1376
68c82291d4 remove number ranje 2024-01-02 14:34:36 +03:30
a2c19a86df add score manufacture capacity columns in tables and restyle all table 2024-01-02 14:21:01 +03:30
AmirHossein Mahmoodi
b4298dc9a3 Merge branch 'feature/amount_unit_debugging' into 'develop'
Mohammad - Feature/amount unit debugging

See merge request witel-front-end/loan-facilities/expert!133
2024-01-02 08:45:13 +00:00
ed60c6c3f5 add refresh data button to tables 2024-01-02 11:56:19 +03:30
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