Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions app/code/Magento/Dhl/Model/Carrier.php
Original file line number Diff line number Diff line change
Expand Up @@ -1263,8 +1263,20 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
*
* @param \Magento\Framework\DataObject $request
* @return $this|\Magento\Framework\DataObject|boolean
* @deprecated
*/
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
{
return $this->processAdditionalValidation($request);
}

/**
* Processing additional validation to check is carrier applicable.
*
* @param \Magento\Framework\DataObject $request
* @return $this|\Magento\Framework\DataObject|boolean
*/
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
{
//Skip by item validation if there is no items in request
if (!count($this->getAllItems($request))) {
Expand Down
15 changes: 14 additions & 1 deletion app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,24 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
* @return $this|bool|\Magento\Framework\DataObject
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
{
return $this;
}

/**
* Processing additional validation to check is carrier applicable.
*
* @param \Magento\Framework\DataObject $request
* @return $this|bool|\Magento\Framework\DataObject
* @deprecated
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
{
return $this->processAdditionalValidation($request);
}

/**
* Determine whether current carrier enabled for activity
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
* @return $this|\Magento\Framework\DataObject|boolean
* @api
*/
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request);
public function processAdditionalValidation(\Magento\Framework\DataObject $request);

/**
* Determine whether current carrier enabled for activity
Expand Down
14 changes: 14 additions & 0 deletions app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,24 @@ public function getAllItems(RateRequest $request)
*
* @param \Magento\Framework\DataObject $request
* @return $this|bool|\Magento\Framework\DataObject
* @deprecated
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
{
return $this->processAdditionalValidation($request);
}

/**
* Processing additional validation to check if carrier applicable.
*
* @param \Magento\Framework\DataObject $request
* @return $this|bool|\Magento\Framework\DataObject
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
{
//Skip by item validation if there is no items in request
if (!count($this->getAllItems($request))) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Shipping/Model/Shipping.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public function collectCarrierRates($carrierCode, $request)
$carrier->setActiveFlag($this->_availabilityConfigField);
$result = $carrier->checkAvailableShipCountries($request);
if (false !== $result && !$result instanceof \Magento\Quote\Model\Quote\Address\RateResult\Error) {
$result = $carrier->proccessAdditionalValidation($request);
$result = $carrier->processAdditionalValidation($request);
}
/*
* Result will be false if the admin set not to show the shipping module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function testComposePackages()
$this->stockItemData->expects($this->atLeastOnce())->method('getIsDecimalDivided')
->will($this->returnValue(true));

$this->carrier->proccessAdditionalValidation($request);
$this->carrier->processAdditionalValidation($request);
}

public function testParseXml()
Expand Down