Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Recurring expenses

This commit is contained in:
Hillel Coren 2021-09-05 21:05:06 +03:00
parent df065d051b
commit bf03214cca
4 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/data/models/recurring_expense_model.dart
View File

@ -12,7 +12,6 @@ class RecurringExpenseFields {
static const String netAmount = 'net_amount'; static const String netAmount = 'net_amount';
static const String amount = 'amount'; static const String amount = 'amount';
static const String taxAmount = 'tax_amount'; static const String taxAmount = 'tax_amount';
static const String expenseDate = 'date';
static const String paymentDate = 'payment_date'; static const String paymentDate = 'payment_date';
static const String exchangeRate = 'exchange_rate'; static const String exchangeRate = 'exchange_rate';
static const String invoiceCurrencyId = 'invoice_currency_id'; static const String invoiceCurrencyId = 'invoice_currency_id';
@ -36,4 +35,5 @@ class RecurringExpenseFields {
static const String archivedAt = 'archived_at'; static const String archivedAt = 'archived_at';
static const String isDeleted = 'is_deleted'; static const String isDeleted = 'is_deleted';
static const String documents = 'documents'; static const String documents = 'documents';
static const String nextSendDate = 'next_send_date';
} }

2
lib/redux/recurring_expense/recurring_expense_selectors.dart
View File

