merge-update-with-lab-changes
haroon amjad 4 years ago
parent fb6183a48b
commit 777d88be30

@ -76,7 +76,7 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
children: [
PharmacyPage(),
PharmacyCategorisePage(),
PharmacyProfilePage(),
PharmacyProfilePage(moveToOrder: false),
CartOrderPage(changeTab: changeCurrentTab),
],
),

@ -1009,11 +1009,7 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
children: <Widget>[
InkWell(
onTap: () {
Navigator.push(context, FadePage(page: OrderDetailsPage(orderModel: cancelledOrderList[index]))).then((value) {
model.getOrder(widget.customerID, widget.customerGUID, pageID).then((value) {
getCancelledOrder(model);
});
});
Navigator.push(context, FadePage(page: OrderDetailsPage(orderModel: cancelledOrderList[index])));
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,

@ -29,6 +29,10 @@ import 'package:flutter_svg/flutter_svg.dart';
dynamic languageID;
class PharmacyProfilePage extends StatefulWidget {
final bool moveToOrder;
PharmacyProfilePage({@required this.moveToOrder});
@override
_ProfilePageState createState() => _ProfilePageState();
}
@ -89,17 +93,20 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
getLanguageID();
super.initState();
getUser();
if (widget.moveToOrder) {
Navigator.push(context, FadePage(page: OrderPage(customerID: customerId, customerGUID: customerGUID)));
}
}
@override
Widget build(BuildContext context) {
return BaseView<OrderModelViewModel>(
onModelReady: (model) async {
var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
var customerGUID = await sharedPref.getObject(PHARMACY_CUSTOMER_GUID);
GifLoaderDialogUtils.showMyDialog(context);
model.getOrder(customerId, customerGUID, page_id);
GifLoaderDialogUtils.hideDialog(context);
// var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
// var customerGUID = await sharedPref.getObject(PHARMACY_CUSTOMER_GUID);
// GifLoaderDialogUtils.showMyDialog(context);
// model.getOrder(customerId, customerGUID, page_id);
// GifLoaderDialogUtils.hideDialog(context);
},
builder: (_, model, wi) => AppScaffold(
appBarTitle: TranslationBase.of(context).myAccount,
@ -220,9 +227,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
Text(
TranslationBase.of(context).lakum,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 13.0, fontWeight: FontWeight.bold),
),
],
),
@ -231,8 +236,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: WishlistPage()));
Navigator.push(context, FadePage(page: WishlistPage()));
},
child: Column(
children: <Widget>[
@ -258,8 +262,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: MyReviewsPage()));
Navigator.push(context, FadePage(page: MyReviewsPage()));
},
child: Column(
children: <Widget>[
@ -304,9 +307,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
children: <Widget>[
Text(
TranslationBase.of(context).myAccount,
style: TextStyle(
fontSize: 16.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 10,
@ -317,10 +318,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: HomePrescriptionsPage()));
Navigator.push(context, FadePage(page: HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
@ -333,8 +331,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 15,
),
Text(
TranslationBase.of(context)
.myPrescription,
TranslationBase.of(context).myPrescription,
style: TextStyle(
fontSize: 13.0,
),
@ -351,15 +348,11 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: ComparePage()));
Navigator.push(context, FadePage(page: ComparePage()));
},
child: Row(
children: <Widget>[
Image.asset(
'assets/images/pharmacy/compare.png',
width: 35,
height: 35),
Image.asset('assets/images/pharmacy/compare.png', width: 35, height: 35),
SizedBox(
width: 15,
),
@ -381,10 +374,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: HomePrescriptionsPage()));
Navigator.push(context, FadePage(page: HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
@ -397,8 +387,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.medicationsRefill,
TranslationBase.of(context).medicationsRefill,
style: TextStyle(
fontSize: 13.0,
),
@ -415,8 +404,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: MyFamily()));
Navigator.push(context, FadePage(page: MyFamily()));
},
child: Row(
children: <Widget>[
@ -446,10 +434,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PharmacyAddressesPage()));
Navigator.push(context, FadePage(page: PharmacyAddressesPage()));
},
child: Row(
children: <Widget>[
@ -462,8 +447,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.shippingAddresses,
TranslationBase.of(context).shippingAddresses,
style: TextStyle(
fontSize: 13.0,
),
@ -480,10 +464,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PharmacyTermsConditions()));
Navigator.push(context, FadePage(page: PharmacyTermsConditions()));
},
child: Row(
children: <Widget>[
@ -496,8 +477,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 10,
),
Text(
TranslationBase.of(context)
.conditionsHMG,
TranslationBase.of(context).conditionsHMG,
style: TextStyle(
fontSize: 13.0,
),
@ -514,15 +494,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: LakumTermsConditions(
this.identificationNo,
this.firstName,
this.lastName,
this.mobileNo,
this.languageId)));
Navigator.push(context, FadePage(page: LakumTermsConditions(this.identificationNo, this.firstName, this.lastName, this.mobileNo, this.languageId)));
},
child: Row(
children: <Widget>[
@ -537,8 +509,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 10,
),
Text(
TranslationBase.of(context)
.conditions,
TranslationBase.of(context).conditions,
style: TextStyle(
fontSize: 13.0,
),
@ -569,9 +540,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
children: <Widget>[
Text(
TranslationBase.of(context).reachUs,
style: TextStyle(
fontSize: 16.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 5,
@ -582,8 +551,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: LiveChatPage()));
Navigator.push(context, FadePage(page: LiveChatPage()));
},
child: Row(
children: <Widget>[
@ -611,8 +579,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: FindUsPage()));
Navigator.push(context, FadePage(page: FindUsPage()));
},
child: Row(
children: <Widget>[
@ -625,8 +592,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.ourLocations,
TranslationBase.of(context).ourLocations,
style: TextStyle(fontSize: 13.0),
),
],

@ -58,8 +58,8 @@ class ProductDetailService extends BaseService {
_stockAvailability = response['products'][0]['stock_availability'];
_stockAvailabilityn = response['products'][0]['stock_availabilityn'];
// _isStockAvailable = response['products'][0]['IsStockAvailable'];
_isStockAvailable = _stockAvailability == "In stock" ? true : false;
_isStockAvailable = response['products'][0]['IsStockAvailable'];
// _isStockAvailable = _stockAvailability == "In stock" ? true : false;
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;

Loading…
Cancel
Save