Skip to content

Commit

Permalink
6.51.0 (FINAL RELEASE)
Browse files Browse the repository at this point in the history
  • Loading branch information
m2epro committed Nov 22, 2023
1 parent 9d6be1f commit 07348fc
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 12 deletions.
1 change: 1 addition & 0 deletions app/code/community/Ess/M2ePro/Helper/Component/Ebay.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Ess_M2ePro_Helper_Component_Ebay extends Mage_Core_Helper_Abstract
const MARKETPLACE_IT = 10;
const MARKETPLACE_BE_NL = 11;
const MARKETPLACE_ES = 13;
const MARKETPLACE_IN = 16;

const LISTING_DURATION_GTC = 100;

Expand Down
19 changes: 10 additions & 9 deletions app/code/community/Ess/M2ePro/Model/Ebay/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -1106,21 +1106,22 @@ public function canRefund()
return false;
}

$supportedMarketplaces = array(
EbayHelper::MARKETPLACE_US,
EbayHelper::MARKETPLACE_CA,
EbayHelper::MARKETPLACE_UK,
EbayHelper::MARKETPLACE_AU,
EbayHelper::MARKETPLACE_DE
);

if (!in_array($this->getParentObject()->getMarketplaceId(), $supportedMarketplaces)) {
if ($this->isMarketplaceNotSupportedForRefund()) {
return false;
}

return true;
}

private function isMarketplaceNotSupportedForRefund()
{
$notSupportedMarketplacesForRefund = array(
EbayHelper::MARKETPLACE_IN
);

return in_array($this->getParentObject()->getMarketplaceId(), $notSupportedMarketplacesForRefund);
}

/**
* @return bool
* @throws Ess_M2ePro_Model_Exception_Logic
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Ess/M2ePro/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "m2epro/magento1-extension",
"description": "M2E Pro is a Magento trusted (TM), award-winning extension, which allows merchants of all sizes to fully integrate Magento based system(s) into eBay/Amazon/Walmart platforms.",
"type": "magento-module",
"version": "6.50.0",
"version": "6.51.0",
"license": "proprietary",
"keywords": ["ebay", "amazon", "walmart", "magento"],
"homepage": "https://www.m2epro.com/",
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Ess/M2ePro/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config>
<modules>
<Ess_M2ePro>
<version>6.50.0</version>
<version>6.51.0</version>
</Ess_M2ePro>
</modules>
<default>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

/**
* @author M2E Pro Developers Team
* @copyright M2E LTD
* @license Commercial use is forbidden
*/

class Ess_M2ePro_Sql_Upgrade_v6_50_0__v6_51_0_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
{
public function getFeaturesList()
{
return array();
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "m2epro/magento1-extension",
"description": "M2E Pro is a Magento trusted (TM), award-winning extension, which allows merchants of all sizes to fully integrate Magento based system(s) into eBay/Amazon/Walmart platforms.",
"type": "magento-module",
"version": "6.50.0",
"version": "6.51.0",
"license": "proprietary",
"keywords": ["ebay", "amazon", "walmart", "magento"],
"homepage": "https://www.m2epro.com/",
Expand Down

0 comments on commit 07348fc

Please sign in to comment.