Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/mage-os/mirror-inventory …
Browse files Browse the repository at this point in the history 
…into develop
  • Loading branch information
@mage-os-ci
mage-os-ci committed Dec 9, 2023
2 parents 4d5e2e1 + 57eaed7 commit 5329689
Show file tree
Hide file tree
Showing 5 changed files with 181 additions and 4 deletions.
168 changes: 168 additions & 0 deletions ...hippingAdminUi/Test/Mftf/Test/QtyCheckShipmentForMultiProductOrderWithMultiSourceTest.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="QtyCheckShipmentForMultiProductOrderWithMultiSourceTest">
<annotations>
<stories value="Check Qty Admin during shipment for multi product order"/>
<title value="Verify Qty Admin during shipment for multi product order"/>
<description value="Verify Qty Admin during shipment for multi product order"/>
<testCaseId value="GIT-38063"/>
<severity value="AVERAGE"/>
<group value="sales"/>
<group value="msi"/>
</annotations>
<before>
<!--Create Category and Simple Product.-->
<createData entity="SimpleSubCategory" stepKey="category"/>
<createData entity="SimpleProduct" stepKey="simpleProduct">
<requiredEntity createDataKey="category"/>
</createData>
<createData entity="SimpleProduct" stepKey="simpleProduct2">
<requiredEntity createDataKey="category"/>
</createData>
<createData entity="SimpleProduct" stepKey="simpleProduct3">
<requiredEntity createDataKey="category"/>
</createData>
<!--Create US Sources.-->
<createData entity="USSource" stepKey="USSource1"/>
<createData entity="USSource" stepKey="USSource2"/>
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="additionalStock"/>
<createData entity="SourceStockLinked1" stepKey="usSource1StockLink">
<requiredEntity createDataKey="additionalStock"/>
<requiredEntity createDataKey="USSource1"/>
</createData>
<createData entity="SourceStockLinked1" stepKey="usSource2StockLink">
<requiredEntity createDataKey="additionalStock"/>
<requiredEntity createDataKey="USSource2"/>
</createData>
<!-- Create Customer.-->
<createData entity="Simple_US_Customer" stepKey="customer"/>
<!--Assign sources to product.-->
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>

<amOnPage url="{{AdminProductEditPage.url($$simpleProduct.id$$)}}" stepKey="openProductEditPageToAssignSource"/>
<!--Assign multiple sources to product.-->
<waitForPageLoad time="60" stepKey="waitForAssignSourcesToProduct"/>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignSource1ToProduct">
<argument name="sourceCode" value="$$USSource1.source[source_code]$$"/>
</actionGroup>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignSource2ToProduct">
<argument name="sourceCode" value="$$USSource2.source[source_code]$$"/>
</actionGroup>
<fillField selector="{{AdminProductSourcesGrid.rowQtyBySourceCode($$USSource1.source[source_code]$$)}}" userInput="100" stepKey="setUSSourceQuantity"/>
<fillField selector="{{AdminProductSourcesGrid.rowQtyBySourceCode($$USSource2.source[source_code]$$)}}" userInput="100" stepKey="setUSSource2Quantity"/>
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveProduct"/>

<amOnPage url="{{AdminProductEditPage.url($$simpleProduct2.id$$)}}" stepKey="openProduct2EditPageToAssignSource"/>
<!--Assign multiple sources to product.-->
<waitForPageLoad time="120" stepKey="waitForAssignSourcesToProduct2"/>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignSource1ToProduct2">
<argument name="sourceCode" value="$$USSource1.source[source_code]$$"/>
</actionGroup>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignSource2ToProduct2">
<argument name="sourceCode" value="$$USSource2.source[source_code]$$"/>
</actionGroup>
<fillField selector="{{AdminProductSourcesGrid.rowQtyBySourceCode($$USSource1.source[source_code]$$)}}" userInput="100" stepKey="setUSSourceQuantity2"/>
<fillField selector="{{AdminProductSourcesGrid.rowQtyBySourceCode($$USSource2.source[source_code]$$)}}" userInput="100" stepKey="setUSSource2Quantity2"/>
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveProduct2"/>

<amOnPage url="{{AdminProductEditPage.url($$simpleProduct3.id$$)}}" stepKey="openProduct3EditPageToAssignSource"/>
<!--Assign multiple sources to product.-->
<waitForPageLoad time="120" stepKey="waitForAssignSourcesToProduct3"/>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignSource1ToProduct3">
<argument name="sourceCode" value="$$USSource1.source[source_code]$$"/>
</actionGroup>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignSource2ToProduct3">
<argument name="sourceCode" value="$$USSource2.source[source_code]$$"/>
</actionGroup>

<fillField selector="{{AdminProductSourcesGrid.rowQtyBySourceCode($$USSource1.source[source_code]$$)}}" userInput="100" stepKey="setUSSourceQuantity3"/>
<fillField selector="{{AdminProductSourcesGrid.rowQtyBySourceCode($$USSource2.source[source_code]$$)}}" userInput="100" stepKey="setUSSource2Quantity3"/>
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveProduct3"/>
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
<argument name="indices" value=""/>
</actionGroup>
</before>
<after>
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
<!--Assign Default Stock to Default Website.-->
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
<argument name="stockName" value="{{_defaultStock.name}}"/>
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
</actionGroup>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
<!--Remove category, product, customer and additional stock.-->
<deleteData createDataKey="category" stepKey="deleteCategory"/>
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
<deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
<deleteData createDataKey="simpleProduct3" stepKey="deleteProduct3"/>
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
<deleteData createDataKey="additionalStock" stepKey="deleteAdditionalStock"/>
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="againReindex">
<argument name="indices" value=""/>
</actionGroup>
</after>
<!--Login Customer.-->
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
<argument name="Customer" value="$$customer$$"/>
</actionGroup>
<!--Add Product to Cart.-->

