diff --git a/sources/api/pom.xml b/sources/api/pom.xml
index bd533ea..b35bf3c 100644
--- a/sources/api/pom.xml
+++ b/sources/api/pom.xml
@@ -26,13 +26,13 @@
tools.dynamia.modules
tools.dynamia.modules.saas.parent
- 3.4.2
+ 3.4.3
tools.dynamia.modules.saas.api
DynamiaModules - SaaS API
https://www.dynamia.tools/modules/saas
- 3.4.2
+ 3.4.3
diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountPaymentDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountPaymentDTO.java
index 00d53df..a51fd03 100644
--- a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountPaymentDTO.java
+++ b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountPaymentDTO.java
@@ -27,6 +27,7 @@ public class AccountPaymentDTO implements Serializable {
private Long id;
private Long accountId;
+ private String account;
private String type;
private BigDecimal value;
private BigDecimal paymentValue;
@@ -36,6 +37,31 @@ public class AccountPaymentDTO implements Serializable {
private String paymentMethodDescription;
private boolean finished;
+ private String paymentMethod;
+ private Long paymentMethodId;
+
+ private String couponCode;
+
+ private boolean silent;
+ private boolean invoiceRequired;
+
+ private String additionalService;
+ private Long additionalServiceId;
+ private String externalReference;
+ private String externalService;
+ private boolean external;
+ private String reference2;
+ private String invoiceID;
+ private String invoiceNumber;
+ private String invoiceUUID;
+ private String extra0;
+ private String extra1;
+ private String extra2;
+ private String extra3;
+ private String paymentLink;
+ private String reseller;
+ private Long resellerId;
+
public Long getId() {
return id;
}
@@ -100,6 +126,22 @@ public void setDescription(String description) {
this.description = description;
}
+ public String getPaymentMethod() {
+ return paymentMethod;
+ }
+
+ public void setPaymentMethod(String paymentMethod) {
+ this.paymentMethod = paymentMethod;
+ }
+
+ public Long getPaymentMethodId() {
+ return paymentMethodId;
+ }
+
+ public void setPaymentMethodId(Long paymentMethodId) {
+ this.paymentMethodId = paymentMethodId;
+ }
+
public String getPaymentMethodDescription() {
return paymentMethodDescription;
}
@@ -115,4 +157,164 @@ public boolean isFinished() {
public void setFinished(boolean finished) {
this.finished = finished;
}
+
+ public String getCouponCode() {
+ return couponCode;
+ }
+
+ public void setCouponCode(String couponCode) {
+ this.couponCode = couponCode;
+ }
+
+ public boolean isSilent() {
+ return silent;
+ }
+
+ public void setSilent(boolean silent) {
+ this.silent = silent;
+ }
+
+ public boolean isInvoiceRequired() {
+ return invoiceRequired;
+ }
+
+ public void setInvoiceRequired(boolean invoiceRequired) {
+ this.invoiceRequired = invoiceRequired;
+ }
+
+ public String getAdditionalService() {
+ return additionalService;
+ }
+
+ public void setAdditionalService(String additionalService) {
+ this.additionalService = additionalService;
+ }
+
+ public Long getAdditionalServiceId() {
+ return additionalServiceId;
+ }
+
+ public void setAdditionalServiceId(Long additionalServiceId) {
+ this.additionalServiceId = additionalServiceId;
+ }
+
+ public String getExternalReference() {
+ return externalReference;
+ }
+
+ public void setExternalReference(String externalReference) {
+ this.externalReference = externalReference;
+ }
+
+ public String getExternalService() {
+ return externalService;
+ }
+
+ public void setExternalService(String externalService) {
+ this.externalService = externalService;
+ }
+
+ public boolean isExternal() {
+ return external;
+ }
+
+ public void setExternal(boolean external) {
+ this.external = external;
+ }
+
+ public String getReference2() {
+ return reference2;
+ }
+
+ public void setReference2(String reference2) {
+ this.reference2 = reference2;
+ }
+
+ public String getInvoiceID() {
+ return invoiceID;
+ }
+
+ public void setInvoiceID(String invoiceID) {
+ this.invoiceID = invoiceID;
+ }
+
+ public String getInvoiceNumber() {
+ return invoiceNumber;
+ }
+
+ public void setInvoiceNumber(String invoiceNumber) {
+ this.invoiceNumber = invoiceNumber;
+ }
+
+ public String getInvoiceUUID() {
+ return invoiceUUID;
+ }
+
+ public void setInvoiceUUID(String invoiceUUID) {
+ this.invoiceUUID = invoiceUUID;
+ }
+
+ public String getExtra0() {
+ return extra0;
+ }
+
+ public void setExtra0(String extra0) {
+ this.extra0 = extra0;
+ }
+
+ public String getExtra1() {
+ return extra1;
+ }
+
+ public void setExtra1(String extra1) {
+ this.extra1 = extra1;
+ }
+
+ public String getExtra2() {
+ return extra2;
+ }
+
+ public void setExtra2(String extra2) {
+ this.extra2 = extra2;
+ }
+
+ public String getExtra3() {
+ return extra3;
+ }
+
+ public void setExtra3(String extra3) {
+ this.extra3 = extra3;
+ }
+
+ public String getPaymentLink() {
+ return paymentLink;
+ }
+
+ public void setPaymentLink(String paymentLink) {
+ this.paymentLink = paymentLink;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getReseller() {
+ return reseller;
+ }
+
+ public void setReseller(String reseller) {
+ this.reseller = reseller;
+ }
+
+ public Long getResellerId() {
+ return resellerId;
+ }
+
+ public void setResellerId(Long resellerId) {
+ this.resellerId = resellerId;
+ }
}
diff --git a/sources/core/pom.xml b/sources/core/pom.xml
index e277807..138a35f 100644
--- a/sources/core/pom.xml
+++ b/sources/core/pom.xml
@@ -22,10 +22,10 @@
tools.dynamia.modules
tools.dynamia.modules.saas.parent
- 3.4.2
+ 3.4.3
tools.dynamia.modules.saas
- 3.4.2
+ 3.4.3
DynamiaModules - SaaS Core
https://www.dynamia.tools/modules/saas
@@ -49,12 +49,12 @@
tools.dynamia.modules
tools.dynamia.modules.saas.api
- 3.4.2
+ 3.4.3
tools.dynamia.modules
tools.dynamia.modules.saas.jpa
- 3.4.2
+ 3.4.3
junit
diff --git a/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPayment.java b/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPayment.java
index f46643b..96576dd 100644
--- a/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPayment.java
+++ b/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPayment.java
@@ -17,20 +17,23 @@
package tools.dynamia.modules.saas.domain;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
import tools.dynamia.commons.BigDecimalUtils;
import tools.dynamia.commons.DateTimeUtils;
import tools.dynamia.domain.OrderBy;
import tools.dynamia.domain.Transferable;
import tools.dynamia.domain.contraints.NotEmpty;
import tools.dynamia.domain.jpa.BaseEntity;
+import tools.dynamia.domain.util.DomainUtils;
import tools.dynamia.integration.Containers;
import tools.dynamia.modules.saas.api.dto.AccountPaymentDTO;
import tools.dynamia.modules.saas.domain.enums.ResellerComissionStatus;
import tools.dynamia.modules.saas.services.AccountService;
-import jakarta.validation.constraints.NotNull;
-
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.Date;
@@ -380,4 +383,36 @@ public boolean isExternal() {
public void setExternal(boolean external) {
this.external = external;
}
+
+ @Override
+ public AccountPaymentDTO toDTO() {
+ AccountPaymentDTO dto = DomainUtils.autoDataTransferObject(this, AccountPaymentDTO.class);
+ if (paymentMethod != null) {
+ dto.setPaymentMethod(paymentMethod.getName());
+ dto.setPaymentMethodId(paymentMethod.getId());
+ }
+
+ if (additionalService != null) {
+ dto.setAdditionalService(additionalService.getName());
+ dto.setAdditionalServiceId(additionalService.getId());
+ }
+
+ if (type != null) {
+ dto.setType(type.getName());
+ }
+
+ if (account != null) {
+ dto.setAccount(account.getName());
+ dto.setAccountId(account.getId());
+
+ }
+
+ if (reseller != null) {
+ dto.setReseller(getReseller().getName());
+ dto.setResellerId(getReseller().getId());
+ }
+
+
+ return dto;
+ }
}
diff --git a/sources/jpa/pom.xml b/sources/jpa/pom.xml
index 026622b..255724a 100644
--- a/sources/jpa/pom.xml
+++ b/sources/jpa/pom.xml
@@ -22,7 +22,7 @@
tools.dynamia.modules.saas.parent
tools.dynamia.modules
- 3.4.2
+ 3.4.3
4.0.0
DynamiaModules - SaaS JPA
@@ -33,7 +33,7 @@
tools.dynamia.modules
tools.dynamia.modules.saas.api
- 3.4.2
+ 3.4.3
tools.dynamia
diff --git a/sources/pom.xml b/sources/pom.xml
index 934947d..4a8185f 100644
--- a/sources/pom.xml
+++ b/sources/pom.xml
@@ -21,7 +21,7 @@
4.0.0
tools.dynamia.modules
tools.dynamia.modules.saas.parent
- 3.4.2
+ 3.4.3
pom
DynamiaModules - SaaS
DynamiaTools extension to create SaaS applications with accounts control and multi tenants in same
diff --git a/sources/remote/pom.xml b/sources/remote/pom.xml
index b5abb69..eb74bfa 100644
--- a/sources/remote/pom.xml
+++ b/sources/remote/pom.xml
@@ -22,7 +22,7 @@
tools.dynamia.modules.saas.parent
tools.dynamia.modules
- 3.4.2
+ 3.4.3
4.0.0
@@ -35,7 +35,7 @@
tools.dynamia.modules
tools.dynamia.modules.saas.jpa
- 3.4.2
+ 3.4.3
diff --git a/sources/ui/pom.xml b/sources/ui/pom.xml
index 4266483..5331a3c 100644
--- a/sources/ui/pom.xml
+++ b/sources/ui/pom.xml
@@ -22,10 +22,10 @@
tools.dynamia.modules
tools.dynamia.modules.saas.parent
- 3.4.2
+ 3.4.3
tools.dynamia.modules.saas.ui
- 3.4.2
+ 3.4.3
DynamiaModules - SaaS UI
https://www.dynamia.tools/modules/saas
diff --git a/sources/ui/src/main/java/tools/dynamia/modules/saas/ui/action/NewAccountPaymentAction.java b/sources/ui/src/main/java/tools/dynamia/modules/saas/ui/action/NewAccountPaymentAction.java
index 43888fe..202b05b 100644
--- a/sources/ui/src/main/java/tools/dynamia/modules/saas/ui/action/NewAccountPaymentAction.java
+++ b/sources/ui/src/main/java/tools/dynamia/modules/saas/ui/action/NewAccountPaymentAction.java
@@ -40,11 +40,10 @@ public NewAccountPaymentAction() {
setName(msg("newPayment"));
setApplicableClass(Account.class);
setImage("payment");
- setColor("white");
- setBackground(".green");
setMenuSupported(true);
- setAttribute("showLabel", true);
+ setShowLabel(true);
setGroup(ActionGroup.get("CRUD"));
+ setType("success");
}
@Override