code push

fix_issues
Saman Waqar 1 day ago
parent 35f5e45d5d
commit 27ac6f1f99

@ -100,7 +100,7 @@ class AppAssets {
static const personalDetails = "assets/$ORGANIZATION/icons/personal_details.svg";
static const ic_sort = "assets/$ORGANIZATION/icons/ic_sort.png";
static const ic_featured = "assets/$ORGANIZATION/icons/ic_featured.svg";
static const ic_congratulations = "assets/$ORGANIZATION/icons/ic_congratulations.svg";
static const ic_congratulations = "assets/$ORGANIZATION/icons/ic_congratulations!.svg";
static const ic_correct_icon = "assets/$ORGANIZATION/icons/ic_congratulation.svg";
static const ic_arrow = "assets/$ORGANIZATION/icons/ic_arrow.svg";

@ -8,6 +8,7 @@ class ResendOtpUsendModel {
String? email;
String? pinType;
bool? isOtpRequired;
String? transPincode;
ResendOtpUsendModel({
this.porOrgacode,
@ -17,6 +18,7 @@ class ResendOtpUsendModel {
this.email,
this.pinType,
this.isOtpRequired,
this.transPincode,
});
Map<String, dynamic> toMap() {
@ -43,7 +45,9 @@ class ResendOtpUsendModel {
if (isOtpRequired != null) {
result.addAll({'isOtpRequired': isOtpRequired});
}
if (transPincode != null) {
result.addAll({'transPincode': transPincode});
}
return result;
}
@ -56,6 +60,7 @@ class ResendOtpUsendModel {
email: map['email'],
pinType: map['pinType'],
isOtpRequired: map['isOtpRequired'],
transPincode:map['transPincode'],
);
}

@ -93,8 +93,9 @@ class AddMoneyOTPController extends GetxController {
email: SessionCache.instance.userInfo.cmpUserId,
cmpCustcode: SessionCache.instance.userInfo.cmpCustcode,
isOtpRequired: false,
transPincode:"123456",
pctCstycode: SessionCache.instance.userInfo.pctCstycode,
pinType: 'C_TRANPIN',
pinType: 'TRAN',
));
isResend.value = false;

@ -76,22 +76,19 @@ class AddMoneyView extends GetView<AddMoneyController> {
},
child: Container(
color: AppColors.transparent,
child: SizedBox(
width: 92,
height: 60,
child: Row(
children: [
Image.asset(controller.getFlagWithCurrencyCode(controller.selectedFromAccountCurrency.value.pcrCurrcode), width: 22),
const SizedBox(width: 6),
Text(
controller.selectedFromAccountCurrency.value.dmpProdshort,
style: context.textTheme.bodyMedium!.copyWith(fontSize: 16, color: AppColors.colorPrimary, fontWeight: FontWeight.w600),
),
const SizedBox(width: 6),
Image.asset(AppAssets.drop_down_ic, width: 10, height: 10),
const SizedBox(width: 6),
],
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Image.asset(controller.getFlagWithCurrencyCode(controller.selectedFromAccountCurrency.value.pcrCurrcode), width: 22),
const SizedBox(width: 6),
Text(
controller.selectedFromAccountCurrency.value.dmpProdshort,
style: context.textTheme.bodyMedium!.copyWith(fontSize: 16, color: AppColors.colorPrimary, fontWeight: FontWeight.w600),
),
const SizedBox(width: 6),
Image.asset(AppAssets.drop_down_ic, width: 10, height: 10),
const SizedBox(width: 15),
],
),
),
),

@ -63,17 +63,20 @@ class DrawerData extends GetView<DashboardScreenController> {
}),
),
const SizedBox(width: 15),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(SessionCache.instance.userInfo.name, style: Theme.of(context).textTheme.titleLarge),
const SizedBox(height: 2),
Text(SessionCache.instance.userInfo.cmpCustlastlogin != null ? SessionCache.instance.userInfo.cmpCustlastlogin : "N/A",
/*TranslationKeys.makeTranslation(
TranslationKeys.textAccountSession),*/
style: Theme.of(context).textTheme.bodyMedium),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(SessionCache.instance.userInfo.name, style: Theme.of(context).textTheme.titleLarge),
const SizedBox(height: 2),
Text(SessionCache.instance.userInfo.cmpCustlastlogin != null ? SessionCache.instance.userInfo.cmpCustlastlogin : "N/A",
/*TranslationKeys.makeTranslation(
TranslationKeys.textAccountSession),*/
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium),
],
),
),
],
),
@ -189,7 +192,7 @@ class DrawerData extends GetView<DashboardScreenController> {
color: AppColors.colorPrimary,
),
const SizedBox(width: 15),
Text(item.title, style: Theme.of(context).textTheme.titleSmall?.copyWith(fontSize: 15, fontWeight: FontWeight.w400)),
Expanded(child: Text(item.title, style: Theme.of(context).textTheme.titleSmall?.copyWith(fontSize: 15, fontWeight: FontWeight.w400))),
],
),
),

Loading…
Cancel
Save