<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
<waitForPageLoad stepKey="waitForProductPage"/>
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart">
<argument name="product" value="$simpleProduct$"/>
</actionGroup>
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProduct2ToCart">
<argument name="product" value="$simpleProduct2$"/>
</actionGroup>
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProduct3ToCart">
<argument name="product" value="$simpleProduct3$"/>
</actionGroup>

<!--Place Order.-->
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/>
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
<argument name="shippingMethod" value="Flat Rate"/>
</actionGroup>

<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
<see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" stepKey="checkOrderPlaceSuccessMessage"/>

<!--Create Shipment-->
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
<argument name="orderId" value="{$grabOrderNumber}"/>
</actionGroup>
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShip"/>
<!--Select source and proceed to shipment.-->
<selectOption selector="{{AdminSourceSelectionFormSection.sourceSelection}}" userInput="$$USSource1.source[name]$$" stepKey="selectSourceToCreateShipment"/>
<fillField selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesQtyToDeduct('0','0')}}" userInput="1" stepKey="setSourceQtyForProduct"/>
<fillField selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesQtyToDeduct('1','0')}}" userInput="0" stepKey="setSourceQtyForProduct2"/>
<fillField selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesQtyToDeduct('2','0')}}" userInput="0" stepKey="setSourceQtyForProduct3"/>

<click selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="createShipment"/>
<waitForPageLoad time="60" stepKey="waitCreateShipment"/>

<!--Submit and verify shipment.-->
<click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShipping"/>
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="checkShipmentCreateSuccessMessage"/>
<!-- Check While creating shipment already shipped product is not available -->
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShip2"/>
<selectOption selector="{{AdminSourceSelectionFormSection.sourceSelection}}" userInput="$$USSource1.source[name]$$" stepKey="selectSourceToCreateShipment2"/>
<grabTextFrom selector="{{AdminSourceSelectionOrderedItemsGrid.rowProductSku('0')}}" stepKey="getProductSku"/>
<assertNotEquals stepKey="assertProductMapPrice">
<actualResult type="string">$getProductSku</actualResult>
<expectedResult type="string">$$simpleProduct.sku$$</expectedResult>
</assertNotEquals>
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilter"/>
</test>
</tests>
1 change: 1 addition & 0 deletions InventoryShippingAdminUi/Test/Mftf/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"php": "~8.1.0||~8.2.0",
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/functional-test-module-backend": "100.0.0-dev",
"magento/functional-test-module-inventory-admin-ui": "100.0.0-dev",
"magento/functional-test-module-inventory-api": "100.0.0-dev",
"magento/functional-test-module-inventory-configuration-api": "100.0.0-dev",
"magento/functional-test-module-inventory-sales-api": "100.0.0-dev",
Expand Down
1 change: 1 addition & 0 deletions InventoryShippingAdminUi/Test/Mftf/test-dependency-allowlist
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
AdminProductSourcesGrid
_defaultStock
AdminSourceSelectionFormSection
AdminSourceSelectionOrderedItemsGrid
AdminShipmentInventorySection
AssignSourceToProductActionGroup
DisableAllSourcesActionGroup
Expand Down
3 changes: 2 additions & 1 deletion InventoryShippingAdminUi/Test/Mftf/test-dependency-errors-detailed
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@

File "/var/www/html/app/code/Magento/InventoryShippingAdminUi/Test/Mftf/Test/SourcesPagerForOrderShipmentTest.xml"
contains entity references that violate dependency constraints:

AdminProductSourcesGrid from module(s): magento/module-inventory-admin-ui
AdminSourceSelectionOrderedItemsGrid from module(s): magento/module-inventory-admin-ui
_defaultStock from module(s): magento/module-inventory-admin-ui
AdminSourceSelectionFormSection from module(s): magento/module-inventory-admin-ui
AdminShipmentInventorySection from module(s): magento/module-inventory-admin-ui, magento/module-inventory-catalog-admin-ui
Expand Down
12 changes: 9 additions & 3 deletions InventoryShippingAdminUi/Ui/DataProvider/SourceSelectionDataProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ public function getData()
foreach ($order->getAllItems() as $orderItem) {
if ($orderItem->getIsVirtual()
|| $orderItem->getLockedDoShip()
|| $orderItem->getHasChildren()) {
|| $orderItem->getHasChildren()
|| $orderItem->getQtyOrdered() === $orderItem->getQtyShipped()) {
continue;
}

Expand Down Expand Up @@ -172,8 +173,10 @@ private function getSources(int $orderId, string $sku, float $qty): array
}

/**
* @param $itemSku
* @param $stockId
* Manage Stock
*
* @param string $itemSku
* @param int $stockId
* @return bool
* @throws LocalizedException
*/
Expand All @@ -186,6 +189,7 @@ private function isManageStock($itemSku, $stockId)

/**
* Generate display product name
*
* @param Item $item
* @return null|string
*/
Expand Down Expand Up @@ -220,6 +224,8 @@ private function getProductName(Item $item)
}

/**
* Cast Qty
*
* @param Item $item
* @param string|int|float $qty
* @return float|int
Expand Down

0 comments on commit 5329689

Please sign in to comment.