Merge branch 'design_changes' into 'development'

Design changes

See merge request Cloud_Solution/driver-app!73
logut
Elham 6 years ago
commit bc08e1c821

@ -6,12 +6,13 @@ import 'package:driverapp/core/model/orders/update_order_status_request_model.da
import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart'; import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart';
import 'package:driverapp/core/service/base_service.dart'; import 'package:driverapp/core/service/base_service.dart';
import 'package:driverapp/core/model/orders/deliverd_order_req_model.dart'; import 'package:driverapp/core/model/orders/deliverd_order_req_model.dart';
import 'package:driverapp/uitl/utils.dart';
import 'package:location/location.dart';
class OrdersService extends BaseService { class OrdersService extends BaseService {
List<PendingOrdersRes> _orders = List(); List<PendingOrdersRes> _orders = List();
List<PendingOrdersRes> _nextOrdersList = List(); List<PendingOrdersRes> _nextOrdersList = List();
List<DeliverdOrderModel> _deliverdOrderList = List(); List<DeliverdOrderModel> _deliverdOrderList = List();
List<PendingOrdersRes> get orders => _orders; List<PendingOrdersRes> get orders => _orders;
List<DeliverdOrderModel> get deliverdOrderList => _deliverdOrderList; List<DeliverdOrderModel> get deliverdOrderList => _deliverdOrderList;
@ -19,13 +20,6 @@ class OrdersService extends BaseService {
bool isOrderInserted; bool isOrderInserted;
bool isOrderStatusUpdated; bool isOrderStatusUpdated;
PendingOrders _requestGetPendingOrders = PendingOrders(
searchKey: "",
pageSize: 0,
pageIndex: 0,
latitude: "24.640000",
longitude: "46.753000",
);
DeliverdOrderModel _requestGetDeliverdOrders = DeliverdOrderModel( DeliverdOrderModel _requestGetDeliverdOrders = DeliverdOrderModel(
searchKey: "", searchKey: "",
pageSize: 0, pageSize: 0,
@ -35,6 +29,14 @@ class OrdersService extends BaseService {
); );
Future getPendingOrders() async { Future getPendingOrders() async {
LocationData loc = await Utils.getLocation();
PendingOrders _requestGetPendingOrders = PendingOrders(
searchKey: "",
pageSize: 0,
pageIndex: 0,
latitude: loc.latitude.toString(),
longitude: loc.longitude.toString(),
);
hasError = false; hasError = false;
try { try {
await baseAppClient.post(GET_ALL_ORDERS, await baseAppClient.post(GET_ALL_ORDERS,
@ -110,6 +112,14 @@ class OrdersService extends BaseService {
} }
Future getDeliverdList() async { Future getDeliverdList() async {
LocationData loc = await Utils.getLocation();
PendingOrders _requestGetPendingOrders = PendingOrders(
searchKey: "",
pageSize: 0,
pageIndex: 0,
latitude: loc.latitude.toString(),
longitude: loc.longitude.toString(),
);
hasError = false; hasError = false;
try { try {
await baseAppClient.post(GET_ALL_DELIVERD_ORDER, await baseAppClient.post(GET_ALL_DELIVERD_ORDER,

File diff suppressed because one or more lines are too long

@ -1,6 +1,6 @@
import 'package:driverapp/widgets/data_display/circle-container.dart'; import 'package:driverapp/widgets/data_display/circle-container.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:driverapp/config/size_config.dart';
import '../../uitl/date_uitl.dart'; import '../../uitl/date_uitl.dart';
import '../../uitl/translations_delegate_base.dart'; import '../../uitl/translations_delegate_base.dart';
@ -36,9 +36,9 @@ class CustomerBriefCard extends StatelessWidget {
return Center( return Center(
child: Container( child: Container(
width: MediaQuery.of(context).orientation == Orientation.landscape width: MediaQuery.of(context).orientation == Orientation.landscape
? 580 ? SizeConfig.widthMultiplier * 125.0
: 370, : SizeConfig.widthMultiplier * 90.0,
height: 270, height: 290,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(

Loading…
Cancel
Save