perbaikan on possale string 1

This commit is contained in:
2026-04-18 22:45:08 +07:00
parent d912b1f63a
commit b1781625f2
2693 changed files with 366 additions and 6459 deletions

View File

@@ -367,7 +367,7 @@ class _CashflowScreenState extends ConsumerState<CashflowScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(tx.cashIn ?? 0)}",
"$currency${formatWithSeparator(tx.cashIn ?? 0)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -397,7 +397,7 @@ class _CashflowScreenState extends ConsumerState<CashflowScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(tx.cashOut ?? 0)}",
"$currency${formatWithSeparator(tx.cashOut ?? 0)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -427,7 +427,7 @@ class _CashflowScreenState extends ConsumerState<CashflowScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(tx.runningCash ?? 0)}",
"$currency${formatWithSeparator(tx.runningCash ?? 0)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -571,7 +571,7 @@ class _CashflowScreenState extends ConsumerState<CashflowScreen> {
Expanded(
flex: 2,
child: Text(
"$currency${formatPointNumber(_transaction.amount ?? 0, addComma: true)}",
"$currency${formatWithSeparator(_transaction.amount ?? 0)}",
textAlign: TextAlign.end,
),
),

View File

@@ -349,7 +349,7 @@ class DayBookReportState extends ConsumerState<DayBookReport> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(transactions.totalAmount ?? 0, addComma: true)}",
"$currency${formatWithSeparator(transactions.totalAmount ?? 0)}",
style: _theme.textTheme.titleLarge?.copyWith(fontWeight: FontWeight.w600),
),
const SizedBox(height: 4),
@@ -375,7 +375,7 @@ class DayBookReportState extends ConsumerState<DayBookReport> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(transactions.moneyIn ?? 0, addComma: true)}",
"$currency${formatWithSeparator(transactions.moneyIn ?? 0)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
color: DAppColors.kSuccess,
@@ -404,7 +404,7 @@ class DayBookReportState extends ConsumerState<DayBookReport> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(transactions.moneyOut ?? 0, addComma: true)}",
"$currency${formatWithSeparator(transactions.moneyOut ?? 0)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
color: DAppColors.kError,
@@ -565,7 +565,7 @@ class DayBookReportState extends ConsumerState<DayBookReport> {
Expanded(
flex: 2,
child: Text(
"$currency${formatPointNumber(t.amount ?? 0, addComma: true)}",
"$currency${formatWithSeparator(t.amount ?? 0)}",
textAlign: TextAlign.end,
style: TextStyle(
color: selectedTransactionType == 'credit'

View File

@@ -434,7 +434,7 @@ class _DueReportScreenState extends ConsumerState<DueReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(totalReceiveDue)}",
"$currency${formatWithSeparator(totalReceiveDue)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -469,7 +469,7 @@ class _DueReportScreenState extends ConsumerState<DueReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(totalPaidDue)}",
"$currency${formatWithSeparator(totalPaidDue)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -597,13 +597,13 @@ class _DueReportScreenState extends ConsumerState<DueReportScreen> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'${l.S.of(context).total} : $currency${formatPointNumber(totalDue)}',
'${l.S.of(context).total} : $currency${formatWithSeparator(totalDue)}',
style: _theme.textTheme.titleSmall?.copyWith(
color: kPeraColor,
),
),
Text(
'${l.S.of(context).paid} : $currency${formatPointNumber(paidAmount)}',
'${l.S.of(context).paid} : $currency${formatWithSeparator(paidAmount)}',
style: _theme.textTheme.titleSmall?.copyWith(
color: kPeraColor,
),
@@ -617,7 +617,7 @@ class _DueReportScreenState extends ConsumerState<DueReportScreen> {
children: [
// if (dueAmount > 0)
Text(
'${l.S.of(context).due}: $currency${formatPointNumber(dueAmount)}',
'${l.S.of(context).due}: $currency${formatWithSeparator(dueAmount)}',
style: _theme.textTheme.titleMedium?.copyWith(
color: kPeraColor,
),

View File

@@ -465,7 +465,7 @@ class _ExpenseReportState extends ConsumerState<ExpenseReport> {
),
Expanded(
child: Text(
'$currency${expense.amount?.toStringAsFixed(2)}',
'$currency${formatWithSeparator(expense.amount ?? 0)}',
textAlign: TextAlign.end,
),
)
@@ -503,8 +503,8 @@ class _ExpenseReportState extends ConsumerState<ExpenseReport> {
fontWeight: FontWeight.w600,
),
),
Text(
'$currency${totalExpense.toStringAsFixed(2)}',
Text(
'$currency${formatWithSeparator(totalExpense)}',
style: _theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -535,8 +535,8 @@ class _ExpenseReportState extends ConsumerState<ExpenseReport> {
fontWeight: FontWeight.w600,
),
),
Text(
'$currency${totalExpense.toStringAsFixed(2)}',
Text(
'$currency${formatWithSeparator(totalExpense)}',
style: _theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w600,
),

View File

@@ -423,7 +423,7 @@ class PurchaseReportState extends ConsumerState<PurchaseReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(totalPurchase)}",
"$currency${formatWithSeparator(totalPurchase)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -456,7 +456,7 @@ class PurchaseReportState extends ConsumerState<PurchaseReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(totalDues)}",
"$currency${formatWithSeparator(totalDues)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -573,7 +573,7 @@ class PurchaseReportState extends ConsumerState<PurchaseReportScreen> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${l.S.of(context).total} : $currency ${filteredTransactions[index].totalAmount.toString()}',
'${l.S.of(context).total} : $currency ${formatWithSeparator(filteredTransactions[index].totalAmount ?? 0)}',
style: _theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w500,
color: kPeraColor,
@@ -582,7 +582,7 @@ class PurchaseReportState extends ConsumerState<PurchaseReportScreen> {
const SizedBox(width: 4),
if (filteredTransactions[index].dueAmount!.toInt() != 0)
Text(
'${l.S.of(context).paid} : $currency ${filteredTransactions[index].totalAmount!.toDouble() - filteredTransactions[index].dueAmount!.toDouble()}',
'${l.S.of(context).paid} : $currency ${formatWithSeparator(filteredTransactions[index].totalAmount!.toDouble() - filteredTransactions[index].dueAmount!.toDouble())}',
style: _theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w500,
color: kPeraColor,
@@ -596,14 +596,14 @@ class PurchaseReportState extends ConsumerState<PurchaseReportScreen> {
children: [
if (filteredTransactions[index].dueAmount!.toInt() == 0)
Text(
'${l.S.of(context).paid} : $currency ${filteredTransactions[index].totalAmount!.toDouble() - filteredTransactions[index].dueAmount!.toDouble()}',
'${l.S.of(context).paid} : $currency ${formatWithSeparator(filteredTransactions[index].totalAmount!.toDouble() - filteredTransactions[index].dueAmount!.toDouble())}',
style: _theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w500,
),
),
if (filteredTransactions[index].dueAmount!.toInt() != 0)
Text(
'${l.S.of(context).due}: $currency ${filteredTransactions[index].dueAmount.toString()}',
'${l.S.of(context).due}: $currency ${formatWithSeparator(filteredTransactions[index].dueAmount ?? 0)}',
style: _theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w500,
),

View File

@@ -418,7 +418,7 @@ class SalesReportScreenState extends ConsumerState<SalesReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(totalSales)}",
"$currency${formatWithSeparator(totalSales)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -451,7 +451,7 @@ class SalesReportScreenState extends ConsumerState<SalesReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(totalDue)}",
"$currency${formatWithSeparator(totalDue)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),

View File

@@ -387,7 +387,7 @@ class _TaxReportScreenState extends ConsumerState<TaxReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(_overview.totalAmount, addComma: true)}",
"$currency${formatWithSeparator(_overview.totalAmount)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -417,7 +417,7 @@ class _TaxReportScreenState extends ConsumerState<TaxReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(_overview.totalDiscount, addComma: true)}",
"$currency${formatWithSeparator(_overview.totalDiscount)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -447,7 +447,7 @@ class _TaxReportScreenState extends ConsumerState<TaxReportScreen> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"$currency${formatPointNumber(_overview.totalVat, addComma: true)}",
"$currency${formatWithSeparator(_overview.totalVat)}",
style: _theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w600,
),
@@ -552,13 +552,13 @@ class _TaxReportScreenState extends ConsumerState<TaxReportScreen> {
spacing: 2,
children: [
Text(
'${_lang.amount}: $currency${formatPointNumber(_transaction.amount ?? 0, addComma: true)}',
'${_lang.amount}: $currency${formatWithSeparator(_transaction.amount ?? 0)}',
),
Text(
'${_lang.discount}: $currency${formatPointNumber(_transaction.discountAmount ?? 0, addComma: true)}',
'${_lang.discount}: $currency${formatWithSeparator(_transaction.discountAmount ?? 0)}',
),
Text(
'${_transaction.vatName ?? _lang.vat}: $currency${formatPointNumber(_transaction.vatAmount ?? 0, addComma: true)}',
'${_transaction.vatName ?? _lang.vat}: $currency${formatWithSeparator(_transaction.vatAmount ?? 0)}',
),
],
),

View File

@@ -221,7 +221,7 @@ class _CustomerLedgerReportState extends ConsumerState<CustomerLedgerReport> {
),
),
Text(
'${_lang.due}: $currency${formatPointNumber(party.due ?? 0, addComma: true)}',
'${_lang.due}: $currency${formatWithSeparator(party.due ?? 0)}',
style: _theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w500,
),
@@ -251,7 +251,7 @@ class _CustomerLedgerReportState extends ConsumerState<CustomerLedgerReport> {
style: _theme.textTheme.bodyMedium,
),
Text(
'${_lang.paidAmount} : $currency${formatPointNumber(party.totalSalePaid ?? 0, addComma: true)}',
'${_lang.paidAmount} : $currency${formatWithSeparator(party.totalSalePaid ?? 0)}',
style: _theme.textTheme.bodyMedium,
),
],

View File

@@ -232,7 +232,7 @@ class _CustomerLedgerReportState extends ConsumerState<SupplierLedger> {
),
),
Text(
'${_lang.due}: $currency${formatPointNumber(party.due ?? 0, addComma: true)}',
'${_lang.due}: $currency${formatWithSeparator(party.due ?? 0)}',
style: _theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w500,
),
@@ -262,7 +262,7 @@ class _CustomerLedgerReportState extends ConsumerState<SupplierLedger> {
style: _theme.textTheme.bodyMedium,
),
Text(
'${_lang.paidAmount} : $currency${formatPointNumber(party.totalPurchasePaid ?? 0, addComma: true)}',
'${_lang.paidAmount} : $currency${formatWithSeparator(party.totalPurchasePaid ?? 0)}',
style: _theme.textTheme.bodyMedium,
),
],