Skip to content

MS-509: Fix setup plreload for SDK language taken from the checkout #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vscmaster merged 1 commit into from
May 13, 2026
Merged

MS-509: Fix setup plreload for SDK language taken from the checkout #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion Sample/lib/feature/home/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class _HomeScreenState extends State<HomeScreen> {
late TextEditingController cardExpiryTimeController;
late TextEditingController paymentsListItemCountController;
late TextEditingController defaultSelectedPaymentController;
late TextEditingController languageController;

@override
void initState() {
Expand All @@ -44,6 +45,7 @@ class _HomeScreenState extends State<HomeScreen> {
cardExpiryTimeController = TextEditingController(text: state.cardExpiryTime);
paymentsListItemCountController = TextEditingController(text: state.paymentsListItemCount);
defaultSelectedPaymentController = TextEditingController(text: state.defaultSelectedPayment);
languageController = TextEditingController(text: state.language);
}

@override
Expand Down Expand Up @@ -73,6 +75,22 @@ class _HomeScreenState extends State<HomeScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
DropdownMenu<String>(
initialSelection: Platform.localeName.split("_")[0],
controller: languageController,
requestFocusOnTap: true,
label: const Text('Language'),
expandedInsets: EdgeInsets.zero,
onSelected: (String? lang) {
context.read<HomeScreenCubit>().onLanguageChanged(lang);
},
dropdownMenuEntries: ["en", "ar"].map<DropdownMenuEntry<String>>((
String lang,
) {
return DropdownMenuEntry<String>(value: lang, label: lang);
}).toList(),
),
const SizedBox(height: 8),
TextFormField(
controller: amountEditingController,
onChanged: (text) {
Expand Down Expand Up @@ -263,7 +281,8 @@ class _HomeScreenState extends State<HomeScreen> {
),
const Text('Auto debit'),
],
),Row(
),
Row(
children: [
Checkbox(
checkColor: Colors.white,
Expand Down
21 changes: 14 additions & 7 deletions Sample/lib/feature/home/home_screen_cubit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
currencyCode: currencyCode,
phoneNumber: _customerPhone,
customerId: customerId,
language: Platform.localeName.split("_")[0],
formsOfPaymentChecked: Map.from({
FormsOfPayment.redirect: true,
FormsOfPayment.flex: true,
Expand Down Expand Up @@ -100,7 +101,9 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
void getSessionId({required String merchantId, required String apiKey}) async {
_logger.d("getSessionId, merchantId: $merchantId, apiKey: $apiKey");
emit(state.copyWith(sessionId: null, hasSessionLoaded: false));
final language = Platform.localeName.split("_")[0];

final language = state.language ?? Platform.localeName.split("_")[0];

final cardExpiryTime = state.cardExpiryTime?.isNotEmpty == true
? int.tryParse(state.cardExpiryTime!)
: null;
Expand Down Expand Up @@ -319,7 +322,7 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {

final brandingOptionsRequest = BrandingOptionsRequest(paymentMethods: BrandingPaymentMethods());
state.pgCodesChecked?.forEach((code, isSelected) {
if(isSelected) {
if (isSelected) {
switch (code) {
case PGCode.knet:
brandingOptionsRequest.paymentMethods.knetStaging = BrandingOption(
Expand All @@ -334,13 +337,13 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
fontWeight: 400,
);
case PGCode.benefit:
/* brandingOptionsRequest.paymentMethods.benefit = BrandingOption(
/* brandingOptionsRequest.paymentMethods.benefit = BrandingOption(
text: "Branding text for Benefit",
color: "#006400",
fontWeight: 900,
);*/
case PGCode.benefitpay:
/* brandingOptionsRequest.paymentMethods.benefitpay = BrandingOption(
/* brandingOptionsRequest.paymentMethods.benefitpay = BrandingOption(
text: "Branding text for BenefitPay",
color: "#48D1CC",
fontWeight: 900,
Expand Down Expand Up @@ -381,8 +384,8 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
color: "#708090",
fontWeight: 700,
);
case PGCode.cs:
brandingOptionsRequest.paymentMethods.cs = BrandingOption(
case PGCode.cs:
brandingOptionsRequest.paymentMethods.cs = BrandingOption(
text: "Branding text for cs",
color: "#D2691E",
fontWeight: 300,
Expand All @@ -399,11 +402,15 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
color: "#2F4F4F",
fontWeight: 300,
);
default:
default:
}
}
});

return brandingOptionsRequest;
}

void onLanguageChanged(String? lang) {
emit(state.copyWith(language: lang));
}
}
5 changes: 5 additions & 0 deletions Sample/lib/feature/home/home_screen_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ final class HomeScreenState extends Equatable {
final String? cardExpiryTime;
final String paymentsListItemCount;
final String? defaultSelectedPayment;
final String? language;
final bool showPaymentDetails;
final bool? noForms;
final bool? preloadPayload;
Expand All @@ -37,6 +38,7 @@ final class HomeScreenState extends Equatable {
this.cardExpiryTime,
this.paymentsListItemCount = "$_default_payments_list__item_count",
this.defaultSelectedPayment,
this.language,
this.showPaymentDetails = true,
this.preloadPayload = true,
this.isAutoDebit = false,
Expand All @@ -60,6 +62,7 @@ final class HomeScreenState extends Equatable {
String? cardExpiryTime,
String? paymentsListItemCount,
String? defaultSelectedPayment,
String? language,
bool? showPaymentDetails,
bool? noForms,
bool? preloadPayload,
Expand All @@ -82,6 +85,7 @@ final class HomeScreenState extends Equatable {
cardExpiryTime: cardExpiryTime ?? this.cardExpiryTime,
paymentsListItemCount: paymentsListItemCount ?? this.paymentsListItemCount,
defaultSelectedPayment: defaultSelectedPayment ?? this.defaultSelectedPayment,
language: language ?? this.language,
showPaymentDetails: showPaymentDetails ?? this.showPaymentDetails,
noForms: noForms ?? this.noForms,
preloadPayload: preloadPayload ?? this.preloadPayload,
Expand All @@ -107,6 +111,7 @@ final class HomeScreenState extends Equatable {
cardExpiryTime,
paymentsListItemCount,
defaultSelectedPayment,
language,
sessionId,
preloadPayload,
isAutoDebit,
Expand Down