Adjusted fixtures

cypress/e2e/mp/data-import/merchant-combined-product-offer.cy.ts

@@ -7,6 +7,7 @@ import {
 } from '@interfaces/mp';
 import { DataImportMerchantFilePage } from '@pages/mp';
 import { CatalogPage, ProductPage } from '@pages/yves';
+import { CustomerLoginScenario } from '../../../support/scenarios/yves';
 
 describe(
   'merchant combined product offer',
@@ -38,6 +39,7 @@ describe(
     const merchantUserLoginScenario = container.get(MerchantUserLoginScenario);
     const userLoginScenario = container.get(UserLoginScenario);
     const approveProductOfferScenario = container.get(ApproveProductOfferScenario);
+    const customerLoginScenario = container.get(CustomerLoginScenario);
 
     let dynamicFixtures: MerchantCombinedProductOfferDynamicFixtures;
     let staticFixtures: MerchantCombinedProductOfferStaticFixtures;
@@ -72,6 +74,12 @@ describe(
         productOfferReference,
         shouldTriggerPublishAndSync: true,
       });
+      if (['b2b-mp'].includes(Cypress.env('repositoryId'))) {
+        customerLoginScenario.execute({
+          email: dynamicFixtures.customer.email,
+          password: staticFixtures.defaultPassword,
+        });
+      }
       catalogPage.visit();
       catalogPage.searchProductFromSuggestions({ query: dynamicFixtures.product.sku });
       productPage.getProductOfferRadio({ productOfferReference }).should('exist');

cypress/e2e/mp/data-import/merchant-combined-product.cy.ts

@@ -4,6 +4,7 @@ import { ActivateProductScenario, UserLoginScenario } from '@scenarios/backoffic
 import { MerchantCombinedProductDynamicFixtures, MerchantCombinedProductStaticFixtures } from '@interfaces/mp';
 import { CatalogPage, ProductPage } from '@pages/yves';
 import { DataImportMerchantFilePage } from '@pages/mp';
+import { CustomerLoginScenario } from '../../../support/scenarios/yves';
 
 describe(
   'merchant combined product',
@@ -35,6 +36,7 @@ describe(
     const userLoginScenario = container.get(UserLoginScenario);
     const activateProductScenario = container.get(ActivateProductScenario);
     const productPage = container.get(ProductPage);
+    const customerLoginScenario = container.get(CustomerLoginScenario);
 
     let dynamicFixtures: MerchantCombinedProductDynamicFixtures;
     let staticFixtures: MerchantCombinedProductStaticFixtures;
@@ -66,7 +68,12 @@ describe(
         password: staticFixtures.defaultPassword,
       });
       activateProductScenario.execute({ abstractSku: abstractSku, shouldTriggerPublishAndSync: true });
-
+      if (['b2b-mp'].includes(Cypress.env('repositoryId'))) {
+        customerLoginScenario.execute({
+          email: dynamicFixtures.customer.email,
+          password: staticFixtures.defaultPassword,
+        });
+      }
       catalogPage.visit();
       catalogPage.searchProductFromSuggestions({ query: abstractSku });
       cy.contains(abstractSku);

cypress/fixtures/b2b-mp/mp/data-import/dynamic-merchant-combined-product-offer.json

@@ -82,6 +82,48 @@
           "type": "helper",
           "name": "addUserToGroup",
           "arguments": ["#rootUser.id_user", 1]
+        },
+        {
+          "type": "helper",
+          "name": "haveConfirmedCustomer",
+          "key": "customer",
+          "arguments": [{ "locale_name": "en_US", "password": "change123" }]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompany",
+          "key": "company",
+          "arguments": [{ "isActive": true, "status": "approved" }]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompanyBusinessUnit",
+          "key": "businessUnit",
+          "arguments": [{ "fkCompany": "#company.id_company" }]
+        },
+        {
+          "type": "helper",
+          "name": "havePermissionByKey",
+          "key": "permission1",
+          "arguments": ["AddCartItemPermissionPlugin"]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompanyRoleWithPermissions",
+          "arguments": [{ "isDefault": true, "fkCompany": "#company.id_company" }, ["#permission1"]]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompanyUser",
+          "key": "companyUser",
+          "arguments": [
+            {
+              "customer": "#customer",
+              "fkCustomer": "#customer.id_customer",
+              "fkCompany": "#company.id_company",
+              "fkCompanyBusinessUnit": "#businessUnit.id_company_business_unit"
+            }
+          ]
         }
       ]
     }

cypress/fixtures/b2b-mp/mp/data-import/dynamic-merchant-combined-product.json

