diff --git a/lib/config/config.dart b/lib/config/config.dart index 229865e1..75de78f4 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -543,7 +543,7 @@ const GET_CUSTOMERS_ADDRESSES = "Customers/"; const SUBSCRIBE_PRODUCT = "subscribe?"; const GET_ORDER = "orders?"; const GET_ORDER_DETAILS = "orders/"; -const ADD_CUSTOMER_ADDRESS = "epharmacy/api/addcustomeraddress"; +const ADD_CUSTOMER_ADDRESS = "addcustomeraddress"; const EDIT_CUSTOMER_ADDRESS = "epharmacy/api/editcustomeraddress"; const DELETE_CUSTOMER_ADDRESS = "epharmacy/api/deletecustomeraddress"; const GET_ADDRESS = "Customers/"; diff --git a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart b/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart index 524501e1..9d096053 100644 --- a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart +++ b/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart @@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/pages/pharmacies/widgets/ProductOrderItem.d import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; +import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/buttons/GestureIconButton.dart'; @@ -20,6 +21,7 @@ import 'package:flutter/material.dart'; import 'package:http/http.dart'; import 'package:provider/provider.dart'; +import '../../../../locator.dart'; import 'cart-order-preview.dart'; class CartOrderPage extends StatefulWidget { @@ -55,6 +57,9 @@ class _CartOrderPageState extends State { isMainPharmacyPages: true, showPharmacyCart: false, baseViewModel: model, + backButtonTab: (){ + widget.changeTab(0); + }, backgroundColor: Colors.white, body: NetworkBaseView( isLoading: isLoading, diff --git a/pubspec.yaml b/pubspec.yaml index 57c417a8..73c9cea9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,7 +43,7 @@ dependencies: flutter_html: ^1.2.0 # Pagnation - pull_to_refresh: ^1.6.2 + pull_to_refresh: 1.6.2 # Native flutter_device_type: ^0.2.0