subscription & profile

master_new_changes
Aamir.Muhammad 2 years ago
parent b4a3819c36
commit 9a8a21e41b

@ -567,7 +567,17 @@
"logOut": "تسجيل الخروج", "logOut": "تسجيل الخروج",
"customer": "العميل", "customer": "العميل",
"accept": "قبول", "accept": "قبول",
"amountVAR": "كمية" "amountVAR": "كمية",
"nowVar": "الآن",
"whendoyouWanttoUpgrade": "متى تريد الترقية",
"yourSubscriptionUpgradeAffectingFrom": "سيتم ترقية اشتراكك الآن. ساري المفعول من",
"upgradeAfterCurrentExpiry": "الترقية بعد انتهاء الاشتراك الحالي",
"yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom": "سيتم ترقية اشتراكك بعد انتهاء اشتراكك الحالي. ساري المفعول من",
"upgradeVar": "ترقية",
"whendoyouWanttoRenew" : "متى تريد التجديد",
"renewVar" : "تجديد"

@ -404,7 +404,7 @@
"passwordAcceptableStrong": "Your password is acceptable but not strong", "passwordAcceptableStrong": "Your password is acceptable but not strong",
"passwordIsStrong": "Your password is strong", "passwordIsStrong": "Your password is strong",
"passwordVeryStrong": "Your password is very strong", "passwordVeryStrong": "Your password is very strong",
"onlyProviderApp": "Sorry, Only Customer's can log in this app", "onlyProviderApp": "Sorry, Only Providers can log in this app",
"selectDuration": "Select Duration", "selectDuration": "Select Duration",
"daysVar": "Days", "daysVar": "Days",
"adCharges": "Ad Charges", "adCharges": "Ad Charges",
@ -568,5 +568,13 @@
"logOut": "Log Out", "logOut": "Log Out",
"customer": "Customer", "customer": "Customer",
"accept": "Accept", "accept": "Accept",
"amountVAR": "Amount" "amountVAR": "Amount",
"nowVar": "Now",
"whendoyouWanttoUpgrade": "When do you want to upgrade",
"yourSubscriptionUpgradeAffectingFrom": "Your subscription will upgrade now. Affecting from",
"upgradeAfterCurrentExpiry": "Upgrade after current expiry",
"yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom": "Your subscription will upgrade after you current subscription will end. Affecting from",
"upgradeVar": "Upgrade",
"whendoyouWanttoRenew" : "When do you want to renew",
"renewVar" : "Renew"
} }

@ -99,6 +99,9 @@ class AppRoutes {
static const providerLicensePage = "/providerLicensePage"; static const providerLicensePage = "/providerLicensePage";
//Provider User Page
static const dealerUser = "/dealerUser";
//Chat //Chat
static const String chatView = "/chatView"; static const String chatView = "/chatView";

@ -583,7 +583,15 @@ class CodegenLoader extends AssetLoader{
"logOut": "تسجيل الخروج", "logOut": "تسجيل الخروج",
"customer": "العميل", "customer": "العميل",
"accept": "قبول", "accept": "قبول",
"amountVAR": "كمية" "amountVAR": "كمية",
"nowVar": "الآن",
"whendoyouWanttoUpgrade": "متى تريد الترقية",
"yourSubscriptionUpgradeAffectingFrom": "سيتم ترقية اشتراكك الآن. ساري المفعول من",
"upgradeAfterCurrentExpiry": "الترقية بعد انتهاء الاشتراك الحالي",
"yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom": "سيتم ترقية اشتراكك بعد انتهاء اشتراكك الحالي. ساري المفعول من",
"upgradeVar": "ترقية",
"whendoyouWanttoRenew": "متى تريد التجديد",
"renewVar": "تجديد"
}; };
static const Map<String,dynamic> en_US = { static const Map<String,dynamic> en_US = {
"firstTimeLogIn": "First Time Log In", "firstTimeLogIn": "First Time Log In",
@ -991,7 +999,7 @@ static const Map<String,dynamic> en_US = {
"passwordAcceptableStrong": "Your password is acceptable but not strong", "passwordAcceptableStrong": "Your password is acceptable but not strong",
"passwordIsStrong": "Your password is strong", "passwordIsStrong": "Your password is strong",
"passwordVeryStrong": "Your password is very strong", "passwordVeryStrong": "Your password is very strong",
"onlyProviderApp": "Sorry, Only Customer's can log in this app", "onlyProviderApp": "Sorry, Only Providers can log in this app",
"selectDuration": "Select Duration", "selectDuration": "Select Duration",
"daysVar": "Days", "daysVar": "Days",
"adCharges": "Ad Charges", "adCharges": "Ad Charges",
@ -1155,7 +1163,15 @@ static const Map<String,dynamic> en_US = {
"logOut": "Log Out", "logOut": "Log Out",
"customer": "Customer", "customer": "Customer",
"accept": "Accept", "accept": "Accept",
"amountVAR": "Amount" "amountVAR": "Amount",
"nowVar": "Now",
"whendoyouWanttoUpgrade": "When do you want to upgrade",
"yourSubscriptionUpgradeAffectingFrom": "Your subscription will upgrade now. Affecting from",
"upgradeAfterCurrentExpiry": "Upgrade after current expiry",
"yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom": "Your subscription will upgrade after you current subscription will end. Affecting from",
"upgradeVar": "Upgrade",
"whendoyouWanttoRenew": "When do you want to renew",
"renewVar": "Renew"
}; };
static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US}; static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
} }

