updates stock with money value

nicho92 · Dec 2, 2024 · eadf756 · eadf756
1 parent 90c3c10
commit eadf756
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/src/main/java/org/magic/api/beans/abstracts/AbstractStockItem.java b/src/main/java/org/magic/api/beans/abstracts/AbstractStockItem.java
@@ -8,8 +8,10 @@
 import org.magic.api.beans.MTGEdition;
 import org.magic.api.beans.MTGGrading;
 import org.magic.api.beans.enums.EnumCondition;
+import org.magic.api.beans.technical.MoneyValue;
 import org.magic.api.interfaces.MTGStockItem;
 import org.magic.api.interfaces.extra.MTGProduct;
+import org.magic.services.MTGControler;
 
 public abstract class AbstractStockItem<T extends MTGProduct> implements MTGStockItem {
 
@@ -20,7 +22,7 @@ public abstract class AbstractStockItem<T extends MTGProduct> implements MTGStoc
 	protected String comment="";
 	protected String language="English";
 	protected boolean updated=false;
-	protected Double price=0.0;
+	@Deprecated protected Double price=0.0;
 	protected MTGGrading grade;
 	protected MTGEdition edition;
 	protected T product;
@@ -141,6 +143,12 @@ public void setGrade(MTGGrading grade) {
 		this.grade = grade;
 	}
 
+
+	@Override
+	public MoneyValue getValue() {
+		return new MoneyValue(getPrice(), MTGControler.getInstance().getCurrencyService().getCurrentCurrency());
+	}
+
 
 	@Override
 	public MTGGrading getGrade() {

diff --git a/src/main/java/org/magic/api/interfaces/MTGStockItem.java b/src/main/java/org/magic/api/interfaces/MTGStockItem.java
@@ -5,6 +5,7 @@
 import org.magic.api.beans.MTGCollection;
 import org.magic.api.beans.MTGGrading;
 import org.magic.api.beans.enums.EnumCondition;
+import org.magic.api.beans.technical.MoneyValue;
 import org.magic.api.interfaces.extra.MTGProduct;
 import org.magic.api.interfaces.extra.MTGSerializable;
 
@@ -15,10 +16,15 @@ public interface MTGStockItem extends MTGSerializable, Comparable<MTGStockItem>
 
 	public MTGGrading getGrade();
 
+	@Deprecated 
 	public Double getPrice();
 
+	@Deprecated 
 	public void setPrice(Double price);
 
+
+	public MoneyValue getValue();
+
 	public Long getId();
 
 	public void setId(Integer id);

diff --git a/src/main/java/org/magic/gui/models/CardStockTableModel.java b/src/main/java/org/magic/gui/models/CardStockTableModel.java
@@ -11,6 +11,7 @@
 import org.magic.api.beans.MTGGrading;
 import org.magic.api.beans.enums.EnumCondition;
 import org.magic.api.beans.enums.EnumRarity;
+import org.magic.api.beans.technical.MoneyValue;
 import org.magic.gui.abstracts.GenericTableModel;
 import org.magic.services.tools.UITools;
 
@@ -95,7 +96,7 @@ public Class<?> getColumnClass(int columnIndex) {
 			return Boolean.class;
 
 		case 14:
-			return Double.class;
+			return MoneyValue.class;
 		case 15:
 			return MTGGrading.class;
 		case 16:
@@ -153,7 +154,7 @@ public Object getValueAt(int row, int column) {
 		case 13:
 			return items.get(row).isDigital();
 		case 14:
-			return UITools.roundDouble(items.get(row).getPrice());
+			return items.get(row).getValue();
 		case 15:
 			return items.get(row).getGrade();
 		case 16:

diff --git a/src/main/java/org/magic/gui/models/SealedStockTableModel.java b/src/main/java/org/magic/gui/models/SealedStockTableModel.java
@@ -7,6 +7,7 @@
 import org.magic.api.beans.enums.EnumCondition;
 import org.magic.api.beans.enums.EnumExtra;
 import org.magic.api.beans.enums.EnumItems;
+import org.magic.api.beans.technical.MoneyValue;
 import org.magic.gui.abstracts.GenericTableModel;
 import org.magic.services.tools.UITools;
 
@@ -30,7 +31,7 @@ public Class<?> getColumnClass(int columnIndex) {
 		case 5: return EnumCondition.class;
 		case 6: return Integer.class;
 		case 7: return MTGCollection.class;
-		case 8: return Double.class;
+		case 8: return MoneyValue.class;
 		default: return super.getColumnClass(columnIndex);
 		}
 	}
@@ -52,7 +53,7 @@ public Object getValueAt(int row, int column) {
 			case 5: return it.getCondition();
 			case 6 : return it.getQte();
 			case 7 : return it.getMagicCollection();
-			case 8 : return it.getPrice();
+			case 8 : return it.getValue();
 			case 9 : return it.getTiersAppIds();
 			default : return super.getValueAt(row, column);
 		}