➕ Add the success/failure handling from Dart side for Apple Pay

pay/example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

pay/example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

pay/example/ios/Podfile.lock

@@ -19,10 +19,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pay_ios/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
   pay_ios: 8c7beb9c61d885f3f51b61f75f8793023fc8843a
 
-PODFILE CHECKSUM: fc81e398f362bae88bdf55239bd5cf842faad39f
+PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2

pay/example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -170,7 +170,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -237,10 +237,12 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -268,6 +270,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

pay/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

pay/example/ios/Runner/Info.plist

@@ -43,5 +43,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

pay/example/lib/main.dart

@@ -35,18 +35,19 @@ class PayMaterialApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const MaterialApp(
+    return MaterialApp(
       title: 'Pay for Flutter Demo',
-      localizationsDelegates: [
+      localizationsDelegates: const [
         ...GlobalMaterialLocalizations.delegates,
         GlobalWidgetsLocalizations.delegate,
       ],
-      supportedLocales: [
+      supportedLocales: const [
         Locale('en', ''),
         Locale('es', ''),
         Locale('de', ''),
       ],
-      home: PaySampleApp(),
+      theme: ThemeData.light(),
+      home: const PaySampleApp(),
     );
   }
 }
@@ -64,16 +65,23 @@ class _PaySampleAppState extends State<PaySampleApp> {
   @override
   void initState() {
     super.initState();
-    _googlePayConfigFuture =
-        PaymentConfiguration.fromAsset('default_google_pay_config.json');
+    _googlePayConfigFuture = PaymentConfiguration.fromAsset(
+      'default_google_pay_config.json',
+    );
   }
 
   void onGooglePayResult(paymentResult) {
     debugPrint(paymentResult.toString());
   }
 
-  void onApplePayResult(paymentResult) {
+  void onApplePayResult(paymentResult, ApplePaymentConfirmation handler) async {
     debugPrint(paymentResult.toString());
+
+    // This is where the payment result is fetched from the backend, and the
+    // payment result is updated accordingly.
+    bool isPaymentSuccessfull = true;
+
+    await handler.updatePaymentResult(isPaymentSuccessfull);
   }
 
   @override
@@ -128,23 +136,25 @@ class _PaySampleAppState extends State<PaySampleApp> {
           ),
           // Example pay button configured using an asset
           FutureBuilder<PaymentConfiguration>(
-              future: _googlePayConfigFuture,
-              builder: (context, snapshot) => snapshot.hasData
-                  ? GooglePayButton(
-                      paymentConfiguration: snapshot.data!,
-                      paymentItems: _paymentItems,
-                      type: GooglePayButtonType.buy,
-                      margin: const EdgeInsets.only(top: 15.0),
-                      onPaymentResult: onGooglePayResult,
-                      loadingIndicator: const Center(
-                        child: CircularProgressIndicator(),
-                      ),
-                    )
-                  : const SizedBox.shrink()),
+            future: _googlePayConfigFuture,
+            builder: (context, snapshot) => snapshot.hasData
+                ? GooglePayButton(
+                    paymentConfiguration: snapshot.data!,
+                    paymentItems: _paymentItems,
+                    type: GooglePayButtonType.buy,
+                    margin: const EdgeInsets.only(top: 15.0),
+                    onPaymentResult: onGooglePayResult,
+                    loadingIndicator: const Center(
+                      child: CircularProgressIndicator(),
+                    ),
+                  )
+                : const SizedBox.shrink(),
+          ),
           // Example pay button configured using a string
           ApplePayButton(
             paymentConfiguration: PaymentConfiguration.fromJsonString(
-                payment_configurations.defaultApplePay),
+              payment_configurations.defaultApplePay,
+            ),
             paymentItems: _paymentItems,
             style: ApplePayButtonStyle.black,
             type: ApplePayButtonType.buy,

pay/lib/src/pay.dart

@@ -40,7 +40,10 @@ class Pay {
 
   /// Creates an instance with a dictionary of [_configurations] and
   /// instantiates the [_payPlatform] to communicate with the native platforms.
-  Pay(this._configurations) : _payPlatform = PayMethodChannel();
+  Pay(this._configurations)
+      : _payPlatform = defaultTargetPlatform == TargetPlatform.iOS
+            ? IosPayMethodChannel()
+            : PayMethodChannel();
 
   /// Determines whether a user can pay with the selected [provider].
   ///
@@ -70,6 +73,19 @@ class Pay {
         _configurations[provider]!, paymentItems);
   }
 
+  /// Update the payment result with the native platform.
+  /// Works only on iOS.
+  Future<void> updatePaymentResult(bool isSuccess) async {
+    if (_payPlatform is IosPayMethodChannel) {
+      final iosPayPlatform = _payPlatform as IosPayMethodChannel;
+      return iosPayPlatform.updatePaymentResult(isSuccess);
+    } else {
+      throw MethodNotForCurrentPlatformException(
+        'The method "updatePaymentResult" can only be called when the "defaultTargetPlatform" is iOS.',
+      );
+    }
+  }
+
   /// Verifies that the selected provider has been previously configured or
   /// throws otherwise.
   Future<void> throwIfProviderIsNotDefined(PayProvider provider) async {
@@ -91,3 +107,15 @@ class ProviderNotConfiguredException implements Exception {
   @override
   String toString() => 'ProviderNotConfiguredException: $message';
 }
+
+/// Thrown to indicate that the method called is not available for the current
+/// platform is has been called from.
+class MethodNotForCurrentPlatformException implements Exception {
+  MethodNotForCurrentPlatformException(this.message);
+
+  /// A human-readable error message, possibly null.
+  final String? message;
+
+  @override
+  String toString() => 'MethodNotForCurrentPlatformException: $message';
+}

pay/lib/src/widgets/apple_pay_button.dart

@@ -14,6 +14,18 @@
 
 part of '../../pay.dart';
 
+class ApplePaymentConfirmation {
+  final Pay _payClient;
+  ApplePaymentConfirmation(Pay payClient) : _payClient = payClient;
+
+  Future<void> updatePaymentResult(bool completedSuccessfully) async {
+    await _payClient.updatePaymentResult(completedSuccessfully);
+  }
+}
+
+typedef ApplePaymentConfirmCallback = Function(
+    Map<String, dynamic> result, ApplePaymentConfirmation handler);
+
 /// A widget to show the Apple Pay button according to the rules and constraints
 /// specified in [PayButton].
 ///
@@ -38,7 +50,7 @@ class ApplePayButton extends PayButton {
     super.key,
     super.buttonProvider = PayProvider.apple_pay,
     required super.paymentConfiguration,
-    super.onPaymentResult,
+    required ApplePaymentConfirmCallback onPaymentResult,
     required List<PaymentItem> paymentItems,
     double? cornerRadius,
     ApplePayButtonStyle style = ApplePayButtonStyle.black,
@@ -51,7 +63,11 @@ class ApplePayButton extends PayButton {
     super.childOnError,
     super.loadingIndicator,
   })  : assert(width >= RawApplePayButton.minimumButtonWidth),
-        assert(height >= RawApplePayButton.minimumButtonHeight) {
+        assert(height >= RawApplePayButton.minimumButtonHeight),
+        super(paymentCallback: (result) {
+          final pay = Pay({buttonProvider: paymentConfiguration});
+          onPaymentResult(result, ApplePaymentConfirmation(pay));
+        }) {
     _applePayButton = RawApplePayButton(
         style: style,
         type: type,

pay/lib/src/widgets/google_pay_button.dart

@@ -14,6 +14,8 @@
 
 part of '../../pay.dart';
 
+typedef GooglePaymentCallback = Function(Map<String, dynamic> result);
+
 /// A widget to show the Google Pay button according to the rules and
 /// constraints specified in [PayButton].
 ///
@@ -38,7 +40,7 @@ class GooglePayButton extends PayButton {
     super.key,
     super.buttonProvider = PayProvider.google_pay,
     required final PaymentConfiguration paymentConfiguration,
-    super.onPaymentResult,
+    required GooglePaymentCallback onPaymentResult,
     required List<PaymentItem> paymentItems,
     int cornerRadius = RawGooglePayButton.defaultButtonHeight ~/ 2,
     GooglePayButtonTheme theme = GooglePayButtonTheme.dark,
@@ -52,7 +54,12 @@ class GooglePayButton extends PayButton {
     super.loadingIndicator,
   })  : assert(width >= RawGooglePayButton.minimumButtonWidth),
         assert(height >= RawGooglePayButton.defaultButtonHeight),
-        super(paymentConfiguration: paymentConfiguration) {
+        super(
+          paymentConfiguration: paymentConfiguration,
+          paymentCallback: (result) {
+            onPaymentResult(result);
+          },
+        ) {
     _googlePayButton = RawGooglePayButton(
         paymentConfiguration: paymentConfiguration,
         cornerRadius: cornerRadius,

pay/lib/src/widgets/pay_button.dart

@@ -14,6 +14,8 @@
 
 part of '../../pay.dart';
 
+typedef PaymentResultCallback = void Function(Map<String, dynamic> result);
+
 /// A widget that handles the API logic to facilitate the integration.
 ///
 /// This widget provides an alternative UI-based integration path that wraps
@@ -27,13 +29,13 @@ part of '../../pay.dart';
 /// method which starts the payment process.
 abstract class PayButton extends StatefulWidget {
   /// A resident client to issue requests against the APIs.
-  late final Pay _payClient;
+  final Pay _payClient;
 
   /// Specifies the payment provider supported by the button
   final PayProvider buttonProvider;
 
   /// A function called when the payment process yields a result.
-  final void Function(Map<String, dynamic> result)? onPaymentResult;
+  final PaymentResultCallback? paymentCallback;
 
   final double width;
   final double height;
@@ -56,7 +58,7 @@ abstract class PayButton extends StatefulWidget {
     super.key,
     required this.buttonProvider,
     required final PaymentConfiguration paymentConfiguration,
-    this.onPaymentResult,
+    this.paymentCallback,
     this.width = 0,
     this.height = 0,
     this.margin = const EdgeInsets.all(0),
@@ -77,7 +79,7 @@ abstract class PayButton extends StatefulWidget {
       try {
         final result =
             await _payClient.showPaymentSelector(buttonProvider, paymentItems);
-        onPaymentResult?.call(result);
+        paymentCallback?.call(result);
       } catch (error) {
         onError?.call(error);
       }

pay_ios/ios/Classes/PayPlugin.swift

@@ -23,6 +23,7 @@ public class PayPlugin: NSObject, FlutterPlugin {
   private static let methodChannelName = "plugins.flutter.io/pay_channel"
   private let methodUserCanPay = "userCanPay"
   private let methodShowPaymentSelector = "showPaymentSelector"
+  private let methodUpdatePaymentResult = "updatePaymentResult"
 
   private let paymentHandler = PaymentHandler()
 
@@ -48,6 +49,10 @@ public class PayPlugin: NSObject, FlutterPlugin {
         paymentConfiguration: arguments["payment_profile"] as! String,
         paymentItems: arguments["payment_items"] as! [[String: Any?]])
 
+    case methodUpdatePaymentResult:
+      let isSuccess = call.arguments as! Bool
+      paymentHandler.updatePaymentResult(isSuccess: isSuccess)
+
     default:
       result(FlutterMethodNotImplemented)
     }