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

conflicts resolution

Browse Source
This commit is contained in:
Stephan D
2025-11-26 15:00:21 +01:00
parent 48ccbb1c82 357af99564
commit 44446c6ad4
53 changed files with 620 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,11 +21,12 @@ class PaymentConfigController {
}
Future<void> addMethod() async {
final methodsProvider = context.read<PaymentMethodsProvider>();
await showDialog<PaymentMethodData>(
context: context,
builder: (_) => const AddPaymentMethodDialog(),
);
loadMethods();
methodsProvider.loadMethods();
}
Future<void> editMethod(PaymentMethod method) async {
@@ -33,19 +34,20 @@ class PaymentConfigController {
}
Future<void> deleteMethod(PaymentMethod method) async {
final methodsProvider = context.read<PaymentMethodsProvider>();
final l10n = AppLocalizations.of(context)!;
final confirmed = await showDialog<bool>(
context: context,
builder: (_) => AlertDialog(
builder: (dialogContext) => AlertDialog(
title: Text(l10n.delete),
content: Text(l10n.deletePaymentConfirmation),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
onPressed: () => Navigator.pop(dialogContext, false),
child: Text(l10n.cancel),
),
ElevatedButton(
onPressed: () => Navigator.pop(context, true),
onPressed: () => Navigator.pop(dialogContext, true),
child: Text(l10n.delete),
),
],
@@ -53,7 +55,7 @@ class PaymentConfigController {
);
if (confirmed == true) {
context.read<PaymentMethodsProvider>().deleteMethod(method);
methodsProvider.deleteMethod(method);
}
}

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

@@ -1,12 +1,15 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.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';
class PaymentConfigPage extends StatelessWidget {
final Function(Wallet) onWalletTap;
@@ -16,13 +19,14 @@ class PaymentConfigPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final provider = context.watch<PaymentMethodsProvider>();
final loc = AppLocalizations.of(context)!;
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
}
if (provider.error != null) {
return Center(child: Text('Error: ${provider.error}'));
return Center(child: Text(loc.notificationError(provider.error ?? loc.noErrorInformation)));
}
return Column(
@@ -34,4 +38,4 @@ class PaymentConfigPage extends StatelessWidget {
],
);
}
}
}

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

@@ -3,25 +3,28 @@ import 'package:flutter/material.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class SaveWalletButton extends StatelessWidget {
final Wallet wallet;
final TextEditingController nameController;
final TextEditingController balanceController;
final VoidCallback onSave; // Changed to VoidCallback
final VoidCallback onSave;
const SaveWalletButton({
super.key,
required this.wallet,
required this.nameController,
required this.balanceController,
required this.onSave, // Now matches _saveWallet signature
required this.onSave,
});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final dimensions = AppDimensions();
final loc = AppLocalizations.of(context)!;
return Center(
child: SizedBox(
@@ -29,7 +32,7 @@ class SaveWalletButton extends StatelessWidget {
height: dimensions.buttonHeight,
child: InkWell(
borderRadius: BorderRadius.circular(dimensions.borderRadiusSmall),
onTap: onSave, // Directly use onSave now
onTap: onSave,
child: Container(
decoration: BoxDecoration(
color: theme.colorScheme.primary,
@@ -37,7 +40,7 @@ class SaveWalletButton extends StatelessWidget {
),
child: Center(
child: Text(
'Save',
loc.save,
style: theme.textTheme.bodyLarge?.copyWith(
color: theme.colorScheme.onSecondary,
fontWeight: FontWeight.w600,
@@ -49,4 +52,4 @@ class SaveWalletButton extends StatelessWidget {
),
);
}
}
}

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

@@ -1,14 +1,19 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/providers/page_selector.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class SendPayoutButton extends StatelessWidget {
const SendPayoutButton({super.key});
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
return ElevatedButton(
style: ElevatedButton.styleFrom(
shadowColor: null,
@@ -23,7 +28,7 @@ class SendPayoutButton extends StatelessWidget {
pageSelectorProvider.startPaymentFromWallet(wallet);
}
},
child: Text('Send Payout'),
child: Text(loc.payoutNavSendPayout),
);
}
}

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

@@ -1,11 +1,14 @@
import 'package:flutter/material.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class TopUpButton extends StatelessWidget{
const TopUpButton({super.key});
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
return ElevatedButton(
style: ElevatedButton.styleFrom(
shadowColor: null,
@@ -13,10 +16,10 @@ class TopUpButton extends StatelessWidget{
),
onPressed: () {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Add functionality')),
SnackBar(content: Text(loc.addFunctionality)),
);
},
child: Text('Top Up Balance'),
child: Text(loc.topUpBalance),
);
}
}
}

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

@@ -5,6 +5,8 @@ import 'package:provider/provider.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pweb/widgets/error/snackbar.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletEditHeader extends StatefulWidget {
const WalletEditHeader({super.key});
@@ -33,7 +35,9 @@ class _WalletEditHeaderState extends State<WalletEditHeader> {
Widget build(BuildContext context) {
final provider = context.watch<WalletsProvider>();
final wallet = provider.selectedWallet;
final loc = AppLocalizations.of(context)!;
final messanger = ScaffoldMessenger.of(context);
if (wallet == null) {
return SizedBox.shrink();
}
@@ -75,10 +79,10 @@ class _WalletEditHeaderState extends State<WalletEditHeader> {
Expanded(
child: TextFormField(
controller: _controller,
decoration: const InputDecoration(
decoration: InputDecoration(
border: OutlineInputBorder(),
isDense: true,
hintText: 'Wallet name',
hintText: loc.walletName,
),
),
),
@@ -112,4 +116,4 @@ class _WalletEditHeaderState extends State<WalletEditHeader> {
],
);
}
}
}

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

@@ -9,6 +9,8 @@ import 'package:pweb/pages/payout_page/wallet/history/history.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletEditPage extends StatelessWidget {
final VoidCallback onBack;
@@ -18,13 +20,14 @@ class WalletEditPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final dimensions = AppDimensions();
final loc = AppLocalizations.of(context)!;
return Consumer<WalletsProvider>(
builder: (context, provider, child) {
final wallet = provider.selectedWallet;
if (wallet == null) {
return Center(child: Text('Кошелёк не выбран'));
return Center(child: Text(loc.noWalletSelected));
}
return Align(

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

@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/status.dart';
@@ -7,6 +6,8 @@ import 'package:pshared/utils/localization.dart';
import 'package:pweb/models/wallet_transaction.dart';
import 'package:pweb/providers/wallet_transactions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletHistoryFilters extends StatelessWidget {
final WalletTransactionsProvider provider;
@@ -21,6 +22,7 @@ class WalletHistoryFilters extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
return Card(
elevation: 2,
@@ -35,13 +37,13 @@ class WalletHistoryFilters extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Wallet activity',
loc.walletActivity,
style: theme.textTheme.titleMedium,
),
if (provider.hasFilters)
TextButton(
onPressed: provider.resetFilters,
child: const Text('Reset'),
child: Text(loc.reset),
),
],
),
@@ -81,7 +83,7 @@ class WalletHistoryFilters extends StatelessWidget {
icon: const Icon(Icons.date_range_outlined),
label: Text(
provider.dateRange == null
? 'Select period'
? loc.selectPeriod
: '${dateToLocalFormat(context, provider.dateRange!.start)} – ${dateToLocalFormat(context, provider.dateRange!.end)}',
),
),
@@ -91,4 +93,4 @@ class WalletHistoryFilters extends StatelessWidget {
),
);
}
}
}

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

