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

temp build

Browse Source
This commit is contained in:
Stephan D
2025-12-05 01:32:41 +01:00
parent 082d782a80
commit f71cc76f64
50 changed files with 853 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
frontend/pweb/lib/pages/address_book/form/page.dart
View File

@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/payment/methods/card.dart';
import 'package:pshared/models/payment/methods/crypto_address.dart';
import 'package:pshared/models/payment/methods/iban.dart';
@@ -9,6 +11,7 @@ import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/models/recipient/status.dart';
import 'package:pshared/models/recipient/type.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pweb/pages/address_book/form/view.dart';
import 'package:pweb/services/amplitude.dart';
@@ -38,8 +41,8 @@ class _AdressBookRecipientFormState extends State<AdressBookRecipientForm> {
void initState() {
super.initState();
final r = widget.recipient;
_nameCtrl = TextEditingController(text: r?.name ?? "");
_emailCtrl = TextEditingController(text: r?.email ?? "");
_nameCtrl = TextEditingController(text: r?.name ?? '');
_emailCtrl = TextEditingController(text: r?.email ?? '');
_type = r?.type ?? RecipientType.internal;
_status = r?.status ?? RecipientStatus.ready;
@@ -50,7 +53,7 @@ class _AdressBookRecipientFormState extends State<AdressBookRecipientForm> {
if (r?.cryptoAddress != null) _methods[PaymentType.cryptoAddress] = r!.cryptoAddress;
}
//TODO Change when registration is ready
//TODO: Change when registration is ready
void _save() {
if (!_formKey.currentState!.validate() || _methods.isEmpty) {
AmplitudeService.recipientAddCompleted(
@@ -66,47 +69,41 @@ class _AdressBookRecipientFormState extends State<AdressBookRecipientForm> {
return;
}
final recipient = Recipient(
final recipient = newRecipient(
name: _nameCtrl.text,
email: _emailCtrl.text,
type: _type,
status: _status,
avatarUrl: null,
card: _methods[PaymentType.card] as CardPaymentMethod?,
iban: _methods[PaymentType.iban] as IbanPaymentMethod?,
wallet: _methods[PaymentType.wallet] as WalletPaymentMethod?,
bank: _methods[PaymentType.bankAccount] as RussianBankAccountPaymentMethod?,
cryptoAddress: _methods[PaymentType.cryptoAddress] as CryptoAddressPaymentMethod?,
organizationRef: context.read<OrganizationsProvider>().current.id
);
widget.onSaved?.call(recipient);
}
@override
Widget build(BuildContext context) {
return FormView(
formKey: _formKey,
nameCtrl: _nameCtrl,
emailCtrl: _emailCtrl,
type: _type,
status: _status,
methods: _methods,
onTypeChanged: (t) => setState(() => _type = t),
onStatusChanged: (s) => setState(() => _status = s),
onMethodsChanged: (type, data) {
setState(() {
if (data != null) {
_methods[type] = data;
} else {
_methods.remove(type);
}
});
},
onSave: _save,
isEditing: widget.recipient != null,
onBack: () {
widget.onSaved?.call(null);
},
);
}
Widget build(BuildContext context) => FormView(
formKey: _formKey,
nameCtrl: _nameCtrl,
emailCtrl: _emailCtrl,
type: _type,
status: _status,
methods: _methods,
onTypeChanged: (t) => setState(() => _type = t),
onStatusChanged: (s) => setState(() => _status = s),
onMethodsChanged: (type, data) {
setState(() {
if (data != null) {
_methods[type] = data;
} else {
_methods.remove(type);
}
});
},
onSave: _save,
isEditing: widget.recipient != null,
onBack: () {
widget.onSaved?.call(null);
},
);
}

16
frontend/pweb/lib/pages/dashboard/payouts/single/adress_book/long_list/info_row.dart
View File

@@ -11,13 +11,11 @@ class PaymentInfoRow extends StatelessWidget {
});
@override
Widget build(BuildContext context) {
return Row(
children: [
Text(label, style: Theme.of(context).textTheme.bodySmall),
const SizedBox(width: 8),
Text(value, style: Theme.of(context).textTheme.bodySmall),
],
);
}
Widget build(BuildContext context) => Row(
children: [
Text(label, style: Theme.of(context).textTheme.bodySmall),
const SizedBox(width: 8),
Text(value, style: Theme.of(context).textTheme.bodySmall),
],
);
}

75
frontend/pweb/lib/pages/dashboard/payouts/single/adress_book/long_list/item.dart
View File

@@ -1,36 +1,60 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/pages/dashboard/payouts/single/adress_book/avatar.dart';
import 'package:pweb/pages/dashboard/payouts/single/adress_book/long_list/info_row.dart';
import 'package:pweb/utils/payment/label.dart';
class RecipientItem extends StatelessWidget {
final Recipient recipient;
final VoidCallback onTap;
class RecipientItem extends StatefulWidget {
static const double _horizontalPadding = 16.0;
static const double _verticalPadding = 8.0;
static const double _avatarRadius = 20;
static const double _spacingWidth = 12;
final Recipient recipient;
final VoidCallback onTap;
const RecipientItem({
super.key,
required this.recipient,
required this.onTap,
});
@override
State<RecipientItem> createState() => _RecipientItemState();
}
class _RecipientItemState extends State<RecipientItem> {
late PaymentMethodsProvider _methodsProvider;
@override
void initState() {
super.initState();
_methodsProvider = PaymentMethodsProvider();
_methodsProvider.updateProviders(
context.read<OrganizationsProvider>(),
context.read<RecipientsProvider>(),
);
}
@override
Widget build(BuildContext context) {
if (!_methodsProvider.isReady) return const Center(child: CircularProgressIndicator());
final recipient = widget.recipient;
return InkWell(
onTap: onTap,
onTap: widget.onTap,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: _horizontalPadding,
vertical: _verticalPadding,
horizontal: RecipientItem._horizontalPadding,
vertical: RecipientItem._verticalPadding,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -42,43 +66,20 @@ class RecipientItem extends StatelessWidget {
isVisible: false,
name: recipient.name,
avatarUrl: recipient.avatarUrl,
avatarRadius: _avatarRadius,
avatarRadius: RecipientItem._avatarRadius,
nameStyle: Theme.of(context).textTheme.bodyMedium,
),
title: Text(recipient.name),
subtitle: Text(recipient.email),
),
),
const SizedBox(width: _spacingWidth),
const SizedBox(width: RecipientItem._spacingWidth),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
if (recipient.bank?.accountNumber.isNotEmpty == true)
PaymentInfoRow(
label: getPaymentTypeLabel(context, PaymentType.bankAccount),
value: recipient.bank!.accountNumber,
),
if (recipient.card?.pan.isNotEmpty == true)
PaymentInfoRow(
label: getPaymentTypeLabel(context, PaymentType.card),
value: recipient.card!.pan,
),
if (recipient.iban?.iban.isNotEmpty == true)
PaymentInfoRow(
label: getPaymentTypeLabel(context, PaymentType.iban),
value: recipient.iban!.iban,
),
if (recipient.wallet?.walletId.isNotEmpty == true)
PaymentInfoRow(
label: getPaymentTypeLabel(context, PaymentType.wallet),
value: recipient.wallet!.walletId,
),
if (recipient.cryptoAddress?.address.isNotEmpty == true)
PaymentInfoRow(
label: getPaymentTypeLabel(context, PaymentType.cryptoAddress),
value: recipient.cryptoAddress!.address,
),
],
children: _methodsProvider.methods.map((m) => PaymentInfoRow(
label: getPaymentTypeLabel(context, m.type),
value: _displayString(m),
)).toList(),
),
],
),

