tech/sendico
2
0
Fork 0
Code Issues 22 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

added wallet source to quotation preparation

Browse Source
This commit is contained in:
Stephan D
2025-12-24 19:59:50 +01:00
parent 68b82cbca2
commit e0820c47c2
35 changed files with 151 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/pweb/lib/app/router/payout_shell.dart
View File

@@ -10,7 +10,7 @@ import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/app/router/pages.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/address_book/form/page.dart';
import 'package:pweb/pages/address_book/page/page.dart';
import 'package:pweb/pages/dashboard/dashboard.dart';
@@ -20,7 +20,7 @@ import 'package:pweb/pages/payout_page/wallet/edit/page.dart';
import 'package:pweb/pages/report/page.dart';
import 'package:pweb/pages/settings/profile/page.dart';
import 'package:pweb/pages/wallet_top_up/page.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/widgets/error/snackbar.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/widgets/sidebar/page.dart';

29
frontend/pweb/lib/data/mappers/wallet_ui.dart
View File

@@ -1,29 +0,0 @@
import 'package:pshared/models/currency.dart';
import 'package:pshared/models/wallet/wallet.dart' as domain;
import 'package:pweb/models/wallet.dart';
extension WalletUiMapper on domain.WalletModel {
Wallet toUi() {
final amountStr = availableMoney?.amount ?? balance?.available?.amount ?? '0';
final currencyStr = availableMoney?.currency ?? balance?.available?.currency ?? Currency.usd.toString().toUpperCase();
final parsedAmount = double.tryParse(amountStr) ?? 0;
final currency = Currency.values.firstWhere(
(c) => c.name.toUpperCase() == currencyStr.toUpperCase(),
orElse: () => Currency.usd,
);
return Wallet(
id: walletRef,
walletUserID: walletRef,
balance: parsedAmount,
currency: currency,
isHidden: true,
calculatedAt: balance?.calculatedAt ?? DateTime.now(),
depositAddress: depositAddress,
network: asset.chain,
tokenSymbol: asset.tokenSymbol,
contractAddress: asset.contractAddress,
describable: describable,
);
}
}

9
frontend/pweb/lib/main.dart
View File

@@ -13,7 +13,6 @@ import 'package:pshared/provider/permissions.dart';
import 'package:pshared/provider/account.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pshared/provider/payment/amount.dart';
import 'package:pshared/provider/payment/quotation.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
@@ -24,13 +23,13 @@ import 'package:pweb/providers/mock_payment.dart';
import 'package:pweb/providers/operatioins.dart';
import 'package:pweb/providers/two_factor.dart';
import 'package:pweb/providers/upload_history.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/providers/wallet_transactions.dart';
import 'package:pweb/services/operations.dart';
import 'package:pweb/services/payments/history.dart';
import 'package:pweb/services/posthog.dart';
import 'package:pweb/services/wallet_transactions.dart';
import 'package:pweb/services/wallets.dart';
import 'package:pshared/service/payment/wallets.dart';
import 'package:pweb/providers/account.dart';
@@ -100,10 +99,6 @@ void main() async {
ChangeNotifierProvider(
create: (_) => PaymentAmountProvider(),
),
ChangeNotifierProxyProvider2<OrganizationsProvider, PaymentAmountProvider, QuotationProvider>(
create: (_) => QuotationProvider(),
update: (context, orgnization, payment, provider) => provider!..update(orgnization, payment),
),
],
child: const PayApp(),
),

67
frontend/pweb/lib/models/wallet.dart
View File

