Commit Graph

277 Commits (267a4445d1925dcbe7d751fefe1e71bc747ffa4b)

Author SHA1 Message Date
Sikander Saleem f6a433ca09 Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
8 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
8 months ago
Sikander Saleem 35e494863f Merge branch 'design_3.0_cx_module' into design_3.0_loan_module 8 months ago
Sikander Saleem 450128b26f Merge branch 'design_3.0_traf_module' into design_3.0_cx_module 8 months ago
Sikander Saleem 8b2e47df09 check request type is new, user can change the quantity, improvement. 8 months ago
WaseemAbbasi22 1df25cc9dd validation added for forms 8 months ago
Sikander Saleem 8f2e9db062 existing loan check api added. 8 months ago
Sikander Saleem 5a5995306b improvement. 8 months ago
WaseemAbbasi22 3d77a96fda added vendor dropdown along with free text 8 months ago
WaseemAbbasi22 afa165dc3d added vendor dropdown along with free text 8 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
8 months ago
WaseemAbbasi22 20b362142c bug fixes 8 months ago
WaseemAbbasi22 7c8855c423 bug fixes 8 months ago
WaseemAbbasi22 d13e9d0439 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 8 months ago
WaseemAbbasi22 9704c26af9 confirmation dialoge added for cancel request 8 months ago
Sikander Saleem e544fc640e add 0 in gas refill 9 months ago
Sikander Saleem 9b00c0c158 improvements 9 months ago
WaseemAbbasi22 bf4d2a3257 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 9 months ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 9 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
9 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
9 months ago
Sikander Saleem 4bd055cfe8 merge conflict resolved. 9 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
9 months ago
WaseemAbbasi22 a0a084803d UI improvements 9 months ago
WaseemAbbasi22 73ee12cba4 Atoms-1743,1745,1748 fixes 9 months ago
WaseemAbbasi22 415bdf18f1 improvements 9 months ago
Sikander Saleem b78d10af46 current user employee id for chat. 9 months ago
WaseemAbbasi22 1c86fe71a2 improvements and added modifiedBy details 9 months ago
WaseemAbbasi22 ac50236aa2 bugs fixes 9 months ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 9 months ago
WaseemAbbasi22 3944a549b2 requested changes done 9 months ago
WaseemAbbasi22 bfb2685c55 added form design for installation and pullout, handle pullout type task and other improvements 9 months ago
WaseemAbbasi22 4f9f76515d added form design for installation and pullout, handle pullout type task and other improvements 9 months ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 9 months ago
WaseemAbbasi22 e598f3b5ad chat bug fixes 9 months ago
Sikander Saleem af6ae868d7 improvements 9 months ago
WaseemAbbasi22 d57348dd92 bug fixes for site and department previously it was showing all sites not related to that specif user 9 months ago
WaseemAbbasi22 e303b4e099 chat bug fixes 9 months ago
WaseemAbbasi22 66b77c51a6 loan site bug fixes 9 months ago
WaseemAbbasi22 077095502e chat count implemented 9 months ago
WaseemAbbasi22 2425c78cf9 chat count implemented 9 months ago
Sikander Saleem ab6b143763 improvements 9 months ago
Sikander Saleem 9f670d4a0b Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
9 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 9 months ago
Sikander Saleem a7c206e6f4 chat notification redirection added. 9 months ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 9 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 10 months ago
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 10 months ago
Sikander Saleem 1ebd6f2fbc Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/providers/api/all_requests_provider.dart
10 months ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 10 months ago