Output just transactions, as that might also be useful.

Remove wrong computed field "Product Net Price"

Author: aadnk

src/main/java/com/comphenix/rema1000/io/DataTableConverter.java

@@ -120,9 +120,8 @@ public void writeJoinedTableTransactions(TableWriter writer, List<Transaction> t
         int productGroupDesc = createHeader(writer, "Product Group Desc");
         int bonusBased = createHeader(writer, "Bonus Based");
         int pieces = createHeader(writer, "Pieces");
-        int productPrice = createHeader(writer, "Product Price");
+        int productPrice = createHeader(writer, "Product Total Price");
         int productDiscount = createHeader(writer, "Product Discount");
-        int productNetPrice = createHeader(writer, "Product Net Price");
         int productDeposit = createHeader(writer, "Product Deposit");
         int volumeAmount = createHeader(writer, "Volume Amount");
         int volumeUnit = createHeader(writer, "Volume Unit");
@@ -157,7 +156,6 @@ public void writeJoinedTableTransactions(TableWriter writer, List<Transaction> t
                 writer.write(pieces, receiptEntry.getPieces());
                 writer.write(productPrice, receiptEntry.getPriceAmount());
                 writer.write(productDiscount, receiptEntry.getPriceDiscount());
-                writer.write(productNetPrice, receiptEntry.getPriceAmount() + receiptEntry.getPriceDiscount());
                 writer.write(productDeposit, receiptEntry.getDeposit());
                 writer.write(volumeAmount, receiptEntry.getVolumeAmount());
                 writer.write(volumeUnit, receiptEntry.getVolumeUnit());
@@ -210,9 +208,8 @@ public void writeTableReceipts(TableWriter writer, List<Transaction> transaction
         int productGroupDesc = createHeader(writer, "Product Group Desc");
         int bonusBased = createHeader(writer, "Bonus Based");
         int pieces = createHeader(writer, "Pieces");
-        int productPrice = createHeader(writer, "Product Price");
+        int productPrice = createHeader(writer, "Product Total Price");
         int productDiscount = createHeader(writer, "Product Discount");
-        int productNetPrice = createHeader(writer, "Product Net Price");
         int productDeposit = createHeader(writer, "Product Deposit");
         int volumeAmount = createHeader(writer, "Volume Amount");
         int volumeUnit = createHeader(writer, "Volume Unit");
@@ -237,7 +234,6 @@ public void writeTableReceipts(TableWriter writer, List<Transaction> transaction
                 writer.write(pieces, receiptEntry.getPieces());
                 writer.write(productPrice, receiptEntry.getPriceAmount());
                 writer.write(productDiscount, receiptEntry.getPriceDiscount());
-                writer.write(productNetPrice, receiptEntry.getPriceAmount() + receiptEntry.getPriceDiscount());
                 writer.write(productDeposit, receiptEntry.getDeposit());
                 writer.write(volumeAmount, receiptEntry.getVolumeAmount());
                 writer.write(volumeUnit, receiptEntry.getVolumeUnit());

src/main/java/com/comphenix/rema1000/io/excel/ExcelWriter.java

@@ -13,7 +13,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
-import java.util.Objects;
 
 public class ExcelWriter extends DataWriter<DataRoot> {
     private DataTableConverter tableConverter = new DataTableConverter();
@@ -23,16 +22,30 @@ public void write(OutputStream output, DataRoot data) throws IOException {
         Workbook workbook = new Workbook(output, "RemaTransactionParser", "1.0");
         WorkbookStyle workbookStyle = createWorkbookStyle();
 
-        writeTransactionsInfo(workbookStyle, workbook.newWorksheet("Info"), data.getTransactionsInfo());
+        TransactionsInfo transactionsInfo = data.getTransactionsInfo();
 
+        if (transactionsInfo != null) {
+            writeTransactionsInfo(workbookStyle, workbook.newWorksheet("Info"), transactionsInfo);
+        }
         writeTopList(workbookStyle, workbook.newWorksheet("TopList"),
                 data.getTopList());
+
+        if (transactionsInfo == null) {
+            return;
+        }
+        List<Transaction> transactions = transactionsInfo.getTransactionList();
+
+        if (transactions == null || transactions.isEmpty()) {
+            return;
+        }
         writeTransactions(workbookStyle, workbook.newWorksheet("Transactions"),
-                data.getTransactionsInfo().getTransactionList());
+                transactions);
+        writeReceiptEntries(workbookStyle, workbook.newWorksheet("Receipt Entries"),
+                transactions);
         writeTransactionsPayments(workbookStyle, workbook.newWorksheet("Transactions Payments"),
-                data.getTransactionsInfo().getTransactionList());
+                transactions);
         writeTransactionUsedOffers(workbookStyle, workbook.newWorksheet("Used Offers"),
-                data.getTransactionsInfo().getTransactionList());
+                transactions);
 
         workbook.finish();
     }
@@ -49,18 +62,12 @@ private void writeInfoLine(WorkbookStyle style, Worksheet sheet, int rowIndex, S
     }
 
     private void writeTransactionsPayments(WorkbookStyle workbookStyle, Worksheet sheet, List<Transaction> transactionList) throws IOException {
-        if (transactionList == null || transactionList.isEmpty()) {
-            return;
-        }
         try (TableWriter writer = new ExcelTableWriter(workbookStyle, sheet)) {
             tableConverter.writeTableTransactionsPayments(writer, transactionList);
         }
     }
 
     private void writeTransactionUsedOffers(WorkbookStyle workbookStyle, Worksheet sheet, List<Transaction> transactionList) throws IOException {
-        if (transactionList == null || transactionList.isEmpty()) {
-            return;
-        }
         try (TableWriter writer = new ExcelTableWriter(workbookStyle, sheet)) {
             tableConverter.writeTableTransactionsUsedOffers(writer, transactionList);
         }
@@ -71,15 +78,18 @@ private void writeTopList(WorkbookStyle workbookStyle, Worksheet sheet, TopListM
         tableConverter.writeTableTopList(writer, metadata);
     }
 
-    private void writeTransactions(WorkbookStyle workbookStyle, Worksheet sheet, List<Transaction> transactionList) throws IOException {
-        if (transactionList == null || transactionList.isEmpty()) {
-            return;
-        }
+    private void writeReceiptEntries(WorkbookStyle workbookStyle, Worksheet sheet, List<Transaction> transactionList) throws IOException {
         try (TableWriter writer = new ExcelTableWriter(workbookStyle, sheet)) {
             tableConverter.writeJoinedTableTransactions(writer, transactionList);
         }
     }
 
+    private void writeTransactions(WorkbookStyle workbookStyle, Worksheet sheet, List<Transaction> transactionList) throws IOException {
+        try (TableWriter writer = new ExcelTableWriter(workbookStyle, sheet)) {
+            tableConverter.writeTableTransactions(writer, transactionList);
+        }
+    }
+
     private WorkbookStyle createWorkbookStyle() {
         return new WorkbookStyle(
             (sheet, r, c) -> sheet.style(r, c).bold().set(),