payment button connected

2025-12-25 16:56:35 +01:00
parent b96babdfd4
commit fcc68c8380
12 changed files with 327 additions and 330 deletions
--- a/frontend/pweb/lib/pages/dashboard/payouts/widget.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/widget.dart
@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:provider/provider.dart';
-
-import 'package:pshared/provider/organizations.dart';
-import 'package:pshared/provider/payment/amount.dart';
-import 'package:pshared/provider/payment/flow.dart';
-import 'package:pshared/provider/payment/quotation.dart';
-import 'package:pshared/provider/payment/wallets.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
-
-import 'package:pweb/pages/dashboard/payouts/form.dart';
-
-
-class PaymentFromWrappingWidget extends StatelessWidget {
-  const PaymentFromWrappingWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) => MultiProvider(
-    providers: [
-      ChangeNotifierProvider(
-        create: (_) => PaymentAmountProvider(),
-      ),
-      ChangeNotifierProxyProvider5<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, PaymentFlowProvider, PaymentMethodsProvider, QuotationProvider>(
-        create: (_) => QuotationProvider(),
-        update: (context, orgnization, payment, wallet, flow, methods, provider) => provider!..update(orgnization, payment, wallet, flow, methods),
-      ),
-    ],
-    child: const PaymentFormWidget(),
-  );
-}
--- a/frontend/pweb/lib/pages/payment_methods/page.dart
+++ b/frontend/pweb/lib/pages/payment_methods/page.dart
@@ -8,7 +8,11 @@ import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/payment/methods/type.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/provider/organizations.dart';
+import 'package:pshared/provider/payment/amount.dart';
 import 'package:pshared/provider/payment/flow.dart';
+import 'package:pshared/provider/payment/provider.dart';
+import 'package:pshared/provider/payment/quotation.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';

