6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit e5e82ade
Changed files
.../pregistration/bloc/preregistration_cubit.dart | 33 ++++++++-------------- .../lib/pregistration/components/add_card.dart | 27 +++++++----------- comwell_key_app/lib/services/api.dart | 14 +-------- 3 files changed, 23 insertions(+), 51 deletions(-)
Diff
diff --git a/comwell_key_app/lib/pregistration/bloc/preregistration_cubit.dart b/comwell_key_app/lib/pregistration/bloc/preregistration_cubit.dart
index ab75f65b..2876a9f4 100644
--- a/comwell_key_app/lib/pregistration/bloc/preregistration_cubit.dart
+++ b/comwell_key_app/lib/pregistration/bloc/preregistration_cubit.dart
@@ -5,7 +5,6 @@ import 'package:comwell_key_app/pregistration/pregistration_repository.dart';
import 'package:comwell_key_app/pregistration/preregistration_flow.dart';
import 'package:comwell_key_app/services/adyen/adyen_amount.dart';
import 'package:comwell_key_app/services/adyen/stored_payment_method.dart';
-import 'package:comwell_key_app/services/api.dart';
import 'package:comwell_key_app/tracking/comwell_tracking.dart';
import 'package:comwell_key_app/tracking/models/analytics_event_item.dart';
import 'package:easy_localization/easy_localization.dart';
@@ -18,7 +17,6 @@ class PreregistrationCubit extends Cubit<PreregistrationState> {
final _profileSettingsRepository = locator<ProfileSettingsRepository>();
final _preregistrationRepository = locator<PreregistrationRepository>();
final _tracking = locator<ComwellTracking>();
- final _api = Api();
final pageController = PageController();
final addressTextController = TextEditingController();
@@ -59,7 +57,7 @@ class PreregistrationCubit extends Cubit<PreregistrationState> {
}
}
- void onAddCardClicked() async {}
+ void onAddCardClicked() {}
void onInformationContinueClicked() {
if (isAddressValid && isPostalCodeValid && isCityValid && isCountryValid) {
@@ -247,35 +245,28 @@ class PreregistrationCubit extends Cubit<PreregistrationState> {
emit(state.copyWith(termsAndConditionsAccepted: toggle));
}
- Future<SessionCheckout> advancedCheckout(AdyenAmount amount) async {
- final response = await _api.createAdyenSession();
- final id = response["Id"] as String;
- final sessionData = response["SessionData"] as String;
- final config = DropInConfiguration(
- environment: Environment.test,
- clientKey: "test_BY456IM6H5DRHEVXE7CPJEPGKMUCBRYO",
- shopperLocale: "da-DK",
- cardConfiguration: const CardConfiguration(showStorePaymentField: true),
- countryCode: "DK");
-
- print("qqq countryCode=${config.countryCode}");
- return AdyenCheckout.session
- .create(sessionId: id, sessionData: sessionData, configuration: config);
+ Checkout advancedCheckout(AdyenAmount amount) {
+ return AdvancedCheckout(
+ onSubmit: (data, [extra]) async {
+ return _preregistrationRepository.onSubmit(amount, data, extra);
+ },
+ onAdditionalDetails: _preregistrationRepository.onAdditionalDetails,
+ );
}
Future<void> onPaymentResult(PaymentResult result) async {
switch (result) {
case PaymentAdvancedFinished():
- print("qqq Payment advanced finished");
+ print("Payment advanced finished");
break;
case PaymentSessionFinished():
- print("qqq Payment session finished");
+ print("Payment session finished");
break;
case PaymentCancelledByUser():
- print("qqq Session cancelled");
+ print("Session cancelled");
break;
case PaymentError():
- print("qqq Session error ${result.reason}");
+ print("Session error ${result.reason}");
break;
}
}
diff --git a/comwell_key_app/lib/pregistration/components/add_card.dart b/comwell_key_app/lib/pregistration/components/add_card.dart
index d02afce4..82ff850a 100644
--- a/comwell_key_app/lib/pregistration/components/add_card.dart
+++ b/comwell_key_app/lib/pregistration/components/add_card.dart
@@ -43,23 +43,16 @@ class AddCard extends StatelessWidget {
isScrollControlled: true,
context: context,
builder: (BuildContext context) {
- return FutureBuilder(
- future: cubit.advancedCheckout(amount),
- builder: (context, snapshot) {
- if(snapshot.hasError && kDebugMode) print("qqq error=${snapshot.error}");
- if (!snapshot.hasData) return const CircularProgressIndicator();
- return SafeArea(
- child: Padding(
- padding: MediaQuery.of(context).viewInsets,
- child: AdyenCardComponent(
- configuration: config,
- paymentMethod: paymentMethodConfig.toJson(),
- checkout: snapshot.data!,
- onPaymentResult: cubit.onPaymentResult,
- ),
- ));
- });
- },
+ return SafeArea(
+ child: Padding(
+ padding: MediaQuery.of(context).viewInsets,
+ child: AdyenCardComponent(
+ configuration: config,
+ paymentMethod: paymentMethodConfig.toJson(),
+ checkout: cubit.advancedCheckout(amount),
+ onPaymentResult: cubit.onPaymentResult,
+ ),
+ )); },
);
cubit.fetchPaymentMethods();
} catch (e) {
diff --git a/comwell_key_app/lib/services/api.dart b/comwell_key_app/lib/services/api.dart
index ce00a44d..95bcbeca 100644
--- a/comwell_key_app/lib/services/api.dart
+++ b/comwell_key_app/lib/services/api.dart
@@ -31,21 +31,9 @@ class Api {
Future<Response<PaymentMethods>> getPaymentMethods() async {
return await dio.get('/paymentMethods');
}
-
- Future<dynamic> createAdyenSession() async {
- final body = {
- "currency": "string",
- "amount": 0,
- "returnUrl": "string",
- "countryCode": "string"
- };
- final json = jsonEncode(body);
- final response = await dio.post<dynamic>("/Payment/v1/CreateAdyenSession", data: json);
- return response.data;
- }
Future<Json> postPaymentsDetails(Json body) async {
- final response = await dio.post<dynamic>("/payment/details", data: jsonEncode(body));
+ final response = await dio.post("/payment/details", data: jsonEncode(body));
return response.data as Json;
}