Merge branch 'develop'

invoiceninja · Dec 6, 2021 · 13f4d32 · 13f4d32
2 parents 08e6373 + 9100eed
commit 13f4d32
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/lib/redux/dashboard/dashboard_sidebar_selectors.dart b/lib/redux/dashboard/dashboard_sidebar_selectors.dart
@@ -276,15 +276,23 @@ List<ExpenseEntity> _recentExpenses({
   expenseMap.forEach((index, expense) {
     final client =
         clientMap[expense.clientId] ?? ClientEntity(id: expense.clientId);
-    if (expense.isNotActive || client.isNotActive) {
+    if (client.isNotActive || expense.isNotActive || expense.isInvoiced) {
       // do noting
     } else {
       expenses.add(expense);
     }
   });
 
-  expenses.sort((expenseA, expenseB) =>
-      (expenseA.date ?? '').compareTo(expenseB.date ?? ''));
+  expenses.sort((expenseA, expenseB) {
+    final expenseAdate = expenseA.date ?? '';
+    final expenseBdate = expenseB.date ?? '';
+
+    if (expenseAdate == expenseBdate) {
+      return expenseB.number.compareTo(expenseA.number);
+    } else {
+      return expenseBdate.compareTo(expenseAdate);
+    }
+  });
 
   return expenses;
 }
diff --git a/lib/ui/invoice/edit/invoice_edit_items_desktop.dart b/lib/ui/invoice/edit/invoice_edit_items_desktop.dart
@@ -793,9 +793,11 @@ class _InvoiceEditItemsDesktopState extends State<InvoiceEditItemsDesktop> {
                               formatNumberType: FormatNumberType.inputMoney,
                               clientId: invoice.clientId),
                           onChanged: (value) => _onChanged(
-                              lineItems[index]
-                                  .rebuild((b) => b..cost = parseDouble(value)),
-                              index),
+                            lineItems[index]
+                                .rebuild((b) => b..cost = parseDouble(value)),
+                            index,
+                            debounce: false,
+                          ),
                           keyboardType: TextInputType.numberWithOptions(
                               decimal: true, signed: true),
                           onSavePressed: widget.entityViewModel.onSavePressed,
@@ -817,9 +819,11 @@ class _InvoiceEditItemsDesktopState extends State<InvoiceEditItemsDesktop> {
                                 formatNumberType: FormatNumberType.inputAmount,
                                 clientId: invoice.clientId),
                             onChanged: (value) => _onChanged(
-                                lineItems[index].rebuild(
-                                    (b) => b..quantity = parseDouble(value)),
-                                index),
+                              lineItems[index].rebuild(
+                                  (b) => b..quantity = parseDouble(value)),
+                              index,
+                              debounce: false,
+                            ),
                             keyboardType: TextInputType.numberWithOptions(
                                 decimal: true, signed: true),
                             onSavePressed: widget.entityViewModel.onSavePressed,

diff --git a/lib/ui/payment/edit/payment_edit.dart b/lib/ui/payment/edit/payment_edit.dart
@@ -134,7 +134,7 @@ class _PaymentEditState extends State<PaymentEdit> {
     if (currency != null) {
       final client = state.clientState.get(payment.clientId);
       exchangeRate = getExchangeRate(state.staticState.currencyMap,
-          fromCurrencyId: currency.id, toCurrencyId: client.currencyId);
+          fromCurrencyId: client.currencyId, toCurrencyId: currency.id);
     }
 
     _exchangeRateController.removeListener(_onChanged);

diff --git a/lib/ui/payment/view/payment_view.dart b/lib/ui/payment/view/payment_view.dart
@@ -112,7 +112,8 @@ class _PaymentViewState extends State<PaymentView> {
                         EntityListTile(
                           isFilter: widget.isFilter,
                           entity: state.invoiceState.map[paymentable.invoiceId],
-                          subtitle: formatNumber(paymentable.amount, context) +
+                          subtitle: formatNumber(paymentable.amount, context,
+                                  clientId: payment.clientId) +
                               ' • ' +
                               formatDate(
                                   convertTimestampToDateString(
@@ -123,7 +124,8 @@ class _PaymentViewState extends State<PaymentView> {
                         EntityListTile(
                           isFilter: widget.isFilter,
                           entity: state.creditState.map[paymentable.creditId],
-                          subtitle: formatNumber(paymentable.amount, context) +
+                          subtitle: formatNumber(paymentable.amount, context,
+                                  clientId: payment.clientId) +
                               ' • ' +
                               formatDate(
                                   convertTimestampToDateString(