louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Moved propterties "SellerAssignedID" and "BuyerAssignedID" from "Item" to "Product"

Browse Source 
Altered Tests
This commit is contained in:
Alexander Berndt
2020-06-02 08:39:14 +02:00
parent ffb7a36500
commit 4643371038
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/Item.java
View File

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
public class Item implements IZUGFeRDExportableItem { public class Item implements IZUGFeRDExportableItem {
protected BigDecimal price, quantity, tax, grossPrice, lineTotalAmount; protected BigDecimal price, quantity, tax, grossPrice, lineTotalAmount;
protected String id, sellerAssignedID, buyerAssignedID; protected String id;
protected Product product; protected Product product;
public Item(Product product, BigDecimal price, BigDecimal quantity) { public Item(Product product, BigDecimal price, BigDecimal quantity) {
@@ -26,24 +26,6 @@ public class Item implements IZUGFeRDExportableItem {
return this; return this;
} }
public String getSellerAssignedID() {
return sellerAssignedID;
}
public Item setSellerAssignedID(String sellerAssignedID) {
this.sellerAssignedID = sellerAssignedID;
return this;
}
public String getBuyerAssignedID() {
return buyerAssignedID;
}
public Item setBuyerAssignedID(String buyerAssignedID) {
this.buyerAssignedID = buyerAssignedID;
return this;
}
public BigDecimal getGrossPrice() { public BigDecimal getGrossPrice() {
return grossPrice; return grossPrice;
} }

21
libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/Product.java
View File

@@ -5,10 +5,9 @@ import org.mustangproject.ZUGFeRD.IZUGFeRDExportableProduct;
import java.math.BigDecimal; import java.math.BigDecimal;
public class Product implements IZUGFeRDExportableProduct { public class Product implements IZUGFeRDExportableProduct {
protected String unit, name, description; protected String unit, name, description, sellerAssignedID, buyerAssignedID;
protected BigDecimal VATPercent; protected BigDecimal VATPercent;
public Product(String name, String description, String unit, BigDecimal VATPercent) { public Product(String name, String description, String unit, BigDecimal VATPercent) {
this.unit = unit; this.unit = unit;
this.name = name; this.name = name;
@@ -17,6 +16,24 @@ public class Product implements IZUGFeRDExportableProduct {
} }
public String getSellerAssignedID() {
return sellerAssignedID;
}
public Product setSellerAssignedID(String sellerAssignedID) {
this.sellerAssignedID = sellerAssignedID;
return this;
}
public String getBuyerAssignedID() {
return buyerAssignedID;
}
public Product setBuyerAssignedID(String buyerAssignedID) {
this.buyerAssignedID = buyerAssignedID;
return this;
}
@Override @Override
public String getUnit() { public String getUnit() {
return unit; return unit;

4
libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
View File

@@ -576,10 +576,10 @@ public class ZUGFeRDImporter {
case "ram:SpecifiedTradeProduct": case "ram:SpecifiedTradeProduct":
node = getNodeByName(nn.getChildNodes(), "ram:SellerAssignedID"); node = getNodeByName(nn.getChildNodes(), "ram:SellerAssignedID");
lineItem.setSellerAssignedID(getNodeValue(node)); lineItem.product.setSellerAssignedID(getNodeValue(node));
node = getNodeByName(nn.getChildNodes(), "ram:BuyerAssignedID"); node = getNodeByName(nn.getChildNodes(), "ram:BuyerAssignedID");
lineItem.setBuyerAssignedID(getNodeValue(node)); lineItem.product.setBuyerAssignedID(getNodeValue(node));
node = getNodeByName(nn.getChildNodes(), "ram:Name"); node = getNodeByName(nn.getChildNodes(), "ram:Name");
lineItem.product.setName(getNodeValue(node)); lineItem.product.setName(getNodeValue(node));

6
libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java
View File

@@ -225,12 +225,11 @@ public class ZF2Test extends MustangReaderTestCase {
List<org.mustangproject.ZUGFeRD.Item> li = zi.getLineItemList(); List<org.mustangproject.ZUGFeRD.Item> li = zi.getLineItemList();
assertEquals(zi.getLineItemList().get(0).getId().toString(), "1"); assertEquals(zi.getLineItemList().get(0).getId().toString(), "1");
assertEquals(zi.getLineItemList().get(0).getBuyerAssignedID(), ""); assertEquals(zi.getLineItemList().get(0).product.getBuyerAssignedID(), "");
assertEquals(zi.getLineItemList().get(0).getSellerAssignedID(), ""); assertEquals(zi.getLineItemList().get(0).product.getSellerAssignedID(), "");
assertEquals(zi.getLineItemList().get(0).getLineTotalAmount().toString(), "160.00"); assertEquals(zi.getLineItemList().get(0).getLineTotalAmount().toString(), "160.00");
assertEquals(zi.getLineItemList().get(0).getQuantity().toString(), "1.0000"); assertEquals(zi.getLineItemList().get(0).getQuantity().toString(), "1.0000");
assertEquals(zi.getLineItemList().get(0).getGrossPrice().toString(), "171.2000"); assertEquals(zi.getLineItemList().get(0).getGrossPrice().toString(), "171.2000");
assertEquals(zi.getLineItemList().get(0).getBuyerAssignedID(), "");
assertEquals(zi.getLineItemList().get(0).product.getVATPercent().toString(), "7.00"); assertEquals(zi.getLineItemList().get(0).product.getVATPercent().toString(), "7.00");
assertEquals(zi.getLineItemList().get(0).product.getName(), "Künstlerische Gestaltung (Stunde): Einer Beispielrechnung"); assertEquals(zi.getLineItemList().get(0).product.getName(), "Künstlerische Gestaltung (Stunde): Einer Beispielrechnung");
assertEquals(zi.getLineItemList().get(0).product.getDescription(), ""); assertEquals(zi.getLineItemList().get(0).product.getDescription(), "");
@@ -241,6 +240,5 @@ public class ZF2Test extends MustangReaderTestCase {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
} }
} }