0
frontend/pweb/lib/pages/dashboard/payouts/single/adress_book/long_list/long_list.dart → frontend/pweb/lib/pages/dashboard/payouts/single/adress_book/long_list/widget.dart
View File

24
frontend/pweb/lib/pages/dashboard/payouts/single/adress_book/widget.dart
View File

@@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/pages/address_book/page/search.dart';
import 'package:pweb/pages/dashboard/payouts/single/adress_book/long_list/long_list.dart';
import 'package:pweb/pages/dashboard/payouts/single/adress_book/long_list/widget.dart';
import 'package:pweb/pages/dashboard/payouts/single/adress_book/short_list.dart';
import 'package:pweb/providers/recipient.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -39,7 +39,7 @@ class _AdressBookPayoutState extends State<AdressBookPayout> {
@override
void initState() {
super.initState();
final provider = context.read<RecipientProvider>();
final provider = context.read<RecipientsProvider>();
_searchController = TextEditingController(text: provider.query);
_searchController.addListener(() {
@@ -57,7 +57,7 @@ class _AdressBookPayoutState extends State<AdressBookPayout> {
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
final provider = context.watch<RecipientProvider>();
final provider = context.watch<RecipientsProvider>();
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
@@ -88,14 +88,14 @@ class _AdressBookPayoutState extends State<AdressBookPayout> {
const SizedBox(height: _spacingBetween),
Expanded(
child: _isExpanded
? LongListAdressBookPayout(
filteredRecipients: provider.filteredRecipients,
onSelected: widget.onSelected,
)
: ShortListAdressBookPayout(
recipients: provider.recipients,
onSelected: widget.onSelected,
),
? LongListAdressBookPayout(
filteredRecipients: provider.filteredRecipients,
onSelected: widget.onSelected,
)
: ShortListAdressBookPayout(
recipients: provider.recipients,
onSelected: widget.onSelected,
),
),
],
),

20
frontend/pweb/lib/pages/payment_methods/method_selector.dart
View File

@@ -1,27 +1,25 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/methods/type.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/payment/methods/type.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pweb/providers/payment_methods.dart';
import 'package:pweb/utils/payment/dropdown.dart';
class PaymentMethodSelector extends StatelessWidget {
final PaymentMethodsProvider methodsProvider;
final ValueChanged<PaymentMethod> onMethodChanged;
const PaymentMethodSelector({
super.key,
required this.methodsProvider,
required this.onMethodChanged,
});
@override
Widget build(BuildContext context) {
return PaymentMethodDropdown(
methods: methodsProvider.methods,
initialValue: methodsProvider.selectedMethod,
onChanged: onMethodChanged,
);
}
Widget build(BuildContext context) => Consumer<PaymentMethodsProvider>(builder:(context, provider, _) => PaymentMethodDropdown(
methods: provider.methods,
initialValue: provider.currentObject,
onChanged: onMethodChanged,
));
}

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

@@ -3,12 +3,12 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/providers/payment_flow_provider.dart';
import 'package:pweb/pages/payment_methods/widgets/payment_page_body.dart';
import 'package:pweb/providers/page_selector.dart';
import 'package:pweb/providers/payment_methods.dart';
import 'package:pweb/providers/recipient.dart';
class PaymentPage extends StatefulWidget {
@@ -49,30 +49,22 @@ class _PaymentPageState extends State<PaymentPage> {
void _initializePaymentPage() {
final pageSelector = context.read<PageSelectorProvider>();
final methodsProvider = context.read<PaymentMethodsProvider>();
final recipientProvider = context.read<RecipientProvider>();
final recipientProvider = context.read<RecipientsProvider>();
pageSelector.handleWalletAutoSelection();
if (methodsProvider.methods.isEmpty && !methodsProvider.isLoading) {
methodsProvider.loadMethods();
}
if (recipientProvider.recipients.isEmpty && !recipientProvider.isLoading) {
recipientProvider.loadRecipients();
}
_flowProvider.syncWithSelector(pageSelector);
}
void _handleSearchChanged(String query) {
context.read<RecipientProvider>().setQuery(query);
context.read<RecipientsProvider>().setQuery(query);
}
void _handleRecipientSelected(Recipient recipient) {
final pageSelector = context.read<PageSelectorProvider>();
final recipientProvider = context.read<RecipientProvider>();
final recipientProvider = context.read<RecipientsProvider>();
recipientProvider.selectRecipient(recipient);
recipientProvider.setCurrentObject(recipient.id);
pageSelector.selectRecipient(recipient);
_flowProvider.reset(pageSelector);
_clearSearchField();
@@ -80,9 +72,9 @@ class _PaymentPageState extends State<PaymentPage> {
void _handleRecipientCleared() {
final pageSelector = context.read<PageSelectorProvider>();
final recipientProvider = context.read<RecipientProvider>();
final recipientProvider = context.read<RecipientsProvider>();
recipientProvider.selectRecipient(null);
recipientProvider.setCurrentObject(null);
pageSelector.selectRecipient(null);
_flowProvider.reset(pageSelector);
_clearSearchField();
@@ -91,7 +83,7 @@ class _PaymentPageState extends State<PaymentPage> {
void _clearSearchField() {
_searchController.clear();
_searchFocusNode.unfocus();
context.read<RecipientProvider>().setQuery('');
context.read<RecipientsProvider>().setQuery('');
}
void _handleSendPayment() {

23
frontend/pweb/lib/pages/payment_methods/title.dart
View File

@@ -31,7 +31,7 @@ class PaymentMethodTile extends StatelessWidget {
final theme = Theme.of(context);
return Opacity(
opacity: method.isEnabled ? 1 : 0.5,
opacity: method.isArchived ? 1 : 0.5,
child: Card(
margin: const EdgeInsets.symmetric(vertical: 4),
elevation: 0,
@@ -41,11 +41,12 @@ class PaymentMethodTile extends StatelessWidget {
onTap: makeMain,
title: Row(
children: [
Expanded(child: Text(method.label)),
Text(
method.details,
style: theme.textTheme.bodySmall,
),
Expanded(child: Text(method.name)),
if (method.description != null)
Text(
method.description!,
style: theme.textTheme.bodySmall,
),
],
),
trailing: Row(
@@ -73,12 +74,10 @@ class PaymentMethodTile extends StatelessWidget {
);
}
Widget _buildEnabledSwitch() {
return Switch.adaptive(
value: method.isEnabled,
onChanged: toggleEnabled,
);
}
Widget _buildEnabledSwitch() => Switch.adaptive(
value: method.isArchived,
onChanged: toggleEnabled,
);
Widget _buildPopupMenu(AppLocalizations l10n) {
return PopupMenuButton<String>(

11
frontend/pweb/lib/pages/payment_methods/widgets/payment_page_body.dart
View File

@@ -1,7 +1,10 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/pages/payment_methods/header.dart';
import 'package:pweb/pages/payment_methods/method_selector.dart';
@@ -12,9 +15,8 @@ import 'package:pweb/pages/payment_methods/widgets/recipient_section.dart';
import 'package:pweb/pages/payment_methods/widgets/section_title.dart';
import 'package:pweb/providers/page_selector.dart';
import 'package:pweb/providers/payment_flow_provider.dart';
import 'package:pweb/providers/payment_methods.dart';
import 'package:pweb/providers/recipient.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -43,7 +45,7 @@ class PaymentPageBody extends StatelessWidget {
final dimensions = AppDimensions();
final pageSelector = context.watch<PageSelectorProvider>();
final methodsProvider = context.watch<PaymentMethodsProvider>();
final recipientProvider = context.watch<RecipientProvider>();
final recipientProvider = context.watch<RecipientsProvider>();
final flowProvider = context.watch<PaymentFlowProvider>();
final recipient = pageSelector.selectedRecipient;
final loc = AppLocalizations.of(context)!;
@@ -79,8 +81,7 @@ class PaymentPageBody extends StatelessWidget {
SectionTitle(loc.sourceOfFunds),
SizedBox(height: dimensions.paddingSmall),
PaymentMethodSelector(
methodsProvider: methodsProvider,
onMethodChanged: methodsProvider.selectMethod,
onMethodChanged: (m) => methodsProvider.setCurrentObject(m.id),
),
SizedBox(height: dimensions.paddingXLarge),

4
frontend/pweb/lib/pages/payment_methods/widgets/recipient_section.dart
View File

@@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/pages/address_book/page/search.dart';
import 'package:pweb/pages/payment_methods/widgets/card.dart';
import 'package:pweb/pages/payment_methods/widgets/search.dart';
import 'package:pweb/pages/payment_methods/widgets/section_title.dart';
import 'package:pweb/providers/recipient.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -15,7 +15,7 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
class RecipientSection extends StatelessWidget {
final Recipient? recipient;
final AppDimensions dimensions;
final RecipientProvider recipientProvider;
final RecipientsProvider recipientProvider;
final TextEditingController searchController;
final FocusNode searchFocusNode;
final ValueChanged<String> onSearchChanged;

4
frontend/pweb/lib/pages/payment_methods/widgets/search.dart
View File

@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/providers/recipient.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -10,7 +10,7 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
class RecipientSearchResults extends StatelessWidget {
final AppDimensions dimensions;
final RecipientProvider recipientProvider;
final RecipientsProvider recipientProvider;
final ValueChanged<Recipient> onRecipientSelected;
const RecipientSearchResults({

25
frontend/pweb/lib/pages/payout_page/methods/controller.dart
View File

@@ -4,8 +4,8 @@ import 'package:provider/provider.dart';
import 'package:pshared/models/payment/methods/data.dart';
import 'package:pshared/models/payment/methods/type.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pweb/providers/payment_methods.dart';
import 'package:pweb/pages/payment_methods/add/widget.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -16,18 +16,10 @@ class PaymentConfigController {
PaymentConfigController(this.context);
void loadMethods() {
context.read<PaymentMethodsProvider>().loadMethods();
}
Future<void> addMethod() async {
final methodsProvider = context.read<PaymentMethodsProvider>();
await showDialog<PaymentMethodData>(
context: context,
builder: (_) => const AddPaymentMethodDialog(),
);
methodsProvider.loadMethods();
}
Future<void> addMethod() async => showDialog<PaymentMethodData>(
context: context,
builder: (_) => const AddPaymentMethodDialog(),
);
Future<void> editMethod(PaymentMethod method) async {
// TODO: implement edit functionality
@@ -55,12 +47,12 @@ class PaymentConfigController {
);
if (confirmed == true) {
methodsProvider.deleteMethod(method);
methodsProvider.delete(method.id);
}
}
void toggleEnabled(PaymentMethod method, bool value) {
context.read<PaymentMethodsProvider>().toggleEnabled(method, value);
context.read<PaymentMethodsProvider>().setArchivedMethod(method: method, newIsArchived: value);
}
void makeMain(PaymentMethod method) {
@@ -68,6 +60,7 @@ class PaymentConfigController {
}
void reorder(int oldIndex, int newIndex) {
context.read<PaymentMethodsProvider>().reorderMethods(oldIndex, newIndex);
// TODO: rimplement on top of Indexable
// context.read<PaymentMethodsProvider>().reorderMethods(oldIndex, newIndex);
}
}

3
frontend/pweb/lib/pages/payout_page/methods/list.dart
View File

@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pweb/pages/payment_methods/title.dart';
import 'package:pweb/pages/payout_page/methods/controller.dart';
import 'package:pweb/providers/payment_methods.dart';
class PaymentConfigList extends StatelessWidget {

1
frontend/pweb/lib/pages/payout_page/methods/widget.dart
View File

@@ -20,7 +20,6 @@ class _MethodsWidgetState extends State<MethodsWidget> {
void initState() {
super.initState();
controller = PaymentConfigController(context);
controller.loadMethods();
}
@override

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

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pweb/pages/payout_page/methods/widget.dart';
import 'package:pweb/pages/payout_page/wallet/wigets.dart';
import 'package:pweb/providers/payment_methods.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';