 Sikander Saleem
|
64fbf46b82
|
Merge branch 'refs/heads/design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/modules/loan_module/pages/loan_equipment_detail_page.dart
# lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
# lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
# lib/new_views/pages/land_page/my_request/my_requests_page.dart
|
9 months ago |
|
Sikander Saleem
|
edcc1471a1
|
request info added.
|
9 months ago |
|
Sikander Saleem
|
16b71e1685
|
site switch bug fixed
|
9 months ago |
|
Sikander Saleem
|
c81d3181d2
|
acknowledgment added for demo request creation.
|
9 months ago |
|
Sikander Saleem
|
17dc2a7809
|
bottom nav padding added.
|
9 months ago |
|
Sikander Saleem
|
4b44a41598
|
demo request cancellation added.
|
9 months ago |
|
Sikander Saleem
|
af1680e575
|
end user status added.
|
9 months ago |
|
Sikander Saleem
|
31a9296a8e
|
improvements
|
9 months ago |
|
Sikander Saleem
|
2997eef5ad
|
chat sync fixes.
|
9 months ago |
|
Sikander Saleem
|
df8d22f792
|
chat employee id changes.
|
9 months ago |
|
Sikander Saleem
|
f6a433ca09
|
Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
9 months ago |
|
Sikander Saleem
|
ce873d99a5
|
Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
9 months ago |
|
Sikander Saleem
|
35e494863f
|
Merge branch 'design_3.0_cx_module' into design_3.0_loan_module
|
9 months ago |
|
Sikander Saleem
|
450128b26f
|
Merge branch 'design_3.0_traf_module' into design_3.0_cx_module
|
9 months ago |
|
Sikander Saleem
|
b20f42848b
|
supplier attachment, extend demo period and submit evaluation.
|
9 months ago |
|
Sikander Saleem
|
1a2845337b
|
improvements
|
9 months ago |
|
Sikander Saleem
|
8b2e47df09
|
check request type is new, user can change the quantity, improvement.
|
9 months ago |
 WaseemAbbasi22
|
1df25cc9dd
|
validation added for forms
|
9 months ago |
|
WaseemAbbasi22
|
42677a72b3
|
improvements
|
10 months ago |
|
Sikander Saleem
|
8f2e9db062
|
existing loan check api added.
|
10 months ago |
|
WaseemAbbasi22
|
60051af331
|
Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/modules/demo_module/create_demo_request_page.dart
# lib/modules/demo_module/demo_provider.dart
|
10 months ago |
|
WaseemAbbasi22
|
1e158e8bd4
|
update form changed
|
10 months ago |
|
Sikander Saleem
|
4e56746e88
|
evaluation form added-1.
|
10 months ago |
|
Sikander Saleem
|
cea77ff7f7
|
evaluation form added.
|
10 months ago |
|
Sikander Saleem
|
3372f7d38d
|
demo attachment document type added.
|
10 months ago |
|
Sikander Saleem
|
5a5995306b
|
improvement.
|
10 months ago |
|
WaseemAbbasi22
|
3d77a96fda
|
added vendor dropdown along with free text
|
10 months ago |
|
WaseemAbbasi22
|
afa165dc3d
|
added vendor dropdown along with free text
|
10 months ago |
|
WaseemAbbasi22
|
63efb3fae0
|
change vendor details from dropdown to free text
|
10 months ago |
|
WaseemAbbasi22
|
1f3c0bad97
|
Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
# lib/modules/cm_module/cm_detail_page.dart
|
10 months ago |
|
WaseemAbbasi22
|
20b362142c
|
bug fixes
|
10 months ago |
|
WaseemAbbasi22
|
7c8855c423
|
bug fixes
|
10 months ago |
|
WaseemAbbasi22
|
5d856fc46b
|
improvements
|
10 months ago |
|
WaseemAbbasi22
|
d13e9d0439
|
Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module
|
10 months ago |
|
WaseemAbbasi22
|
9704c26af9
|
confirmation dialoge added for cancel request
|
10 months ago |
|
WaseemAbbasi22
|
e0ed594072
|
API's implemented
|
10 months ago |
|
Sikander Saleem
|
e544fc640e
|
add 0 in gas refill
|
10 months ago |
|
WaseemAbbasi22
|
56252716b3
|
Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
|
10 months ago |
|
Sikander Saleem
|
9b00c0c158
|
improvements
|
10 months ago |
|
WaseemAbbasi22
|
bf4d2a3257
|
Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module
|
10 months ago |
|
WaseemAbbasi22
|
0908cda2b0
|
Ui improvement and delivery inspection new apis implemented
|
10 months ago |
|
Sikander Saleem
|
9eaae96c84
|
Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.dart
# lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
# lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
# lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
|
10 months ago |
|
Sikander Saleem
|
178309eb1e
|
Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.dart
# lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
# lib/new_views/pages/land_page/my_request/my_requests_page.dart
|
10 months ago |
|
Sikander Saleem
|
da85a2b639
|
Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
10 months ago |
|
Sikander Saleem
|
4bd055cfe8
|
merge conflict resolved.
|
10 months ago |
|
Sikander Saleem
|
48b4b5e368
|
Merge branch 'design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
# lib/controllers/notification/firebase_notification_manger.dart
# lib/modules/cm_module/cm_detail_page.dart
# lib/modules/cx_module/chat/chat_widget.dart
# lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
# lib/new_views/pages/land_page/requests/service_request_item_view.dart
# lib/views/pages/user/requests/pending_requests_screen.dart
|
10 months ago |
|
WaseemAbbasi22
|
bff132ec6b
|
API implementation inprogress
|
10 months ago |
|
WaseemAbbasi22
|
a0a084803d
|
UI improvements
|
10 months ago |
|
WaseemAbbasi22
|
73ee12cba4
|
Atoms-1743,1745,1748 fixes
|
10 months ago |
|
WaseemAbbasi22
|
415bdf18f1
|
improvements
|
10 months ago |