redesigned payment page + a lot of fixes

This commit is contained in:
Arseni
2026-02-21 21:55:20 +03:00
parent a68aa2abff
commit 0c6fa03aba
208 changed files with 4062 additions and 2217 deletions

View File

@@ -6,7 +6,7 @@ import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/models/visibility.dart';
import 'package:pweb/models/state/visibility.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/widgets/refresh_balance/wallet.dart';

View File

@@ -1,12 +1,13 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -27,9 +28,11 @@ class SendPayoutButton extends StatelessWidget {
final wallet = wallets.selectedWallet;
if (wallet != null) {
context.pushToPayment(
paymentType: PaymentType.wallet,
returnTo: PayoutDestination.editwallet,
context.pushNamed(
PayoutRoutes.payment,
queryParameters: PayoutRoutes.buildQueryParameters(
paymentType: PaymentType.wallet,
),
);
}
},

View File

@@ -5,7 +5,6 @@ import 'package:provider/provider.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -29,7 +28,7 @@ class TopUpButton extends StatelessWidget{
);
return;
}
context.pushToWalletTopUp(returnTo: PayoutDestination.editwallet);
context.pushToWalletTopUp();
},
child: Text(loc.topUpBalance),
);

View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:pweb/models/wallet_transaction.dart';
import 'package:pweb/models/wallet/wallet_transaction.dart';
class TypeChip extends StatelessWidget {

View File

@@ -3,14 +3,14 @@ import 'package:flutter/material.dart';
import 'package:pshared/models/payment/status.dart';
import 'package:pshared/utils/localization.dart';
import 'package:pweb/models/wallet_transaction.dart';
import 'package:pweb/providers/wallet_transactions.dart';
import 'package:pweb/models/wallet/wallet_transaction.dart';
import 'package:pweb/controllers/operations/wallet_transactions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletHistoryFilters extends StatelessWidget {
final WalletTransactionsProvider provider;
final WalletTransactionsController provider;
final VoidCallback onPickRange;
const WalletHistoryFilters({

View File

@@ -6,6 +6,7 @@ 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/controllers/operations/wallet_transactions.dart';
import 'package:pweb/providers/wallet_transactions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -44,7 +45,7 @@ class _WalletHistoryState extends State<WalletHistory> {
}
Future<void> _pickRange() async {
final provider = context.read<WalletTransactionsProvider>();
final provider = context.read<WalletTransactionsController>();
final now = DateTime.now();
final initial = provider.dateRange ??
DateTimeRange(
@@ -69,7 +70,7 @@ class _WalletHistoryState extends State<WalletHistory> {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
return Consumer<WalletTransactionsProvider>(
return Consumer<WalletTransactionsController>(
builder: (context, provider, child) {
if (provider.isLoading) {
return const Padding(

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pweb/models/wallet_transaction.dart';
import 'package:pweb/models/wallet/wallet_transaction.dart';
import 'package:pweb/pages/payout_page/wallet/history/chip.dart';
import 'package:pweb/pages/report/table/badge.dart';