@ -52,7 +52,7 @@ List<String> dropdownRecurringExpensesSelector(
final recurringExpenseB = recurringExpenseMap[recurringExpenseBId]; final recurringExpenseB = recurringExpenseMap[recurringExpenseBId];
return recurringExpenseA.compareTo( return recurringExpenseA.compareTo(
recurringExpenseB, recurringExpenseB,
RecurringExpenseFields.expenseDate, RecurringExpenseFields.number,
true, true,
clientMap, clientMap,
userMap, userMap,

137
lib/ui/recurring_expense/recurring_expense_presenter.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/models/recurring_expense_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart';
import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
@ -9,12 +10,12 @@ import 'package:invoiceninja_flutter/utils/formatting.dart';
class RecurringExpensePresenter extends EntityPresenter { class RecurringExpensePresenter extends EntityPresenter {
static List<String> getDefaultTableFields(UserCompanyEntity userCompany) { static List<String> getDefaultTableFields(UserCompanyEntity userCompany) {
return [ return [
ExpenseFields.status, RecurringExpenseFields.status,
ExpenseFields.vendor, RecurringExpenseFields.vendor,
ExpenseFields.client, RecurringExpenseFields.client,
ExpenseFields.expenseDate, RecurringExpenseFields.nextSendDate,
ExpenseFields.amount, RecurringExpenseFields.amount,
ExpenseFields.publicNotes, RecurringExpenseFields.publicNotes,
EntityFields.state, EntityFields.state,
]; ];
} }
@ -23,34 +24,34 @@ class RecurringExpensePresenter extends EntityPresenter {
return [ return [
...getDefaultTableFields(userCompany), ...getDefaultTableFields(userCompany),
...EntityPresenter.getBaseFields(), ...EntityPresenter.getBaseFields(),
ExpenseFields.number, RecurringExpenseFields.number,
ExpenseFields.netAmount, RecurringExpenseFields.netAmount,
ExpenseFields.taxAmount, RecurringExpenseFields.taxAmount,
ExpenseFields.privateNotes, RecurringExpenseFields.privateNotes,
ExpenseFields.shouldBeInvoiced, RecurringExpenseFields.shouldBeInvoiced,
ExpenseFields.transactionId, RecurringExpenseFields.transactionId,
ExpenseFields.transactionReference, RecurringExpenseFields.transactionReference,
ExpenseFields.bankId, RecurringExpenseFields.bankId,
ExpenseFields.currencyId, RecurringExpenseFields.currencyId,
ExpenseFields.categoryId, RecurringExpenseFields.categoryId,
ExpenseFields.category, RecurringExpenseFields.category,
ExpenseFields.paymentDate, RecurringExpenseFields.paymentDate,
ExpenseFields.exchangeRate, RecurringExpenseFields.exchangeRate,
ExpenseFields.invoiceCurrencyId, RecurringExpenseFields.invoiceCurrencyId,
ExpenseFields.taxName1, RecurringExpenseFields.taxName1,
ExpenseFields.taxName2, RecurringExpenseFields.taxName2,
ExpenseFields.taxName3, RecurringExpenseFields.taxName3,
ExpenseFields.taxRate1, RecurringExpenseFields.taxRate1,
ExpenseFields.taxRate2, RecurringExpenseFields.taxRate2,
ExpenseFields.taxRate3, RecurringExpenseFields.taxRate3,
ExpenseFields.clientId, RecurringExpenseFields.clientId,
ExpenseFields.invoiceId, RecurringExpenseFields.invoiceId,
ExpenseFields.vendorId, RecurringExpenseFields.vendorId,
ExpenseFields.customValue1, RecurringExpenseFields.customValue1,
ExpenseFields.customValue2, RecurringExpenseFields.customValue2,
ExpenseFields.customValue3, RecurringExpenseFields.customValue3,
ExpenseFields.customValue4, RecurringExpenseFields.customValue4,
ExpenseFields.documents, RecurringExpenseFields.documents,
]; ];
} }
@ -60,86 +61,86 @@ class RecurringExpensePresenter extends EntityPresenter {
final expense = entity as ExpenseEntity; final expense = entity as ExpenseEntity;
switch (field) { switch (field) {
case ExpenseFields.status: case RecurringExpenseFields.status:
return EntityStatusChip(entity: expense); return EntityStatusChip(entity: expense);
case ExpenseFields.vendor: case RecurringExpenseFields.vendor:
case ExpenseFields.vendorId: case RecurringExpenseFields.vendorId:
return Text((state.vendorState.map[expense.vendorId] ?? VendorEntity()) return Text((state.vendorState.map[expense.vendorId] ?? VendorEntity())
.listDisplayName); .listDisplayName);
case ExpenseFields.clientId: case RecurringExpenseFields.clientId:
case ExpenseFields.client: case RecurringExpenseFields.client:
return Text((state.clientState.map[expense.clientId] ?? ClientEntity()) return Text((state.clientState.map[expense.clientId] ?? ClientEntity())
.listDisplayName); .listDisplayName);
case ExpenseFields.expenseDate: case RecurringExpenseFields.nextSendDate:
return Text(formatDate(expense.date, context)); return Text(formatDate(expense.date, context));
case ExpenseFields.netAmount: case RecurringExpenseFields.netAmount:
return Text(formatNumber(expense.netAmount, context, return Text(formatNumber(expense.netAmount, context,
currencyId: expense.currencyId)); currencyId: expense.currencyId));
case ExpenseFields.amount: case RecurringExpenseFields.amount:
return Text(formatNumber(expense.grossAmount, context, return Text(formatNumber(expense.grossAmount, context,
currencyId: expense.currencyId)); currencyId: expense.currencyId));
case ExpenseFields.taxAmount: case RecurringExpenseFields.taxAmount:
return Text(formatNumber(expense.taxAmount, context, return Text(formatNumber(expense.taxAmount, context,
currencyId: expense.currencyId)); currencyId: expense.currencyId));
case ExpenseFields.publicNotes: case RecurringExpenseFields.publicNotes:
return Text(expense.publicNotes); return Text(expense.publicNotes);
case ExpenseFields.number: case RecurringExpenseFields.number:
return Text(expense.number); return Text(expense.number);
case ExpenseFields.privateNotes: case RecurringExpenseFields.privateNotes:
return Text(expense.privateNotes); return Text(expense.privateNotes);
case ExpenseFields.shouldBeInvoiced: case RecurringExpenseFields.shouldBeInvoiced:
return Text(expense.shouldBeInvoiced.toString()); return Text(expense.shouldBeInvoiced.toString());
case ExpenseFields.transactionId: case RecurringExpenseFields.transactionId:
return Text(expense.transactionId); return Text(expense.transactionId);
case ExpenseFields.transactionReference: case RecurringExpenseFields.transactionReference:
return Text(expense.transactionReference); return Text(expense.transactionReference);
case ExpenseFields.bankId: case RecurringExpenseFields.bankId:
return Text(expense.bankId); return Text(expense.bankId);
case ExpenseFields.currencyId: case RecurringExpenseFields.currencyId:
return Text(state return Text(state
.staticState.currencyMap[expense.currencyId]?.listDisplayName ?? .staticState.currencyMap[expense.currencyId]?.listDisplayName ??
''); '');
case ExpenseFields.category: case RecurringExpenseFields.category:
case ExpenseFields.categoryId: case RecurringExpenseFields.categoryId:
return Text(state.expenseCategoryState.map[expense.categoryId] return Text(state.expenseCategoryState.map[expense.categoryId]
?.listDisplayName ?? ?.listDisplayName ??
''); '');
case ExpenseFields.paymentDate: case RecurringExpenseFields.paymentDate:
return Text(formatDate(expense.paymentDate, context)); return Text(formatDate(expense.paymentDate, context));
case ExpenseFields.exchangeRate: case RecurringExpenseFields.exchangeRate:
return Text(formatNumber(expense.exchangeRate, context, return Text(formatNumber(expense.exchangeRate, context,
formatNumberType: FormatNumberType.double)); formatNumberType: FormatNumberType.double));
case ExpenseFields.invoiceCurrencyId: case RecurringExpenseFields.invoiceCurrencyId:
return Text(state.staticState.currencyMap[expense.invoiceCurrencyId] return Text(state.staticState.currencyMap[expense.invoiceCurrencyId]
?.listDisplayName ?? ?.listDisplayName ??
''); '');
case ExpenseFields.taxName1: case RecurringExpenseFields.taxName1:
return Text(expense.taxName1); return Text(expense.taxName1);
case ExpenseFields.taxName2: case RecurringExpenseFields.taxName2:
return Text(expense.taxName2); return Text(expense.taxName2);
case ExpenseFields.taxName3: case RecurringExpenseFields.taxName3:
return Text(expense.taxName3); return Text(expense.taxName3);
case ExpenseFields.taxRate1: case RecurringExpenseFields.taxRate1:
return Text(formatNumber(expense.taxRate1, context, return Text(formatNumber(expense.taxRate1, context,
formatNumberType: FormatNumberType.percent)); formatNumberType: FormatNumberType.percent));
case ExpenseFields.taxRate2: case RecurringExpenseFields.taxRate2:
return Text(formatNumber(expense.taxRate2, context, return Text(formatNumber(expense.taxRate2, context,
formatNumberType: FormatNumberType.percent)); formatNumberType: FormatNumberType.percent));
case ExpenseFields.taxRate3: case RecurringExpenseFields.taxRate3:
return Text(formatNumber(expense.taxRate3, context, return Text(formatNumber(expense.taxRate3, context,
formatNumberType: FormatNumberType.percent)); formatNumberType: FormatNumberType.percent));
case ExpenseFields.invoiceId: case RecurringExpenseFields.invoiceId:
return Text( return Text(
state.invoiceState.map[expense.invoiceId]?.listDisplayName ?? ''); state.invoiceState.map[expense.invoiceId]?.listDisplayName ?? '');
case ExpenseFields.customValue1: case RecurringExpenseFields.customValue1:
return Text(presentCustomField(expense.customValue1)); return Text(presentCustomField(expense.customValue1));
case ExpenseFields.customValue2: case RecurringExpenseFields.customValue2:
return Text(presentCustomField(expense.customValue2)); return Text(presentCustomField(expense.customValue2));
case ExpenseFields.customValue3: case RecurringExpenseFields.customValue3:
return Text(presentCustomField(expense.customValue3)); return Text(presentCustomField(expense.customValue3));
case ExpenseFields.customValue4: case RecurringExpenseFields.customValue4:
return Text(presentCustomField(expense.customValue4)); return Text(presentCustomField(expense.customValue4));
case ExpenseFields.documents: case RecurringExpenseFields.documents:
return Text('${expense.documents.length}'); return Text('${expense.documents.length}');
} }

2
lib/ui/recurring_expense/recurring_expense_screen.dart
View File

@ -64,7 +64,7 @@ class RecurringExpenseScreen extends StatelessWidget {
}, },
sortFields: [ sortFields: [
RecurringExpenseFields.number, RecurringExpenseFields.number,
RecurringExpenseFields.expenseDate, RecurringExpenseFields.nextSendDate,
RecurringExpenseFields.updatedAt, RecurringExpenseFields.updatedAt,
], ],
onSelectedState: (EntityState state, value) { onSelectedState: (EntityState state, value) {