@@ -1,67 +0,0 @@
import 'package:pshared/models/currency.dart';
import 'package:pshared/models/describable.dart';
import 'package:pshared/models/payment/chain_network.dart';
class Wallet implements Describable {
final String id;
final String walletUserID; // ID or number that we show the user
final double balance;
final Currency currency;
final bool isHidden;
final DateTime calculatedAt;
final String? depositAddress;
final ChainNetwork? network;
final String? tokenSymbol;
final String? contractAddress;
final Describable describable;
@override
String get name => describable.name;
@override
String? get description => describable.description;
Wallet({
required this.id,
required this.walletUserID,
required this.balance,
required this.currency,
required this.calculatedAt,
required this.describable,
this.isHidden = true,
this.depositAddress,
this.network,
this.tokenSymbol,
this.contractAddress,
});
Wallet copyWith({
String? id,
double? balance,
Currency? currency,
String? walletUserID,
bool? isHidden,
String? depositAddress,
ChainNetwork? network,
String? tokenSymbol,
String? contractAddress,
Describable? describable,
String? name,
String? Function()? description,
}) => Wallet(
id: id ?? this.id,
balance: balance ?? this.balance,
currency: currency ?? this.currency,
walletUserID: walletUserID ?? this.walletUserID,
isHidden: isHidden ?? this.isHidden,
calculatedAt: calculatedAt,
depositAddress: depositAddress ?? this.depositAddress,
network: network ?? this.network,
tokenSymbol: tokenSymbol ?? this.tokenSymbol,
contractAddress: contractAddress ?? this.contractAddress,
describable: describable
?? (name != null || description != null
? this.describable.copyWith(name: name, description: description)
: this.describable),
);
}

