Merge branch 'dev' into feat/vcst-2454

VirtoCommerce · Dec 20, 2024 · b1b9b4c · b1b9b4c
2 parents 7236800 + c42f160
commit b1b9b4c
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 54 deletions.
diff --git a/client-app/core/api/graphql/cart/fragments/fullLineItem.graphql b/client-app/core/api/graphql/cart/fragments/fullLineItem.graphql
@@ -11,6 +11,10 @@ fragment fullLineItem on LineItemType {
   imageUrl
   selectedForCheckout
   productType
+  showPlacedPrice
+  listTotal {
+    ...money
+  }
   product {
     ...fullLineItemProduct
   }

diff --git a/client-app/core/api/graphql/fragments/orderLineItemFields.graphql b/client-app/core/api/graphql/fragments/orderLineItemFields.graphql
@@ -8,6 +8,10 @@ fragment orderLineItemFields on OrderLineItemType {
   name
   productId
   productType
+  showPlacedPrice
+  listTotal {
+    ...money
+  }
   product {
     id
     brandName

diff --git a/client-app/core/api/graphql/types.ts b/client-app/core/api/graphql/types.ts
diff --git a/client-app/core/types/line-items.ts b/client-app/core/types/line-items.ts
@@ -38,6 +38,8 @@ export type AnyLineItemType = {
     id: string;
     name?: string;
   }[];
+  showPlacedPrice?: boolean;
+  listTotal?: MoneyType;
 };
 
 export type VendorGroupType<T> = {
@@ -74,4 +76,6 @@ export type PreparedLineItemType = {
     id: string;
     name?: string;
   }[];
+  showPlacedPrice?: boolean;
+  listTotal?: MoneyType;
 };
diff --git a/client-app/core/utilities/line-items/index.ts b/client-app/core/utilities/line-items/index.ts
@@ -37,17 +37,19 @@ function prepareItemPrices(item: AnyLineItemType) {
   const salePrice = "salePrice" in item ? item.salePrice : undefined;
   const placedPrice = "placedPrice" in item ? item.placedPrice : undefined;
   const extendedPrice = "extendedPrice" in item ? item.extendedPrice : undefined;
+  const listTotal = "listTotal" in item ? item.listTotal : undefined;
   return {
     listPrice,
     salePrice,
     placedPrice,
     extendedPrice,
     actualPrice: placedPrice ?? salePrice ?? listPrice,
+    listTotal,
   };
 }
 
 export function prepareLineItem(item: AnyLineItemType, countInCart?: number): PreparedLineItemType {
-  const { listPrice, extendedPrice, actualPrice } = prepareItemPrices(item);
+  const { listPrice, extendedPrice, actualPrice, listTotal } = prepareItemPrices(item);
 
   const productType = "productType" in item ? item.productType : undefined;
   const isVariation = !!item.product?.masterVariation;
@@ -70,6 +72,7 @@ export function prepareLineItem(item: AnyLineItemType, countInCart?: number): Pr
     listPrice,
     actualPrice,
     extendedPrice,
+    listTotal,
     quantity,
     inStockQuantity,
     route,
@@ -83,6 +86,7 @@ export function prepareLineItem(item: AnyLineItemType, countInCart?: number): Pr
     hasVariations: item.product?.hasVariations,
     variations: item.product?.variations,
     configurationItems: "configurationItems" in item ? item.configurationItems : undefined,
+    showPlacedPrice: item.showPlacedPrice,
   };
 }
 

diff --git a/client-app/ui-kit/components/molecules/line-item/vc-line-item.vue b/client-app/ui-kit/components/molecules/line-item/vc-line-item.vue
@@ -87,7 +87,7 @@
           v-if="withPrice"
           class="vc-line-item__price"
           :list-price="listPrice"
-          :actual-price="actualPrice"
+          :actual-price="showPlacedPrice ? actualPrice : listPrice"
           :disabled="disabled"
           align="end"
         />
@@ -100,7 +100,8 @@
           <VcProductPrice
             v-if="withTotal"
             class="vc-line-item__total"
-            :list-price="total"
+            :list-price="showPlacedPrice ? total : listTotal"
+            :actual-price="total"
             align="end"
             :disabled="disabled"
             truncate
@@ -145,6 +146,7 @@ interface IProps {
   listPrice?: MoneyType;
   actualPrice?: MoneyType;
   total?: MoneyType;
+  listTotal?: MoneyType;
   selectable?: boolean;
   selected?: boolean;
   removable?: boolean;
@@ -156,6 +158,7 @@ interface IProps {
   withTotal?: boolean;
   vendor?: CommonVendor;
   browserTarget?: BrowserTargetType;
+  showPlacedPrice?: boolean;
 }
 
 defineEmits<IEmits>();

diff --git a/client-app/ui-kit/components/molecules/line-items/vc-line-items.vue b/client-app/ui-kit/components/molecules/line-items/vc-line-items.vue
@@ -57,6 +57,7 @@
             :list-price="item.listPrice"
             :actual-price="item.actualPrice"
             :total="item.extendedPrice"
+            :list-total="item.listTotal"
             :with-image="showImage"
             :with-properties="showProperties"
             :with-price="showPrice"
@@ -67,6 +68,7 @@
             :selectable="selectable"
             :selected="selectable && selectedItemIds?.includes(item.id)"
             :browser-target="browserTarget"
+            :show-placed-price="item.showPlacedPrice"
             @select="($event) => selectSingleItem(item.id, $event)"
             @remove="() => removeSingleItem(item.id)"
           >