diff --git a/lib/core/service/orders_service.dart b/lib/core/service/orders_service.dart index 5af7599..8b9ebee 100644 --- a/lib/core/service/orders_service.dart +++ b/lib/core/service/orders_service.dart @@ -39,9 +39,7 @@ class OrdersService extends BaseService { } } - Future insertOrder() async { - ScanQrRequestModel _scanQrRequestModel = - ScanQrRequestModel(deliveryOrderID: 1200, groupID: 0); + Future insertOrder(ScanQrRequestModel _scanQrRequestModel) async { hasError = false; try { await baseAppClient.post(SCAN_QR, diff --git a/lib/core/viewModels/orders_view_model.dart b/lib/core/viewModels/orders_view_model.dart index b526f16..9a367ad 100644 --- a/lib/core/viewModels/orders_view_model.dart +++ b/lib/core/viewModels/orders_view_model.dart @@ -1,6 +1,7 @@ import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/model/orders/pending_orders_res_model.dart'; import 'package:driverapp/core/model/orders/update_order_status_request_model.dart'; +import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart'; import 'package:driverapp/core/service/orders_service.dart'; import '../../locator.dart'; @@ -22,9 +23,9 @@ class OrdersViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future insertOrder() async { + Future insertOrder(ScanQrRequestModel _scanQrRequestModel) async { setState(ViewState.ErrorLocal); - await _OrdersService.insertOrder(); + await _OrdersService.insertOrder(_scanQrRequestModel); if (_OrdersService.hasError) { error = _OrdersService.error; setState(ViewState.ErrorLocal); @@ -32,7 +33,6 @@ class OrdersViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future updateOrderStatus( UpdateOrderStatusRequestModel updateOrderStatusRequestModel) async { setState(ViewState.BusyLocal); diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 33781a2..22d28e1 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -1,5 +1,6 @@ import 'package:barcode_scan/platform_wrapper.dart'; import 'package:driverapp/core/enum/viewstate.dart'; +import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/pages/delivery/information_page.dart'; import 'package:driverapp/pages/orders/pending_orders_page.dart'; @@ -493,8 +494,10 @@ class _DashboardScreenState extends State { var result = await BarcodeScanner.scan(); // if (result.rawContent == "") { List listOfParams = result.rawContent.split(','); + ScanQrRequestModel _scanQrRequestModel = ScanQrRequestModel( + deliveryOrderID: int.parse(listOfParams[0]), groupID: 0); String patientType = "1"; - await model.insertOrder(); + await model.insertOrder(_scanQrRequestModel); if (model.state == ViewState.ErrorLocal) { Utils.showErrorToast(model.error); } else {