Skip to content

Commit 83caf9e

Browse files
author
Kogut Dmitro
committed
Merge remote-tracking branch 'origin/2.3-develop-mftf-pr1' into MAGETWO-90117
2 parents d4019bc + 70b6798 commit 83caf9e

File tree

20 files changed

+108
-16
lines changed

20 files changed

+108
-16
lines changed

‎app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use Magento\Framework\App\ResourceConnection;
1111
use Magento\Framework\DB\Select;
12+
use Magento\CatalogInventory\Model\Stock\Status;
1213

1314
/**
1415
* Apply stock condition to select.
@@ -43,7 +44,12 @@ public function execute(
4344
) {
4445
$select->joinInner(
4546
[$stockAlias => $this->resourceConnection->getTableName('cataloginventory_stock_status')],
46-
sprintf('%2$s.product_id = %1$s.source_id', $alias, $stockAlias),
47+
sprintf(
48+
'%2$s.product_id = %1$s.source_id AND %2$s.stock_status = %3$d',
49+
$alias,
50+
$stockAlias,
51+
Status::STATUS_IN_STOCK
52+
),
4753
[]
4854
);
4955
}

‎app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<container name="extra_customer_info"/>
1616
</block>
1717
<block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
18+
<container name="extra_shipment_info"/>
1819
<block class="Magento\Shipping\Block\Adminhtml\Create\Items" name="order_items" template="Magento_Shipping::create/items.phtml">
1920
<block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="default" as="default" template="Magento_Shipping::create/items/renderer/default.phtml"/>
2021
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>

‎app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<container name="extra_customer_info"/>
1616
</block>
1717
<block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
18+
<container name="extra_shipment_info"/>
1819
<block class="Magento\Shipping\Block\Adminhtml\View\Items" name="shipment_items" template="Magento_Shipping::view/items.phtml">
1920
<block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="default" as="default" template="Magento_Shipping::view/items/renderer/default.phtml"/>
2021
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>

‎app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
</div>
5353
</div>
5454
</div>
55+
<div><?= $block->getChildHtml('extra_shipment_info') ?></div>
5556
<div id="ship_items_container">
5657
<?= $block->getItemsHtml() ?>
5758
</div>

‎app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ $order = $block->getShipment()->getOrder();
103103
</div>
104104
</div>
105105
</section>
106+
<div><?= $block->getChildHtml('extra_shipment_info') ?></div>
106107

107108
<section class="admin__page-section">
108109
<div class="admin__page-section-title">

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="CheckoutPage" url="/checkout" area="storefront" module="Checkout">
11+
<page name="CheckoutPage" url="/checkout" area="storefront" module="Magento_Checkout">
1212
<section name="CheckoutShippingSection"/>
1313
<section name="CheckoutShippingMethodsSection"/>
1414
<section name="CheckoutOrderSummarySection"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
<element name="ProductOptionsActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true" />
2626
<element name="shipToInfomation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
2727
<element name="shippingMethodInfomation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
28+
<element name="paymentMethodTitle" type="text" selector=".payment-method-title span" />
2829
</section>
2930
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<section name="CheckoutSuccessMainSection">
1212
<element name="success" type="text" selector="div.checkout-success"/>
1313
<element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
14+
<element name="orderNumberLink" type="text" selector="div.checkout-success > p:nth-child(1) > a"/>
1415
<element name="orderNumber22" type="text" selector=".order-number>strong"/>
1516
</section>
1617
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="OpenEditCustomerFromAdminActionGroup">
11+
<arguments>
12+
<argument name="customer"/>
13+
</arguments>
14+
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
15+
<waitForPageLoad stepKey="waitForPageLoad1" />
16+
<click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
17+
<fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
18+
<click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
19+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
20+
<click selector="{{AdminCustomerGridSection.rowEditAction}}" stepKey="clickEdit"/>
21+
<waitForPageLoad stepKey="waitForPageLoad2" />
22+
</actionGroup>
23+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="AdminCustomerPage" url="/customer/index/" area="admin" module="Customer">
12-
<section name="AdminCustomerMainActionsSection"/>
11+
<page name="AdminCustomerPage" url="/customer/index/" area="admin" module="Magento_Customer">
12+
<section name="AdminCustomerGridMainActionsSection"/>
1313
<section name="AdminCustomerMessagesSection"/>
1414
<section name="AdminCustomerGridSection"/>
1515
<section name="AdminCustomerFiltersSection"/>

0 commit comments

Comments
 (0)