From 713d98a756bad9a9477835a66dadecfb572beb70 Mon Sep 17 00:00:00 2001 From: AichaELYamlahi <aicha.elyamalhi@marketingconfort.com> Date: Mon, 28 Oct 2024 12:17:13 +0100 Subject: [PATCH 1/3] add new path & add new attributes --- CHANGELOG.md | 2 +- .../mydressin/common/cart/enumurations/ItemCartStatus.java | 1 + .../mydressin/common/cart/enumurations/OrderStatus.java | 1 + .../urlServiceConstant/Path/StockManagerServicePath.java | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aa5e33..e56c0a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [1.0.119-RELEASE] ### Added -- New features that have been added. +- MYD-common-cart2/add new path & add new attributes ### Changed - Changes in existing functionality. diff --git a/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/ItemCartStatus.java b/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/ItemCartStatus.java index bb02382..3a752e1 100644 --- a/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/ItemCartStatus.java +++ b/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/ItemCartStatus.java @@ -5,6 +5,7 @@ public enum ItemCartStatus { DELETED_SITE, DELETED_BO, CONSULTED , + PAYED, EXPIRED, NEAR_EXPIRATION } diff --git a/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/OrderStatus.java b/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/OrderStatus.java index 33971f1..262dba1 100644 --- a/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/OrderStatus.java +++ b/src/main/java/com/marketingconfort/mydressin/common/cart/enumurations/OrderStatus.java @@ -3,5 +3,6 @@ package com.marketingconfort.mydressin.common.cart.enumurations; public enum OrderStatus { EN_ATTENTE, EN_COURS, + TERMINEE } diff --git a/src/main/java/com/marketingconfort/mydressin/common/constant/urlServiceConstant/Path/StockManagerServicePath.java b/src/main/java/com/marketingconfort/mydressin/common/constant/urlServiceConstant/Path/StockManagerServicePath.java index a92dfea..f4e6f58 100644 --- a/src/main/java/com/marketingconfort/mydressin/common/constant/urlServiceConstant/Path/StockManagerServicePath.java +++ b/src/main/java/com/marketingconfort/mydressin/common/constant/urlServiceConstant/Path/StockManagerServicePath.java @@ -21,4 +21,5 @@ public class StockManagerServicePath { return "/variations/" + id+"/"+type ; } public static final String DECREMENT_STOCK_WEB_LIST = "/products/decrement-stock-web-list"; + public static final String GET_PRODUCT= "/products/get-Product"; } -- GitLab From ebb101307e212814cff3c9daf586f816853a3bcc Mon Sep 17 00:00:00 2001 From: AichaELYamlahi <aicha.elyamalhi@marketingconfort.com> Date: Mon, 28 Oct 2024 12:59:40 +0100 Subject: [PATCH 2/3] change pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 449d51f..00f6b11 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.marketingconfort</groupId> <artifactId>mc-starter-parent</artifactId> - <version>1.0.18-RELEASE</version> + <version>1.0.40-RELEASE</version> <relativePath/> </parent> <groupId>com.marketingconfort</groupId> -- GitLab From b47d41dff1cd19e77b224df83582a785350597d3 Mon Sep 17 00:00:00 2001 From: AichaELYamlahi <aicha.elyamalhi@marketingconfort.com> Date: Mon, 28 Oct 2024 13:20:30 +0100 Subject: [PATCH 3/3] some changes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00f6b11..449d51f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.marketingconfort</groupId> <artifactId>mc-starter-parent</artifactId> - <version>1.0.40-RELEASE</version> + <version>1.0.18-RELEASE</version> <relativePath/> </parent> <groupId>com.marketingconfort</groupId> -- GitLab