Skip to content

Commit 104a56e

Browse files
committed
20.53.1 SHQ23-1143 Minor enhancement to inventory logic
1 parent 87dd843 commit 104a56e

File tree

7 files changed

+34
-4
lines changed

7 files changed

+34
-4
lines changed

CHANGELOG-PUBLIC.md

+4
Original file line numberDiff line numberDiff line change
@@ -760,3 +760,7 @@ SHQ23-429 Resolve issue with store price using incorrect value when coupon code
760760
SHQ23-531 Add support for PHP8.2
761761

762762

763+
## 20.53.1 (2023-09-20)
764+
SHQ23-1143 Minor enhancement to inventory logic
765+
766+

CHANGELOG.MD

+4
Original file line numberDiff line numberDiff line change
@@ -760,3 +760,7 @@ SHQ23-429 Resolve issue with store price using incorrect value when coupon code
760760
SHQ23-531 Add support for PHP8.2
761761

762762

763+
## 20.53.1 (2023-09-20)
764+
SHQ23-1143 Minor enhancement to inventory logic
765+
766+

README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,15 @@ Compatibility
1919
-------------
2020
This module supports and is tested against the following Magento versions:
2121

22+
* 2.4.7-beta1
23+
* 2.4.6-p1
24+
* 2.4.6
25+
* 2.4.5-p3
26+
* 2.4.5-p2
2227
* 2.4.5-p1
2328
* 2.4.5
29+
* 2.4.4-p4
30+
* 2.4.4-p3
2431
* 2.4.4-p2
2532
* 2.4.4-p1
2633
* 2.4.4
@@ -89,7 +96,7 @@ Magento Issues Impacting ShipperHQ
8996
3. Only country, region and postcode are included in shipping request at checkout - you may not see correct rates returned if filtering on city or PO box addresses
9097
- Github Issue: https://github.com/magento/magento2/issues/3789
9198
- Resolved in Magento 2.1 and above for Guest checkout, logged in customers will still only see region/state, postcode and country
92-
4. Error thrown when using Elastic search and Magento Enterprise " error: MapperParsingException[No handler for type [array] declared on field [shipperhq_master_boxes]]"
99+
4. Error thrown when using Elastic search and Magento Enterprise " error: MapperParsingException[No handler for type [array] declared on field [shipperhq_master_boxes]"
93100
- Magento issue number/patch reference: MDVA-791 - contact Enterprise support for patch
94101
5. Error thrown when placing an order with some shipping methods. Root cause is that some shipping methods have shipping method codes longer than the column length on quote for shipping_method field. Field is truncating the code and order cannot be placed.
95102
- Github Issue: https://github.com/magento/magento2/issues/6475

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "shipperhq/module-shipper",
33
"description": "Magento Shipping integration with ShipperHQ",
44
"type": "magento2-module",
5-
"version": "20.53.0",
5+
"version": "20.53.1",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"

src/Model/Carrier/Processor/StockHandlerFactory.php

+15
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,31 @@ public function create(array $data = []): StockHandlerInterface
5353
"getSkusByProductIds" => $this->objectManager->create('Magento\InventoryCatalogApi\Model\GetSkusByProductIdsInterface', []),
5454
"isSourceItemManagementAllowedForProductType" => $this->objectManager->create('Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface', [])
5555
];
56+
57+
if ($this->isCustomInventoryInstalled()) {
58+
return $this->objectManager->create('\ShipperHQ\CustomInventory\Model\StockHandler', $injection);
59+
}
60+
5661
return $this->objectManager->create('\ShipperHQ\Shipper\Model\Carrier\Processor\StockHandler\AdobeMSI', $injection);
5762
} elseif ($this->isLegacyStockRegistryInstalled()) {
5863
$injection = [
5964
"stockRegistry" => $this->objectManager->create('Magento\CatalogInventory\Api\StockRegistryInterface', []),
6065
];
66+
6167
return $this->objectManager->create('\ShipperHQ\Shipper\Model\Carrier\Processor\StockHandler\LegacyStockRegistry', $injection);
6268
}
6369
return $this->objectManager->create('\ShipperHQ\Shipper\Model\Carrier\Processor\StockHandler\Oops', $data);
6470
}
6571

72+
/**
73+
* @return bool
74+
*/
75+
private function isCustomInventoryInstalled(): bool
76+
{
77+
return class_exists('ShipperHQ\CustomInventory\Model\StockHandler')
78+
&& $this->moduleManager->isEnabled('ShipperHQ_CustomInventory');
79+
}
80+
6681
/**
6782
* @return bool
6883
*/

src/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "shipperhq/module-shipper",
33
"description": "Magento Shipping integration with ShipperHQ",
44
"type": "magento2-module",
5-
"version": "20.53.0",
5+
"version": "20.53.1",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"

src/etc/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<ws_timeout>30</ws_timeout>
6868
<use_cache>0</use_cache>
6969
<always_use_cache>1</always_use_cache>
70-
<extension_version>20.53.0</extension_version>
70+
<extension_version>20.53.1</extension_version>
7171
<allowed_methods></allowed_methods>
7272
<magento_version></magento_version>
7373
<cache_timeout>300</cache_timeout>

0 commit comments

Comments
 (0)