Pharmacy Payment method design fix, Blood Donation fix

merge-update-with-lab-changes
haroon amjad 4 years ago
parent 3dc82a0547
commit ddf764897a

@ -22,7 +22,7 @@ class BloodDetailsService extends BaseService{
BloodModelList.add(List_BloodGroupDetailsModel.fromJson(vital));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
// hasError = true;
super.error = error;
}, body: body);
}

@ -52,6 +52,9 @@ class MyBalanceViewModel extends BaseViewModel {
PatientInfoAndMobileNumber get patientInfoAndMobileNumber =>
_myBalanceService.patientInfoAndMobileNumber;
List<List_BloodGroupDetailsModel> get bloodModelList =>
_bloodDetailsService.BloodModelList;
String get logInTokenID => _myBalanceService.logInTokenID;
String get verificationCode => _myBalanceService.verificationCode;

@ -228,4 +228,4 @@ class OrderPreviewViewModel extends BaseViewModel {
}
}
enum PaymentOption { meda, sadad, visa, mastercard, installments }
enum PaymentOption { meda, sadad, visa, mastercard, installments, applepay }

@ -77,7 +77,6 @@ class _BloodCholesterolState extends State<BloodCholesterol> {
width: 350.0,
child: Text(
TranslationBase.of(context).convertCholesterolStatement,
//textAlign: TextAlign.center,
style: TextStyle(fontSize: 20.0),
),
),
@ -90,7 +89,6 @@ class _BloodCholesterolState extends State<BloodCholesterol> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
//crossAxisAlignment: CrossAxisAlignment.end,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15.0),

