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

redesigned payment page + a lot of fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/pweb/lib/pages/report/cards/list.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:pshared/models/payment/operation.dart';
import 'package:pweb/models/load_more_state.dart';
import 'package:pweb/models/state/load_more_state.dart';
import 'package:pweb/pages/report/cards/items.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/report/charts/distribution.dart
View File

@@ -5,7 +5,7 @@ import 'package:syncfusion_flutter_charts/charts.dart' hide ChartPoint;
import 'package:pshared/models/payment/operation.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
import 'package:pweb/models/chart_point.dart';
import 'package:pweb/models/report/chart_point.dart';
class PayoutDistributionChart extends StatelessWidget {

2
frontend/pweb/lib/pages/report/charts/payout_volumes/chart.dart
View File

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
import 'package:pshared/models/payment/operation.dart';
import 'package:pweb/controllers/payout_volumes.dart';
import 'package:pweb/controllers/payouts/payout_volumes.dart';
import 'package:pweb/pages/report/charts/payout_volumes/aggregator.dart';
import 'package:pweb/pages/report/charts/payout_volumes/pie_chart.dart';
import 'package:pweb/pages/report/charts/payout_volumes/range_label.dart';

2
frontend/pweb/lib/pages/report/charts/payout_volumes/range_picker.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:pweb/controllers/payout_volumes.dart';
import 'package:pweb/controllers/payouts/payout_volumes.dart';
Future<void> pickPayoutVolumesRange(

2
frontend/pweb/lib/pages/report/charts/status.dart
View File

@@ -7,7 +7,7 @@ import 'package:syncfusion_flutter_charts/charts.dart' hide ChartPoint;
import 'package:pshared/models/payment/status.dart';
import 'package:pshared/models/payment/operation.dart';
import 'package:pweb/models/chart_point.dart';
import 'package:pweb/models/report/chart_point.dart';
class StatusChart extends StatelessWidget {

2
frontend/pweb/lib/pages/report/details/page.dart
View File

@@ -7,7 +7,7 @@ import 'package:provider/provider.dart';
import 'package:pshared/provider/payment/payments.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/controllers/payment_details.dart';
import 'package:pweb/controllers/payments/details.dart';
import 'package:pweb/pages/report/details/content.dart';
import 'package:pweb/pages/report/details/states/error.dart';
import 'package:pweb/pages/report/details/states/not_found.dart';

38
frontend/pweb/lib/pages/report/operations/actions.dart Normal file
View File

@@ -0,0 +1,38 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/operation.dart';
import 'package:pweb/controllers/operations/report_operations.dart';
import 'package:pweb/utils/report/payment_mapper.dart';
import 'package:pweb/app/router/payout_routes.dart';
Future<void> pickOperationsRange(
BuildContext context,
ReportOperationsController controller,
) async {
final now = DateTime.now();
final initial = controller.selectedRange ??
DateTimeRange(
start: now.subtract(const Duration(days: 30)),
end: now,
);
final picked = await showDateRangePicker(
context: context,
firstDate: DateTime(2000),
lastDate: now.add(const Duration(days: 1)),
initialDateRange: initial,
);
if (picked != null) {
controller.setRange(picked);
}
}
void openPaymentDetails(BuildContext context, OperationItem operation) {
final paymentId = paymentIdFromOperation(operation);
if (paymentId == null) return;
context.pushToReportPayment(paymentId);
}

36
frontend/pweb/lib/pages/report/operations/charts_row.dart Normal file
View File

@@ -0,0 +1,36 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/operation.dart';
import 'package:pweb/pages/report/charts/payout_volumes/chart.dart';
import 'package:pweb/pages/report/charts/status.dart';
class OperationHistoryChartsRow extends StatelessWidget {
final List<OperationItem> operations;
const OperationHistoryChartsRow({
super.key,
required this.operations,
});
@override
Widget build(BuildContext context) {
return SizedBox(
height: 200,
child: Row(
spacing: 16,
children: [
Expanded(
child: StatusChart(operations: operations),
),
Expanded(
child: PayoutVolumesChart(
operations: operations,
),
),
],
),
);
}
}

55
frontend/pweb/lib/pages/report/operations/content.dart Normal file
View File

@@ -0,0 +1,55 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/operation.dart';
import 'package:pweb/controllers/operations/report_operations.dart';
import 'package:pweb/models/state/load_more_state.dart';
import 'package:pweb/pages/report/cards/list.dart';
import 'package:pweb/pages/report/operations/charts_row.dart';
import 'package:pweb/pages/report/table/filters.dart';
class OperationHistoryContent extends StatelessWidget {
final ReportOperationsController controller;
final VoidCallback onPickRange;
final ValueChanged<OperationItem> onOperationTap;
const OperationHistoryContent({
super.key,
required this.controller,
required this.onPickRange,
required this.onOperationTap,
});
@override
Widget build(BuildContext context) {
final operations = controller.operations;
final filteredOperations = controller.filteredOperations;
return Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 16,
children: [
OperationHistoryChartsRow(operations: operations),
OperationFilters(
selectedRange: controller.selectedRange,
selectedStatuses: controller.selectedStatuses,
onPickRange: onPickRange,
onToggleStatus: controller.toggleStatus,
onClear: controller.clearFilters,
),
OperationsCardsList(
operations: filteredOperations,
onTap: onOperationTap,
loadMoreState: controller.loadMoreState,
onLoadMore: controller.loadMoreState == LoadMoreState.available
? () => controller.loadMore()
: null,
),
],
),
);
}
}

31
frontend/pweb/lib/pages/report/operations/states/error.dart Normal file
View File

@@ -0,0 +1,31 @@
import 'package:flutter/material.dart';
class OperationHistoryError extends StatelessWidget {
final String message;
final String retryLabel;
final VoidCallback onRetry;
const OperationHistoryError({
super.key,
required this.message,
required this.retryLabel,
required this.onRetry,
});
@override
Widget build(BuildContext context) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(message),
ElevatedButton(
onPressed: onRetry,
child: Text(retryLabel),
),
],
),
);
}
}

