Add some fixes and create types

Author: nesrineabdmouleh

src/data/types/product.ts

@@ -136,17 +136,31 @@ type ProductCustomizations = {
 };
 
 type ProductDetailsBasic = {
-  image: string
+  image?: string
   name: string
   price: number
-  quantity: number
+  quantity?: number
 };
 
 type ProductDetails = ProductDetailsBasic & {
-  summary: string
-  description: string
+  summary?: string
+  description?: string
   shipping?: string
   subtotal?: number
+  coverImage?:string,
+  thumbImage?:string,
+  taxShippingDeliveryLabel?: string,
+  shortDescription?: string,
+};
+
+type ProductDetailsWithDiscount = ProductDetailsBasic & {
+  discountPercentage: string,
+  regularPrice: number,
+  subtotal?: number,
+  taxShippingDeliveryLabel?: string,
+  coverImage?:string,
+  thumbImage?:string,
+  shortDescription?: string,
 };
 
 type ProductDiscount = {
@@ -242,6 +256,7 @@ export type {
   ProductCustomization,
   ProductDetails,
   ProductDetailsBasic,
+  ProductDetailsWithDiscount,
   ProductDiscount,
   ProductFilterMinMax,
   ProductHeaderSummary,

src/interfaces/FO/cart/index.ts

@@ -1,5 +1,5 @@
 import {FOBasePagePageInterface} from '@interfaces/FO';
-import type {ProductAttribute} from '@data/types/product';
+import type {ProductAttribute, ProductDetailsWithDiscount} from '@data/types/product';
 import type {Page} from '@playwright/test';
 
 export interface FoCartPageInterface extends FOBasePagePageInterface {
@@ -28,7 +28,7 @@ export interface FoCartPageInterface extends FOBasePagePageInterface {
     getNoItemsInYourCartMessage(page: Page): Promise<string>;
     getNotificationMessage(page: Page): Promise<string>;
     getProductAttributes(page: Page, row: number): Promise<ProductAttribute[]>;
-    getProductDetail(page: Page, row: number): Promise<object>;
+    getProductDetail(page: Page, row: number): Promise<ProductDetailsWithDiscount>;
     getProductsNumber(page: Page): Promise<number>;
     getSubtotalDiscountValue(page: Page): Promise<number>;
     isAlertWarningForMinimumPurchaseVisible(page: Page): Promise<boolean>;

src/interfaces/FO/checkout/orderConfirmation.ts

@@ -3,7 +3,12 @@ import type {Page} from '@playwright/test';
 
 export interface FoCheckoutOrderConfirmationPageInterface extends FOBasePagePageInterface {
     readonly orderConfirmationCardTitle: string;
+    readonly pageTitle: string;
 
+    getGiftWrappingValue(page: Page): Promise<number>;
     getOrderConfirmationCardTitle(page: Page): Promise<string>;
     getOrderReferenceValue(page: Page): Promise<string>;
+    getPaymentMethod(page: Page): Promise<string>;
+    goToContactUsPage(page: Page): Promise<void>;
+    isFinalSummaryVisible(page: Page): Promise<boolean>;
 }

src/pages/BO/catalog/products/index.ts

@@ -4,14 +4,13 @@ import testContext from '@utils/test';
 
 const psVersion = testContext.getPSVersion();
 
-/* eslint-disable global-require */
+/* eslint-disable global-require, @typescript-eslint/no-var-requires */
 function requirePage(): BOProductsPageInterface {
   if (semver.gte(psVersion, '0.0.0')) {
-    return require('@versions/develop/pages/BO/catalog/products');
+    return require('@versions/develop/pages/BO/catalog/products').productsPage;
   }
-  return require('@versions/develop/pages/BO/catalog/products');
+  return require('@versions/develop/pages/BO/catalog/products').productsPage;
 }
-
-/* eslint-enable global-require */
+/* eslint-disable global-require, @typescript-eslint/no-var-requires */
 
 export default requirePage();

src/versions/develop/pages/FO/classic/cart/index.ts

@@ -3,7 +3,7 @@ import type {FoCartPageInterface} from '@interfaces/FO/cart';
 import FOBasePage from '@pages/FO/FOBasePage';
 
 // Import data
-import type {ProductAttribute} from '@data/types/product';
+import type {ProductAttribute, ProductDetailsWithDiscount} from '@data/types/product';
 
 import type {Page} from 'playwright';
 
@@ -216,23 +216,15 @@ class CartPage extends FOBasePage implements FoCartPageInterface {
    * @returns {Promise<{discountPercentage: string, image: string|null, quantity: number, totalPrice: number,
    *     price: number, regularPrice: number, name: string}>}
    */
-  async getProductDetail(page: Page, row: number): Promise<{
-    discountPercentage: string,
-    image: string | null,
-    quantity: number,
-    totalPrice: number,
-    price: number,
-    regularPrice: number,
-    name: string,
-  }> {
+  async getProductDetail(page: Page, row: number): Promise<ProductDetailsWithDiscount> {
     return {
       name: await this.getTextContent(page, this.productName(row)),
       regularPrice: await this.getPriceFromText(page, this.productRegularPrice(row)),
       price: await this.getPriceFromText(page, this.productPrice(row)),
       discountPercentage: await this.getTextContent(page, this.productDiscountPercentage(row)),
       image: await this.getAttributeContent(page, this.productImage(row), 'src'),
       quantity: parseFloat(await this.getAttributeContent(page, this.productQuantity(row), 'value') ?? ''),
-      totalPrice: await this.getPriceFromText(page, this.productTotalPrice(row)),
+      subtotal: await this.getPriceFromText(page, this.productTotalPrice(row)),
     };
   }