fix proceed button

merge-requests/471/head
Elham Rababh 5 years ago
parent 62b29b4904
commit 616748dc6f

@ -14,8 +14,8 @@ const PACKAGES_PRODUCTS = '/api/products';
const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders'; const PACKAGES_ORDERS = '/api/orders';
const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/'; const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

@ -63,11 +63,11 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
color: Color(0xFFF1F1F1), color: Color(0xFFF1F1F1),
child: Column( child: Column(
children: [ children: [
SelectAddressWidget(model, widget.addresses), SelectAddressWidget(model, widget.addresses,changeMainState),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
SelectPaymentOptionWidget(model), SelectPaymentOptionWidget(model, changeMainState),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -235,4 +235,9 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
), ),
); );
} }
changeMainState(){
setState(() {
});
}
} }

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/payment-checkout-data.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/payment-checkout-data.dart';
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
@ -25,39 +26,35 @@ import 'package:provider/provider.dart';
class SelectAddressWidget extends StatefulWidget { class SelectAddressWidget extends StatefulWidget {
final OrderPreviewViewModel model; final OrderPreviewViewModel model;
final List<Addresses> addresses; final List<Addresses> addresses;
final Function changeMainState;
SelectAddressWidget(this.model, this.addresses); SelectAddressWidget(this.model, this.addresses, this.changeMainState);
@override @override
_SelectAddressWidgetState createState() => _SelectAddressWidgetState(); _SelectAddressWidgetState createState() => _SelectAddressWidgetState();
} }
class _SelectAddressWidgetState extends State<SelectAddressWidget> { class _SelectAddressWidgetState extends State<SelectAddressWidget> {
Addresses address; AddressInfo address;
_navigateToAddressPage() { _navigateToAddressPage() {
Navigator.push(context, FadePage(page: PharmacyAddressesPage())) Navigator.push(context, FadePage(page: PharmacyAddressesPage()))
.then((result) { .then((result) {
if (result != null) { if (result != null) {
address = result; address = result;
widget.model.paymentCheckoutData.address = address; widget.model.paymentCheckoutData.address =
Addresses.fromJson(address.toJson());
widget.model.getInformationsByAddress(); widget.model.getInformationsByAddress();
widget.changeMainState();
} }
/* setState(() {
if (result != null) {
address = result;
widget.model.paymentCheckoutData.address = address;
widget.model.getInformationsByAddress();
}
})*/
}); });
} }
@override @override
void initState() { void initState() {
if (widget.model.paymentCheckoutData.address != null) { if (widget.model.paymentCheckoutData.address != null) {
address = widget.model.paymentCheckoutData.address; address = AddressInfo.fromJson(
widget.model.paymentCheckoutData.address.toJson());
} }
super.initState(); super.initState();
} }

@ -24,8 +24,9 @@ import 'package:provider/provider.dart';
class SelectPaymentOptionWidget extends StatefulWidget { class SelectPaymentOptionWidget extends StatefulWidget {
final OrderPreviewViewModel model; final OrderPreviewViewModel model;
final Function changeMainState;
SelectPaymentOptionWidget(this.model); SelectPaymentOptionWidget(this.model, this.changeMainState);
@override @override
_SelectPaymentOptionWidgetState createState() => _SelectPaymentOptionWidgetState createState() =>
@ -44,6 +45,7 @@ class _SelectPaymentOptionWidgetState extends State<SelectPaymentOptionWidget> {
widget.model.paymentCheckoutData.paymentOption = widget.model.paymentCheckoutData.paymentOption =
paymentOption; paymentOption;
} }
widget.changeMainState();
}) })
}); });
} }

Loading…
Cancel
Save