diff --git a/lib/presentation/pages/main/pages/report/sections/report_category_section.dart b/lib/presentation/pages/main/pages/report/sections/report_category_section.dart index 7103ebb..e056f56 100644 --- a/lib/presentation/pages/main/pages/report/sections/report_category_section.dart +++ b/lib/presentation/pages/main/pages/report/sections/report_category_section.dart @@ -43,6 +43,7 @@ class ReportCategorySection extends StatelessWidget { endDate: endDate, startDate: startDate, ), + SpaceHeight(16), _buildSummary(state), Container( margin: EdgeInsets.only(top: 16), diff --git a/lib/presentation/pages/main/pages/report/sections/report_payment_method_section.dart b/lib/presentation/pages/main/pages/report/sections/report_payment_method_section.dart index 0ee5be5..d04161c 100644 --- a/lib/presentation/pages/main/pages/report/sections/report_payment_method_section.dart +++ b/lib/presentation/pages/main/pages/report/sections/report_payment_method_section.dart @@ -136,7 +136,7 @@ class ReportPaymentMethodSection extends StatelessWidget { ), ), Text( - "${item.percentage}%", + "${item.percentage.round()}%", style: AppStyle.md.copyWith( fontWeight: FontWeight.bold, color: AppColor.primary, @@ -221,11 +221,8 @@ class ReportPaymentMethodSection extends StatelessWidget { color: AppColor.info, icon: Icons.shopping_cart_outlined, title: 'Jumlah Pesanan', - value: state - .paymentMethodAnalytic - .summary - .totalOrders - .currencyFormatRpV2, + value: state.paymentMethodAnalytic.summary.totalOrders + .toString(), ), ), ], @@ -251,11 +248,8 @@ class ReportPaymentMethodSection extends StatelessWidget { color: AppColor.info, icon: Icons.wallet_outlined, title: 'Jumlah Pembayaran', - value: state - .paymentMethodAnalytic - .summary - .totalPayments - .currencyFormatRpV2, + value: state.paymentMethodAnalytic.summary.totalPayments + .toString(), ), ), ], diff --git a/lib/presentation/pages/main/pages/report/sections/report_product_section.dart b/lib/presentation/pages/main/pages/report/sections/report_product_section.dart index c6540ee..0fe2a1d 100644 --- a/lib/presentation/pages/main/pages/report/sections/report_product_section.dart +++ b/lib/presentation/pages/main/pages/report/sections/report_product_section.dart @@ -64,7 +64,7 @@ class ReportProductSection extends StatelessWidget { final category = state.productAnalytic.categories[index]; return Container( - width: 200, + width: 220, padding: EdgeInsets.only( right: index == diff --git a/lib/presentation/pages/main/pages/report/sections/report_profit_loss_section.dart b/lib/presentation/pages/main/pages/report/sections/report_profit_loss_section.dart index 04a973b..edad7b5 100644 --- a/lib/presentation/pages/main/pages/report/sections/report_profit_loss_section.dart +++ b/lib/presentation/pages/main/pages/report/sections/report_profit_loss_section.dart @@ -144,7 +144,7 @@ class ReportProfitLossSection extends StatelessWidget { icon: Icons.account_balance_outlined, title: 'Laba Bersih', value: state.profitLossAnalytic.summary.netProfit - .toString() + .toDouble() .currencyFormatRpV2, ), ), diff --git a/lib/presentation/pages/main/pages/report/sections/report_sales_section.dart b/lib/presentation/pages/main/pages/report/sections/report_sales_section.dart index 34988f6..1b6608f 100644 --- a/lib/presentation/pages/main/pages/report/sections/report_sales_section.dart +++ b/lib/presentation/pages/main/pages/report/sections/report_sales_section.dart @@ -281,7 +281,9 @@ class ReportSalesSection extends StatelessWidget { color: AppColor.primary, icon: Icons.attach_money_outlined, title: "Nilai Pesanan Rata-rata", - value: state.salesAnalytic.summary.averageOrderValue.toString(), + value: state.salesAnalytic.summary.averageOrderValue + .round() + .currencyFormatRpV2, ), ], ),