2
frontend/pweb/lib/pages/dashboard/buttons/balance/amount.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
class BalanceAmount extends StatelessWidget {

4
frontend/pweb/lib/pages/dashboard/buttons/balance/balance.dart
View File

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/carousel.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

4
frontend/pweb/lib/pages/dashboard/buttons/balance/card.dart
View File

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/add_funds.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
import 'package:pweb/pages/dashboard/buttons/balance/header.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
class WalletCard extends StatelessWidget {

2
frontend/pweb/lib/pages/dashboard/buttons/balance/carousel.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/card.dart';
import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
import 'package:pweb/pages/dashboard/buttons/balance/indicator.dart';

2
frontend/pweb/lib/pages/dashboard/dashboard.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/balance.dart';
import 'package:pweb/pages/dashboard/buttons/buttons.dart';
import 'package:pweb/pages/dashboard/payouts/multiple/title.dart';

2
frontend/pweb/lib/pages/dashboard/payouts/summary/widget.dart
View File

@@ -8,7 +8,7 @@ import 'package:pweb/pages/dashboard/payouts/summary/fee.dart';
import 'package:pweb/pages/dashboard/payouts/summary/recipient_receives.dart';
import 'package:pweb/pages/dashboard/payouts/summary/sent_amount.dart';
import 'package:pweb/pages/dashboard/payouts/summary/total.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
class PaymentSummary extends StatelessWidget {

5
frontend/pweb/lib/pages/dashboard/payouts/widget.dart
View File

@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pshared/provider/payment/amount.dart';
import 'package:pshared/provider/payment/quotation.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/pages/dashboard/payouts/form.dart';
@@ -18,9 +19,9 @@ class PaymentFromWrappingWidget extends StatelessWidget {
ChangeNotifierProvider(
create: (_) => PaymentAmountProvider(),
),
ChangeNotifierProxyProvider2<OrganizationsProvider, PaymentAmountProvider, QuotationProvider>(
ChangeNotifierProxyProvider3<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, QuotationProvider>(
create: (_) => QuotationProvider(),
update: (context, orgnization, payment, provider) => provider!..update(orgnization, payment),
update: (context, orgnization, payment, wallet, provider) => provider!..update(orgnization, payment, wallet),
),
],
child: const PaymentFormWidget(),

4
frontend/pweb/lib/pages/payment_methods/page.dart
View File

@@ -11,10 +11,10 @@ import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/providers/payment_flow.dart';
import 'package:pweb/pages/payment_methods/payment_page/body.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/services/posthog.dart';

4
frontend/pweb/lib/pages/payment_methods/payment_page/method_selector.dart
View File

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/utils/payment/dropdown.dart';

2
frontend/pweb/lib/pages/payout_page/page.dart
View File

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/payout_page/methods/widget.dart';
import 'package:pweb/pages/payout_page/wallet/wigets.dart';

4
frontend/pweb/lib/pages/payout_page/wallet/card.dart
View File

@@ -4,9 +4,9 @@ import 'package:provider/provider.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/buttons.dart
View File

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
import 'package:pweb/pages/payout_page/wallet/edit/buttons/send.dart';
import 'package:pweb/pages/payout_page/wallet/edit/buttons/top_up.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
class ButtonsWalletWidget extends StatelessWidget {

2
frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/save.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/send.dart
View File

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/top_up.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/edit/fields.dart
View File

@@ -4,7 +4,7 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
class WalletEditFields extends StatelessWidget {

2
frontend/pweb/lib/pages/payout_page/wallet/edit/header.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/edit/page.dart
View File

@@ -6,7 +6,7 @@ import 'package:pweb/pages/payout_page/wallet/edit/buttons/buttons.dart';
import 'package:pweb/pages/payout_page/wallet/edit/fields.dart';
import 'package:pweb/pages/payout_page/wallet/edit/header.dart';
import 'package:pweb/pages/payout_page/wallet/history/history.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/history/history.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/payout_page/wallet/history/filters.dart';
import 'package:pweb/pages/payout_page/wallet/history/table.dart';
import 'package:pweb/providers/wallet_transactions.dart';

10
frontend/pweb/lib/pages/payout_page/wallet/wigets.dart
View File

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/payout_page/wallet/card.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
class WalletWidgets extends StatelessWidget {
final Function(Wallet) onWalletTap;
final void Function(Wallet) onWalletTap;
const WalletWidgets({super.key, required this.onWalletTap});
@@ -34,9 +34,7 @@ class WalletWidgets extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 6.0),
child: WalletCard(
wallet: wallet,
onTap: () {
onWalletTap(wallet);
},
onTap: () => onWalletTap(wallet),
),
);
},

2
frontend/pweb/lib/pages/wallet_top_up/content.dart
View File

@@ -4,7 +4,7 @@ import 'package:pshared/models/payment/chain_network.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pshared/utils/l10n/chain.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/wallet_top_up/details.dart';
import 'package:pweb/pages/wallet_top_up/header.dart';
import 'package:pweb/pages/wallet_top_up/meta.dart';

2
frontend/pweb/lib/pages/wallet_top_up/page.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/pages/wallet_top_up/content.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

103
frontend/pweb/lib/providers/wallets.dart
View File

@@ -1,103 +0,0 @@
import 'package:flutter/material.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pshared/provider/resource.dart';
import 'package:pshared/utils/exception.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pweb/services/wallets.dart';
class WalletsProvider with ChangeNotifier {
final WalletsService _service;
late OrganizationsProvider _organizations;
WalletsProvider(this._service);
Resource<List<Wallet>> _resource = Resource(data: []);
Resource<List<Wallet>> get resource => _resource;
List<Wallet> get wallets => _resource.data ?? [];
bool get isLoading => _resource.isLoading;
Exception? get error => _resource.error;
Wallet? _selectedWallet;
Wallet? get selectedWallet => _selectedWallet;
final bool _isHidden = true;
bool get isHidden => _isHidden;
bool _isRefreshingBalances = false;
bool get isRefreshingBalances => _isRefreshingBalances;
void update(OrganizationsProvider organizations) {
_organizations = organizations;
if (_organizations.isOrganizationSet) loadWalletsWithBalances();
}
Future<Wallet> updateWallet(Wallet newWallet) {
throw Exception('update wallet is not implemented');
}
void selectWallet(Wallet wallet) {
_selectedWallet = wallet;
notifyListeners();
}
Future<void> loadWalletsWithBalances() async {
_setResource(_resource.copyWith(isLoading: true, error: null));
try {
final base = await _service.getWallets(_organizations.current.id);
final withBalances = <Wallet>[];
for (final wallet in base) {
try {
final balance = await _service.getBalance(_organizations.current.id, wallet.id);
withBalances.add(wallet.copyWith(balance: balance));
} catch (e) {
_setResource(_resource.copyWith(error: toException(e)));
withBalances.add(wallet);
}
}
_setResource(Resource(data: withBalances, isLoading: false, error: _resource.error));
} catch (e) {
_setResource(_resource.copyWith(isLoading: false, error: toException(e)));
}
}
Future<void> refreshBalances() async {
if (wallets.isEmpty) return;
_isRefreshingBalances = true;
notifyListeners();
try {
final updated = <Wallet>[];
for (final wallet in wallets) {
final balance = await _service.getBalance(_organizations.current.id, wallet.id);
updated.add(wallet.copyWith(balance: balance));
}
_setResource(_resource.copyWith(data: updated));
} catch (e) {
_setResource(_resource.copyWith(error: toException(e)));
} finally {
_isRefreshingBalances = false;
notifyListeners();
}
}
void toggleVisibility(String walletId) {
final index = wallets.indexWhere((w) => w.id == walletId);
if (index < 0) return;
final wallet = wallets[index];
final updated = wallet.copyWith(isHidden: !wallet.isHidden);
final next = List<Wallet>.from(wallets);
next[index] = updated;
_setResource(_resource.copyWith(data: next));
if (_selectedWallet?.id == walletId) {
_selectedWallet = updated;
}
}
void _setResource(Resource<List<Wallet>> newResource) {
_resource = newResource;
notifyListeners();
}
}

28
frontend/pweb/lib/services/wallets.dart
View File

@@ -1,28 +0,0 @@
import 'package:pshared/service/wallet.dart' as shared_wallet_service;
import 'package:pweb/models/wallet.dart';
import 'package:pweb/data/mappers/wallet_ui.dart';
abstract class WalletsService {
Future<List<Wallet>> getWallets(String organizationRef);
Future<double> getBalance(String organizationRef, String walletRef);
}
class ApiWalletsService implements WalletsService {
@override
Future<List<Wallet>> getWallets(String organizationRef) async {
final models = await shared_wallet_service.WalletService.list(organizationRef);
return models.map((m) => m.toUi()).toList();
}
@override
Future<double> getBalance(String organizationRef, String walletRef) async {
final balance = await shared_wallet_service.WalletService.getBalance(
organizationRef: organizationRef,
walletRef: walletRef,
);
final amount = balance.available?.amount;
return amount == null ? 0 : double.tryParse(amount) ?? 0;
}
}

52
frontend/pweb/lib/utils/payment/dropdown.dart
View File

@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pweb/pages/payment_methods/icon.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -34,32 +34,28 @@ class _PaymentMethodDropdownState extends State<PaymentMethodDropdown> {
}
@override
Widget build(BuildContext context) {
return DropdownButtonFormField<Wallet>(
dropdownColor: Theme.of(context).colorScheme.onSecondary,
initialValue: _selectedMethod,
decoration: InputDecoration(
labelText: AppLocalizations.of(context)!.whereGetMoney,
border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
Widget build(BuildContext context) => DropdownButtonFormField<Wallet>(
dropdownColor: Theme.of(context).colorScheme.onSecondary,
initialValue: _selectedMethod,
decoration: InputDecoration(
labelText: AppLocalizations.of(context)!.whereGetMoney,
border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
),
items: widget.methods.map((method) => DropdownMenuItem<Wallet>(
value: method,
child: Row(
children: [
Icon(iconForPaymentType(PaymentType.managedWallet), size: 20),
const SizedBox(width: 8),
Text(method.name),
],
),
items: widget.methods.map((method) {
return DropdownMenuItem<Wallet>(
value: method,
child: Row(
children: [
Icon(iconForPaymentType(PaymentType.managedWallet), size: 20),
const SizedBox(width: 8),
Text(method.name),
],
),
);
}).toList(),
onChanged: (value) {
if (value != null) {
setState(() => _selectedMethod = value);
widget.onChanged(value);
}
},
);
}
)).toList(),
onChanged: (value) {
if (value != null) {
setState(() => _selectedMethod = value);
widget.onChanged(value);
}
},
);
}