diff --git a/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart index 338fe87e..85bc7cb8 100644 --- a/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart +++ b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart @@ -48,7 +48,7 @@ class _PharmacyAddressesState extends State { return BaseView( onModelReady: (model) => model.getAddressesList(), builder: (_, model, wi) => AppScaffold( - appBarTitle: TranslationBase.of(context).changeAddress, + appBarTitle: widget.isUpdate?TranslationBase.of(context).changeAddress:"Add Address", isShowAppBar: true, isPharmacy: true, baseViewModel: model, @@ -66,11 +66,6 @@ class _PharmacyAddressesState extends State { () { setState(() { model.setSelectedAddressIndex(index); - //TODO Elham* - widget.orderPreviewViewModel.paymentCheckoutData - .address = - Addresses.fromJson( - model.addresses[index].toJson()); }); }, model.selectedAddressIndex == index, @@ -127,6 +122,11 @@ class _PharmacyAddressesState extends State { fontSize: 14, vPadding: 8, handler: () { + //TODO Elham* + widget.orderPreviewViewModel.paymentCheckoutData + .address = + Addresses.fromJson( + model.addresses[model.selectedAddressIndex].toJson()); model.saveSelectedAddressLocally( model.addresses[model.selectedAddressIndex]); _navigateToPaymentOption(model);