Merge branch 'pharmacy_fix' into 'development'

Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!407
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 361b72624b

@ -19,7 +19,10 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/pharmacy/my_account_items.dart';
import 'package:diplomaticquarterapp/widgets/pharmacy/my_account_services.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
@ -98,7 +101,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
isPharmacy: true, isPharmacy: true,
body: user != null body: user != null
? Container( ? Container(
color: Colors.white, color: Colors.white,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@ -108,47 +111,56 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Container( Container(
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Container( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.symmetric(
top: 20.0, horizontal: 15.0, vertical: 8.0),
left: 10.0, child: Container(
right: 10.0, padding: EdgeInsets.only(
bottom: 10.0, top: 20.0,
), left: 10.0,
child: LargeAvatar( right: 10.0,
name: user.firstName.toString(), bottom: 10.0,
url: '', ),
child: LargeAvatar(
radius: 55.0,
name: user.firstName.toString(),
url:
'https://thumbs.dreamstime.com/b/default-avatar-profile-vector-user-profile-default-avatar-profile-vector-user-profile-profile-179376714.jpg',
),
), ),
), ),
Column(children: <Widget>[ Column(
Row(children: <Widget>[ crossAxisAlignment:
Text( CrossAxisAlignment.start,
TranslationBase.of(context) children: <Widget>[
.welcome, Row(children: <Widget>[
style: TextStyle( Texts(
fontSize: 14.0, TranslationBase.of(context)
.welcome,
fontSize: 16.0,
),
]),
SizedBox(
height: 5.0,
),
Row(children: <Widget>[
Texts(
languageID == "ar"
? user.firstNameN
.toString() +
" " +
user.lastNameN
.toString()
: user.firstName
.toString() +
" " +
user.lastName
.toString(),
fontSize: 17.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.grey), ),
), ]),
]), ]),
SizedBox(
height: 10,
),
Row(children: <Widget>[
Text(
languageID == "ar"
? user.firstNameN.toString() +
" " +
user.lastNameN.toString()
: user.firstName.toString() +
" " +
user.lastName.toString(),
style: TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.bold),
),
]),
]),
], ],
), ),
) )
@ -168,125 +180,53 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Container( Container(
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( AccountServices(
child: InkWell( title: TranslationBase.of(context).orders,
onTap: () { serviceImage:
if (customerId == null) { 'assets/images/pharmacy/orders_icon.svg',
AppToast.showErrorToast( onTap: () {
message: "Customer not found"); if (customerId == null) {
return; AppToast.showErrorToast(
} message: "Customer not found");
Navigator.push( return;
context, }
FadePage( Navigator.push(
page: OrderPage( context,
customerID: customerId))); FadePage(
}, page: OrderPage(
child: Column( customerID: customerId)));
children: <Widget>[ },
// Image(image: AssetImage('assets/images/pharmacy/orders_icon.svg')),
SvgPicture.asset(
'assets/images/pharmacy/orders_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).orders,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
),
),
), ),
Expanded( AccountServices(
child: InkWell( title: TranslationBase.of(context).lakum,
onTap: () { serviceImage:
Navigator.push(context, 'assets/images/pharmacy/lakum_icon.svg',
FadePage(page: LakumMainPage())); onTap: () {
}, Navigator.push(context,
child: Column( FadePage(page: LakumMainPage()));
children: <Widget>[ },
SvgPicture.asset(
'assets/images/pharmacy/lakum_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).lakum,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold),
),
],
),
),
), ),
Expanded( AccountServices(
child: InkWell( title: TranslationBase.of(context).wishlist,
onTap: () { serviceImage:
Navigator.push( 'assets/images/pharmacy/wishlist_icon.svg',
context, onTap: () {
MaterialPageRoute( Navigator.push(
builder: (context) => context,
WishlistPage(true))); MaterialPageRoute(
}, builder: (context) =>
child: Column( WishlistPage(true)));
children: <Widget>[ },
SvgPicture.asset(
'assets/images/pharmacy/wishlist_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).wishlist,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
),
),
),
Expanded(
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: MyReviewsPage()));
},
child: Column(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/review_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).reviews,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
),
),
), ),
AccountServices(
title: TranslationBase.of(context).reviews,
serviceImage:
'assets/images/pharmacy/review_icon.svg',
onTap: () {
Navigator.push(context,
FadePage(page: MyReviewsPage()));
},
)
], ],
)), )),
SizedBox( SizedBox(
@ -303,16 +243,13 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
height: 10, height: 10,
), ),
Container( Container(
padding: EdgeInsets.only(left: 10.0), padding: EdgeInsets.symmetric(horizontal: 25.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Texts(TranslationBase.of(context).myAccount,
TranslationBase.of(context).myAccount, fontSize: 16.0,
style: TextStyle( fontWeight: FontWeight.bold),
fontSize: 16.0,
fontWeight: FontWeight.bold),
),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -327,24 +264,11 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
FadePage( FadePage(
page: HomePrescriptionsPage())); page: HomePrescriptionsPage()));
}, },
child: Row( child: AccountItem(
children: <Widget>[ title: TranslationBase.of(context)
SvgPicture.asset( .myPrescription,
itemIcon:
'assets/images/pharmacy/my_prescription_icon.svg', 'assets/images/pharmacy/my_prescription_icon.svg',
width: 28,
height: 28,
),
SizedBox(
width: 15,
),
Text(
TranslationBase.of(context)
.myPrescription,
style: TextStyle(
fontSize: 13.0,
),
),
],
), ),
), ),
SizedBox( SizedBox(
@ -355,28 +279,16 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
height: 20, height: 20,
), ),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.push(context, Navigator.push(context,
FadePage(page: ComparePage())); FadePage(page: ComparePage()));
}, },
child: Row( child: AccountItem(
children: <Widget>[ isTerms: true,
Image.asset( title: TranslationBase.of(context)
'assets/images/pharmacy/compare.png', .compare,
width: 35, itemIcon:
height: 35), "assets/images/pharmacy/compare.png")),
SizedBox(
width: 15,
),
Text(
TranslationBase.of(context).compare,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -391,25 +303,11 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
FadePage( FadePage(
page: HomePrescriptionsPage())); page: HomePrescriptionsPage()));
}, },
child: Row( child: AccountItem(
children: <Widget>[ title: TranslationBase.of(context)
SvgPicture.asset( .medicationsRefill,
'assets/images/pharmacy/medication_refill_icon.svg', itemIcon:
width: 30, 'assets/images/pharmacy/medication_refill_icon.svg'),
height: 30,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context)
.medicationsRefill,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
), ),
SizedBox( SizedBox(
height: 5, height: 5,
@ -423,23 +321,10 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Navigator.push( Navigator.push(
context, FadePage(page: MyFamily())); context, FadePage(page: MyFamily()));
}, },
child: Row( child: AccountItem(
children: <Widget>[ title: TranslationBase.of(context).family,
SvgPicture.asset( itemIcon:
'assets/images/pharmacy/my_family_icon.svg', 'assets/images/pharmacy/my_family_icon.svg',
width: 20,
height: 20,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).family,
style: TextStyle(
fontSize: 13.0,
),
),
],
), ),
), ),
SizedBox( SizedBox(
@ -456,24 +341,11 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
FadePage( FadePage(
page: PharmacyAddressesPage())); page: PharmacyAddressesPage()));
}, },
child: Row( child: AccountItem(
children: <Widget>[ itemIcon:
SvgPicture.asset(
'assets/images/pharmacy/shipping_addresses_icon.svg', 'assets/images/pharmacy/shipping_addresses_icon.svg',
width: 30, title: TranslationBase.of(context)
height: 30, .shippingAddresses,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context)
.shippingAddresses,
style: TextStyle(
fontSize: 13.0,
),
),
],
), ),
), ),
SizedBox( SizedBox(
@ -484,32 +356,19 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
height: 20, height: 20,
), ),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
page: PharmacyTermsConditions())); page:
}, PharmacyTermsConditions()));
child: Row( },
children: <Widget>[ child: AccountItem(
Image.asset( isTerms: true,
'assets/images/pharmacy/terms.png', title: TranslationBase.of(context)
width: 25,
height: 25,
),
SizedBox(
width: 10,
),
Text(
TranslationBase.of(context)
.conditionsHMG, .conditionsHMG,
style: TextStyle( itemIcon:
fontSize: 13.0, 'assets/images/pharmacy/terms.png')),
),
),
],
),
),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -518,39 +377,24 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
height: 20, height: 20,
), ),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
page: LakumTermsConditions( page: LakumTermsConditions(
this.identificationNo, this.identificationNo,
this.firstName, this.firstName,
this.lastName, this.lastName,
this.mobileNo, this.mobileNo,
this.languageId))); this.languageId)));
}, },
child: Row( child: AccountItem(
children: <Widget>[ title: TranslationBase.of(context)
Image.asset( .conditions,
'assets/images/pharmacy/terms.png', itemIcon:
width: 25, 'assets/images/pharmacy/terms.png',
height: 25, isTerms: true,
), )),
// IconButton(icon: Icon(Icons.error_outline), iconSize: 30,
// color: Colors.black,),
SizedBox(
width: 10,
),
Text(
TranslationBase.of(context)
.conditions,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
], ],
), ),
), ),
@ -567,77 +411,54 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Container( Padding(
padding: EdgeInsets.only(left: 10.0), padding: const EdgeInsets.symmetric(
child: Column( horizontal: 15.0, vertical: 8.0),
crossAxisAlignment: CrossAxisAlignment.start, child: Container(
children: <Widget>[ padding: EdgeInsets.only(left: 10.0),
Text( child: Column(
TranslationBase.of(context).reachUs, crossAxisAlignment: CrossAxisAlignment.start,
style: TextStyle( children: <Widget>[
Texts(TranslationBase.of(context).reachUs,
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), SizedBox(
SizedBox( height: 5,
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: LiveChatPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/contact_us_icon.svg',
width: 20,
height: 20,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).contactUs,
style: TextStyle(fontSize: 13.0),
),
],
), ),
), Divider(
SizedBox( color: Colors.grey,
height: 5, height: 20,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: FindUsPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/our_locations_icon.svg',
width: 30,
height: 30,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context)
.ourLocations,
style: TextStyle(fontSize: 13.0),
),
],
), ),
) InkWell(
], onTap: () {
Navigator.push(context,
FadePage(page: LiveChatPage()));
},
child: AccountItem(
title: TranslationBase.of(context)
.contactUs,
itemIcon:
'assets/images/pharmacy/contact_us_icon.svg'),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: FindUsPage()));
},
child: AccountItem(
title: TranslationBase.of(context)
.ourLocations,
itemIcon:
'assets/images/pharmacy/our_locations_icon.svg'))
],
),
), ),
) )
], ],

