From 80353ea11d09869521e314174a844940ad0863c2 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 1 Dec 2020 21:09:01 +0200
Subject: [PATCH] Set default refund amount

---
 lib/data/models/payment_model.dart     | 20 +++++++++++---------
 lib/redux/payment/payment_actions.dart |  6 ++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart
index fccd6a6ee..557f1256d 100644
--- a/lib/data/models/payment_model.dart
+++ b/lib/data/models/payment_model.dart
@@ -373,18 +373,20 @@ abstract class PaymentEntity extends Object
 
     if (!isDeleted) {
       if (userCompany.canEditEntity(this)) {
-        if (includeEdit) {
-          actions.add(EntityAction.edit);
-        }
+        if (!multiselect) {
+          if (includeEdit) {
+            actions.add(EntityAction.edit);
+          }
 
-        if (applied < amount) {
-          actions.add(EntityAction.apply);
-        }
+          if (applied < amount) {
+            actions.add(EntityAction.apply);
+          }
 
-        if (completedAmount > 0) {
-          actions.add(EntityAction.refund);
+          if (completedAmount > 0) {
+            actions.add(EntityAction.refund);
+          }
         }
-
+        
         if (client != null && client.hasEmailAddress) {
           actions.add(EntityAction.emailPayment);
         }
diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart
index c64f386b6..d4b3e2587 100644
--- a/lib/redux/payment/payment_actions.dart
+++ b/lib/redux/payment/payment_actions.dart
@@ -342,8 +342,10 @@ void handlePaymentAction(
       viewEntity(context: context, entity: payment);
       WidgetsBinding.instance.addPostFrameCallback((duration) {
         if (payment.invoicePaymentables.length == 1) {
-          payment = payment.rebuild((b) =>
-              b..invoices.add(PaymentableEntity(invoiceId: payment.invoiceId)));
+          payment = payment.rebuild((b) => b
+            ..invoices.add(PaymentableEntity(
+                invoiceId: payment.invoiceId,
+                amount: payment.completedAmount)));
         }
         store.dispatch(ViewRefundPayment(
           navigator: navigator,