Skip to content
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

Fixed unable to select "free method" in UPS backend configuration #4005

Merged
merged 1 commit into from
May 27, 2024
Merged

Fixed unable to select "free method" in UPS backend configuration #4005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,13 @@ protected function _beforeSave()
if (!method_exists($sourceModel, 'toOptionArray')) {
Mage::throwException(Mage::helper('usa')->__('Method toOptionArray not found in source model.'));
}
$hasCorrectValue = false;
$value = $this->getValue();
foreach ($sourceModel->toOptionArray() as $allowedValue) {
if (isset($allowedValue['value']) && $allowedValue['value'] == $value) {
$hasCorrectValue = true;
break;
return $this;
}
}
if (!$hasCorrectValue) {
Mage::throwException(Mage::helper('usa')->__('Field "%s" has wrong value.', $this->_nameErrorField));
}
return $this;

Mage::throwException(Mage::helper('usa')->__('Field "%s" has wrong value.', $this->_nameErrorField));
}
}
11 changes: 11 additions & 0 deletions app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,20 @@ public function toOptionArray()
{
$ups = Mage::getSingleton('usa/shipping_carrier_ups');
$arr = [];

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only small issue here is that a lot of the elements in this array will be repeats, which is going to make it several times bigger than it needs to be. An easy way to fix that would be to use the 'value' as a key in $arr, and then take just the values without the keys, like this:

    public function toOptionArray()
    {
        $ups = Mage::getSingleton('usa/shipping_carrier_ups');
        $arr = [];

        // necessary after the add of Rest API
        $origins = $ups->getCode('originShipment');
        foreach ($origins as $origin) {
            foreach ($origin as $k => $v) {
                $arr[$k] = ['value' => $k, 'label' => Mage::helper('usa')->__($v)];
            }
        }

        // old XML API codes
        foreach ($ups->getCode('method') as $k => $v) {
            $arr[$k] = ['value' => $k, 'label' => Mage::helper('usa')->__($v)];
        }

        return array_values($arr);
    }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but we're talking 20 elements instead of 10, I don't think it's something that needs to be optimized.

plus it will be removed later this year

I'll take a look at it later but

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, it doesn't really matter. But, there's also the old saying "There's nothing more permanent than a temporary fix." :)

I went ahead and made an "approved" review. I don't feel strongly about this change, so it doesn't matter if you leave it as-is or tweak it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is true, but I will personally remove it when the XML API will go down.

I'm all for cleaning the old mess and probably half of my PRs are cleanups heheheh

// necessary after the add of Rest API
$origins = $ups->getCode('originShipment');
foreach ($origins as $origin) {
foreach ($origin as $k => $v) {
$arr[] = ['value' => $k, 'label' => Mage::helper('usa')->__($v)];
}
}

// old XML API codes
foreach ($ups->getCode('method') as $k => $v) {
$arr[] = ['value' => $k, 'label' => Mage::helper('usa')->__($v)];
}

return $arr;
}
}
7 changes: 5 additions & 2 deletions app/design/adminhtml/default/default/template/system/shipping/ups.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
$upsModel = Mage::getSingleton('usa/shipping_carrier_ups');
$orShipArr = $upsModel->getCode('originShipment');
$defShipArr = $upsModel->getCode('method');

$allMethodsCodes = [];
foreach (Mage::getModel('usa/shipping_carrier_ups_source_method')->toOptionArray() as $method) {
$allMethodsCodes[]= $method['value'];
}
/** @var $this Mage_Adminhtml_Block_Template */
$sectionCode = $this->getRequest()->getParam('section');
$websiteCode = $this->getRequest()->getParam('website');
Expand All @@ -44,7 +47,7 @@ if (!$storeCode && $websiteCode) {
if (!in_array($storedOriginShipment, array_keys($orShipArr))) {
$storedOriginShipment = '';
}
if ($storedFreeShipment != '' && !in_array($storedFreeShipment, array_keys($defShipArr))) {
if ($storedFreeShipment != '' && !in_array($storedFreeShipment, $allMethodsCodes)) {
$storedFreeShipment = '';
}
if (!Mage::helper('usa')->validateUpsType($storedUpsType)) {
Expand Down
Loading