Merge branch 'fix_some_issue' into 'master'

ES-185:Handel no item in the list

See merge request Cloud_Solution/driver-app!127

lib/pages/delivery/delivery_confirmed_page.dart

@@ -4,6 +4,7 @@ import 'package:driverapp/core/model/orders/next_order_request_model.dart';
 import 'package:driverapp/core/model/orders/pending_orders_res_model.dart';
 import 'package:driverapp/core/viewModels/orders_view_model.dart';
 import 'package:driverapp/pages/base/base_view.dart';
+import 'package:driverapp/root_page.dart';
 import 'package:driverapp/uitl/utils.dart';
 import 'package:driverapp/widgets/buttons/secondary_button.dart';
 import 'package:driverapp/widgets/delivery/customer_brief_card.dart';
@@ -221,6 +222,12 @@ class DeliveryConfirmedPage extends StatelessWidget {
     } else {
       if (model.nextOrdersList != null && model.nextOrdersList.length == 0) {
         Utils.showErrorToast("No Items in the list");
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(
+            builder: (context) => RootPage(),
+          ),
+        );
       } else {
         Navigator.pushReplacement(
           context,

lib/widgets/order/order_info_card.dart

@@ -124,7 +124,8 @@ class OrderInfoCard extends StatelessWidget {
                           backgroundColor:
                               order.statusID == 2 ? Colors.green : Colors.red,
                           child: Padding(
-                            padding: const EdgeInsets.all(5.0),
+                            padding: const EdgeInsets.symmetric(
+                                vertical: 5, horizontal: 15),
                             child: Text(
                               order.description,
                               style: TextStyle(