Skip to content

Commit 2509d68

Browse files
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-90466-amqp
2 parents 13e05db + 35324e5 commit 2509d68

File tree

6 files changed

+20
-1
lines changed

6 files changed

+20
-1
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">

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,15 @@ protected function _query($sql, $bind = [])
549549
$retry = true;
550550
$triesCount++;
551551
$this->closeConnection();
552+
553+
/**
554+
* _connect() function does not allow port parameter, so put the port back with the host
555+
*/
556+
if (!empty($this->_config['port'])) {
557+
$this->_config['host'] = implode(':', [$this->_config['host'], $this->_config['port']]);
558+
unset($this->_config['port']);
559+
}
560+
552561
$this->_connect();
553562
}
554563

0 commit comments

Comments
 (0)