11
frontend/pweb/lib/pages/report/operations/states/loading.dart Normal file
View File

@@ -0,0 +1,11 @@
import 'package:flutter/material.dart';
class OperationHistoryLoading extends StatelessWidget {
const OperationHistoryLoading({super.key});
@override
Widget build(BuildContext context) {
return const Center(child: CircularProgressIndicator());
}
}

44
frontend/pweb/lib/pages/report/operations/view.dart Normal file
View File

@@ -0,0 +1,44 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/controllers/operations/report_operations.dart';
import 'package:pweb/pages/report/operations/actions.dart';
import 'package:pweb/pages/report/operations/content.dart';
import 'package:pweb/pages/report/operations/states/error.dart';
import 'package:pweb/pages/report/operations/states/loading.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class OperationHistoryView extends StatelessWidget {
const OperationHistoryView({super.key});
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
return Consumer<ReportOperationsController>(
builder: (context, controller, child) {
if (controller.isLoading) {
return const OperationHistoryLoading();
}
if (controller.error != null) {
final message = controller.error?.toString() ?? loc.noErrorInformation;
return OperationHistoryError(
message: loc.notificationError(message),
retryLabel: loc.retry,
onRetry: controller.refresh,
);
}
return OperationHistoryContent(
controller: controller,
onPickRange: () => pickOperationsRange(context, controller),
onOperationTap: (operation) =>
openPaymentDetails(context, operation),
);
},
);
}
}

124
frontend/pweb/lib/pages/report/page.dart
View File

@@ -2,19 +2,10 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/payment/operation.dart';
import 'package:pshared/provider/payment/payments.dart';
import 'package:pweb/pages/report/cards/list.dart';
import 'package:pweb/pages/report/charts/payout_volumes/chart.dart';
import 'package:pweb/pages/report/charts/status.dart';
import 'package:pweb/controllers/report_operations.dart';
import 'package:pweb/pages/report/table/filters.dart';
import 'package:pweb/utils/report/payment_mapper.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/models/load_more_state.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
import 'package:pweb/controllers/operations/report_operations.dart';
import 'package:pweb/pages/report/operations/view.dart';
class OperationHistoryPage extends StatelessWidget {
@@ -25,116 +16,7 @@ class OperationHistoryPage extends StatelessWidget {
return ChangeNotifierProxyProvider<PaymentsProvider, ReportOperationsController>(
create: (_) => ReportOperationsController(),
update: (_, payments, controller) => controller!..update(payments),
child: const _OperationHistoryView(),
);
}
}
class _OperationHistoryView extends StatelessWidget {
const _OperationHistoryView();
Future<void> _pickRange(
BuildContext context,
ReportOperationsController controller,
) async {
final now = DateTime.now();
final initial = controller.selectedRange ??
DateTimeRange(
start: now.subtract(const Duration(days: 30)),
end: now,
);
final picked = await showDateRangePicker(
context: context,
firstDate: DateTime(2000),
lastDate: now.add(const Duration(days: 1)),
initialDateRange: initial,
);
if (picked != null) {
controller.setRange(picked);
}
}
void _openPaymentDetails(BuildContext context, OperationItem operation) {
final paymentId = paymentIdFromOperation(operation);
if (paymentId == null) return;
context.pushToReportPayment(paymentId);
}
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
return Consumer<ReportOperationsController>(
builder: (context, controller, child) {
if (controller.isLoading) {
return const Center(child: CircularProgressIndicator());
}
if (controller.error != null) {
final message =
controller.error?.toString() ?? loc.noErrorInformation;
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(loc.notificationError(message)),
ElevatedButton(
onPressed: () => controller.refresh(),
child: Text(loc.retry),
),
],
),
);
}
final operations = controller.operations;
final filteredOperations = controller.filteredOperations;
return Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 16,
children: [
//TODO Make charts more useful and re-enable
SizedBox(
height: 200,
child: Row(
spacing: 16,
children: [
Expanded(
child: StatusChart(operations: operations),
),
Expanded(
child: PayoutVolumesChart(
operations: operations,
),
),
],
),
),
OperationFilters(
selectedRange: controller.selectedRange,
selectedStatuses: controller.selectedStatuses,
onPickRange: () => _pickRange(context, controller),
onToggleStatus: controller.toggleStatus,
onClear: controller.clearFilters,
),
OperationsCardsList(
operations: filteredOperations,
onTap: (operation) => _openPaymentDetails(context, operation),
loadMoreState: controller.loadMoreState,
onLoadMore: controller.loadMoreState ==
LoadMoreState.available
? () => controller.loadMore()
: null,
),
],
),
);
},
child: const OperationHistoryView(),
);
}
}