diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml
index 2351a6b1b2d5f..409558b417216 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml
@@ -114,7 +114,9 @@
-
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index dad3e05d81a53..17272a1672d52 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -169,8 +169,9 @@
-
-
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index e09c2a3af2f3e..0fbc1e713fd0e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -86,7 +86,9 @@
-
+
+
+
-
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml
new file mode 100644
index 0000000000000..4ba070286efc3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Navigate to storefront order view page
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml
index b975cf62765c1..abab474e7ab9e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml
@@ -6,7 +6,7 @@
*/
-->
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index bcf6fc96aa131..b6313018c679d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,7 +8,7 @@
-
+
Assert Admin Order page contains message about Order created by a Store Administrator.
@@ -18,7 +18,8 @@
-
+
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index f40ea7f93c7a1..ef6596320adfa 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -17,7 +17,8 @@
-
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml
index 03dd8b28a624f..016af69cf629e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml
@@ -27,16 +27,16 @@
-
+
-
+
-
+
@@ -64,9 +64,9 @@
-
+
-
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml
index b086074132e85..58f9b4e68f406 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml
@@ -89,13 +89,13 @@
-
+
-
+
diff --git a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
index 14df80224e2ce..db45ac9009968 100644
--- a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
+++ b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
@@ -56,8 +56,9 @@ public function create()
{
$defaultStoreIds = [0, 1];
foreach ($defaultStoreIds as $storeId) {
+ $prefix = $storeId === 1 ? $storeId : $this->sequenceConfig->get('prefix');
foreach ($this->entityPool->getEntities() as $entityType) {
- $this->sequenceBuilder->setPrefix($this->sequenceConfig->get('prefix'))
+ $this->sequenceBuilder->setPrefix($prefix)
->setSuffix($this->sequenceConfig->get('suffix'))
->setStartValue($this->sequenceConfig->get('startValue'))
->setStoreId($storeId)
diff --git a/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php b/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php
new file mode 100644
index 0000000000000..8fecf0e51ef5f
--- /dev/null
+++ b/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php
@@ -0,0 +1,139 @@
+objectManger = Bootstrap::getObjectManager();
+ $this->sequenceCreator = $this->objectManger->create(SequenceCreator::class);
+ $this->sequenceMetaResource = $this->objectManger->create(MetaResource::class);
+ $this->sequenceProfileResource = $this->objectManger->create(ProfileResource::class);
+ $this->entityPool = $this->objectManger->create(EntityPool::class);
+ $this->sequenceConfig = $this->objectManger->create(SequenceConfig::class);
+ $this->appResource = $this->objectManger->create(AppResource::class);
+ }
+
+ /**
+ * Test prefix for default created store views.
+ *
+ * @param array $defaultStores
+ * @dataProvider defaultStoresDataProvider
+ */
+ public function testSalesSequenceProfileTableForDefaultStores(array $defaultStores): void
+ {
+ foreach ($defaultStores as $storeId) {
+ foreach ($this->entityPool->getEntities() as $entityType) {
+ $meta = $this->sequenceMetaResource->loadByEntityTypeAndStore($entityType, $storeId);
+ $profile = $this->sequenceProfileResource->loadActiveProfile($meta->getId());
+ $this->assertEquals($this->getSequenceTableName($entityType, $storeId), $meta->getSequenceTable());
+ $this->assertEquals($this->sequenceConfig->get('startValue'), $profile->getStartValue());
+ $this->assertEquals($this->sequenceConfig->get('suffix'), $profile->getSuffix());
+ $this->assertEquals($this->sequenceConfig->get('step'), $profile->getStep());
+ $this->assertEquals($this->sequenceConfig->get('warningValue'), $profile->getWarningValue());
+ $this->assertEquals($this->sequenceConfig->get('maxValue'), $profile->getMaxValue());
+
+ if ($storeId === 0) {
+ $this->assertEquals(null, $profile->getPrefix());
+ } else {
+ $this->assertNotNull($profile->getPrefix());
+ }
+ }
+ }
+ }
+
+ /**
+ * Default store codes data provider
+ *
+ * @return array
+ */
+ public function defaultStoresDataProvider(): array
+ {
+ return [
+ [
+ 'defaultStores' => [
+ 0,
+ 1
+ ]
+ ],
+ ];
+
+ }
+
+ /**
+ * Get sequence table name
+ *
+ * @param string $entityType
+ * @param int $storeId
+ *
+ * @return string
+ */
+ private function getSequenceTableName(string $entityType, int $storeId): string
+ {
+ return $this->appResource->getTableName(
+ sprintf(
+ 'sequence_%s_%s',
+ $entityType,
+ $storeId
+ )
+ );
+ }
+}