@@ -38,16 +42,12 @@ class PaymentPage extends StatefulWidget {
 class _PaymentPageState extends State<PaymentPage> {
  late final TextEditingController _searchController;
  late final FocusNode _searchFocusNode;
-  late final PaymentFlowProvider _flowProvider;

  @override
  void initState() {
    super.initState();
    _searchController = TextEditingController();
    _searchFocusNode = FocusNode();
-    _flowProvider = PaymentFlowProvider(
-      initialType: widget.initialPaymentType ?? PaymentType.bankAccount,
-    );

    WidgetsBinding.instance.addPostFrameCallback((_) => _initializePaymentPage());
  }
@@ -56,45 +56,30 @@ class _PaymentPageState extends State<PaymentPage> {
  void dispose() {
    _searchController.dispose();
    _searchFocusNode.dispose();
-    _flowProvider.dispose();
    super.dispose();
  }

  void _initializePaymentPage() {
    final methodsProvider = context.read<PaymentMethodsProvider>();
    _handleWalletAutoSelection(methodsProvider);
-
-    final recipient = context.read<RecipientsProvider>().currentObject;
-    _syncFlowProvider(
-      recipient: recipient,
-      methodsProvider: methodsProvider,
-      preferredType: widget.initialPaymentType,
-    );
  }

  void _handleSearchChanged(String query) {
    context.read<RecipientsProvider>().setQuery(query);
  }

-  void _handleRecipientSelected(Recipient recipient) {
+  void _handleRecipientSelected(BuildContext context, Recipient recipient) {
    final recipientProvider = context.read<RecipientsProvider>();
-    final methodsProvider = context.read<PaymentMethodsProvider>();
-
    recipientProvider.setCurrentObject(recipient.id);
-    _flowProvider.reset(
-      recipient: recipient,
-      availableTypes: _availablePaymentTypes(recipient, methodsProvider),
-      preferredType: widget.initialPaymentType,
-    );
    _clearSearchField();
  }

-  void _handleRecipientCleared() {
+  void _handleRecipientCleared(BuildContext context) {
    final recipientProvider = context.read<RecipientsProvider>();
    final methodsProvider = context.read<PaymentMethodsProvider>();

    recipientProvider.setCurrentObject(null);
-    _flowProvider.reset(
+    context.read<PaymentFlowProvider>().reset(
      recipient: null,
      availableTypes: _availablePaymentTypes(null, methodsProvider),
      preferredType: widget.initialPaymentType,
@@ -108,9 +93,13 @@ class _PaymentPageState extends State<PaymentPage> {
    context.read<RecipientsProvider>().setQuery('');
  }

-  void _handleSendPayment() {
-    // TODO: Handle Payment logic
-    PosthogService.paymentInitiated(method: _flowProvider.selectedType);
+  void _handleSendPayment(BuildContext context) {
+    if (context.read<QuotationProvider>().isReady) {
+      context.read<PaymentProvider>().pay();
+      PosthogService.paymentInitiated(
+        method: context.read<PaymentFlowProvider>().selectedType,
+      );
+    }
  }

  @override
@@ -120,27 +109,49 @@ class _PaymentPageState extends State<PaymentPage> {
    final recipient = recipientProvider.currentObject;
    final availableTypes = _availablePaymentTypes(recipient, methodsProvider);

-    _syncFlowProvider(
-      recipient: recipient,
-      methodsProvider: methodsProvider,
-      preferredType: recipient != null ? widget.initialPaymentType : null,
-    );
-
-    return ChangeNotifierProvider.value(
-      value: _flowProvider,
-      child: PaymentPageBody(
-        onBack: widget.onBack,
-        fallbackDestination: widget.fallbackDestination,
-        recipient: recipient,
-        recipientProvider: recipientProvider,
-        methodsProvider: methodsProvider,
-        availablePaymentTypes: availableTypes,
-        searchController: _searchController,
-        searchFocusNode: _searchFocusNode,
-        onSearchChanged: _handleSearchChanged,
-        onRecipientSelected: _handleRecipientSelected,
-        onRecipientCleared: _handleRecipientCleared,
-        onSend: _handleSendPayment,
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProxyProvider2<RecipientsProvider, PaymentMethodsProvider, PaymentFlowProvider>(
+          create: (_) => PaymentFlowProvider(
+            initialType: widget.initialPaymentType ?? PaymentType.bankAccount,
+          ),
+          update: (_, recipients, methods, flow) {
+            final currentRecipient = recipients.currentObject;
+            flow!.sync(
+              recipient: currentRecipient,
+              availableTypes: _availablePaymentTypes(currentRecipient, methods),
+              preferredType: currentRecipient != null ? widget.initialPaymentType : null,
+            );
+            return flow;
+          },
+        ),
+        ChangeNotifierProvider(
+          create: (_) => PaymentAmountProvider(),
+        ),
+        ChangeNotifierProxyProvider5<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, PaymentFlowProvider, PaymentMethodsProvider, QuotationProvider>(
+          create: (_) => QuotationProvider(),
+          update: (_, organization, payment, wallet, flow, methods, provider) => provider!..update(organization, payment, wallet, flow, methods),
+        ),
+        ChangeNotifierProxyProvider2<OrganizationsProvider, QuotationProvider, PaymentProvider>(
+          create: (_) => PaymentProvider(), 
+          update: (_, organization, quotation, provider) => provider!..update(organization, quotation),
+        ),
+      ],
+      child: Builder(
+        builder: (innerContext) => PaymentPageBody(
+          onBack: widget.onBack,
+          fallbackDestination: widget.fallbackDestination,
+          recipient: recipient,
+          recipientProvider: recipientProvider,
+          methodsProvider: methodsProvider,
+          availablePaymentTypes: availableTypes,
+          searchController: _searchController,
+          searchFocusNode: _searchFocusNode,
+          onSearchChanged: _handleSearchChanged,
+          onRecipientSelected: (selected) => _handleRecipientSelected(innerContext, selected),
+          onRecipientCleared: () => _handleRecipientCleared(innerContext),
+          onSend: () => _handleSendPayment(innerContext),
+        ),
      ),
    );
  }
@@ -155,18 +166,6 @@ class _PaymentPageState extends State<PaymentPage> {
    }
  }

-  void _syncFlowProvider({
-    required Recipient? recipient,
-    required PaymentMethodsProvider methodsProvider,
-    PaymentType? preferredType,
-  }) {
-    _flowProvider.sync(
-      recipient: recipient,
-      availableTypes: _availablePaymentTypes(recipient, methodsProvider),
-      preferredType: preferredType,
-    );
-  }
-
  MethodMap _availablePaymentTypes(
    Recipient? recipient,
    PaymentMethodsProvider methodsProvider,
--- a/frontend/pweb/lib/pages/payment_methods/payment_page/page.dart
+++ b/frontend/pweb/lib/pages/payment_methods/payment_page/page.dart
@@ -8,7 +8,7 @@ import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 import 'package:pshared/provider/payment/flow.dart';

-import 'package:pweb/pages/dashboard/payouts/widget.dart';
+import 'package:pweb/pages/dashboard/payouts/form.dart';
 import 'package:pweb/pages/payment_methods/payment_page/back_button.dart';
 import 'package:pweb/pages/payment_methods/payment_page/header.dart';
 import 'package:pweb/pages/payment_methods/payment_page/method_selector.dart';
@@ -105,7 +105,7 @@ class PaymentPageContent extends StatelessWidget {
                    availableTypes: availablePaymentTypes,
                  ),
                  SizedBox(height: dimensions.paddingLarge),
-                  const PaymentFromWrappingWidget(),
+                  const PaymentFormWidget(),
                  SizedBox(height: dimensions.paddingXXXLarge),
                  SendButton(onPressed: onSend),
                  SizedBox(height: dimensions.paddingLarge),
--- a/frontend/pweb/lib/services/amplitude.dart
+++ b/frontend/pweb/lib/services/amplitude.dart
@@ -1,210 +0,0 @@
-import 'package:amplitude_flutter/amplitude.dart';
-import 'package:amplitude_flutter/configuration.dart';
-import 'package:amplitude_flutter/constants.dart' as amp;
-import 'package:amplitude_flutter/events/base_event.dart';
-import 'package:flutter/widgets.dart';
-import 'package:pshared/models/account/account.dart';
-import 'package:pshared/models/payment/type.dart';
-import 'package:pshared/models/recipient/status.dart';
-import 'package:pshared/models/recipient/type.dart';
-import 'package:pweb/widgets/sidebar/destinations.dart';
-
-
-class AmplitudeService {
-  static late Amplitude _analytics;
-
-  static Amplitude _amp() => _analytics;
-
-  static Future<void> initialize() async {
-    _analytics = Amplitude(Configuration(
-      apiKey: '12345', //TODO define through App Contants
-      serverZone: amp.ServerZone.eu, //TODO define through App Contants
-    ));
-    await _analytics.isBuilt;
-  }
-
-  static Future<void> identify(Account account) async =>
-      _amp().setUserId(account.id);
-
-  
-  static Future<void> login(Account account) async =>
-      _logEvent(
-        'login',
-        userProperties: {
-          // 'email': account.email, TODO Add email into account
-          'locale': account.locale,
-        },
-      );
-
-  static Future<void> logout() async => _logEvent("logout");
-
-  static Future<void> pageOpened(PayoutDestination page, {String? path, String? uiSource}) async {
-    return _logEvent("pageOpened", eventProperties: {
-      "page": page,
-      if (path != null) "path": path,
-      if (uiSource != null) "uiSource": uiSource,
-    });
-  }
-
-  //TODO Add when registration is ready. User properties {user_id, registration_date, has_wallet (true/false), wallet_balance (should concider loggin it as: 0 / <100 / 100–500 / 500+), preferred_method (Wallet/Card/Bank/IBAN), total_transactions, total_amount, last_payout_date, last_login_date , marketing_source}
-  
-  // static Future<void> registrationStarted(String method, String country) async =>
-  //   _logEvent("registrationStarted", eventProperties: {"method": method, "country": country});
-
-  // static Future<void> registrationCompleted(String method, String country) async =>
-  //     _logEvent("registrationCompleted", eventProperties: {"method": method, "country": country});
-
-  static Future<void> pageNotFound(String url) async =>
-      _logEvent("pageNotFound", eventProperties: {"url": url});
-
-  static Future<void> localeChanged(Locale locale) async =>
-      _logEvent("localeChanged", eventProperties: {"locale": locale.toString()});
-
-  static Future<void> localeMatched(String locale, bool haveRequested) async => //DO we need it?
-      _logEvent("localeMatched", eventProperties: {
-        "locale": locale,
-        "have_requested_locale": haveRequested
-      });
-
-  static Future<void> recipientAddStarted() async =>
-      _logEvent("recipientAddStarted");
-
-  static Future<void> recipientAddCompleted(
-    RecipientType type, 
-    RecipientStatus status, 
-    Set<PaymentType> methods,
-  ) async {
-    _logEvent(
-      "recipientAddCompleted", 
-      eventProperties: {
-        "methods": methods.map((m) => m.name).toList(),
-        "type": type.name,
-        "status": status.name,
-      },
-    );
-  }
-
-  static Future<void> _paymentEvent(
-    String evt,
-    double amount,
-    double fee,
-    bool payerCoversFee,
-    PaymentType source,
-    PaymentType recpientPaymentMethod, {
-    String? message,
-    String? errorType,
-    Map<String, dynamic>? extraProps,
-  }) async {
-    final props = {
-      "amount": amount,
-      "fee": fee,
-      "feeCoveredBy": payerCoversFee ? 'payer' : 'recipient',
-      "source": source,
-      "recipient_method": recpientPaymentMethod,
-      if (message != null) "message": message,
-      if (errorType != null) "error_type": errorType,
-      if (extraProps != null) ...extraProps,
-    };
-    return _logEvent(evt, eventProperties: props);
-  }
-
-  static Future<void> paymentPrepared(double amount, double fee,
-          bool payerCoversFee, PaymentType source, PaymentType recpientPaymentMethod) async =>
-      _paymentEvent("paymentPrepared", amount, fee, payerCoversFee, source, recpientPaymentMethod);
-  //TODO Rework paymentStarted (do i need all those properties or is the event enough? Mb properties should be passed at paymentPrepared)
-  static Future<void> paymentStarted(double amount, double fee,
-          bool payerCoversFee, PaymentType source, PaymentType recpientPaymentMethod) async =>
-      _paymentEvent("paymentStarted", amount, fee, payerCoversFee, source, recpientPaymentMethod);
-
-  static Future<void> paymentFailed(double amount, double fee, bool payerCoversFee,
-      PaymentType source, PaymentType recpientPaymentMethod, String errorType, String message) async =>
-      _paymentEvent("paymentFailed", amount, fee, payerCoversFee, source, recpientPaymentMethod,
-          errorType: errorType, message: message);
-
-  static Future<void> paymentError(double amount, double fee, bool payerCoversFee,
-      PaymentType source,PaymentType recpientPaymentMethod, String message) async =>
-      _paymentEvent("paymentError", amount, fee, payerCoversFee, source, recpientPaymentMethod,
-          message: message);
-
-  static Future<void> paymentSuccess({
-    required double amount,
-    required double fee,
-    required bool payerCoversFee,
-    required PaymentType source, 
-    required PaymentType recpientPaymentMethod,
-    required String transactionId,
-    String? comment,
-    required int durationMs,
-  }) async {
-    return _paymentEvent(
-      "paymentSuccess",
-      amount,
-      fee,
-      payerCoversFee,
-      source,
-      recpientPaymentMethod,
-      message: comment,
-      extraProps: {
-        "transaction_id": transactionId,
-        "duration_ms": durationMs, //How do i calculate duration here?
-        "\$revenue": amount, //How do i calculate revenue here?
-        "\$revenueType": "payment", //Do we need to get revenue type?
-      },
-    );
-  }
-
-  //TODO add when support is ready
-  // static Future<void> supportOpened(String fromPage, String trigger) async =>
-  //     _logEvent("supportOpened", eventProperties: {"from_page": fromPage, "trigger": trigger});
-
-  // static Future<void> supportMessageSent(String category, bool resolved) async =>
-  //     _logEvent("supportMessageSent", eventProperties: {"category": category, "resolved": resolved});
-
-
-  static Future<void> walletTopUp(double amount, PaymentType method) async =>
-      _logEvent("walletTopUp", eventProperties: {"amount": amount, "method": method});
-
-
-  //TODO Decide do we need uiElementClicked or pageOpened is enough?
-  static Future<void> uiElementClicked(String elementName, String page, String uiSource) async =>
-      _logEvent("uiElementClicked", eventProperties: {
-        "element_name": elementName,
-        "page": page,
-        "uiSource": uiSource
-      });
-
-  static final Map<String, int> _stepStartTimes = {};
-  //TODO Consider it as part of payment flow or registration flow or adding recipient and rework accordingly
-  static Future<void> stepStarted(String stepName, {String? context}) async {
-    _stepStartTimes[stepName] = DateTime.now().millisecondsSinceEpoch;
-    return _logEvent("stepStarted", eventProperties: {
-      "step_name": stepName,
-      if (context != null) "context": context,
-    });
-  }
-
-  static Future<void> stepCompleted(String stepName, bool success) async {
-    final now = DateTime.now().millisecondsSinceEpoch;
-    final start = _stepStartTimes[stepName] ?? now;
-    final duration = now - start;
-    return _logEvent("stepCompleted", eventProperties: {
-      "step_name": stepName,
-      "duration_ms": duration,
-      "success": success
-    });
-  }
-
-  static Future<void> _logEvent(
-    String eventType, {
-    Map<String, dynamic>? eventProperties,
-    Map<String, dynamic>? userProperties,
-  }) async {
-    final event = BaseEvent(
-      eventType,
-      eventProperties: eventProperties,
-      userProperties: userProperties,
-    );
-    _amp().track(event);
-    print(event.toString()); //TODO delete when everything is ready
-  }
-}