@ -50,18 +50,23 @@ class _HealthCalculatorsState extends State<HealthCalculators> with SingleTicker
children: [
TabBar(
controller: _tabController,
isScrollable: true,
indicatorWeight: 4.0,
indicatorColor: Colors.red,
labelColor: Theme.of(context).buttonColor,
indicatorWeight: 3.0,
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Color(0xff2B353E),
unselectedLabelColor: Color(0xff575757),
labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
unselectedLabelColor: Colors.grey,
labelStyle: TextStyle(
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),
unselectedLabelStyle: TextStyle(
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),
tabs: <Widget>[
Container(
width: MediaQuery.of(context).size.width * 0.35,

@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/get_all_cities.dart';
//import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info.dart';
@ -13,6 +14,7 @@ import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStat
import 'package:diplomaticquarterapp/pages/Blood/user_agreement_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/balance/dialogs/SelectCiteisDialog.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -25,11 +27,8 @@ import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
import 'package:provider/provider.dart';
import 'dialogs/SelectBeneficiaryDialog.dart';
import 'dialogs/SelectBloodDialog.dart';
import 'dialogs/SelectGenderDialog.dart';
import 'dialogs/SelectPatientFamilyDialog.dart';
import 'dialogs/SelectPatientInfoDialog.dart';
enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON }
enum Gender { Male, Female, NON }
@ -79,7 +78,10 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
projectProvider = Provider.of(context);
return BaseView<MyBalanceViewModel>(
onModelReady: (model) => model.getCities(), //model.getHospitals(),
onModelReady: (model) {
model.getCities();
model.getBlood();
},
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
showNewAppBar: true,
@ -95,9 +97,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
TranslationBase.of(context).bloodDEnterDesc
),
Texts(TranslationBase.of(context).bloodDEnterDesc),
SizedBox(
height: 12,
),
@ -111,7 +111,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Texts(getHospitalName(projectProvider, context), color: Colors.black), Icon(Icons.arrow_drop_down)],
children: [Texts(getHospitalName(projectProvider, context, model), color: Colors.black), Icon(Icons.arrow_drop_down)],
),
),
),
@ -119,7 +119,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
height: 12,
),
InkWell(
//======Gender========
onTap: () => confirmSelectGenderDialog(),
child: Container(
padding: EdgeInsets.all(12),
@ -128,10 +127,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Texts(getGender(context), color: Colors.black),
Icon(Icons.arrow_drop_down)
],
children: [Texts(getGender(context), color: Colors.black), Icon(Icons.arrow_drop_down)],
),
),
),
@ -139,7 +135,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
height: 12,
),
InkWell(
//======Gender========
onTap: () => confirmSelectBloodDialog(),
child: Container(
padding: EdgeInsets.all(12),
@ -148,7 +143,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Texts(getBlood(), color: Colors.black), Icon(Icons.arrow_drop_down)],
children: [Texts(getBlood(model), color: Colors.black), Icon(Icons.arrow_drop_down)],
),
),
),
@ -241,45 +236,31 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
width: double.infinity,
color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(20),
child: DefaultButton(TranslationBase.of(context).save, () async {
if (_selectedHospital == null) {
AppToast.showErrorToast(message: TranslationBase.of(context).selectCity);
return;
}
bloodDetails.city = projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description;
bloodDetails.cityCode = _selectedHospital.iD.toString();
bloodDetails.gender = gender == Gender.Male ? 1 : 2;
await model.updateBloodGroup(bloodDetails);
if (model.state == ViewState.Idle) {
AppToast.showSuccessToast(message: model.updatedRegisterBloodMessage);
} else {
AppToast.showErrorToast(message: model.error);
}
}),
child: DefaultButton(
TranslationBase.of(context).save,
checkedValue
? () async {
if (_selectedHospital == null) {
AppToast.showErrorToast(message: TranslationBase.of(context).selectCity);
return;
}
bloodDetails.city = projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description;
bloodDetails.cityCode = _selectedHospital.iD.toString();
bloodDetails.gender = gender == Gender.Male ? 1 : 2;
await model.updateBloodGroup(bloodDetails);
if (model.state == ViewState.Idle) {
AppToast.showSuccessToast(message: model.updatedRegisterBloodMessage);
} else {
AppToast.showErrorToast(message: model.error);
}
}
: null,
disabledColor: CustomColors.grey2,
),
)),
);
}
void confirmSelectBeneficiaryDialog(MyBalanceViewModel model) {
showDialog(
context: context,
child: SelectBeneficiaryDialog(
beneficiaryType: beneficiaryType,
onValueSelected: (value) {
setState(() {
if (value == BeneficiaryType.MyAccount) {
_fileTextController.text = model.user.patientID.toString();
advanceModel.depositorName = model.user.firstName + " " + model.user.lastName;
} else
_fileTextController.text = "";
beneficiaryType = value;
});
},
),
);
}
void confirmSelectBloodDialog() {
showDialog(
context: context,
@ -289,48 +270,22 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
setState(() {
if (value == Blood.Oplus) {
bloodDetails.bloodGroup = "O+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else if (value == Blood.Ominus) {
// _fileTextController.text = model.user.patientID.toString();
bloodDetails.bloodGroup = "O-";
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else if (value == Blood.ABplus) {
bloodDetails.bloodGroup = "AB+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else if (value == Blood.ABminus) {
bloodDetails.bloodGroup = "AB-";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else if (value == Blood.Aplus) {
bloodDetails.bloodGroup = "A+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else if (value == Blood.Aminus) {
bloodDetails.bloodGroup = "A-";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else if (value == Blood.Bplus) {
bloodDetails.bloodGroup = "B+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else if (value == Blood.Bminus) {
bloodDetails.bloodGroup = "B-";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else
_fileTextController.text = "";
// beneficiaryType = value;
blood = value;
});
},
@ -346,17 +301,10 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
onValueSelected: (value) {
setState(() {
if (value == Gender.Male) {
// _fileTextController.text = model.user.patientID.toString();
bloodDetails.patientType = 1;
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else
// _fileTextController.text = "";
{
} else {
bloodDetails.gender = 2;
}
// beneficiaryType = value;
gender = value;
});
},
@ -364,7 +312,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
);
}
//void confirmSelectHospitalDialog(List<HospitalsModel> hospitals) {
void confirmSelectHospitalDialog(List<CitiesModel> hospitals) {
showDialog(
context: context,
@ -380,55 +327,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
);
}
void confirmSelectPatientDialog(List<PatientInfo> patientInfoList) {
showDialog(
context: context,
child: SelectPatientInfoDialog(
patientInfoList: patientInfoList,
selectedPatientInfo: _selectedPatientInfo,
onValueSelected: (value) {
setState(() {
advanceModel.depositorName = value.fullName;
_selectedPatientInfo = value;
});
},
),
);
}
void confirmSelectFamilyDialog(List<GetAllSharedRecordsByStatusList> getAllSharedRecordsByStatusList) {
showDialog(
context: context,
child: SelectPatientFamilyDialog(
getAllSharedRecordsByStatusList: getAllSharedRecordsByStatusList,
selectedPatientFamily: selectedPatientFamily,
onValueSelected: (value) {
setState(() {
selectedPatientFamily = value;
_fileTextController.text = selectedPatientFamily.patientID.toString();
advanceModel.depositorName = value.patientName;
});
},
),
);
}
String getBeneficiaryType() {
switch (beneficiaryType) {
case BeneficiaryType.MyAccount:
return TranslationBase.of(context).myAccount;
case BeneficiaryType.MyFamilyFiles:
return TranslationBase.of(context).myFamilyFiles;
break;
case BeneficiaryType.OtherAccount:
return TranslationBase.of(context).otherAccount;
break;
case BeneficiaryType.NON:
return TranslationBase.of(context).selectBeneficiary;
}
return TranslationBase.of(context).selectBeneficiary;
}
String getGender(BuildContext context) {
switch (gender) {
case Gender.Male:
@ -436,62 +334,60 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
case Gender.Female:
return TranslationBase.of(context).female;
break;
case Gender.NON:
return TranslationBase.of(context).selectGender;
}
return TranslationBase.of(context).selectGender;
}
String getBlood() {
switch (blood) {
case Blood.Oplus:
return "O+";
break;
case Blood.Ominus:
return "O-";
break;
case Blood.ABplus:
return "AB+";
break;
case Blood.ABminus:
return "AB-";
break;
case Blood.Aplus:
return "A+";
break;
case Blood.Aminus:
return "A-";
break;
case Blood.Bplus:
return "B-";
break;
case Blood.Bminus:
return "B-";
break;
case Blood.Bplus:
return "B+";
break;
case Blood.NON:
return "Select Blood Type"; //TranslationBase.of(context).selectBeneficiary;
String getBlood(MyBalanceViewModel model) {
if (model.bloodModelList.length > 0) {
return model.bloodModelList[0].bloodGroup;
} else {
switch (blood) {
case Blood.Oplus:
return "O+";
break;
case Blood.Ominus:
return "O-";
break;
case Blood.ABplus:
return "AB+";
break;
case Blood.ABminus:
return "AB-";
break;
case Blood.Aplus:
return "A+";
break;
case Blood.Aminus:
return "A-";
break;
case Blood.Bplus:
return "B-";
break;
case Blood.Bminus:
return "B-";
break;
case Blood.Bplus:
return "B+";
break;
case Blood.NON:
return "Select Blood Type";
}
}
return "Select Blood Type"; //TranslationBase.of(context).selectBeneficiary;
return "Select Blood Type";
}
String getHospitalName(ProjectViewModel projectProvider, BuildContext context) {
if (_selectedHospital != null)
return projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description;
else
return TranslationBase.of(context).selectCity;
// return List_BloodGroupDetailsModel.fromJson(0).city.toString();//"Select City";//TranslationBase.of(context).selectHospital;
}
String getPatientName() {
if (_selectedPatientInfo != null)
return _selectedPatientInfo.fullName;
else
return TranslationBase.of(context).selectPatientName;
String getHospitalName(ProjectViewModel projectProvider, BuildContext context, MyBalanceViewModel model) {
if (model.bloodModelList.length > 0) {
return model.bloodModelList[0].city;
} else {
if (_selectedHospital != null)
return projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description;
else
return TranslationBase.of(context).selectCity;
}
}
getAuthUser() async {
@ -502,14 +398,4 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
});
}
}
String getFamilyMembersName() {
if (selectedPatientFamily != null)
return selectedPatientFamily.patientName;
else
return TranslationBase.of(context).selectFamilyPatientName;
}
//================
}

@ -94,7 +94,7 @@ class _ChildPageState extends State<ChildVaccinePage> with SingleTickerProviderS
),
),
Text(
model.babyInformationModelList[index].gender == 1 ? TranslationBase.of(context).female : TranslationBase.of(context).male,
model.babyInformationModelList[index].genderDescription,
style: TextStyle(
fontSize: 11,
color: selectedColor,

@ -5,7 +5,6 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
class PaymentMethod extends StatefulWidget {
Function onSelectedMethod;
@ -37,7 +36,6 @@ class _PaymentMethodState extends State<PaymentMethod> {
children: <Widget>[
Container(
margin: EdgeInsets.fromLTRB(4, 15.0, 4, 0.0),
child: Text(TranslationBase.of(context).selectPaymentOption, style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold)),
),
Container(
@ -119,16 +117,6 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60,
child: Image.asset("assets/images/new/payment/visa.png"),
),
// mWidth(12),
// Text(
// "VISA",
// style: TextStyle(
// color: Colors.black,
// fontSize: 14,
// fontWeight: FontWeight.bold,
// ),
// )
// ,
mFlex(1),
if (selectedPaymentMethod == "VISA")
Container(
@ -178,15 +166,6 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60,
child: Image.asset("assets/images/new/payment/Mastercard.png"),
),
// mWidth(12),
// Text(
// "MasterCard",
// style: TextStyle(
// color: Colors.black,
// fontSize: 14,
// fontWeight: FontWeight.bold,
// ),
// ),
mFlex(1),
if (selectedPaymentMethod == "MASTERCARD")
Container(
@ -236,15 +215,6 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60,
child: Image.asset("assets/images/new/payment/installments.png"),
),
// mWidth(12),
// Text(
// "Installments",
// style: TextStyle(
// color: Colors.black,
// fontSize: 14,
// fontWeight: FontWeight.bold,
// ),
// ),
mFlex(1),
if (selectedPaymentMethod == "Installment")
Container(
@ -295,15 +265,6 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60,
child: Image.asset("assets/images/new/payment/Apple_Pay.png"),
),
// mWidth(12),
// Text(
// "Apple Pay",
// style: TextStyle(
// color: Colors.black,
// fontSize: 14,
// fontWeight: FontWeight.bold,
// ),
// ),
mFlex(1),
if (selectedPaymentMethod == "ApplePay")
Container(
@ -323,40 +284,6 @@ class _PaymentMethodState extends State<PaymentMethod> {
),
),
)
// Container(
// margin: EdgeInsets.only(top: 25.0),
// child: Flex(
// direction: Axis.horizontal,
// children: <Widget>[
// Expanded(
// child: Container(
// child: InkWell(
// onTap: () {
// updateSelectedPaymentMethod("ApplePay");
// },
// child: Card(
// elevation: 3.0,
// margin: EdgeInsets.fromLTRB(8.0, 16.0, 8.0, 8.0),
// color: Colors.white,
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(10),
// side: selectedPaymentMethod == "ApplePay" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0),
// ),
// child: Container(
// height: 120.0,
// padding: EdgeInsets.all(20.0),
// child: SvgPicture.asset("assets/images/new-design/applepay.svg"),
// ),
// ),
// ),
// ),
// ),
// Expanded(
// child: Container(),
// ),
// ],
// ),
// )
: Container(),
SizedBox(
height: 150.0,

@ -107,7 +107,7 @@ class ServicesView extends StatelessWidget {
FadePage(page: ChildInitialPage()),
);
} else if (index == 15) {
Navigator.pop(context);
// Navigator.pop(context);
LandingPage.shared.switchToDoFromHMGServices();
} else if (index == 16) {
Navigator.push(

@ -62,10 +62,9 @@ class _SmartWatchInstructionsState extends State<SmartWatchInstructions> {
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
// margin: EdgeInsets.only(top: 10.0),
child: CarouselSlider(
carouselController: buttonCarouselController,
options: CarouselOptions(enableInfiniteScroll: false, viewportFraction: 0.95, height: MediaQuery.of(context).size.height * 0.65),
options: CarouselOptions(enableInfiniteScroll: false, viewportFraction: 0.95, height: MediaQuery.of(context).size.height * 0.9),
items: [1, 2].map((i) {
return Builder(
builder: (BuildContext context) {

@ -1,26 +1,10 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/payment-checkout-data.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/payment_bottom_widget.dart';
import 'package:diplomaticquarterapp/pages/ToDoList/payment_method_select.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/payment-method-select-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/widgets/ProductOrderPreviewItem.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class SelectPaymentOptionWidget extends StatefulWidget {
final OrderPreviewViewModel model;
@ -28,24 +12,21 @@ class SelectPaymentOptionWidget extends StatefulWidget {
SelectPaymentOptionWidget(this.model);
@override
_SelectPaymentOptionWidgetState createState() =>
_SelectPaymentOptionWidgetState();
_SelectPaymentOptionWidgetState createState() => _SelectPaymentOptionWidgetState();
}
class _SelectPaymentOptionWidgetState extends State<SelectPaymentOptionWidget> {
PaymentOption paymentOption;
_navigateToPaymentOption() {
Navigator.push(context, FadePage(page: PaymentMethodSelectPage()))
.then((result) => {
setState(() {
if (result != null) {
paymentOption = result;
widget.model.paymentCheckoutData.paymentOption =
paymentOption;
}
})
});
Navigator.push(context, FadePage(page: PaymentMethodSelectPage())).then((result) => {
setState(() {
if (result != null) {
paymentOption = result;
widget.model.paymentCheckoutData.paymentOption = paymentOption;
}
})
});
}
@override
@ -75,8 +56,7 @@ class _SelectPaymentOptionWidgetState extends State<SelectPaymentOptionWidget> {
),
Expanded(
child: Container(
padding:
EdgeInsets.symmetric(vertical: 0, horizontal: 6),
padding: EdgeInsets.symmetric(vertical: 0, horizontal: 6),
child: Texts(
TranslationBase.of(context).selectPaymentOption,
fontSize: 14,

@ -1,14 +1,16 @@
import 'dart:io';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/borderedButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
class PaymentMethodSelectPage extends StatefulWidget {
@override
_PaymentMethodSelectPageState createState() =>
_PaymentMethodSelectPageState();
_PaymentMethodSelectPageState createState() => _PaymentMethodSelectPageState();
}
class _PaymentMethodSelectPageState extends State<PaymentMethodSelectPage> {
@ -20,8 +22,9 @@ class _PaymentMethodSelectPageState extends State<PaymentMethodSelectPage> {
double cardWidth = screenSize.width / 2 - 32;
return AppScaffold(
title: "Payment method",
appBarTitle: TranslationBase.of(context).paymentMethod,
isShowAppBar: true,
isPharmacy: true,
isShowDecPage: false,
body: Container(
width: double.infinity,
@ -30,72 +33,65 @@ class _PaymentMethodSelectPageState extends State<PaymentMethodSelectPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Center(
child: Texts(
child: Text(
TranslationBase.of(context).selectPaymentOption,
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.black,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
),
Container(
margin: EdgeInsets.symmetric(horizontal: 0, vertical: 16),
child: Column(
children: [
Row(
children: [
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.meda,
() => {
setState(() {
selectedPaymentOption = PaymentOption.meda;
})
}),
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.sadad,
() => {
setState(() {
selectedPaymentOption = PaymentOption.sadad;
})
}),
],
),
Row(
children: [
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.visa,
() => {
setState(() {
selectedPaymentOption = PaymentOption.visa;
})
}),
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.mastercard,
() => {
setState(() {
selectedPaymentOption =
PaymentOption.mastercard;
})
}),
],
),
PaymentMethodCard(
(cardWidth * 2 + 32),
cardWidth,
selectedPaymentOption,
PaymentOption.meda,
() => {
setState(() {
selectedPaymentOption = PaymentOption.meda;
})
}),
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.visa,
() => {
setState(() {
selectedPaymentOption = PaymentOption.visa;
})
}),
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.mastercard,
() => {
setState(() {
selectedPaymentOption = PaymentOption.mastercard;
})
}),
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.installments,
() => {
setState(() {
selectedPaymentOption =
PaymentOption.installments;
selectedPaymentOption = PaymentOption.installments;
})
}),
if (Platform.isIOS)
PaymentMethodCard(
cardWidth,
selectedPaymentOption,
PaymentOption.applepay,
() => {
setState(() {
selectedPaymentOption = PaymentOption.applepay;
})
}),
],
),
),
@ -103,18 +99,12 @@ class _PaymentMethodSelectPageState extends State<PaymentMethodSelectPage> {
),
),
bottomSheet: Container(
height: screenSize.height * 0.08,
margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: BorderedButton(
color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 20),
child: DefaultButton(
TranslationBase.of(context).next,
backgroundColor: Color(0xff5AB154),
textColor: Colors.white,
fontSize: 16,
hPadding: 8,
vPadding: 12,
handler: selectedPaymentOption != null
? () => {Navigator.pop(context, selectedPaymentOption)}
: null,
selectedPaymentOption != null ? () => {Navigator.pop(context, selectedPaymentOption)} : null,
color: Color(0xff5AB154),
),
),
);
@ -127,61 +117,102 @@ class PaymentMethodCard extends StatelessWidget {
final PaymentOption paymentOption;
final Function selectMethod;
PaymentMethodCard(this.cardWidth, this.selectedPaymentOption,
this.paymentOption, this.selectMethod);
PaymentMethodCard(this.cardWidth, this.selectedPaymentOption, this.paymentOption, this.selectMethod);
@override
Widget build(BuildContext context) {
bool isSelected = false;
if (selectedPaymentOption != null &&
selectedPaymentOption == paymentOption) {
if (selectedPaymentOption != null && selectedPaymentOption == paymentOption) {
isSelected = true;
}
return InkWell(
onTap: selectMethod,
child: Container(
margin: EdgeInsets.symmetric(horizontal: 2, vertical: 0),
child: Stack(
children: [
Container(
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
margin: EdgeInsets.symmetric(horizontal: 14, vertical: 8),
decoration: new BoxDecoration(
color: Colors.grey.shade100,
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(8),
border: Border.fromBorderSide(BorderSide(
color: isSelected ? Color(0xff20BC11) : Colors.grey.shade300,
width: 0.8,
)),
),
width: cardWidth,
child: Image.asset(
getPaymentOptionImage(paymentOption),
fit: BoxFit.cover,
),
),
if (isSelected)
Positioned(
right: 1,
child: Icon(
Icons.check_circle,
color: Color(0xff20BC11),
size: 30,
return Container(
width: MediaQuery.of(context).size.width * 0.99,
child: InkWell(
onTap: selectMethod,
child: Card(
elevation: 0.0,
margin: EdgeInsets.fromLTRB(8.0, 16.0, 8.0, 8.0),
color: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
side: isSelected ? BorderSide(color: Colors.green, width: 2.0) : BorderSide(color: Colors.transparent, width: 0.0),
),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
children: [
Container(
width: 24,
height: 24,
decoration: containerColorRadiusBorderWidth(isSelected ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
),
),
],
mWidth(12),
Container(
height: 70.0,
width: 70.0,
child: Image.asset(getPaymentOptionImage(paymentOption)),
),
mFlex(1),
if (isSelected)
Container(
decoration: containerRadius(CustomColors.green, 200),
padding: EdgeInsets.only(top: 6, bottom: 6, left: 12, right: 12),
child: Text(
TranslationBase.of(context).paymentSelected,
style: TextStyle(
color: Colors.white,
fontSize: 11,
),
),
),
],
),
),
),
// Container(
// margin: EdgeInsets.symmetric(horizontal: 2, vertical: 0),
// child: Stack(
// children: [
// Container(
// padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
// margin: EdgeInsets.symmetric(horizontal: 14, vertical: 8),
// decoration: new BoxDecoration(
// color: Colors.grey.shade100,
// shape: BoxShape.rectangle,
// borderRadius: BorderRadius.circular(8),
// border: Border.fromBorderSide(BorderSide(
// color: isSelected ? Color(0xff20BC11) : Colors.grey.shade300,
// width: 0.8,
// )),
// ),
// width: cardWidth,
// child: Image.asset(
// getPaymentOptionImage(paymentOption),
// fit: BoxFit.cover,
// ),
// ),
// if (isSelected)
// Positioned(
// right: 1,
// child: Icon(
// Icons.check_circle,
// color: Color(0xff20BC11),
// size: 30,
// ),
// ),
// ],
// ),
// ),
),
);
}
String getPaymentOptionImage(PaymentOption paymentOption) {
String assetFile = "assets/images/pharmacy_module/payment/";
String assetFile = "assets/images/new/payment/";
switch (paymentOption.index) {
case 0:
return "${assetFile}mada.png";
return "${assetFile}Mada.png";
break;
case 1:
return "${assetFile}sadad.png";
@ -190,10 +221,13 @@ class PaymentMethodCard extends StatelessWidget {
return "${assetFile}visa.png";
break;
case 3:
return "${assetFile}mastercard.png";
return "${assetFile}Mastercard.png";
break;
case 4:
return "${assetFile}installment.png";
return "${assetFile}installments.png";
break;
case 5:
return "${assetFile}Apple_Pay.png";
break;
default:
return "";

Loading…
Cancel
Save