Merge branch 'production' into issue#1366

apprunn · Jun 10, 2024 · 65a50ef · 65a50ef
2 parents 39bbdf1 + 3fd12cc
commit 65a50ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/components/products/product-in-car.vue b/src/components/products/product-in-car.vue
@@ -200,7 +200,7 @@ function clickQuantity(val) {
 			this.maxQuantity = false;
 		}
 	}
-	// this.product.priceDiscountOrigin = this.product.priceDiscount;
+	this.product.priceDiscount = this.product.priceDiscountOrigin;
 	if (
 		this.quantityStock > this.product.stockWarehouse &&
 		!this.$allowOrderStockNegative

diff --git a/src/store/actions.js b/src/store/actions.js
@@ -54,7 +54,8 @@ function addProductToBuyCar(context, product) {
 		const newPrice = helper.getPriceByRange({
 			ranges,
 			quantity: productsSelected[index].quantity,
-			originalPrice: productsSelected[index].originalPrice,
+			originalPrice: productsSelected[index].originalPrice
+				|| productsSelected[index].priceDiscountOrigin,
 		});
 
 		productsSelected[index].priceDiscount = newPrice;

diff --git a/src/store/mutations/order.js b/src/store/mutations/order.js
@@ -49,7 +49,8 @@ const orderMutation = {
 		const newPrice = h.getPriceByRange({
 			ranges,
 			quantity: products[index].quantity,
-			originalPrice: products[index].originalPrice,
+			originalPrice: products[index].originalPrice
+				|| products[index].priceDiscountOrigin,
 		});
 
 		products[index].priceDiscount = newPrice;
@@ -137,3 +138,4 @@ const orderMutation = {
 	},
 };
 export default orderMutation;
+