Merge branch 'main' into PRDP-171-read-psp-config-from-local-file

pagopa · Oct 17, 2023 · e4b8c7e · e4b8c7e
2 parents d623a89 + 64e557e
commit e4b8c7e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopareceiptpdfgenerator
 description: Microservice description
 type: application
-version: 0.84.0
-appVersion: 1.3.9-PRDP-171-read-psp-config-from-local-file
+version: 0.85.0
+appVersion: 1.3.9-1
 dependencies:
   - name: microservice-chart
     version: 2.4.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-receipt-pdf-generator
-    tag: "1.3.9-PRDP-171-read-psp-config-from-local-file"
+    tag: "1.3.9-1"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-receipt-pdf-generator
-    tag: "1.3.9-PRDP-171-read-psp-config-from-local-file"
+    tag: "1.3.9-1"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-receipt-pdf-generator
-    tag: "1.3.9-PRDP-171-read-psp-config-from-local-file"
+    tag: "1.3.9-1"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>it.gov.pagopa.receipt</groupId>
     <artifactId>receipt-pdf-generator</artifactId>
-    <version>1.3.9-PRDP-171-read-psp-config-from-local-file</version>
+    <version>1.3.9-1</version>
     <packaging>jar</packaging>
 
     <name>pagopa-receipt-pdf-generator</name>

diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/BizEventToPdfMapper.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/BizEventToPdfMapper.java
@@ -81,7 +81,7 @@ public static String getAmount(BizEvent event) {
                 event.getTransactionDetails().getTransaction() != null &&
                 event.getTransactionDetails().getTransaction().getAmount() != 0L) {
             // Amount in transactionDetails is defined in cents (es. 25500 not 255.00)
-            return currencyFormat(String.valueOf(event.getTransactionDetails().getTransaction().getAmount() / 100.00));
+            return currencyFormat(String.valueOf(event.getTransactionDetails().getTransaction().getGrandTotal() / 100.00));
         }
 
         return event.getPaymentInfo() != null ? currencyFormat(event.getPaymentInfo().getAmount()) : null;

diff --git a/src/main/resources/template.zip b/src/main/resources/template.zip