From 2544ab87a80f7130744797b2653e5e15bf20dd18 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 23 Sep 2022 04:21:29 +0200 Subject: [PATCH] Don't cherry-pick: - renamed method as this is for recipient items - also cleared itemId property - removed debug code --- .../receipt_item/FinancialsReceiptItemWebRequestBean.java | 4 ++-- .../action/FinancialAdminReceiptItemActionWebRequestBean.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java index dc8c4738..5225e551 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java @@ -96,7 +96,7 @@ public class FinancialsReceiptItemWebRequestBean extends BaseFinancialsBean impl } // Prepare receipt instance - final BillableReceiptItem receiptItem = this.createReceiptInstance(); + final BillableReceiptItem receiptItem = this.createReceiptItemInstance(); // Is the receipt already there? if (this.receiptItemListController.isReceiptItemAdded(receiptItem)) { @@ -136,7 +136,7 @@ public class FinancialsReceiptItemWebRequestBean extends BaseFinancialsBean impl *

* @return Receipt item instance */ - private BillableReceiptItem createReceiptInstance () { + private BillableReceiptItem createReceiptItemInstance () { // Init receipt instance // @TODO Unfinished: final BillableReceiptItem receiptItem = new FinancialReceiptItem(); diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/action/FinancialAdminReceiptItemActionWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/action/FinancialAdminReceiptItemActionWebRequestBean.java index f6d515d2..b7947a63 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/action/FinancialAdminReceiptItemActionWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/action/FinancialAdminReceiptItemActionWebRequestBean.java @@ -513,7 +513,6 @@ public class FinancialAdminReceiptItemActionWebRequestBean extends BaseFinancial } // Copy all data - System.out.println("receiptItem.itemEntryCreated=" + receiptItem.getItemEntryCreated()); ReceiptItems.copyReceiptItemData(receiptItem, this.getCurrentReceiptItem()); // Create updated receipt instance @@ -545,6 +544,7 @@ public class FinancialAdminReceiptItemActionWebRequestBean extends BaseFinancial this.setItemBrandName(null); this.setItemCouponNumber(null); this.setItemGrossPrice(null); + this.setItemId(null); this.setItemIsDiscount(null); this.setItemIsRefund(null); this.setItemManufacturer(null); -- 2.39.5