@ -0,0 +1,50 @@
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_svg/flutter_svg.dart';
class AccountItem extends StatelessWidget {
final String title;
final String itemIcon;
final bool isTerms;
const AccountItem({this.title, this.itemIcon, this.isTerms = false});
@override
Widget build(BuildContext context) {
return Row(
children: <Widget>[
isTerms == false
? Container(
height: 35.0,
width: 35.0,
child: SvgPicture.asset(
'$itemIcon',
width: 35,
height: 35,
),
)
: Container(
height: 35.0,
width: 35.0,
child: Image.asset(
'$itemIcon',
width: 35,
height: 35,
),
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 20,
),
Texts(
title,
fontSize: 15.0,
),
],
)
],
);
}
}

@ -0,0 +1,52 @@
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
class AccountServices extends StatelessWidget {
final String title;
final String serviceImage;
final Function onTap;
const AccountServices({this.title, this.onTap, this.serviceImage});
@override
Widget build(BuildContext context) {
return Expanded(
child: InkWell(
onTap: onTap,
// () {
// if (customerId == null) {
// AppToast.showErrorToast(
// message: "Customer not found");
// return;
// }
// Navigator.push(
// context,
// FadePage(
// page: OrderPage(
// customerID: customerId)));
// },
child: Column(
children: <Widget>[
// Image(image: AssetImage('assets/images/pharmacy/orders_icon.svg')),
SvgPicture.asset(
'$serviceImage',
width: 55,
height: 55,
),
SizedBox(
height: 7,
),
Texts(
title,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
],
),
),
);
}
}
Loading…
Cancel
Save