UCO-Projects
/
uco-mobile-poc
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code push

Browse Source
fix_issues
Saman Waqar 1 day ago
parent 35f5e45d5d
commit 27ac6f1f99
5 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
lib/app/core/constants/app_assets.dart
Unescape Escape View File

@ -100,7 +100,7 @@ class AppAssets {
static const personalDetails = "assets/$ORGANIZATION/icons/personal_details.svg"; static const personalDetails = "assets/$ORGANIZATION/icons/personal_details.svg";
static const ic_sort = "assets/$ORGANIZATION/icons/ic_sort.png"; static const ic_sort = "assets/$ORGANIZATION/icons/ic_sort.png";
static const ic_featured = "assets/$ORGANIZATION/icons/ic_featured.svg"; 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_correct_icon = "assets/$ORGANIZATION/icons/ic_congratulation.svg";
static const ic_arrow = "assets/$ORGANIZATION/icons/ic_arrow.svg"; static const ic_arrow = "assets/$ORGANIZATION/icons/ic_arrow.svg";

7
lib/app/models/resend_otp_usend.dart
Unescape Escape View File

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

3
lib/app/modules/add_money/controllers/add_money_otp_controller.dart
Unescape Escape View File

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

29
lib/app/modules/add_money/views/add_money_view.dart
Unescape Escape View File

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

27
lib/app/modules/dashboard/views/shared/drawer_data.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save