fixed orders

merge-update-with-lab-changes
Fatimah Alshammari 5 years ago
parent ba4003cb56
commit a1b2709ac8

@ -178,10 +178,10 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
Container( Container(
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: InkWell( child: InkWell(
// onTap: () { onTap: () {
// Navigator.push(context, Navigator.push(context,
// MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel: deliveredOrderList[index]),)); MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel: deliveredOrderList[index]),));
// }, },
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" languageID == "ar"
? 'assets/images/pharmacy/arrow_left.svg' ? 'assets/images/pharmacy/arrow_left.svg'
@ -392,9 +392,9 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
// Navigator.push(context, Navigator.push(context,
// MaterialPageRoute(builder: (context) => OrderDetailsPage(Orders:processingOrderList[index]))); MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel :processingOrderList[index])));
//
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" languageID == "ar"
@ -784,9 +784,9 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
margin: EdgeInsets.all( 8.0), margin: EdgeInsets.all( 8.0),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
// Navigator.push(context, Navigator.push(context,
// MaterialPageRoute(builder: (context) => OrderDetailsPage(Orders:pendingOrderList[index]))); MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel:pendingOrderList[index])));
//
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" languageID == "ar"
@ -1001,9 +1001,9 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
// Navigator.push(context, Navigator.push(context,
// MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel: cancelledOrderList[index]))); MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel: cancelledOrderList[index])));
//
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" languageID == "ar"

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart';
@ -22,9 +23,11 @@ import 'package:provider/provider.dart';
dynamic languageID; dynamic languageID;
class OrderDetailsPage extends StatefulWidget { class OrderDetailsPage extends StatefulWidget {
OrderModel orderModel; Orders orderModel;
OrderModel orderDetails;
OrderDetailsPage({@required this.orderModel, this.orderDetails});
OrderDetailsPage({@required this.orderModel});
@override @override
_OrderDetailsPageState createState() => _OrderDetailsPageState(); _OrderDetailsPageState createState() => _OrderDetailsPageState();
@ -51,9 +54,10 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
@override @override
void initState() { void initState() {
getLanguageID(); getLanguageID();
super.initState(); super.initState();
print(widget.orderModel.orderItems.length); // print(widget.orderModel.orderItems.length);
getCancelOrder(widget.orderModel.id); getCancelOrder(widget.orderModel.id);
// cancelOrderDetail(order) // cancelOrderDetail(order)
} }
@ -105,9 +109,9 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
color: getStatusBackgroundColor(), color: getStatusBackgroundColor(),
borderRadius: BorderRadius.circular(30.0)), borderRadius: BorderRadius.circular(30.0)),
child: Text( child: Text(
languageID == "ar" languageID == "ar"
? widget.orderModel.orderStatusn.toString(): ? widget.orderModel.orderStatusn.toString():
widget.orderModel.orderStatus.toString().substring(12) , widget.orderModel.orderStatus.toString().substring(12) ,
// TranslationBase.of(context).delivered, // TranslationBase.of(context).delivered,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
@ -124,11 +128,11 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
widget.orderModel.shippingAddress.firstName widget.orderDetails.shippingAddress.firstName
.toString() .toString()
.substring(10) + .substring(10) +
' ' + ' ' +
widget.orderModel.shippingAddress.lastName widget.orderDetails.shippingAddress.lastName
.toString() .toString()
.substring(9), .substring(9),
style: TextStyle( style: TextStyle(
@ -141,18 +145,18 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
Container( Container(
margin: EdgeInsets.fromLTRB(10.0, 5.0, 1.0, 5.0), margin: EdgeInsets.fromLTRB(10.0, 5.0, 1.0, 5.0),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
widget.orderModel.shippingAddress.address1 widget.orderDetails.shippingAddress.address1
.toString() .toString()
.substring(9), .substring(9),
style: TextStyle( style: TextStyle(
fontSize: 10.0, fontSize: 10.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.grey, color: Colors.grey,
), ),
),] ),]
), ),
), ),
Container( Container(
@ -161,14 +165,14 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
widget.orderModel.shippingAddress.address2 widget.orderDetails.shippingAddress.address2
.toString() .toString()
.substring(9) + .substring(9) +
' ' + ' ' +
widget.orderModel.shippingAddress.country widget.orderDetails.shippingAddress.country
.toString() + .toString() +
' ' + ' ' +
widget.orderModel.shippingAddress.zipPostalCode widget.orderDetails.shippingAddress.zipPostalCode
.toString(), .toString(),
style: TextStyle( style: TextStyle(
fontSize: 10.0, fontSize: 10.0,
@ -191,7 +195,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
Container( Container(
margin: EdgeInsets.only(top: 5.0, bottom: 5.0), margin: EdgeInsets.only(top: 5.0, bottom: 5.0),
child: Text( child: Text(
widget.orderModel.shippingAddress.phoneNumber widget.orderDetails.shippingAddress.phoneNumber
.toString(), .toString(),
style: TextStyle( style: TextStyle(
fontSize: 15.0, fontSize: 15.0,
@ -230,8 +234,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
), ),
Container( Container(
child: flutterImage.Image.asset( child: flutterImage.Image.asset(
widget.orderModel.shippingRateComputationMethodSystemName != widget.orderDetails.shippingRateComputationMethodSystemName !=
"Shipping.Aramex" "Shipping.Aramex"
? "assets/images/pharmacy_module/payment/LogoParmacyGreen.png" ? "assets/images/pharmacy_module/payment/LogoParmacyGreen.png"
: "assets/images/pharmacy_module/payment/aramex_shipping_logo.png", : "assets/images/pharmacy_module/payment/aramex_shipping_logo.png",
fit: BoxFit.contain, fit: BoxFit.contain,
@ -282,7 +286,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
Container( Container(
margin: EdgeInsets.only(bottom: 10.0, top: 10.0), margin: EdgeInsets.only(bottom: 10.0, top: 10.0),
child: Text( child: Text(
widget.orderModel.paymentName.toString().substring(12), widget.orderDetails.paymentName.toString().substring(12),
style: TextStyle( style: TextStyle(
fontSize: 13.0, fontSize: 13.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -318,23 +322,23 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount:widget.orderModel.orderItems.length, itemCount:widget.orderDetails.orderItems.length,
itemBuilder: (context, index){ itemBuilder: (context, index){
return Container( return Container(
child: productTile(productName: widget.orderModel.orderItems[index].product.name.toString(), child: productTile(productName: widget.orderDetails.orderItems[index].product.name.toString(),
productPrice: widget.orderModel.orderItems[index].product.price.toString(), productPrice: widget.orderDetails.orderItems[index].product.price.toString(),
productRate: widget.orderModel.orderItems[index].product.approvedRatingSum.toDouble(), productRate: widget.orderDetails.orderItems[index].product.approvedRatingSum.toDouble(),
productReviews:widget.orderModel.orderItems[index].product.approvedTotalReviews, productReviews:widget.orderDetails.orderItems[index].product.approvedTotalReviews,
totalPrice: "${(widget.orderModel.orderItems[index].product.price totalPrice: "${(widget.orderDetails.orderItems[index].product.price
* widget.orderModel.orderItems[index].quantity).toStringAsFixed(2)}", * widget.orderDetails.orderItems[index].quantity).toStringAsFixed(2)}",
qyt: widget.orderModel.orderItems[index].quantity.toString(), qyt: widget.orderDetails.orderItems[index].quantity.toString(),
isOrderDetails:true, isOrderDetails:true,
imgs: widget.orderModel.orderItems[index].product.images != null && imgs: widget.orderDetails.orderItems[index].product.images != null &&
widget.orderModel.orderItems[index].product.images.length != 0 widget.orderDetails.orderItems[index].product.images.length != 0
? widget.orderModel.orderItems[index].product.images [0].src.toString() ? widget.orderDetails.orderItems[index].product.images [0].src.toString()
: null, : null,
status: widget.orderModel.orderStatusId, status: widget.orderDetails.orderStatusId,
product: widget.orderModel.orderItems[index].product, product: widget.orderDetails.orderItems[index].product,
), ),
); );
}), }),
@ -383,7 +387,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
), ),
), ),
Text( Text(
widget.orderModel.orderSubtotalExclTax.toString(), widget.orderDetails.orderSubtotalExclTax.toString(),
style: TextStyle( style: TextStyle(
fontSize: 13.0, fontSize: 13.0,
), ),
@ -421,7 +425,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
), ),
), ),
Text( Text(
widget.orderModel.orderShippingExclTax.toString(), widget.orderDetails.orderShippingExclTax.toString(),
style: TextStyle( style: TextStyle(
fontSize: 13.0, fontSize: 13.0,
), ),
@ -459,7 +463,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
), ),
), ),
Text( Text(
widget.orderModel.orderTax.toString(), widget.orderDetails.orderTax.toString(),
style: TextStyle( style: TextStyle(
fontSize: 13.0, fontSize: 13.0,
), ),
@ -510,58 +514,58 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
), ),
widget.orderModel.orderStatusId == 10 widget.orderModel.orderStatusId == 10
? InkWell( ? InkWell(
onTap: () { onTap: () {
model.makeOrder(); model.makeOrder();
}, },
child: Container( child: Container(
// margin: EdgeInsets.only(top: 20.0), // margin: EdgeInsets.only(top: 20.0),
height: 50.0, height: 50.0,
color: Colors.transparent, color: Colors.transparent,
child: Container( child: Container(
padding: EdgeInsets.only(left: 130.0, right: 130.0), padding: EdgeInsets.only(left: 130.0, right: 130.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.green, color: Colors.green,
style: BorderStyle.solid, style: BorderStyle.solid,
width: 4.0), width: 4.0),
color: Colors.green, color: Colors.green,
borderRadius: BorderRadius.circular(5.0)), borderRadius: BorderRadius.circular(5.0)),
child: Center( child: Center(
child: Text( child: Text(
TranslationBase.of(context).payOnline, TranslationBase.of(context).payOnline,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
),
),
),
), ),
), ),
) ),
),
),
)
: Container(), : Container(),
// getCancelOrder(canCancel, canRefund), // getCancelOrder(canCancel, canRefund),
isCancel isCancel
? InkWell( ? InkWell(
onTap: () { onTap: () {
presentConfirmDialog(model, presentConfirmDialog(model,
widget.orderModel.id); //(widget.orderModel.id)); widget.orderModel.id); //(widget.orderModel.id));
// //
}, },
child: Container( child: Container(
// padding: EdgeInsets.only(left: 13.0, right: 13.0, top: 5.0), // padding: EdgeInsets.only(left: 13.0, right: 13.0, top: 5.0),
height: 50.0, height: 50.0,
color: Colors.transparent, color: Colors.transparent,
child: Center( child: Center(
child: Text( child: Text(
TranslationBase.of(context).cancelOrder, TranslationBase.of(context).cancelOrder,
style: TextStyle( style: TextStyle(
color: Colors.red[900], color: Colors.red[900],
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
decoration: TextDecoration.underline), decoration: TextDecoration.underline),
), ),
), ),
), ),
) )
: Container(), : Container(),
], ],
), ),
@ -591,17 +595,17 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
} }
getCancelOrder(dataIsCancel) { getCancelOrder(dataIsCancel) {
if (widget.orderModel.canCancel && widget.orderModel.canRefund) { if (widget.orderDetails.canCancel && widget.orderDetails.canRefund) {
setState(() { setState(() {
isCancel = true; isCancel = true;
isRefund = false; isRefund = false;
}); });
} else if (widget.orderModel.canCancel) { } else if (widget.orderDetails.canCancel) {
setState(() { setState(() {
isCancel = true; isCancel = true;
isRefund = false; isRefund = false;
}); });
} else if (widget.orderModel.canRefund) { } else if (widget.orderDetails.canRefund) {
setState(() { setState(() {
isCancel = false; isCancel = false;
isRefund = true; isRefund = true;
@ -630,7 +634,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => OrderPage( builder: (context) => OrderPage(
customerID: widget.orderModel.customerId.toString())), customerID: widget.orderDetails.customerId.toString())),
); );
}), }),
cancelFunction: () => {}); cancelFunction: () => {});
@ -639,7 +643,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
getCanceledOrder(order) { getCanceledOrder(order) {
Navigator.pop(context); Navigator.pop(context);
if (widget.orderModel.canCancel && widget.orderModel.canRefund == false) { if (widget.orderDetails.canCancel && widget.orderDetails.canRefund == false) {
// getCanceledOrder(order); // getCanceledOrder(order);
// AppToast.showSuccessToast(message: "Request Sent Successfully"); // AppToast.showSuccessToast(message: "Request Sent Successfully");
// Navigator.push(context, // Navigator.push(context,

Loading…
Cancel
Save