From bdb9461e95b3beab9cf2fe0d0c62e9167f941aea Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Mon, 11 Dec 2023 15:47:02 +0100
Subject: [PATCH] Planned invoice excluded from invoice payment

---
 .../java/hu/user/lis/db/repository/InvoiceRepository.java     | 4 ++--
 .../java/hu/user/lis/ui/view/InvoicePaymentViewModel.java     | 4 ++--
 lis-ui/src/main/resources/web/invoices.zul                    | 2 +-
 .../hu/user/lis/workflow/invoice/DownloadInvoiceData.java     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lis-db/src/main/java/hu/user/lis/db/repository/InvoiceRepository.java b/lis-db/src/main/java/hu/user/lis/db/repository/InvoiceRepository.java
index 0c6ef8b..979bf99 100644
--- a/lis-db/src/main/java/hu/user/lis/db/repository/InvoiceRepository.java
+++ b/lis-db/src/main/java/hu/user/lis/db/repository/InvoiceRepository.java
@@ -9,8 +9,8 @@ import java.util.Optional;
 
 public interface InvoiceRepository extends JpaRepository<Invoice, Long>, InvoiceRepositorySearch {
 
-    List<Invoice> findByHumanId(String humanId);
+    List<Invoice> findByHumanIdAndPlanned(String humanId, boolean planned);
 
-    Optional<Invoice> findByHumanIdAndPartner(String humanId, Partner partner);
+    Optional<Invoice> findByHumanIdAndPartnerAndPlanned(String humanId, Partner partner, boolean planned);
 
 }
diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java
index df2a1a9..3b84372 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java
@@ -108,7 +108,7 @@ public class InvoicePaymentViewModel extends EntityViewModel<Payment> implements
         }
         hideEditor();
         if (Objects.isNull(filterPartner)) {
-            List<Invoice> invoices = invoiceRepository.findByHumanId(invoiceNumber);
+            List<Invoice> invoices = invoiceRepository.findByHumanIdAndPlanned(invoiceNumber, false);
             if (invoices.isEmpty()) {
                 setPartnerRequired(false);
                 Notification.show("Nem található számla: " + invoiceNumber, null, null, null, 3000, true);
@@ -123,7 +123,7 @@ public class InvoicePaymentViewModel extends EntityViewModel<Payment> implements
                 }
             }
         } else {
-            Optional<Invoice> opInvoice = invoiceRepository.findByHumanIdAndPartner(invoiceNumber, filterPartner);
+            Optional<Invoice> opInvoice = invoiceRepository.findByHumanIdAndPartnerAndPlanned(invoiceNumber, filterPartner, false);
             opInvoice.ifPresent(this::showEditor);
         }
     }
diff --git a/lis-ui/src/main/resources/web/invoices.zul b/lis-ui/src/main/resources/web/invoices.zul
index 8cb02bb..60fa52e 100644
--- a/lis-ui/src/main/resources/web/invoices.zul
+++ b/lis-ui/src/main/resources/web/invoices.zul
@@ -66,7 +66,7 @@
                                        onClick="@command('onChangeProject')" disabled="@load(empty vm.selectedEntity)"/>
                         <toolbarbutton label="Számla kiegyenlítés" iconSclass="z-icon-credit-card"
                                        onClick="@command('onInvoicePayment')"
-                                       disabled="@load(empty vm.selectedEntity)"/>
+                                       disabled="@load(empty vm.selectedEntity || vm.selectedEntity.planned)"/>
 
                         <!--                        <toolbarbutton label="Hozzáadás" iconSclass="z-icon-plus" onClick="@command('onAdd')"/>-->
                         <!--                        <toolbarbutton label="Törlés" iconSclass="z-icon-remove" onClick="@command('onDelete')"-->
diff --git a/lis-workflow/src/main/java/hu/user/lis/workflow/invoice/DownloadInvoiceData.java b/lis-workflow/src/main/java/hu/user/lis/workflow/invoice/DownloadInvoiceData.java
index e926be2..b618df8 100644
--- a/lis-workflow/src/main/java/hu/user/lis/workflow/invoice/DownloadInvoiceData.java
+++ b/lis-workflow/src/main/java/hu/user/lis/workflow/invoice/DownloadInvoiceData.java
@@ -84,6 +84,6 @@ public class DownloadInvoiceData implements JavaDelegate {
     }
 
     private boolean isInvoiceImported(String humanId, Partner partner) {
-        return invoiceRepository.findByHumanIdAndPartner(humanId, partner).isPresent();
+        return invoiceRepository.findByHumanIdAndPartnerAndPlanned(humanId, partner, false).isPresent();
     }
 }
-- 
2.54.0