@ -547,5 +547,13 @@ abstract class LocaleKeys {
static const customer = 'customer'; static const customer = 'customer';
static const accept = 'accept'; static const accept = 'accept';
static const amountVAR = 'amountVAR'; static const amountVAR = 'amountVAR';
static const nowVar = 'nowVar';
static const whendoyouWanttoUpgrade = 'whendoyouWanttoUpgrade';
static const yourSubscriptionUpgradeAffectingFrom = 'yourSubscriptionUpgradeAffectingFrom';
static const upgradeAfterCurrentExpiry = 'upgradeAfterCurrentExpiry';
static const yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom = 'yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom';
static const upgradeVar = 'upgradeVar';
static const whendoyouWanttoRenew = 'whendoyouWanttoRenew';
static const renewVar = 'renewVar';
} }

@ -13,14 +13,17 @@ import 'package:sizer/sizer.dart';
final navigatorKey = GlobalKey<NavigatorState>(); final navigatorKey = GlobalKey<NavigatorState>();
Logger logger = Logger( Logger logger = Logger(
// printer: PrettyPrinter(lineLength: 0, methodCount: 0,), printer: PrettyPrinter(printEmojis: false, colors: true,printTime: false),
); );
class MyHttpOverrides extends HttpOverrides { class MyHttpOverrides extends HttpOverrides {
@override @override
HttpClient createHttpClient(SecurityContext? context) { HttpClient createHttpClient(SecurityContext? context) {
return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true; return super.createHttpClient(context)
..badCertificateCallback = (X509Certificate cert, String host, int port) => true;
} }
} }
@ -64,11 +67,9 @@ class MyApp extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return LayoutBuilder(builder: (context, constraints) { return LayoutBuilder(builder: (context, constraints) {
return Sizer( return Sizer(
builder: ( builder: (BuildContext context,
BuildContext context,
Orientation orientation, Orientation orientation,
DeviceType deviceType, DeviceType deviceType,) {
) {
List<LocalizationsDelegate<dynamic>> delegates = context.localizationDelegates; List<LocalizationsDelegate<dynamic>> delegates = context.localizationDelegates;
// AppState().setPostParamsModel( // AppState().setPostParamsModel(
// PostParamsModel( // PostParamsModel(
@ -79,7 +80,10 @@ class MyApp extends StatelessWidget {
// key: navigatorKey, // key: navigatorKey,
navigatorKey: navigatorKey, navigatorKey: navigatorKey,
theme: AppTheme.getTheme( theme: AppTheme.getTheme(
isArabic: EasyLocalization.of(context)?.locale.languageCode == "ar", isArabic: EasyLocalization
.of(context)
?.locale
.languageCode == "ar",
), ),
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
localizationsDelegates: delegates, localizationsDelegates: delegates,

@ -117,6 +117,8 @@ class UserInfo {
AppState().userType = UserType.providerDealer; AppState().userType = UserType.providerDealer;
} else if (json["roleID"] == 6) { } else if (json["roleID"] == 6) {
AppState().userType = UserType.providerIndividual; AppState().userType = UserType.providerIndividual;
} else if (json["roleID"] == 7) {
AppState().userType = UserType.providerIndividual;
} else { } else {
AppState().userType = UserType.customer; AppState().userType = UserType.customer;
} }

@ -78,15 +78,7 @@ enum PaymentMethods {
tamara, tamara,
} }
enum PaymentTypes { enum PaymentTypes { subscription, appointment, adReserve, ads, request, extendAds, partialAppointment }
subscription,
appointment,
adReserve,
ads,
request,
extendAds,
partialAppointment
}
enum AdCreationSteps { enum AdCreationSteps {
vehicleDetails, vehicleDetails,
@ -199,3 +191,9 @@ enum SubscriptionTypeEnum {
upgrade, upgrade,
downgrade, downgrade,
} }
enum SubscriptionActionTypeEnum {
ads,
users,
branches,
}

@ -53,8 +53,7 @@ class PaymentVM extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
Future<void> onContinuePressed(BuildContext context, Future<void> onContinuePressed(BuildContext context, {required PaymentTypes paymentType}) async {
{required PaymentTypes paymentType}) async {
switch (selectedPaymentMethod) { switch (selectedPaymentMethod) {
case PaymentMethods.mada: case PaymentMethods.mada:
// TODO: Handle this case. // TODO: Handle this case.
@ -76,52 +75,40 @@ class PaymentVM extends ChangeNotifier {
return; return;
} }
Future<void> onAdsPaymentSuccess( Future<void> onAdsPaymentSuccess({required BuildContext context, required int currentAdId, required int paymentTypeId}) async {
{required BuildContext context,
required int currentAdId,
required int paymentTypeId}) async {
Utils.showLoading(context); Utils.showLoading(context);
PayOrderDetailRespModel payOrderDetailRespModel = await paymentRepo PayOrderDetailRespModel payOrderDetailRespModel = await paymentRepo.getPayOrderDetails(paymentId: paymentTypeId, adId: currentAdId);
.getPayOrderDetails(paymentId: paymentTypeId, adId: currentAdId);
await Future.delayed(const Duration(seconds: 2)); await Future.delayed(const Duration(seconds: 2));
Utils.hideLoading(context); Utils.hideLoading(context);
log("payOrderDetailRespModel: ${payOrderDetailRespModel.toString()}"); log("payOrderDetailRespModel: ${payOrderDetailRespModel.toString()}");
if (payOrderDetailRespModel.isPaid == null || if (payOrderDetailRespModel.isPaid == null || !payOrderDetailRespModel.isPaid!) {
!payOrderDetailRespModel.isPaid!) {
Utils.showToast(LocaleKeys.paymentFailed.tr()); Utils.showToast(LocaleKeys.paymentFailed.tr());
return; return;
} }
if (payOrderDetailRespModel.isPaid != null && if (payOrderDetailRespModel.isPaid != null && payOrderDetailRespModel.isPaid!) {
payOrderDetailRespModel.isPaid!) {
Utils.showToast(LocaleKeys.paymentSuccessful.tr()); Utils.showToast(LocaleKeys.paymentSuccessful.tr());
navigateReplaceWithNameUntilRoute(context, AppRoutes.dashboard); navigateReplaceWithNameUntilRoute(context, AppRoutes.dashboard);
} }
} }
Future<void> onAppointmentPaymentSuccess( Future<void> onAppointmentPaymentSuccess({required BuildContext context, required int currentAdId, required int paymentTypeId}) async {
{required BuildContext context,
required int currentAdId,
required int paymentTypeId}) async {
Utils.showLoading(context); Utils.showLoading(context);
//TODO: CONFIRM FROM ZAHOOR THAT WILL THIS METHOD WORK FOR APPOINTMENT //TODO: CONFIRM FROM ZAHOOR THAT WILL THIS METHOD WORK FOR APPOINTMENT
PayOrderDetailRespModel payOrderDetailRespModel = await paymentRepo PayOrderDetailRespModel payOrderDetailRespModel = await paymentRepo.getPayOrderDetails(paymentId: paymentTypeId, adId: currentAdId);
.getPayOrderDetails(paymentId: paymentTypeId, adId: currentAdId);
await Future.delayed(const Duration(seconds: 2)); await Future.delayed(const Duration(seconds: 2));
Utils.hideLoading(context); Utils.hideLoading(context);
log("payOrderDetailRespModel: ${payOrderDetailRespModel.toString()}"); log("payOrderDetailRespModel: ${payOrderDetailRespModel.toString()}");
if (payOrderDetailRespModel.isPaid == null || if (payOrderDetailRespModel.isPaid == null || !payOrderDetailRespModel.isPaid!) {
!payOrderDetailRespModel.isPaid!) {
Utils.showToast(LocaleKeys.paymentFailed.tr()); Utils.showToast(LocaleKeys.paymentFailed.tr());
return; return;
} }
if (payOrderDetailRespModel.isPaid != null && if (payOrderDetailRespModel.isPaid != null && payOrderDetailRespModel.isPaid!) {
payOrderDetailRespModel.isPaid!) {
Utils.showToast(LocaleKeys.paymentSuccessful.tr()); Utils.showToast(LocaleKeys.paymentSuccessful.tr());
navigateReplaceWithNameUntilRoute(context, AppRoutes.dashboard); navigateReplaceWithNameUntilRoute(context, AppRoutes.dashboard);
} }
@ -143,9 +130,7 @@ class PaymentVM extends ChangeNotifier {
} }
} }
Future<void> placeThePayment( Future<void> placeThePayment({required PaymentTypes paymentTypeEnum, required BuildContext context}) async {
{required PaymentTypes paymentTypeEnum,
required BuildContext context}) async {
await paymentService.placePayment( await paymentService.placePayment(
// This will be request ID for request payment || ad ID for Ad Related Payment || OrderProviderSubscriptionID for SubscriptionPayment // This will be request ID for request payment || ad ID for Ad Related Payment || OrderProviderSubscriptionID for SubscriptionPayment
id: getIdTypeByPaymentType(paymentTypeEnum), id: getIdTypeByPaymentType(paymentTypeEnum),
@ -193,10 +178,7 @@ class PaymentVM extends ChangeNotifier {
case PaymentTypes.adReserve: case PaymentTypes.adReserve:
case PaymentTypes.ads: case PaymentTypes.ads:
case PaymentTypes.extendAds: case PaymentTypes.extendAds:
await onAdsPaymentSuccess( await onAdsPaymentSuccess(context: context, paymentTypeId: paymentTypeEnum.getIdFromPaymentTypesEnum(), currentAdId: currentAdId);
context: context,
paymentTypeId: paymentTypeEnum.getIdFromPaymentTypesEnum(),
currentAdId: currentAdId);
break; break;
case PaymentTypes.partialAppointment: case PaymentTypes.partialAppointment:
log("Partial Appointment Payment has been Succeeded"); log("Partial Appointment Payment has been Succeeded");
@ -207,15 +189,19 @@ class PaymentVM extends ChangeNotifier {
} }
onSubscriptionSuccess(BuildContext context) { onSubscriptionSuccess(BuildContext context) {
pop(context); // pop(context);
pop(context); // pop(context);
pop(context); // pop(context);
context.read<SubscriptionsVM>().getMySubscriptions(
AppState().getUser.data?.userInfo?.providerId.toString() ?? ""); // context.read<SubscriptionsVM>().getMySubscriptions(AppState().getUser.data?.userInfo?.providerId.toString() ?? "");
context
.read<SubscriptionsVM>()
.mySubscriptionsBySp = [];
context.read<SubscriptionsVM>().getMySubscriptionsBySP(AppState().getUser.data?.userInfo?.providerId.toString() ?? "");
navigateReplaceWithNameUntilRoute(context, AppRoutes.mySubscriptionsPage);
} }
Future<void> onVisaCardSelected( Future<void> onVisaCardSelected(BuildContext context, PaymentTypes paymentType) async {
BuildContext context, PaymentTypes paymentType) async {
currentPaymentType = paymentType; currentPaymentType = paymentType;
switch (currentPaymentType) { switch (currentPaymentType) {
case PaymentTypes.appointment: case PaymentTypes.appointment:

@ -352,7 +352,7 @@ class UserVM extends BaseVM {
if (verifiedUser.messageStatus == 1) { if (verifiedUser.messageStatus == 1) {
User user = User.fromJson(jsonDecode(response2.body)); User user = User.fromJson(jsonDecode(response2.body));
if (appType == AppType.provider) { if (appType == AppType.provider) {
if (user.data!.userInfo!.roleId == 5 || user.data!.userInfo!.roleId == 6) { if (user.data!.userInfo!.roleId == 5 || user.data!.userInfo!.roleId == 6 || user.data!.userInfo!.roleId == 7) {
AppState().setUser = user; AppState().setUser = user;
SharedPrefManager.setUserToken(user.data!.accessToken ?? ""); SharedPrefManager.setUserToken(user.data!.accessToken ?? "");
SharedPrefManager.setUserId(user.data!.userInfo!.userId ?? ""); SharedPrefManager.setUserId(user.data!.userInfo!.userId ?? "");
@ -393,7 +393,7 @@ class UserVM extends BaseVM {
if (verifiedUser.messageStatus == 1) { if (verifiedUser.messageStatus == 1) {
User user = User.fromJson(jsonDecode(response2.body)); User user = User.fromJson(jsonDecode(response2.body));
if (appType == AppType.provider) { if (appType == AppType.provider) {
if (user.data!.userInfo!.roleId == 5 || user.data!.userInfo!.roleId == 6) { if (user.data!.userInfo!.roleId == 5 || user.data!.userInfo!.roleId == 6 || user.data!.userInfo!.roleId == 7 ) {
AppState().setUser = user; AppState().setUser = user;
SharedPrefManager.setUserToken(user.data!.accessToken ?? ""); SharedPrefManager.setUserToken(user.data!.accessToken ?? "");
SharedPrefManager.setUserId(user.data!.userInfo!.userId ?? ""); SharedPrefManager.setUserId(user.data!.userInfo!.userId ?? "");

@ -16,9 +16,7 @@ class PaymentMethodsView extends StatelessWidget {
final PaymentTypes paymentType; final PaymentTypes paymentType;
final Function? onTempContinue; final Function? onTempContinue;
const PaymentMethodsView( const PaymentMethodsView({Key? key, required this.paymentType, this.onTempContinue}) : super(key: key);
{Key? key, required this.paymentType, this.onTempContinue})
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -36,46 +34,29 @@ class PaymentMethodsView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
20.height, 20.height,
LocaleKeys.selectPaymentMethod LocaleKeys.selectPaymentMethod.tr().toText(fontSize: 18, isBold: true),
.tr()
.toText(fontSize: 18, isBold: true),
15.height, 15.height,
Consumer( Consumer(
builder: builder: (BuildContext context, PaymentVM paymentVm, Widget? child) {
(BuildContext context, PaymentVM paymentVm, Widget? child) {
return Expanded( return Expanded(
child: ListView( child: ListView(
shrinkWrap: true, shrinkWrap: true,
children: [ children: [
PaymentMethodContainer( PaymentMethodContainer(
isSelected: paymentVm.selectedPaymentMethod == isSelected: paymentVm.selectedPaymentMethod == PaymentMethods.mada, onTap: () => paymentVm.updateSelectedPaymentMethod(PaymentMethods.mada), cardAsset: MyAssets.madaPng),
PaymentMethods.mada,
onTap: () => paymentVm
.updateSelectedPaymentMethod(PaymentMethods.mada),
cardAsset: MyAssets.madaPng),
PaymentMethodContainer( PaymentMethodContainer(
isSelected: paymentVm.selectedPaymentMethod == isSelected: paymentVm.selectedPaymentMethod == PaymentMethods.visa, onTap: () => paymentVm.updateSelectedPaymentMethod(PaymentMethods.visa), cardAsset: MyAssets.visaPng),
PaymentMethods.visa,
onTap: () => paymentVm
.updateSelectedPaymentMethod(PaymentMethods.visa),
cardAsset: MyAssets.visaPng),
PaymentMethodContainer( PaymentMethodContainer(
isSelected: paymentVm.selectedPaymentMethod == isSelected: paymentVm.selectedPaymentMethod == PaymentMethods.applePay,
PaymentMethods.applePay, onTap: () => paymentVm.updateSelectedPaymentMethod(PaymentMethods.applePay),
onTap: () => paymentVm.updateSelectedPaymentMethod(
PaymentMethods.applePay),
cardAsset: MyAssets.applePayPng), cardAsset: MyAssets.applePayPng),
PaymentMethodContainer( PaymentMethodContainer(
isSelected: paymentVm.selectedPaymentMethod == isSelected: paymentVm.selectedPaymentMethod == PaymentMethods.masterCard,
PaymentMethods.masterCard, onTap: () => paymentVm.updateSelectedPaymentMethod(PaymentMethods.masterCard),
onTap: () => paymentVm.updateSelectedPaymentMethod(
PaymentMethods.masterCard),
cardAsset: MyAssets.mastercardPng), cardAsset: MyAssets.mastercardPng),
PaymentMethodContainer( PaymentMethodContainer(
isSelected: paymentVm.selectedPaymentMethod == isSelected: paymentVm.selectedPaymentMethod == PaymentMethods.tamara,
PaymentMethods.tamara, onTap: () => paymentVm.updateSelectedPaymentMethod(PaymentMethods.tamara),
onTap: () => paymentVm.updateSelectedPaymentMethod(
PaymentMethods.tamara),
cardAsset: MyAssets.tamaraEngPng), cardAsset: MyAssets.tamaraEngPng),
], ],
), ),
@ -93,10 +74,7 @@ class PaymentMethodsView extends StatelessWidget {
isNeedToCallPayment = await onTempContinue!(); isNeedToCallPayment = await onTempContinue!();
} }
if (isNeedToCallPayment) { if (isNeedToCallPayment) {
context.read<PaymentVM>().onContinuePressed( context.read<PaymentVM>().onContinuePressed(context, paymentType: paymentType);
context,
paymentType: paymentType,
);
} }
}, },
backgroundColor: MyColors.darkPrimaryColor, backgroundColor: MyColors.darkPrimaryColor,
@ -114,12 +92,7 @@ class PaymentMethodContainer extends StatelessWidget {
final String cardAsset; final String cardAsset;
final Function() onTap; final Function() onTap;
const PaymentMethodContainer( const PaymentMethodContainer({Key? key, required this.isSelected, required this.cardAsset, required this.onTap}) : super(key: key);
{Key? key,
required this.isSelected,
required this.cardAsset,
required this.onTap})
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -132,9 +105,7 @@ class PaymentMethodContainer extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyColors.white, color: MyColors.white,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
border: Border.all( border: Border.all(color: isSelected ? Colors.green : Colors.transparent, width: isSelected ? 2.0 : 0.0),
color: isSelected ? Colors.green : Colors.transparent,
width: isSelected ? 2.0 : 0.0),
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
@ -143,11 +114,7 @@ class PaymentMethodContainer extends StatelessWidget {
Container( Container(
width: 24, width: 24,
height: 24, height: 24,
decoration: Utils.containerColorRadiusBorderWidth( decoration: Utils.containerColorRadiusBorderWidth(isSelected ? MyColors.primaryColor : Colors.transparent, 100, Colors.grey, 0.5),
isSelected ? MyColors.primaryColor : Colors.transparent,
100,
Colors.grey,
0.5),
), ),
12.width, 12.width,
Container( Container(
@ -157,12 +124,7 @@ class PaymentMethodContainer extends StatelessWidget {
child: Image.asset(cardAsset), child: Image.asset(cardAsset),
), ),
Utils.mFlex(1), Utils.mFlex(1),
isSelected isSelected ? Utils.statusContainerChip(text: "Selected", padding: EdgeInsets.symmetric(vertical: 6, horizontal: 10)) : SizedBox(),
? Utils.statusContainerChip(
text: "Selected",
padding:
EdgeInsets.symmetric(vertical: 6, horizontal: 10))
: SizedBox(),
], ],
), ),
), ),

@ -144,7 +144,24 @@ class SettingOptionsLanguage extends StatelessWidget {
onTap: () { onTap: () {
navigateWithName(context, AppRoutes.providerLicensePage); navigateWithName(context, AppRoutes.providerLicensePage);
}, },
) ),
// CustomSettingOptionsTile(
// leadingWidget: SizedBox(
// width: 16,
// height: 16,
// child: SvgPicture.asset(
// MyAssets.providersIcon,
// // color: MyColors.primaryColor,
// ),
// ),
// titleText: "Users",
// subTitle: null,
// isForLanguage: false,
// needBorderBelow: false,
// onTap: () {
// navigateWithName(context, AppRoutes.dealerUser, arguments: AppState().getUser.data!.userInfo!.id.toString());
// },
// )
], ],
).toWhiteContainer(width: double.infinity, pading: const EdgeInsets.all(12), borderRadius: 0) ).toWhiteContainer(width: double.infinity, pading: const EdgeInsets.all(12), borderRadius: 0)
: SizedBox(), : SizedBox(),

@ -49,10 +49,19 @@ class _LoginWithPasswordState extends State<LoginWithPassword> {
userVM = Provider.of(context, listen: false); userVM = Provider.of(context, listen: false);
context.read<UserVM>().getAvailBio(); context.read<UserVM>().getAvailBio();
if (AppState().currentAppType == AppType.provider) { if (AppState().currentAppType == AppType.provider) {
// phoneNum = "966530896018"; phoneNum = "966530896018";
// password = "Amir@1234"; password = "Amir@1234";
phoneNum = "966569755630";
password = "Amir12345@"; // phoneNum = "966569755630";
// password = "Amir12345@"; //AAmir Sal
// phoneNum = "966598646795";
// password = "Zahoor@123";
// User Details
// phoneNum = "966554870506";
// password = "Sikander123@"; // "lastName": "sik",
// "email": "sikander@gmail.com",
} }
getCountryList(); getCountryList();

Loading…
Cancel
Save