Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'

Browse Source 
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!543
merge-requests/531/merge
haroon amjad 3 years ago
parent 68b443905e 127096ec04
commit 003375b12f
14 changed files with 88 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
lib/pages/final_products_page.dart
Unescape Escape View File

@ -93,6 +93,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
isShowAppBar: true,
backgroundColor: Colors.white,
isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model,
body: Container(
height: MediaQuery.of(context).size.height * 5.87,
@ -485,7 +487,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
color: CustomColors.green,
),
onPressed: () async {
if (model.finalProducts[index].rxMessage == null) {
if (model.finalProducts[index].isRx == false) {
GifLoaderDialogUtils.showMyDialog(context);
await addToCartFunction(1, model.finalProducts[index].id);
GifLoaderDialogUtils.hideDialog(context);

5
lib/pages/parent_categorise_page.dart
Unescape Escape View File

@ -93,6 +93,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
isShowAppBar: true,
backgroundColor: Colors.white,
isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model,
body: SmartRefresher(
enablePullDown: false,
@ -1271,8 +1273,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
),
onPressed:
() async {
if (model.parentProducts[index].rxMessage ==
null) {
if (model.parentProducts[index].isRx == false) {
GifLoaderDialogUtils.showMyDialog(context);
await addToCartFunction(1,
model.parentProducts[index].id);

1
lib/pages/pharmacies/ProductCheckTypeWidget.dart
Unescape Escape View File

@ -37,6 +37,7 @@ class _ProductCheckTypeWidgetState extends State<ProductCheckTypeWidget> {
productImage: widget.model.wishListList[index].product.images[0].src,
productID: widget.model.wishListList[index].product.id,
onDelete: deleteWishListItem,
isRx:widget.model.wishListList[index].product.isRx,
),
),

3
lib/pages/pharmacies/compare.dart
Unescape Escape View File

@ -33,6 +33,9 @@ class _ComparePageState extends State<ComparePage> {
appBarTitle: TranslationBase.of(context).compare,
isShowAppBar: true,
isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
body: SingleChildScrollView(
child: Container(
child: compareList(),

3
lib/pages/pharmacies/my_reviews.dart
Unescape Escape View File

@ -26,6 +26,9 @@ class _MyReviewsPageState extends State<MyReviewsPage> {
appBarTitle: TranslationBase.of(context).reviews,
isShowAppBar: true,
isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
baseViewModel: model,
body: model.reviewListList.length == 0
? Container(

20
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
Unescape Escape View File

@ -76,9 +76,14 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
icon: Icons.shopping_cart,
color: Colors.grey[800],
onPress: () {
Navigator.pushAndRemoveUntil(
locator<NavigationService>().navigatorKey.currentContext, MaterialPageRoute(builder: (context) => LandingPagePharmacy(currentTab: 3)), (Route<dynamic> r) => false);
locator<NavigationService>()
.navigatorKey
.currentContext,
MaterialPageRoute(
builder: (context) =>
LandingPagePharmacy(currentTab: 3)),
(Route<dynamic> r) => false);
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => CartOrderPage()),
@ -144,7 +149,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
return Container(
child: new Wrap(
children: <Widget>[
if (product.stockAvailability != 'Out of stock')
if (product.stockAvailability != 'Out of stock' && product.isRx != true)
new ListTile(
leading: Icon(Icons.shopping_cart),
title: Text(
@ -161,9 +166,10 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
Navigator.of(context).pop();
}
} else {
AppToast.showErrorToast(message: TranslationBase.of(context).addQuantity
// "you should add quantity"
);
AppToast.showErrorToast(
message: TranslationBase.of(context).addQuantity
// "you should add quantity"
);
}
}),
ListTile(
@ -190,7 +196,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
),
onTap: () {
Provider.of<CompareList>(context, listen: false)
.addItem(specificationData,context);
.addItem(specificationData, context);
Navigator.of(context).pop();
},
),

2
lib/pages/pharmacies/widgets/ProductOrderItem.dart
Unescape Escape View File

@ -252,7 +252,7 @@ class _ProductOrderItemState extends State<ProductOrderItem> {
}
_quantityController.text = "${widget.item.quantity}";
_totalPrice =
"${(widget.item.product.price * widget.item.quantity).toStringAsFixed(2)}";
"${(widget.item.product.price * widget.item.quantity).toStringAsFixed(2)}";
}
});
}

7
lib/pages/pharmacies/wishlist.dart
Unescape Escape View File

@ -17,6 +17,9 @@ class WishlistPage extends StatelessWidget {
isShowAppBar: true,
isShowDecPage: false,
isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
baseViewModel: model,
body: model.wishListList.length == 0
? Container(
@ -35,8 +38,8 @@ class WishlistPage extends StatelessWidget {
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'There is no data',
child: Text(TranslationBase.of(context).noData,
// 'There is no data',
style: TextStyle(fontSize: 30),
),
)

3
lib/pages/pharmacy/order/Order.dart
Unescape Escape View File

@ -66,6 +66,9 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
baseViewModel: model,
isShowAppBar: true,
isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
body: Container(
child: Column(
children: [

3
lib/pages/pharmacy/order/OrderDetails.dart
Unescape Escape View File

@ -84,6 +84,9 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
appBarTitle: TranslationBase.of(context).orderDetail,
isShowAppBar: true,
isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
baseViewModel: model,
body: model.orderListModel.length > 0
? Container(

6
lib/pages/pharmacy/profile/profile.dart
Unescape Escape View File

@ -108,10 +108,10 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
builder: (_, model, wi) => AppScaffold(
appBarTitle: TranslationBase.of(context).myAccount,
isShowAppBar: true,
isShowDecPage: true,
isShowDecPage: false,
isPharmacy: true,
//isBottomBar: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isMainPharmacyPages: true,
body: user != null
? Container(

10
lib/pages/sub_categories_modalsheet.dart
Unescape Escape View File

@ -40,11 +40,13 @@ class _SubCategoriseModalsheetState extends State<SubCategoriseModalsheet> {
builder: (_, model, wi) => AppScaffold(
// appBarTitle: titleName,
appBarTitle: TranslationBase.of(context).categorise,
isBottomBar: false,
isBottomBar: true,
isShowAppBar: true,
isPharmacy: true,
backgroundColor: Colors.white,
isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model,
body: Container(
color: Colors.white,
@ -77,7 +79,11 @@ class _SubCategoriseModalsheetState extends State<SubCategoriseModalsheet> {
context,
FadePage(
page: SubCategorisePage(
title: model.categoriseParent[index].name,
title: projectViewModel
.isArabic
? model.categoriseParent[index].namen
: model.categoriseParent[index].name,
// title: model.categoriseParent[index].name,
id: model.categoriseParent[index].id,
parentId: id,
)),

11
lib/pages/sub_categorise_page.dart
Unescape Escape View File

@ -14,6 +14,7 @@ import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/entity_checkbox_list.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@ -76,12 +77,15 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
allowAny: true,
builder: (BuildContext context, PharmacyCategoriseViewModel model,
Widget child) =>
PharmacyAppScaffold(
AppScaffold(
isPharmacy: true,
appBarTitle: title,
isBottomBar: false,
isBottomBar: true,
isShowAppBar: true,
backgroundColor: Colors.white,
isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model,
body: SmartRefresher(
controller: controller,
@ -1219,8 +1223,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
if (model
.subProducts[
index]
.rxMessage ==
null) {
.isRx == false) {
GifLoaderDialogUtils
.showMyDialog(
context);

35
lib/widgets/pharmacy/product_tile.dart
Unescape Escape View File

@ -1,13 +1,16 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart';
class productTile extends StatelessWidget {
@ -27,6 +30,7 @@ class productTile extends StatelessWidget {
final dynamic productID;
final Function onDelete;
final dynamic approvedTotalReviews;
final dynamic isRx;
// final VoidCallback deleteWishlistItems;
@ -47,10 +51,12 @@ class productTile extends StatelessWidget {
this.productID,
this.onDelete,
this.approvedTotalReviews,
this.isRx
});
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return Container(
height: 180,
width: double.infinity,
@ -87,7 +93,16 @@ class productTile extends StatelessWidget {
children: [
Container(
margin: EdgeInsets.all(5),
child: Align(
child: projectViewModel
.isArabic ? Align(
alignment: Alignment.topRight,
child: RichText(
text: TextSpan(
text: productName,
style: TextStyle(color: Colors.black54, fontSize: 15, fontWeight: FontWeight.bold),
),
),
): Align(
alignment: Alignment.topLeft,
child: RichText(
text: TextSpan(
@ -99,7 +114,17 @@ class productTile extends StatelessWidget {
),
Container(
margin: EdgeInsets.all(5),
child: Align(
child: projectViewModel
.isArabic ? Align(
alignment: Alignment.topRight,
child: RichText(
text: TextSpan(
text: 'SAR $productPrice',
style: TextStyle(fontWeight: FontWeight.bold, color: Colors.black, fontSize: 13),
),
),
)
:Align(
alignment: Alignment.topLeft,
child: RichText(
text: TextSpan(
@ -163,10 +188,14 @@ class productTile extends StatelessWidget {
color: Colors.green,
),
onPressed: () async {
if(isRx == false){
GifLoaderDialogUtils.showMyDialog(context);
await addToCartFunction(1, productID, context);
GifLoaderDialogUtils.hideDialog(context);
Utils.navigateToCartPage();
Utils.navigateToCartPage();}
else {
AppToast.showErrorToast(message: TranslationBase.of(context).needPrescription);
}
},
),
],

Write Preview
Loading…
Cancel
Save