Skip to content

Commit 7725fc6

Browse files
Karishmathakare19Karishmathakare19
authored
Merge branch 'develop' into ACQE-functional-deployment-v4-5
2 parents 92cd632 + 35458c7 commit 7725fc6

File tree

65 files changed

+2187
-1083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2187
-1083
lines changed

‎Inventory/Model/SourceItem/Command/SourceItemsDelete.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ class SourceItemsDelete implements SourceItemsDeleteInterface
3232
* @param DeleteMultiple $deleteMultiple
3333
* @param LoggerInterface $logger
3434
*/
35-
public function __construct(
36-
DeleteMultiple $deleteMultiple,
37-
LoggerInterface $logger
38-
) {
35+
public function __construct(DeleteMultiple $deleteMultiple, LoggerInterface $logger)
36+
{
3937
$this->deleteMultiple = $deleteMultiple;
4038
$this->logger = $logger;
4139
}

‎InventoryAdminUi/Test/Mftf/Test/AdminAssignMultipleSourcesToProductTest.xml‎

Lines changed: 3 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -51,70 +51,9 @@
5151
</createData>
5252
</before>
5353
<after>
54-
<!--Disable multiple sources.-->
55-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableFirstCreatedSource">
56-
<argument name="sourceCode" value="$$createFirstCustomSource.source[source_code]$$"/>
57-
</actionGroup>
58-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableSecondCreatedSource">
59-
<argument name="sourceCode" value="$$createSecondCustomSource.source[source_code]$$"/>
60-
</actionGroup>
61-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableThirdCreatedSource">
62-
<argument name="sourceCode" value="$$createThirdCustomSource.source[source_code]$$"/>
63-
</actionGroup>
64-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableFourthCreatedSource">
65-
<argument name="sourceCode" value="$$createFourthCustomSource.source[source_code]$$"/>
66-
</actionGroup>
67-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableFifthCreatedSource">
68-
<argument name="sourceCode" value="$$createFifthCustomSource.source[source_code]$$"/>
69-
</actionGroup>
70-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableSixthCreatedSource">
71-
<argument name="sourceCode" value="$$createSixthCustomSource.source[source_code]$$"/>
72-
</actionGroup>
73-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableSeventhCreatedSource">
74-
<argument name="sourceCode" value="$$createSeventhCustomSource.source[source_code]$$"/>
75-
</actionGroup>
76-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableEighthCreatedSource">
77-
<argument name="sourceCode" value="$$createEighthCustomSource.source[source_code]$$"/>
78-
</actionGroup>
79-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableNineCreatedSource">
80-
<argument name="sourceCode" value="$$createNineCustomSource.source[source_code]$$"/>
81-
</actionGroup>
82-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableTenthCreatedSource">
83-
<argument name="sourceCode" value="$$createTenthCustomSource.source[source_code]$$"/>
84-
</actionGroup>
85-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableEleventhCreatedSource">
86-
<argument name="sourceCode" value="$$createEleventhCustomSource.source[source_code]$$"/>
87-
</actionGroup>
88-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableTwelveCreatedSource">
89-
<argument name="sourceCode" value="$$createTwelveCustomSource.source[source_code]$$"/>
90-
</actionGroup>
91-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableThirteenCreatedSource">
92-
<argument name="sourceCode" value="$$createThirteenCustomSource.source[source_code]$$"/>
93-
</actionGroup>
94-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableFourteenthCreatedSource">
95-
<argument name="sourceCode" value="$$createFourteenthCustomSource.source[source_code]$$"/>
96-
</actionGroup>
97-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableFifteenCreatedSource">
98-
<argument name="sourceCode" value="$$createFifteenCustomSource.source[source_code]$$"/>
99-
</actionGroup>
100-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableSixteenCreatedSource">
101-
<argument name="sourceCode" value="$$createSixteenCustomSource.source[source_code]$$"/>
102-
</actionGroup>
103-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableSeventeenCreatedSource">
104-
<argument name="sourceCode" value="$$createSeventeenCustomSource.source[source_code]$$"/>
105-
</actionGroup>
106-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableEighteenCreatedSource">
107-
<argument name="sourceCode" value="$$createEighteenCustomSource.source[source_code]$$"/>
108-
</actionGroup>
109-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableNineteenCreatedSource">
110-
<argument name="sourceCode" value="$$createNineteenCustomSource.source[source_code]$$"/>
111-
</actionGroup>
112-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableTwentyCreatedSource">
113-
<argument name="sourceCode" value="$$createTwentyCustomSource.source[source_code]$$"/>
114-
</actionGroup>
115-
<actionGroup ref="DisableSourceActionGroup" stepKey="disableTwentyOneCreatedSource">
116-
<argument name="sourceCode" value="$$createTwentyOneCustomSource.source[source_code]$$"/>
117-
</actionGroup>
54+
<!-- Disable all created sources -->
55+
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
56+
11857
<deleteData createDataKey="category" stepKey="deleteCategory"/>
11958
<deleteData createDataKey="product" stepKey="deleteProduct"/>
12059
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>

‎InventoryBundleProduct/Model/GetBundleProductStockStatus.php‎

Lines changed: 0 additions & 151 deletions
This file was deleted.

‎InventoryBundleProduct/Model/GetProductSelection.php‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)