@@ -7,6 +7,8 @@ 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';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletHistory extends StatefulWidget {
final Wallet wallet;
@@ -64,6 +66,7 @@ class _WalletHistoryState extends State<WalletHistory> {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
return Consumer<WalletTransactionsProvider>(
builder: (context, provider, child) {
@@ -81,16 +84,16 @@ class _WalletHistoryState extends State<WalletHistory> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Failed to load history',
loc.failedToLoadHistory,
style: theme.textTheme.titleMedium!
.copyWith(color: theme.colorScheme.error),
),
const SizedBox(height: 8),
Text(provider.error!),
Text(loc.notificationError(provider.error ?? loc.noErrorInformation)),
const SizedBox(height: 8),
OutlinedButton(
onPressed: _load,
child: const Text('Retry'),
child: Text(loc.retry),
),
],
),
@@ -113,4 +116,4 @@ class _WalletHistoryState extends State<WalletHistory> {
},
);
}
}
}

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

@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:pweb/models/wallet_transaction.dart';
@@ -6,6 +5,8 @@ import 'package:pweb/pages/payout_page/wallet/history/chip.dart';
import 'package:pweb/pages/report/table/badge.dart';
import 'package:pweb/utils/currency.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletTransactionsTable extends StatelessWidget {
final List<WalletTransaction> transactions;
@@ -15,14 +16,15 @@ class WalletTransactionsTable extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
if (transactions.isEmpty) {
return Card(
color: theme.colorScheme.onSecondary,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
child: const Padding(
padding: EdgeInsets.all(16),
child: Text('No history yet'),
child: Padding(
padding: const EdgeInsets.all(16),
child: Text(loc.walletHistoryEmpty),
),
);
}
@@ -38,14 +40,14 @@ class WalletTransactionsTable extends StatelessWidget {
child: DataTable(
columnSpacing: 18,
headingTextStyle: const TextStyle(fontWeight: FontWeight.w600),
columns: const [
DataColumn(label: Text('Status')),
DataColumn(label: Text('Type')),
DataColumn(label: Text('Amount')),
DataColumn(label: Text('Balance')),
DataColumn(label: Text('Counterparty')),
DataColumn(label: Text('Date')),
DataColumn(label: Text('Comment')),
columns: [
DataColumn(label: Text(loc.colStatus)),
DataColumn(label: Text(loc.colType)),
DataColumn(label: Text(loc.colAmount)),
DataColumn(label: Text(loc.colBalance)),
DataColumn(label: Text(loc.colCounterparty)),
DataColumn(label: Text(loc.colDate)),
DataColumn(label: Text(loc.colComment)),
],
rows: List.generate(
transactions.length,
@@ -85,4 +87,4 @@ class WalletTransactionsTable extends StatelessWidget {
),
);
}
}
}