@@ -30,6 +30,48 @@
           "type": "helper",
           "name": "addUserToGroup",
           "arguments": ["#rootUser.id_user", 1]
+        },
+        {
+          "type": "helper",
+          "name": "haveConfirmedCustomer",
+          "key": "customer",
+          "arguments": [{ "locale_name": "en_US", "password": "change123" }]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompany",
+          "key": "company",
+          "arguments": [{ "isActive": true, "status": "approved" }]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompanyBusinessUnit",
+          "key": "businessUnit",
+          "arguments": [{ "fkCompany": "#company.id_company" }]
+        },
+        {
+          "type": "helper",
+          "name": "havePermissionByKey",
+          "key": "permission1",
+          "arguments": ["AddCartItemPermissionPlugin"]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompanyRoleWithPermissions",
+          "arguments": [{ "isDefault": true, "fkCompany": "#company.id_company" }, ["#permission1"]]
+        },
+        {
+          "type": "helper",
+          "name": "haveCompanyUser",
+          "key": "companyUser",
+          "arguments": [
+            {
+              "customer": "#customer",
+              "fkCustomer": "#customer.id_customer",
+              "fkCompany": "#company.id_company",
+              "fkCompanyBusinessUnit": "#businessUnit.id_company_business_unit"
+            }
+          ]
         }
       ]
     }

cypress/fixtures/b2b-mp/mp/data-import/failed_merchant_combined_product.csv

@@ -1,2 +1,2 @@
-abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product.{WAREHOUSE_NAME}.quantity","product.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
+abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product_stock.{WAREHOUSE_NAME}.quantity","product_stock.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
 "PRODUCT-{UNIQUE}",1,PRODUCT-{UNIQUE}_0001,NOT-EXISTING,100-cer,"Smart Watch Epsilon {UNIQUE} US","Smart Watch Epsilon {UNIQUE} DE","Abstract Smart Watch Epsilon {UNIQUE} US","Abstract Smart Watch Epsilon {UNIQUE} DE",,,,,,,,,Standard Taxes,,,,,pc_operating_system-{UNIQUE},PC Operating System {UNIQUE} US,PC Operating System {UNIQUE} DE,/en/product-{UNIQUE}-0001,/de/product-{UNIQUE}-0001,0,1,1,both,100,1,8000,9600,,,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg

cypress/fixtures/b2b-mp/mp/data-import/one_merchant_combined_product.csv

@@ -1,2 +1,2 @@
-abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product.{WAREHOUSE_NAME}.quantity","product.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
+abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product_stock.{WAREHOUSE_NAME}.quantity","product_stock.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
 "PRODUCT-{UNIQUE}",1,"PRODUCT-{UNIQUE}_0001",DE,100-cer,"Smart Watch Epsilon {UNIQUE} US","Smart Watch Epsilon {UNIQUE} DE","Abstract Smart Watch Epsilon {UNIQUE} US","Abstract Smart Watch Epsilon {UNIQUE} DE",,,,,,,,,Standard Taxes,,,,,pc_operating_system-{UNIQUE},PC Operating System {UNIQUE} US,PC Operating  {UNIQUE} DE,/en/product-{UNIQUE}-0001,/de/product-{UNIQUE}-0001,0,1,1,both,100,1,8000,9600,,,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg

cypress/fixtures/b2b-mp/mp/data-import/one_merchant_combined_product_offer.csv

@@ -1,2 +1,2 @@
-offer_reference,concrete_sku,is_active,store_relations,stock.{WAREHOUSE_NAME}.quantity
-OFFER-{UNIQUE},{PRODUCT_SKU},1,DE,10
+offer_reference,concrete_sku,is_active,store_relations,stock.{WAREHOUSE_NAME}.quantity,price.DE.default.EUR.value_net,price.DE.default.EUR.value_gross
+OFFER-{UNIQUE},{PRODUCT_SKU},1,DE,10,10000,19000

cypress/support/types/mp/data-import.ts

@@ -1,16 +1,18 @@
-import { User, Merchant, ProductConcrete } from './shared';
+import { User, Merchant, ProductConcrete, Customer } from './shared';
 
 export interface MerchantCombinedProductDynamicFixtures {
   rootUser: User;
   merchantUser: User;
   merchant: Merchant;
+  customer: Customer;
 }
 
 export interface MerchantCombinedProductOfferDynamicFixtures {
   rootUser: User;
   merchantUser: User;
   merchant: Merchant;
   product: ProductConcrete;
+  customer: Customer;
 }
 
 export interface MerchantCombinedProductStaticFixtures {