Merge branch 'nov_fixes' into 'development_new_design_2.0'

fix cart order page

See merge request Cloud_Solution/diplomatic-quarter!515
merge-update-with-lab-changes
haroon amjad 4 years ago
commit f533dd5356

@ -68,25 +68,26 @@ class OrderPreviewViewModel extends BaseViewModel {
} }
Future<ShoppingCartResponse> changeProductQuantity(ShoppingCart product) async { Future<ShoppingCartResponse> changeProductQuantity(ShoppingCart product) async {
setState(ViewState.Busy); setState(ViewState.BusyLocal);
var resp = await _orderService.changeProductQuantity(product.id, product); var resp = await _orderService.changeProductQuantity(product.id, product);
var object = _handleGetShoppingCartResponse(resp);
if (_orderService.hasError) { if (_orderService.hasError) {
error = _orderService.error; error = _orderService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
var object = _handleGetShoppingCartResponse(resp);
setState(ViewState.Idle); setState(ViewState.Idle);
} }
return object; // return object;
} }
Future<ShoppingCartResponse> deleteProduct(ShoppingCart product) async { Future<ShoppingCartResponse> deleteProduct(ShoppingCart product) async {
setState(ViewState.Busy); setState(ViewState.BusyLocal);
var resp = await _orderService.deleteProduct(product.id); var resp = await _orderService.deleteProduct(product.id);
var object = _handleGetShoppingCartResponse(resp); var object = _handleGetShoppingCartResponse(resp);
if (_orderService.hasError) { if (_orderService.hasError) {
error = _orderService.error; error = _orderService.error;
setState(ViewState.Error); setState(ViewState.ErrorLocal);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
} }

@ -57,7 +57,7 @@ class _CartOrderPageState extends State<CartOrderPage> {
isMainPharmacyPages: true, isMainPharmacyPages: true,
showPharmacyCart: false, showPharmacyCart: false,
baseViewModel: model, baseViewModel: model,
backButtonTab: (){ backButtonTab: () {
widget.changeTab(0); widget.changeTab(0);
}, },
backgroundColor: Colors.white, backgroundColor: Colors.white,
@ -99,32 +99,34 @@ class _CartOrderPageState extends State<CartOrderPage> {
: 0, : 0,
(index) => ProductOrderItem( (index) => ProductOrderItem(
model.cartResponse model.cartResponse
.shoppingCarts[index], () { .shoppingCarts[index], () async {
print(model.cartResponse GifLoaderDialogUtils.showMyDialog(
.shoppingCarts[index].quantity); context);
model await model.changeProductQuantity(model
.changeProductQuantity(model .cartResponse.shoppingCarts[index]);
.cartResponse if (model.state != ViewState.Error) {
// appScaffold.appBar.badgeUpdater(
// '${value.quantityCount ?? 0}');
}
if (model.state ==
ViewState.ErrorLocal) {
Utils.showErrorToast(model.error);
}
GifLoaderDialogUtils.hideDialog(
context);
}, () async {
GifLoaderDialogUtils.showMyDialog(
context);
await model
.deleteProduct(model.cartResponse
.shoppingCarts[index]) .shoppingCarts[index])
.then((value) { .then((value) {
if (model.state != ViewState.Error) {
// appScaffold.appBar.badgeUpdater(
// '${value.quantityCount ?? 0}');
}
if (model.state == if (model.state ==
ViewState.ErrorLocal) { ViewState.ErrorLocal) {
Utils.showErrorToast(model.error); Utils.showErrorToast(model.error);
} }
}); GifLoaderDialogUtils.hideDialog(
}, () { context);
model
.deleteProduct(model.cartResponse
.shoppingCarts[index])
.then((value) {
if (model.state != ViewState.Error) {
// appScaffold.appBar.badgeUpdater(
// '${value.quantityCount ?? 0}');
}
}); });
})) }))
], ],
@ -254,7 +256,7 @@ class _CartOrderPageState extends State<CartOrderPage> {
? height * 0.15 ? height * 0.15
: 0, : 0,
color: Colors.white, color: Colors.white,
child: OrderBottomWidget(model.addresses, height, model), child: OrderBottomWidget(model.addresses, height, model, isLoading),
), ),
); );
} }
@ -272,8 +274,9 @@ class OrderBottomWidget extends StatefulWidget {
final List<Addresses> addresses; final List<Addresses> addresses;
final double height; final double height;
final OrderPreviewViewModel model; final OrderPreviewViewModel model;
final bool isLoading;
OrderBottomWidget(this.addresses, this.height, this.model); OrderBottomWidget(this.addresses, this.height, this.model, this.isLoading);
@override @override
_OrderBottomWidgetState createState() => _OrderBottomWidgetState(); _OrderBottomWidgetState createState() => _OrderBottomWidgetState();
@ -286,7 +289,7 @@ class _OrderBottomWidgetState extends State<OrderBottomWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectProvider = Provider.of(context); ProjectViewModel projectProvider = Provider.of(context);
return !(widget.model.cartResponse.shoppingCarts == null || return ! widget.isLoading && !(widget.model.cartResponse.shoppingCarts == null ||
widget.model.cartResponse.shoppingCarts.length == 0) widget.model.cartResponse.shoppingCarts.length == 0)
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

Loading…
Cancel
Save