RetailCRM-Mirror/magento-module
1
0
Fork 0
mirror of synced 2025-04-04 05:33:31 +03:00
Code Issues Projects Releases Wiki Activity

fix test

Browse source
This commit is contained in:
gorokh 2020-01-24 12:21:08 +03:00
parent fb52912bd7
commit 62480edee1
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Helper/Data.php
View file

@ -11,7 +11,6 @@ use Magento\Store\Model\ScopeInterface;
class Data extends AbstractHelper
{
private $storeManager;
private $json;
const XML_PATH_RETAILCRM = 'retailcrm/';
const XML_PATH_DEFAULT_SITE = 'retailcrm_site/default';
@ -20,11 +19,9 @@ class Data extends AbstractHelper
const XML_PATH_INVENTORIES = 'inventories_upload/';
public function __construct(
\Magento\Framework\Serialize\Serializer\Json $json,
Context $context,
StoreManagerInterface $storeManager
) {
$this->json = $json;
$this->storeManager = $storeManager;
parent::__construct($context);
}
@ -216,7 +213,7 @@ class Data extends AbstractHelper
public function getConfigPayments()
{
$json = $this->scopeConfig->getValue('retailcrm/paymentList/paymentList');
$List = $this->json->unserialize($json);
$List = $this->getConfigJsonUnserialize($json);
foreach ($List as $code => $el) {
$payments[$el['payment_cms']] = $el['payment_crm'];
}
@ -230,7 +227,7 @@ class Data extends AbstractHelper
public function getCongigShipping()
{
$json = $this->scopeConfig->getValue('retailcrm/shippingList/shippingList');
$shippingList = $this->json->unserialize($json);
$shippingList = $this->getConfigJsonUnserialize($json);
foreach ($shippingList as $code => $el) {
$shippings[$el['shipping_cms']] = $el['shipping_crm'];
}
@ -244,11 +241,28 @@ class Data extends AbstractHelper
public function getCongigStatus()
{
$json = $this->scopeConfig->getValue('retailcrm/statusList/statusList');
$List = $this->json->unserialize($json);
$List = $this->getConfigJsonUnserialize($json);
foreach ($List as $code => $el) {
$statusList[$el['status_cms']] = $el['status_crm'];
}
return $statusList;
}
/**
* @param $json
*
* @return mixed
*/
public function getConfigJsonUnserialize($json)
{
if (class_exists(\Magento\Framework\Serialize\Serializer\Json::class)) {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$serializer = $objectManager->create(\Magento\Framework\Serialize\Serializer\Json::class);
return $serializer->unserialize($json);
} else {
return json_decode($json);
}
}
}

10
src/Test/Unit/Model/Service/OrderTest.php
View file

@ -50,11 +50,12 @@ class OrderTest extends \PHPUnit\Framework\TestCase
$this->mockHelper->expects($this->any())->method('getGeneralSettings')
->with('api_version')->willReturn($apiVersion);
$this->mockHelper->expects($this->any())->method('getConfigPayments')->willReturn(['checkmo'=>'test']);
$this->mockHelper->expects($this->any())->method('getCongigStatus')->willReturn(['processing'=>'test']);
$this->mockHelper->expects($this->any())->method('getCongigShipping')->willReturn(['flatrate'=>'test']);
$this->mockConfig->expects($this->any())->method('getValue')
->with($this->logicalOr(
$this->equalTo('retailcrm/retailcrm_status/processing'),
$this->equalTo('retailcrm/retailcrm_payment/checkmo'),
$this->equalTo('retailcrm/retailcrm_shipping/flatrate'),
$this->equalTo('retailcrm/retailcrm_site/default')
))->will($this->returnCallback([$this, 'getCallbackDataConfig']));
@ -166,9 +167,6 @@ class OrderTest extends \PHPUnit\Framework\TestCase
public function getCallbackDataConfig($key)
{
$data = [
'retailcrm/retailcrm_status/processing' => 'new',
'retailcrm/retailcrm_payment/checkmo' => 'test',
'retailcrm/retailcrm_shipping/flatrate' => 'test',
'retailcrm/retailcrm_site/default' => 'test'
];