Skip to content

OD-921 Fix package volume and sizes calculation #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luckyraul merged 5 commits into from
Jun 11, 2025
Merged

OD-921 Fix package volume and sizes calculation #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32af3f7
OD-921 Fix package volume and sizes calculation
sekulich-mygento Jun 10, 2025
8339e42
ODS-927 Change dimension calculation
sekulich-mygento Jun 11, 2025
506315d
ODS-927 Update copyright year
sekulich-mygento Jun 11, 2025
0c627f1
ODS-297 Change PHPdocs
sekulich-mygento Jun 11, 2025
5fc1835
ODS-297 Fix package volume and sizes calculation
sekulich-mygento Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
$header = <<<EOF
@author Mygento Team
@copyright 2016-2024 Mygento (https://www.mygento.ru)
@copyright 2016-2025 Mygento (https://www.mygento.com)
@package Mygento_Shipment
EOF;

Expand Down
2 changes: 1 addition & 1 deletion Api/Carrier/AbstractCarrierInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Carrier/BaseInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Carrier/TrackingInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/CarrierManagerInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Client/AbstractClientInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Client/BaseInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Data/CalculateRequestInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Data/CalculateResultInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Data/EstimateTimeInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Data/PointInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Data/PointProviderInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Data/PointSearchResultsInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/DimensionInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/PointManagerInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/PointRepositoryInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Service/AutoshipInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Service/BaseInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Service/CalculateInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Service/MarkingInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Service/OrderInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Api/Service/PointInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/Config/Carrier/TrackStatuses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/Config/Magento/OrderStatuses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/Order/DeliveryDatetime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/Order/Estimate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/Order/Tab/Delivery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Order/DeliveryDate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Order/DeliveryTab.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Order/DeliveryTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Point.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Point/Index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
13 changes: 10 additions & 3 deletions Helper/Dimensions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down Expand Up @@ -122,9 +122,16 @@ public function dimenAlgo(array $dimensions): array
}

foreach ($dim as $d) {
($d['width'] > $result['width']) ? $result['width'] = $d['width'] : '';
//find the maximum items height
($d['height'] > $result['height']) ? $result['height'] = $d['height'] : '';
$result['length'] += $d['length'];

//find the longest horizontal side (either length or width) - used as the package length
$length = max($d['length'], $d['width']);
($length > $result['length']) ? $result['length'] = $length : '';

//sum the shorter horizontal side if items are laid in a row
$width = min($d['length'], $d['width']);
$result['width'] += $width;
}
$result['volume'] = $result['length'] * $result['height'] * $result['width'];

Expand Down
2 changes: 1 addition & 1 deletion Model/AbstractCarrier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Model/AbstractClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Model/AbstractService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Model/Carrier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Model/CarrierManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Model/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Model/Cron/Autoship.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
2 changes: 1 addition & 1 deletion Model/Estimate/Time.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @author Mygento Team
* @copyright 2016-2024 Mygento (https://www.mygento.ru)
* @copyright 2016-2025 Mygento (https://www.mygento.com)
* @package Mygento_Shipment
*/

Expand Down
Loading
Loading