1
0
mirror of synced 2024-11-25 06:26:07 +03:00

Merge pull request #11 from iyzoer/master

Multisite, tests
This commit is contained in:
Alex Lushpai 2018-06-14 12:42:34 +03:00 committed by GitHub
commit 9ef2baf81d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
89 changed files with 3617 additions and 4278 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/nbproject/private/

40
.travis.yml Normal file
View File

@ -0,0 +1,40 @@
language: php
sudo: false
env:
global:
- DB_USER=root
- DB_HOST=localhost
- DB_NAME=magento2_test
- ADMIN_FIRSTNAME=admin_firstname
- ADMIN_LASTNAME=admin_lastname
- ADMIN_EMAIL=example@email.com
- ADMIN_USER=admin
- ADMIN_PASS=admin123
matrix:
include:
- php: 7.0
env: BRANCH=2.2-develop
- php: 7.1
env: BRANCH=2.2-develop
- php: 7.1
env: BRANCH=2.3-develop
- php: 7.2
env: BRANCH=2.3-develop
before_script:
- bash bin/install.sh
script:
- bash bin/script.sh
deploy:
skip_cleanup: true
provider: script
script: make
on:
php: 7.2
branch: master
condition: "$DEPLOY = true"

View File

@ -1,63 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field;
use Magento\Framework\Data\Form\Element\AbstractElement;
class Attributes extends \Magento\Config\Block\System\Config\Form\Field
{
protected function _getElementHtml(AbstractElement $element)
{
$values = $element->getValues();
$html = '<table id="' . $element->getId() . '_table" class="ui_select_table" cellspacing="0">';
$html .= '<tbody><tr>';
$html .= '<td><ul id="' . $element->getId() . '_selected" class="ui_select selected sortable">';
$selected = explode(',', $element->getValue());
foreach ($selected as $value) {
if ($key = array_search($value, array_column($values, 'value'))) {
$html .= '<li value="' . $value . '" title="' . $values[$key]['title'] . '">';
$html .= isset($values[$key]['label'])?$values[$key]['label']:'n/a';
$html .= '</li>';
$values[$key]['selected'] = TRUE;
}
}
$html .= '</ul></td><td>';
$html .= '<ul id="' . $element->getId() . '_source" class="ui_select source sortable">';
if ($values) {
foreach ($values as $option) {
if (!isset($option['selected'])) {
$html .= '<li value="' . $option['value'] . '" title="' . $option['title'] . '">';
$html .= isset($option['label'])?$option['label']:'n/a';
$html .= '</li>';
}
}
}
$html .= '</ul></td></tr></tbody></table>';
$html .= '<div style="display:none;">' . $element->getElementHtml() . '</div>';
$html .= '<script type="text/javascript">
require(["jquery"], function(jQuery){
require(["BelVG_Pricelist/js/verpage", "ui/1.11.4"], function(){
jQuery(document).ready( function() {
jQuery("#' . $element->getId() . '_selected, #' . $element->getId() . '_source").sortable({
connectWith: ".sortable",
stop: function(event, ui) {
var vals = [];
jQuery("#' . $element->getId() . '_selected").find("li").each(function(index, element){
vals.push(jQuery(element).val());
});
jQuery("#' . $element->getId() . '").val(vals);
}
}).disableSelection();
});
})
})
</script>';
return $html;
}
}

View File

@ -1,72 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field;
class Base extends \Magento\Framework\Model\AbstractModel
{
public $_apiKey;
public $_apiUrl;
public $_isCredentialCorrect;
protected $logger;
protected $_cacheTypeList;
protected $_resourceConfig;
public function __construct()
{
$om = \Magento\Framework\App\ObjectManager::getInstance();
$config = $om->get('\Magento\Framework\App\Config\ScopeConfigInterface');
$logger = $om->get('\Psr\Log\LoggerInterface');
$cacheTypeList = $om->get('\Magento\Framework\App\Cache\TypeListInterface');
$resourceConfig = $om->get('Magento\Config\Model\ResourceModel\Config');
$this->_resourceConfig = $resourceConfig;
$this->_cacheTypeList = $cacheTypeList;
$this->logger = $logger;
$this->_apiUrl = $config->getValue('retailcrm/general/api_url');
$this->_apiKey = $config->getValue('retailcrm/general/api_key');
$this->_isCredentialCorrect = false;
if (!empty($this->_apiUrl) && !empty($this->_apiKey)) {
if (false === stripos($this->_apiUrl, 'https://')) {
$this->_apiUrl = str_replace("http://", "https://", $this->_apiUrl);
$this->_resourceConfig->saveConfig('retailcrm/general/api_url', $this->_apiUrl, 'default', 0);
$this->_cacheTypeList->cleanType('config');
}
if (!$this->is_url($this->_apiUrl)){
echo 'URL not valid<br>';
echo 'Please check your Url and Reload page<br>';
$this->_resourceConfig->saveConfig('retailcrm/general/api_url', '', 'default', 0);
$this->_cacheTypeList->cleanType('config');
}
$client = new \Retailcrm\Retailcrm\Model\ApiClient\ApiClient(
$this->_apiUrl,
$this->_apiKey
);
try {
$response = $client->sitesList();
} catch (\Retailcrm\Retailcrm\Model\ApiClient\Exception\CurlException $e) {
$this->_logger->addDebug($e->getMessage());
}
if ($response->isSuccessful()) {
$this->_isCredentialCorrect = true;
if($response['success'] != 1) {
$this->_resourceConfig->saveConfig('retailcrm/general/api_url', '', 'default', 0);
$this->_cacheTypeList->cleanType('config');
}
}
}
}
public function is_url($url) {
return preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', $url);
}
}

View File

@ -1,16 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\ListMode;
class ListMode implements \Magento\Framework\Option\ArrayInterface
{
public function toOptionArray()
{
return [
['value' => 'grid', 'label' => __('Grid Only')],
['value' => 'list', 'label' => __('List Only')],
['value' => 'grid-list', 'label' => __('Grid (default) / List')],
['value' => 'list-grid', 'label' => __('List (default) / Grid')]
];
}
}

View File

@ -1,87 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field;
use Magento\Framework\Data\Form\Element\AbstractElement;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class Payment extends \Magento\Config\Block\System\Config\Form\Field
{
protected $_apiUrl;
protected $_apiKey;
protected $_systemStore;
protected $_formFactory;
protected $_logger;
public function __construct(
\Magento\Framework\Data\FormFactory $formFactory,
\Magento\Store\Model\System\Store $systemStore
) {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$config = $objectManager->get('\Magento\Framework\App\Config\ScopeConfigInterface');
$this->_apiUrl = $config->getValue('retailcrm/general/api_url');
$this->_apiKey = $config->getValue('retailcrm/general/api_key');
$this->_apiVersion = $config->getValue('retailcrm/general/api_version');
$this->_systemStore = $systemStore;
$this->_formFactory = $formFactory;
}
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
if ((!empty($this->_apiUrl)) && (!empty($this->_apiKey))) {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$paymentConfig = $objectManager->get('Magento\Payment\Model\Config');
$activePaymentMethods = $paymentConfig->getActiveMethods();
$client = new ApiClient($this->_apiUrl, $this->_apiKey, $this->_apiVersion);
$response = $client->paymentTypesList();
if ($response === false) {
return $htmlError;
}
if ($response->isSuccessful()) {
$paymentTypes = $response['paymentTypes'];
} else {
return $htmlError;
}
$config = \Magento\Framework\App\ObjectManager::getInstance()->get(
'Magento\Framework\App\Config\ScopeConfigInterface'
);
foreach (array_keys($activePaymentMethods) as $k=>$payment){
$html .='<table id="' . $element->getId() . '_table">';
$html .='<tr id="row_retailcrm_payment_'.$payment.'">';
$html .='<td class="label">'.$payment.'</td>';
$html .='<td>';
$html .='<select id="1" name="groups[Payment][fields]['.$payment.'][value]">';
$selected = $config->getValue('retailcrm/Payment/' . $payment);
foreach ($paymentTypes as $k => $value){
if ((!empty($selected)) && (($selected == $value['code']))) {
$select = 'selected="selected"';
}else{
$select = '';
}
$html .= '<option '.$select.' value="'.$value['code'].'"> '.$value['name'].'</option>';
}
$html .= '</select>';
$html .= '</td>';
$html .= '</tr>';
$html .= '</table>';
}
return $html;
} else {
return $htmlError;
}
}
}

View File

@ -1,88 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field;
use Magento\Framework\Data\Form\Element\AbstractElement;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class Shipping extends \Magento\Config\Block\System\Config\Form\Field
{
protected $_apiUrl;
protected $_apiKey;
protected $_systemStore;
protected $_formFactory;
protected $_logger;
protected $_objectManager;
public function __construct(
\Magento\Framework\Data\FormFactory $formFactory,
\Magento\Store\Model\System\Store $systemStore
) {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$config = $objectManager->get('\Magento\Framework\App\Config\ScopeConfigInterface');
$this->_apiUrl = $config->getValue('retailcrm/general/api_url');
$this->_apiKey = $config->getValue('retailcrm/general/api_key');
$this->_apiVersion = $config->getValue('retailcrm/general/api_version');
$this->_systemStore = $systemStore;
$this->_formFactory = $formFactory;
$this->_objectManager = $objectManager;
}
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
if (!empty($this->_apiUrl) && !empty($this->_apiKey)) {
$shipConfig = $this->_objectManager->get('Magento\Shipping\Model\Config');
$deliveryMethods = $shipConfig->getActiveCarriers();
$client = new ApiClient($this->_apiUrl, $this->_apiKey, $this->_apiVersion);
$response = $client->deliveryTypesList();
if ($response === false) {
return $htmlError;
}
if ($response->isSuccessful()) {
$deliveryTypes = $response['deliveryTypes'];
} else {
return $htmlError;
}
$config = \Magento\Framework\App\ObjectManager::getInstance()->get(
'Magento\Framework\App\Config\ScopeConfigInterface'
);
foreach (array_keys($deliveryMethods) as $k => $delivery) {
$html .='<table id="' . $element->getId() . '_table">';
$html .='<tr id="row_retailcrm_shipping_'.$delivery.'">';
$html .='<td class="label">'.$delivery.'</td>';
$html .='<td>';
$html .='<select id="1" name="groups[Shipping][fields]['.$delivery.'][value]">';
$selected = $config->getValue('retailcrm/Shipping/'.$delivery);
foreach ($deliveryTypes as $k => $value) {
if ((!empty($selected)) && (($selected == $value['code']))) {
$select ='selected="selected"';
}else{
$select ='';
}
$html .='<option '.$select.' value="'.$value['code'].'"> '.$value['name'].'</option>';
}
$html .='</select>';
$html .='</td>';
$html .='</tr>';
$html .='</table>';
}
return $html;
} else {
return $htmlError;
}
}
}

View File

@ -1,91 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field;
use Magento\Framework\Data\Form\Element\AbstractElement;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class Status extends \Magento\Config\Block\System\Config\Form\Field
{
protected $_apiUrl;
protected $_apiKey;
protected $_systemStore;
protected $_formFactory;
protected $_logger;
protected $_objectManager;
public function __construct(
\Magento\Framework\Data\FormFactory $formFactory,
\Magento\Store\Model\System\Store $systemStore
) {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$config = $objectManager->get('\Magento\Framework\App\Config\ScopeConfigInterface');
$this->_apiUrl = $config->getValue('retailcrm/general/api_url');
$this->_apiKey = $config->getValue('retailcrm/general/api_key');
$this->_apiVersion = $config->getValue('retailcrm/general/api_version');
$this->_systemStore = $systemStore;
$this->_formFactory = $formFactory;
$this->_objectManager = $objectManager;
}
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
if ((!empty($this->_apiUrl)) && (!empty($this->_apiKey))) {
$statusCollection = $this->_objectManager->create('Magento\Sales\Model\ResourceModel\Order\Status\Collection');
$statuses = $statusCollection->toOptionArray();
$client = new ApiClient($this->_apiUrl, $this->_apiKey, $this->_apiVersion);
$response = $client->statusesList();
if ($response === false) {
return $htmlError;
}
if ($response->isSuccessful()) {
$statusTypes = $response['statuses'];
} else {
return $htmlError;
}
$config = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
foreach ($statuses as $k => $status){
$html .= '<table id="' . $element->getId() . '_table">';
$html .= '<tr id="row_retailcrm_status_' . $status['label'] . '">';
$html .= '<td class="label">' . $status['label'] . '</td>';
$html .= '<td>';
$html .= '<select name="groups[Status][fields][' . $status['value'] . '][value]">';
$selected = $config->getValue('retailcrm/Status/' . $status['value']);
$html .= '<option value=""> Select status </option>';
foreach ($statusTypes as $k => $value){
if (
(!empty($selected))
&& (($selected == $value['name']))
|| (($selected == $value['code']))
) {
$select = 'selected="selected"';
} else {
$select = '';
}
$html .= '<option ' . $select . 'value="' . $value['code'] . '"> ' . $value['name'] . '</option>';
}
$html .= '</select>';
$html .= '</td>';
$html .= '</tr>';
$html .= '</table>';
}
return $html;
} else {
return $htmlError;
}
}
}

View File

@ -1,16 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Block;
class Display extends \Magento\Framework\View\Element\Template
{
public function __construct(\Magento\Framework\View\Element\Template\Context $context)
{
parent::__construct($context);
}
public function sayHello()
{
return __('Hello World');
}
}

View File

@ -1,36 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Controller\Index;
use Magento\Framework\App\Helper\Context;
use Psr\Log\LoggerInterface;
class Test extends \Magento\Framework\App\Action\Action
{
protected $logger;
public function __construct(
LoggerInterface $logger,
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\View\Page\Config $pageConfig,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->logger = $logger;
$api_url = $config->getValue('retailcrm/general/api_url');
$api_key = $config->getValue('retailcrm/general/api_key');
var_dump($api_key);
var_dump($api_url);
//$this->logger->debug($api_url);
parent::__construct($context);
}
public function execute()
{
//
exit;
}
}

View File

@ -1,19 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Cron;
class Icml {
protected $_logger;
public function __construct() {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$logger = new \Retailcrm\Retailcrm\Model\Logger\Logger($objectManager);
$this->_logger = $logger;
}
public function execute()
{
$Icml = new \Retailcrm\Retailcrm\Model\Icml\Icml();
$Icml->generate();
}
}

View File

@ -1,23 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Cron;
class OrderHistory
{
protected $_logger;
public function __construct()
{
$om = \Magento\Framework\App\ObjectManager::getInstance();
$logger = new \Retailcrm\Retailcrm\Model\Logger\Logger($om);
$this->_logger = $logger;
}
public function execute()
{
$history = new \Retailcrm\Retailcrm\Model\History\Exchange();
$history->ordersHistory();
$this->_logger->writeRow('Cron Works: OrderHistory');
}
}

View File

@ -1,68 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Helper;
use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\ObjectManagerInterface;
use Magento\Framework\App\Helper\Context;
use Magento\Store\Model\ScopeInterface;
class Data extends AbstractHelper
{
protected $storeManager;
protected $objectManager;
const XML_PATH_RETAILCRM = 'retailcrm/';
public function __construct(Context $context,
ObjectManagerInterface $objectManager,
StoreManagerInterface $storeManager
) {
$this->objectManager = $objectManager;
$this->storeManager = $storeManager;
parent::__construct($context);
}
public function getConfigValue($field, $storeId = null)
{
return $this->scopeConfig->getValue(
$field, ScopeInterface::SCOPE_STORE, $storeId
);
}
public function getGeneralConfig($code, $storeId = null)
{
return $this->getConfigValue(self::XML_PATH_RETAILCRM . $code, $storeId);
}
/**
* Recursive array filter
*
* @param array $haystack input array
*
* @SuppressWarnings(PHPMD.StaticAccess)
* @SuppressWarnings(PHPMD.ElseExpression)
*
* @return array
*/
public function filterRecursive($haystack)
{
foreach ($haystack as $key => $value) {
if (is_array($value)) {
$haystack[$key] = self::filterRecursive($haystack[$key]);
}
if (is_null($haystack[$key])
|| $haystack[$key] === ''
|| count($haystack[$key]) == 0
) {
unset($haystack[$key]);
} elseif (!is_array($value)) {
$haystack[$key] = trim($value);
}
}
return $haystack;
}
}

View File

@ -1,81 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Helper;
use RetailCrm\ApiClient;
use Magento\Framework\App\ObjectManager;
use Retailcrm\Retailcrm\Model\Logger\Logger;
class Proxy
{
protected $logger;
protected $apiClient;
private $errorAccount = 'Account does not exist.';
private $errorNotFound = 'Not found';
private $errorApiKey = 'Wrong "apiKey" value.';
public function __construct ($url, $key, $apiVersion)
{
$objectManager = ObjectManager::getInstance();
$this->logger = new Logger($objectManager);
$this->apiClient = new ApiClient($url, $key, $apiVersion);
}
public function __call($method, $arguments)
{
try {
$response = call_user_func_array([$this->apiClient->request, $method], $arguments);
if (!$response->isSuccessful()) {
$this->logger->writeRow(
sprintf(
"[HTTP status %s] %s",
$response->getStatusCode(),
$response->getErrorMsg()
)
);
if (isset($response['errors'])) {
$this->logger->writeRow(implode(' :: ', $response['errors']));
}
}
} catch (\RetailCrm\Exception\CurlException $exception) {
$this->logger->writeRow($exception->getMessage());
return false;
} catch (\RetailCrm\Exception\InvalidJsonException $exception) {
$this->logger->writeRow($exception->getMessage());
return false;
} catch (\InvalidArgumentException $exception) {
$this->logger->writeRow($exception->getMessage());
}
return $response;
}
/**
* Get API version
*
* @return string
*/
public function getVersion()
{
if (!is_object($this->apiClient)) {
return false;
}
return $this->apiClient->getVersion();
}
/**
* Get error text message
*
* @param string $property
*
* @return string
*/
public function getErrorText($property)
{
return $this->{$property};
}
}

14
Makefile Normal file
View File

@ -0,0 +1,14 @@
FILE = $(TRAVIS_BUILD_DIR)/VERSION
VERSION = `cat $(FILE)`
ARCHIVE_NAME = '/tmp/retailcrm-retailcrm-'$(VERSION)'.zip'
all: build_archive send_to_ftp delete_archive
build_archive:
cd src; zip -r $(ARCHIVE_NAME) ./*
send_to_ftp:
curl -T $(ARCHIVE_NAME) -u $(FTP_USER):$(FTP_PASSWORD) ftp://$(FTP_HOST)
delete_archive:
rm -f $(ARCHIVE_NAME)

File diff suppressed because it is too large Load Diff

View File

@ -1,30 +0,0 @@
<?php
/**
* PHP version 5.3
*
* Class CurlException
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
namespace Retailcrm\Retailcrm\Model\ApiClient\Exception;
/**
* PHP version 5.3
*
* Class CurlException
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
class CurlException extends \RuntimeException
{
}

View File

@ -1,30 +0,0 @@
<?php
/**
* PHP version 5.3
*
* Class InvalidJsonException
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
namespace Retailcrm\Retailcrm\Model\ApiClient\Exception;
/**
* PHP version 5.3
*
* Class InvalidJsonException
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
class InvalidJsonException extends \DomainException
{
}

View File

@ -1,128 +0,0 @@
<?php
/**
* PHP version 5.3
*
* HTTP client
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
namespace Retailcrm\Retailcrm\Model\ApiClient\Http;
use Retailcrm\Retailcrm\Model\ApiClient\Exception\CurlException;
use Retailcrm\Retailcrm\Model\ApiClient\Exception\InvalidJsonException;
use Retailcrm\Retailcrm\Model\ApiClient\Response\ApiResponse;
/**
* PHP version 5.3
*
* HTTP client
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
class Client
{
const METHOD_GET = 'GET';
const METHOD_POST = 'POST';
protected $url;
protected $defaultParameters;
/**
* Client constructor.
*
* @param string $url api url
* @param array $defaultParameters array of parameters
*
* @throws \InvalidArgumentException
*/
public function __construct($url, array $defaultParameters = array())
{
if (false === stripos($url, 'https://')) {
throw new \InvalidArgumentException(
'API schema requires HTTPS protocol'
);
}
$this->url = $url;
$this->defaultParameters = $defaultParameters;
}
/**
* Make HTTP request
*
* @param string $path request url
* @param string $method (default: 'GET')
* @param array $parameters (default: array())
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*
* @throws \InvalidArgumentException
* @throws CurlException
* @throws InvalidJsonException
*
* @return ApiResponse
*/
public function makeRequest(
$path,
$method,
array $parameters = array()
) {
$allowedMethods = array(self::METHOD_GET, self::METHOD_POST);
if (!in_array($method, $allowedMethods, false)) {
throw new \InvalidArgumentException(
sprintf(
'Method "%s" is not valid. Allowed methods are %s',
$method,
implode(', ', $allowedMethods)
)
);
}
$parameters = array_merge($this->defaultParameters, $parameters);
$url = $this->url . $path;
if (self::METHOD_GET === $method && count($parameters)) {
$url .= '?' . http_build_query($parameters, '', '&');
}
$curlHandler = curl_init();
curl_setopt($curlHandler, CURLOPT_URL, $url);
curl_setopt($curlHandler, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curlHandler, CURLOPT_FOLLOWLOCATION, 1);
curl_setopt($curlHandler, CURLOPT_FAILONERROR, false);
curl_setopt($curlHandler, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curlHandler, CURLOPT_SSL_VERIFYHOST, false);
curl_setopt($curlHandler, CURLOPT_TIMEOUT, 30);
curl_setopt($curlHandler, CURLOPT_CONNECTTIMEOUT, 30);
if (self::METHOD_POST === $method) {
curl_setopt($curlHandler, CURLOPT_POST, true);
curl_setopt($curlHandler, CURLOPT_POSTFIELDS, $parameters);
}
$responseBody = curl_exec($curlHandler);
$statusCode = curl_getinfo($curlHandler, CURLINFO_HTTP_CODE);
$errno = curl_errno($curlHandler);
$error = curl_error($curlHandler);
curl_close($curlHandler);
if ($errno) {
throw new CurlException($error, $errno);
}
return new ApiResponse($statusCode, $responseBody);
}
}

View File

@ -1,180 +0,0 @@
<?php
/**
* PHP version 5.3
*
* Response from retailCRM API
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
namespace Retailcrm\Retailcrm\Model\ApiClient\Response;
use Retailcrm\Retailcrm\Model\ApiClient\Exception\InvalidJsonException;
/**
* PHP version 5.3
*
* Response from retailCRM API
*
* @category RetailCrm
* @package RetailCrm
* @author RetailCrm <integration@retailcrm.ru>
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
class ApiResponse implements \ArrayAccess
{
// HTTP response status code
protected $statusCode;
// response assoc array
protected $response;
/**
* ApiResponse constructor.
*
* @param int $statusCode HTTP status code
* @param mixed $responseBody HTTP body
*
* @throws InvalidJsonException
*/
public function __construct($statusCode, $responseBody = null)
{
$this->statusCode = (int) $statusCode;
if (!empty($responseBody)) {
$response = json_decode($responseBody, true);
if (!$response && JSON_ERROR_NONE !== ($error = json_last_error())) {
throw new InvalidJsonException(
"Invalid JSON in the API response body. Error code #$error",
$error
);
}
$this->response = $response;
}
}
/**
* Return HTTP response status code
*
* @return int
*/
public function getStatusCode()
{
return $this->statusCode;
}
/**
* HTTP request was successful
*
* @return bool
*/
public function isSuccessful()
{
return $this->statusCode < 400;
}
/**
* Allow to access for the property throw class method
*
* @param string $name method name
* @param mixed $arguments method parameters
*
* @throws \InvalidArgumentException
*
* @return mixed
*/
public function __call($name, $arguments)
{
// convert getSomeProperty to someProperty
$propertyName = strtolower(substr($name, 3, 1)) . substr($name, 4);
if (!isset($this->response[$propertyName])) {
throw new \InvalidArgumentException("Method \"$name\" not found");
}
return $this->response[$propertyName];
}
/**
* Allow to access for the property throw object property
*
* @param string $name property name
*
* @throws \InvalidArgumentException
*
* @return mixed
*/
public function __get($name)
{
if (!isset($this->response[$name])) {
throw new \InvalidArgumentException("Property \"$name\" not found");
}
return $this->response[$name];
}
/**
* Offset set
*
* @param mixed $offset offset
* @param mixed $value value
*
* @throws \BadMethodCallException
* @return void
*/
public function offsetSet($offset, $value)
{
throw new \BadMethodCallException('This activity not allowed');
}
/**
* Offset unset
*
* @param mixed $offset offset
*
* @throws \BadMethodCallException
* @return void
*/
public function offsetUnset($offset)
{
throw new \BadMethodCallException('This call not allowed');
}
/**
* Check offset
*
* @param mixed $offset offset
*
* @return bool
*/
public function offsetExists($offset)
{
return isset($this->response[$offset]);
}
/**
* Get offset
*
* @param mixed $offset offset
*
* @throws \InvalidArgumentException
*
* @return mixed
*/
public function offsetGet($offset)
{
if (!isset($this->response[$offset])) {
throw new \InvalidArgumentException("Property \"$offset\" not found");
}
return $this->response[$offset];
}
}

View File

@ -1,312 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Model\Icml;
class Icml
{
protected $_dd;
protected $_eCategories;
protected $_eOffers;
protected $_shop;
protected $_manager;
protected $_category;
protected $_product;
protected $_storeManager;
protected $_StockState;
protected $_configurable;
protected $_config;
public function __construct()
{
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$manager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
$categoryCollectionFactory = $objectManager->get('\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory');
$product = $objectManager->get('\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory');
$storeManager = $objectManager->get('\Magento\Store\Model\StoreManagerInterface');
$StockState = $objectManager->get('\Magento\CatalogInventory\Api\StockStateInterface');
$configurable = $objectManager->get('Magento\ConfigurableProduct\Model\Product\Type\Configurable');
$config = $objectManager->get('\Magento\Framework\App\Config\ScopeConfigInterface');
$this->_configurable = $configurable;
$this->_StockState = $StockState;
$this->_storeManager = $storeManager;
$this->_product = $product;
$this->_category = $categoryCollectionFactory;
$this->_manager = $manager;
$this->_config = $config;
}
public function generate()
{
$this->_shop = $this->_manager->getStore()->getId();
$string = '<?xml version="1.0" encoding="UTF-8"?>
<yml_catalog date="'.date('Y-m-d H:i:s').'">
<shop>
<name>'.$this->_manager->getStore()->getName().'</name>
<categories/>
<offers/>
</shop>
</yml_catalog>
';
$xml = new \SimpleXMLElement(
$string,
LIBXML_NOENT | LIBXML_NOCDATA | LIBXML_COMPACT | LIBXML_PARSEHUGE
);
$this->_dd = new \DOMDocument();
$this->_dd->preserveWhiteSpace = false;
$this->_dd->formatOutput = true;
$this->_dd->loadXML($xml->asXML());
$this->_eCategories = $this->_dd->
getElementsByTagName('categories')->item(0);
$this->_eOffers = $this->_dd
->getElementsByTagName('offers')->item(0);
$this->addCategories();
$this->addOffers();
$this->_dd->saveXML();
$dirlist = new \Magento\Framework\Filesystem\DirectoryList('');
$baseDir = $dirlist->getRoot();
$shopCode = $this->_manager->getStore()->getCode();
$this->_dd->save($baseDir . 'retailcrm_' . $shopCode . '.xml');
}
private function addCategories()
{
$collection = $this->_category->create();
$collection->addAttributeToSelect('*');
foreach ($collection as $category) {
if ($category->getId() > 1){
$e = $this->_eCategories->appendChild(
$this->_dd->createElement('category')
);
$e->appendChild($this->_dd->createTextNode($category->getName()));
$e->setAttribute('id', $category->getId());
if ($category->getParentId() > 1) {
$e->setAttribute('parentId', $category->getParentId());
}
}
}
}
private function addOffers()
{
$offers = [];
$collection = $this->_product->create();
$collection->addFieldToFilter('visibility', 4);//catalog, search visible
$collection->addAttributeToSelect('*');
$picUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
$baseUrl = $this->_storeManager->getStore()->getBaseUrl();
$customAdditionalAttributes = [];
$customAdditionalAttributes = $this->_config->getValue('retailcrm/Misc/attributes_to_export_into_icml');
foreach ($collection as $product) {
if ($product->getTypeId() == 'simple') {
$offer['id'] = $product->getId();
$offer['productId'] = $product->getId();
$offer['productActivity'] = $product->isAvailable() ? 'Y' : 'N';
$offer['name'] = $product->getName();
$offer['productName'] = $product->getName();
$offer['initialPrice'] = $product->getFinalPrice();
$offer['url'] = $product->getProductUrl();
$offer['picture'] = $picUrl.'catalog/product'.$product->getImage();
$offer['quantity'] = $this->_StockState->getStockQty($product->getId(), $product->getStore()->getWebsiteId());
$offer['categoryId'] = $product->getCategoryIds();
$offer['vendor'] = $product->getAttributeText('manufacturer');
$offer['params'] = [];
$article = $product->getSku();
if(!empty($article)) {
$offer['params'][] = [
'name' => 'Article',
'code' => 'article',
'value' => $article
];
}
$weight = $product->getWeight();
if(!empty($weight)) {
$offer['params'][] = [
'name' => 'Weight',
'code' => 'weight',
'value' => $weight
];
}
if(!empty($customAdditionalAttributes)) {
//var_dump($customAdditionalAttributes);
}
$offers[] = $offer;
}
if ($product->getTypeId() == 'configurable') {
$associated_products = $this->_configurable
->getUsedProductCollection($product)
->addAttributeToSelect('*')
->addFilterByRequiredOptions();
foreach ($associated_products as $associatedProduct) {
$offer['id'] = $associatedProduct->getId();
$offer['productId'] = $product->getId();
$offer['productActivity'] = $associatedProduct->isAvailable() ? 'Y' : 'N';
$offer['name'] = $associatedProduct->getName();
$offer['productName'] = $product->getName();
$offer['initialPrice'] = $associatedProduct->getFinalPrice();
$offer['url'] = $product->getProductUrl();
$offer['picture'] = $picUrl.'catalog/product'.$associatedProduct->getImage();
$offer['quantity'] = $this->_StockState->getStockQty($associatedProduct->getId(), $associatedProduct->getStore()->getWebsiteId());
$offer['categoryId'] = $associatedProduct->getCategoryIds();
$offer['vendor'] = $associatedProduct->getAttributeText('manufacturer');
$offer['params'] = [];
$article = $associatedProduct->getSku();
if ($associatedProduct->getResource()->getAttribute('color')) {
$colorAttribute = $associatedProduct->getResource()->getAttribute('color');
$color = $colorAttribute->getSource()->getOptionText($associatedProduct->getColor());
}
if (isset($color)) {
$offer['params'][] = [
'name' => 'Color',
'code' => 'color',
'value' => $color
];
}
if ($associatedProduct->getResource()->getAttribute('size')) {
$sizeAttribute = $associatedProduct->getResource()->getAttribute('size');
$size = $sizeAttribute->getSource()->getOptionText($associatedProduct->getSize());
}
if (isset($size)) {
$offer['params'][] = [
'name' => 'Size',
'code' => 'size',
'value' => $size
];
}
if (!empty($article)) {
$offer['params'][] = [
'name' => 'Article',
'code' => 'article',
'value' => $article
];
}
$weight = $associatedProduct->getWeight();
if(!empty($weight)) {
$offer['params'][] = [
'name' => 'Weight',
'code' => 'weight',
'value' => $weight
];
}
$offers[] = $offer;
}
}
}
foreach ($offers as $offer) {
$e = $this->_eOffers->appendChild(
$this->_dd->createElement('offer')
);
$e->setAttribute('id', $offer['id']);
$e->setAttribute('productId', $offer['productId']);
if (!empty($offer['quantity'])) {
$e->setAttribute('quantity', (int) $offer['quantity']);
} else {
$e->setAttribute('quantity', 0);
}
if (!empty($offer['categoryId'])) {
foreach ($offer['categoryId'] as $categoryId) {
$e->appendChild(
$this->_dd->createElement('categoryId')
)->appendChild(
$this->_dd->createTextNode($categoryId)
);
}
} else {
$e->appendChild($this->_dd->createElement('categoryId', 1));
}
$e->appendChild($this->_dd->createElement('productActivity'))
->appendChild(
$this->_dd->createTextNode($offer['productActivity'])
);
$e->appendChild($this->_dd->createElement('name'))
->appendChild(
$this->_dd->createTextNode($offer['name'])
);
$e->appendChild($this->_dd->createElement('productName'))
->appendChild(
$this->_dd->createTextNode($offer['productName'])
);
$e->appendChild($this->_dd->createElement('price'))
->appendChild(
$this->_dd->createTextNode($offer['initialPrice'])
);
if (!empty($offer['purchasePrice'])) {
$e->appendChild($this->_dd->createElement('purchasePrice'))
->appendChild(
$this->_dd->createTextNode($offer['purchasePrice'])
);
}
if (!empty($offer['picture'])) {
$e->appendChild($this->_dd->createElement('picture'))
->appendChild(
$this->_dd->createTextNode($offer['picture'])
);
}
if (!empty($offer['url'])) {
$e->appendChild($this->_dd->createElement('url'))
->appendChild(
$this->_dd->createTextNode($offer['url'])
);
}
if (!empty($offer['vendor'])) {
$e->appendChild($this->_dd->createElement('vendor'))
->appendChild(
$this->_dd->createTextNode($offer['vendor'])
);
}
if(!empty($offer['params'])) {
foreach($offer['params'] as $param) {
$paramNode = $this->_dd->createElement('param');
$paramNode->setAttribute('name', $param['name']);
$paramNode->setAttribute('code', $param['code']);
$paramNode->appendChild(
$this->_dd->createTextNode($param['value'])
);
$e->appendChild($paramNode);
}
}
}
}
}

View File

@ -1,66 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Model\Observer;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class Customer implements \Magento\Framework\Event\ObserverInterface
{
protected $_api;
protected $_config;
protected $_helper;
protected $_logger;
protected $_objectManager;
protected $registry;
public function __construct(
\Magento\Framework\ObjectManagerInterface $objectManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\Registry $registry
) {
$helper = $objectManager->get('\Retailcrm\Retailcrm\Helper\Data');
$logger = $objectManager->get('\Retailcrm\Retailcrm\Model\Logger\Logger');
$this->_logger = $logger;
$this->_helper = $helper;
$this->_config = $config;
$this->_objectManager = $objectManager;
$this->registry = $registry;
$url = $config->getValue('retailcrm/general/api_url');
$key = $config->getValue('retailcrm/general/api_key');
$version = $config->getValue('retailcrm/general/api_version');
if (!empty($url) && !empty($key)) {
$this->_api = new ApiClient($url, $key, $version);
}
}
public function execute(\Magento\Framework\Event\Observer $observer)
{
if ($this->registry->registry('RETAILCRM_HISTORY') === true) {
return;
}
$data = $observer->getEvent()->getCustomer();
$customer = [
'externalId' => $data->getId(),
'email' => $data->getEmail(),
'firstName' => $data->getFirstname(),
'patronymic' => $data->getMiddlename(),
'lastName' => $data->getLastname(),
'createdAt' => date('Y-m-d H:i:s', strtotime($data->getCreatedAt()))
];
$response = $this->_api->customersEdit($customer);
if ($response === false) {
return;
}
if (!$response->isSuccessful() && $response->errorMsg == $this->_api->getErrorText('errorNotFound')) {
$this->_api->customersCreate($customer);
}
}
}

View File

@ -1,79 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Model\Observer;
use Magento\Framework\Event\Observer;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class OrderUpdate implements \Magento\Framework\Event\ObserverInterface
{
protected $_api;
protected $_config;
protected $_helper;
protected $_objectManager;
protected $registry;
/**
* Constructor
*
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
\Magento\Framework\ObjectManagerInterface $objectManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\Registry $registry
) {
$this->_helper = $objectManager->get('\Retailcrm\Retailcrm\Helper\Data');
$this->_objectManager = $objectManager;
$this->_config = $config;
$this->registry = $registry;
$url = $config->getValue('retailcrm/general/api_url');
$key = $config->getValue('retailcrm/general/api_key');
$apiVersion = $config->getValue('retailcrm/general/api_version');
if (!empty($url) && !empty($key)) {
$this->_api = new ApiClient($url, $key, $apiVersion);
}
}
/**
* Execute update order in CRM
*
* @param Observer $observer
*
* @return void
*/
public function execute(Observer $observer)
{
if ($this->registry->registry('RETAILCRM_HISTORY') === true) {
return;
}
$order = $observer->getEvent()->getOrder();
if ($order) {
$preparedOrder = [
'externalId' => $order->getId(),
'status' => $this->_config->getValue('retailcrm/Status/' . $order->getStatus())
];
if ($order->getBaseTotalDue() == 0) {
if ($this->_api->getVersion() == 'v4') {
$preparedOrder['paymentStatus'] = 'paid';
} elseif ($this->_api->getVersion() == 'v5') {
$payment = [
'externalId' => $order->getPayment()->getId(),
'status' => 'paid'
];
$this->_api->ordersPaymentsEdit($payment);
}
}
$this->_helper->filterRecursive($preparedOrder);
$this->_api->ordersEdit($preparedOrder);
}
}
}

View File

@ -1,165 +0,0 @@
<?php
namespace Retailcrm\Retailcrm\Model\Order;
use Retailcrm\Retailcrm\Model\Observer\OrderCreate;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class OrderNumber extends OrderCreate
{
protected $_orderRepository;
protected $_searchCriteriaBuilder;
protected $_config;
protected $_filterBuilder;
protected $_order;
protected $_helper;
protected $_api;
protected $_logger;
public function __construct()
{
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$orderRepository = $objectManager->get('Magento\Sales\Model\OrderRepository');
$searchCriteriaBuilder = $objectManager->get('Magento\Framework\Api\SearchCriteriaBuilder');
$config = $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
$filterBuilder = $objectManager->get('Magento\Framework\Api\FilterBuilder');
$order = $objectManager->get('\Magento\Sales\Api\Data\OrderInterface');
$helper = $objectManager->get('\Retailcrm\Retailcrm\Helper\Data');
$this->_orderRepository = $orderRepository;
$this->_searchCriteriaBuilder = $searchCriteriaBuilder;
$this->_config = $config;
$this->_filterBuilder = $filterBuilder;
$this->_order = $order;
$this->_helper = $helper;
$this->_logger = $objectManager->get('\Retailcrm\Retailcrm\Model\Logger\Logger');
$url = $config->getValue('retailcrm/general/api_url');
$key = $config->getValue('retailcrm/general/api_key');
$version = $config->getValue('retailcrm/general/api_version');
if (!empty($url) && !empty($key)) {
$this->_api = new ApiClient($url, $key, $version);
}
}
public function ExportOrderNumber()
{
$ordernumber = $this->_config->getValue('retailcrm/Load/number_order');
$ordersId = explode(",", $ordernumber);
$orders = [];
foreach ($ordersId as $id) {
$orders[] = $this->prepareOrder($id);
}
$chunked = array_chunk($orders, 50);
unset($orders);
foreach ($chunked as $chunk) {
$this->_api->ordersUpload($chunk);
time_nanosleep(0, 250000000);
}
unset($chunked);
return true;
}
public function prepareOrder($id)
{
$magentoOrder = $this->_order->load($id);
$items = [];
$addressObj = $magentoOrder->getBillingAddress();
foreach ($magentoOrder->getAllItems() as $item) {
if ($item->getProductType() == "simple") {
$price = $item->getPrice();
if ($price == 0){
$om = \Magento\Framework\App\ObjectManager::getInstance();
$omproduct = $om->get('Magento\Catalog\Model\ProductRepository')
->getById($item->getProductId());
$price = $omproduct->getPrice();
}
$product = [
'productId' => $item->getProductId(),
'productName' => $item->getName(),
'quantity' => $item->getQtyOrdered(),
'initialPrice' => $price,
'offer' => [
'externalId'=>$item->getProductId()
]
];
unset($om);
unset($omproduct);
unset($price);
$items[] = $product;
}
}
$ship = $this->getShippingCode($magentoOrder->getShippingMethod());
$preparedOrder = [
'site' => $magentoOrder->getStore()->getCode(),
'externalId' => $magentoOrder->getRealOrderId(),
'number' => $magentoOrder->getRealOrderId(),
'createdAt' => date('Y-m-d H:i:s'),
'lastName' => $magentoOrder->getCustomerLastname(),
'firstName' => $magentoOrder->getCustomerFirstname(),
'patronymic' => $magentoOrder->getCustomerMiddlename(),
'email' => $magentoOrder->getCustomerEmail(),
'phone' => $addressObj->getTelephone(),
'paymentType' => $this->_config->getValue('retailcrm/Payment/'.$magentoOrder->getPayment()->getMethodInstance()->getCode()),
'status' => $this->_config->getValue('retailcrm/Status/'.$magentoOrder->getStatus()),
'discount' => abs($magentoOrder->getDiscountAmount()),
'items' => $items,
'delivery' => [
'code' => $this->_config->getValue('retailcrm/Shipping/'.$ship),
'cost' => $magentoOrder->getShippingAmount(),
'address' => [
'index' => $addressObj->getData('postcode'),
'city' => $addressObj->getData('city'),
'country' => $addressObj->getData('country_id'),
'street' => $addressObj->getData('street'),
'region' => $addressObj->getData('region'),
'text' => trim(
',',
implode(
',',
[
$addressObj->getData('postcode'),
$addressObj->getData('city'),
$addressObj->getData('street'),
]
)
)
]
]
];
if (trim($preparedOrder['delivery']['code']) == ''){
unset($preparedOrder['delivery']['code']);
}
if (trim($preparedOrder['paymentType']) == ''){
unset($preparedOrder['paymentType']);
}
if (trim($preparedOrder['status']) == ''){
unset($preparedOrder['status']);
}
if ($magentoOrder->getCustomerIsGuest() == 0) {
$preparedOrder['customer']['externalId'] = $magentoOrder->getCustomerId();
}
$this->_logger->writeDump($preparedOrder,'OrderNumber');
return $this->_helper->filterRecursive($preparedOrder);
}
}

View File

@ -9,14 +9,18 @@ Module allows:
* Configure relations between dictionaries of retailCRM and Magento (statuses, payments, delivery types and etc) * Configure relations between dictionaries of retailCRM and Magento (statuses, payments, delivery types and etc)
* Generate [ICML](http://www.retailcrm.ru/docs/Developers/ICML) (Intaro Markup Language) export file for catalog loading by retailCRM * Generate [ICML](http://www.retailcrm.ru/docs/Developers/ICML) (Intaro Markup Language) export file for catalog loading by retailCRM
### ICML ## ICML
By default ICML file is being generated by module every 4 hours. You can find file in the web root folder with name "retailcrm_{{shop_code}}.xml". For example, http://example.org/retailcrm_default.xml By default ICML file is being generated by module every 4 hours. You can find file in the web root folder with name "retailcrm_{{shop_code}}.xml". For example, http://example.org/retailcrm_default.xml
### Manual install ### Manual install
1) Run into your project root directory: 1) Run into your project root directory:
1) Unpack the archive with the module in the directory "app/code/Retailcrm/Retailcrm". In the file "app/etc/config.php" in array `modules` add an element `'Retailcrm_Retailcrm' => 1`
2) Run into your project directory:
```bash ```bash
composer require retailcrm/api-client-php ~5.0 composer require retailcrm/api-client-php ~5.0
``` ```
@ -25,5 +29,4 @@ composer require retailcrm/api-client-php ~5.0
3) Change `app/etc/config.php` file by adding `'Retailcrm_Retailcrm' => 1` line into `modules` array 3) Change `app/etc/config.php` file by adding `'Retailcrm_Retailcrm' => 1` line into `modules` array
This module is compatible with Magento up to version 2.2.3 This module is compatible with Magento up to version 2.2.3

View File

@ -1,5 +1,4 @@
Magento module Magento module
==============
Модуль Magento 2 для интеграции с [retailCRM](http://www.retailcrm.ru). Модуль Magento 2 для интеграции с [retailCRM](http://www.retailcrm.ru).
@ -17,6 +16,19 @@ Magento module
1) Находясь в корневой директории проекта выполните команду: 1) Находясь в корневой директории проекта выполните команду:
* Настроить соответствие справочников RetailCRM и Magento (статусы, оплаты, типы доставки и т.д.)
* Создать [ICML] (http://www.retailcrm.ru/docs/Developers/ICML) (Intaro Markup Language) для загрузки каталога товаров в RetailCRM
## ICML
По умолчанию ICML-файл генерируется модулем каждые 4 часа. Вы можете найти файл в корневой папке с именем «retailcrm_{{shop_code}}.xml". Например, http://retailcrm.ru/retailcrm_default.xml
## Ручная установка
1) Распакуйте архив с модулем в директорию "app/code/Retailcrm/Retailcrm". В файле "app/etc/config.php" в массив `modules` добавьте элемент `'Retailcrm_Retailcrm' => 1`
2) Выполните в папке проекта:
```bash ```bash
composer require retailcrm/api-client-php ~5.0 composer require retailcrm/api-client-php ~5.0
``` ```
@ -28,4 +40,5 @@ composer require retailcrm/api-client-php ~5.0
В конфигурационный файл `composer.json` вашего проекта будет добавлена библиотека [retailcrm/api-client-php](https://github.com/retailcrm/api-client-php), которая будет установлена в директорию `vendor/`. В конфигурационный файл `composer.json` вашего проекта будет добавлена библиотека [retailcrm/api-client-php](https://github.com/retailcrm/api-client-php), которая будет установлена в директорию `vendor/`.
Этот модуль совместим с Magento 2 до версии 2.2.3 Этот модуль совместим с Magento 2 до версии 2.2.3

1
VERSION Normal file
View File

@ -0,0 +1 @@
1.0.0

52
bin/install.sh Normal file
View File

@ -0,0 +1,52 @@
#!/usr/bin/env bash
if [ -z $TRAVIS_BUILD_DIR ]; then
exit 0;
fi
MAGE_ROOT=$TRAVIS_BUILD_DIR/../magento2
create_db() {
mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"
}
magento_clone() {
cd ..
git clone https://github.com/magento/magento2
cd magento2
git checkout $BRANCH
composer install
composer require retailcrm/api-client-php
}
magento_install() {
cd $MAGE_ROOT
php bin/magento setup:install \
--db-host="$DB_HOST" \
--db-name="$DB_NAME" \
--db-user="$DB_USER" \
--admin-firstname="$ADMIN_FIRSTNAME" \
--admin-lastname="$ADMIN_LASTNAME" \
--admin-email="$ADMIN_EMAIL" \
--admin-user="$ADMIN_USER" \
--admin-password="$ADMIN_PASS" \
--language="en_US" \
--currency="USD" \
--timezone="Europe/Moscow"
}
module_install() {
cd $MAGE_ROOT
mkdir -p app/code/Retailcrm/Retailcrm
cp -R $TRAVIS_BUILD_DIR/src/* app/code/Retailcrm/Retailcrm
php bin/magento module:enable Retailcrm_Retailcrm
php bin/magento setup:upgrade
php bin/magento setup:di:compile
}
create_db
magento_clone
magento_install
module_install

9
bin/script.sh Normal file
View File

@ -0,0 +1,9 @@
#!/usr/bin/env bash
if [ -z $TRAVIS_BUILD_DIR ]; then
exit 0;
fi
MAGE_ROOT=$TRAVIS_BUILD_DIR/../magento2
cd $MAGE_ROOT
php vendor/phpunit/phpunit/phpunit -c dev/tests/unit/phpunit.xml.dist app/code/Retailcrm/Retailcrm/Test/Unit

View File

@ -1,97 +0,0 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
<tab id="retailcrm" translate="label" sortOrder="10">
<label>Retailcrm</label>
</tab>
<section id="retailcrm" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
<class>separator-top</class>
<label>Setting</label>
<tab>retailcrm</tab>
<resource>Retailcrm_Retailcrm::retailcrm_configuration</resource>
<group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
<label>General Configuration</label>
<field id="api_url" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
<label>API URL</label>
<comment>https://YourCrmName.retailcrm.ru</comment>
<backend_model>Retailcrm\Retailcrm\Model\Config\Backend\ApiUrl</backend_model>
</field>
<field id="api_key" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
<label>API Key</label>
<comment>To generate an API Key, log in to RetailCRM then select Admin > Integration > API Keys</comment>
</field>
<field id="api_version" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
<label>API Version</label>
<source_model>Retailcrm\Retailcrm\Model\Setting\ApiVersions</source_model>
<backend_model>Retailcrm\Retailcrm\Model\Config\Backend\ApiVersion</backend_model>
</field>
</group>
<group id="Misc" translate="label" type="text" sortOrder="20" showInDefault="2" showInWebsite="0" showInStore="0">
<label>Misc</label>
<field id="attributes_to_export_into_icml" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0">
<label>attributes to export into icml</label>
<comment>attributes to export into icml</comment>
<source_model>Retailcrm\Retailcrm\Model\Setting\Attribute</source_model>
<!--
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field\Attributes</frontend_model>
-->
</field>
</group>
<group id="Shipping" translate="label" type="text" sortOrder="30" showInDefault="3" showInWebsite="0" showInStore="0">
<label>Shipping</label>
<field id="Shipping" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Shipping</label>
<!-- <source_model>Retailcrm\Retailcrm\Model\Setting\Shipping</source_model>
-->
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field\Shipping</frontend_model>
</field>
</group>
<group id="Payment" translate="label comment" type="text" sortOrder="40" showInDefault="4" showInWebsite="0" showInStore="0">
<label>Payment method</label>
<field id="display_text" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Payment</label>
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field\Payment</frontend_model>
<comment>This text will display on the frontend.</comment>
</field>
</group>
<group id="Status" translate="label" type="text" sortOrder="50" showInDefault="5" showInWebsite="0" showInStore="0">
<label>Order Status</label>
<field id="status_text" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Status</label>
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Field\Status</frontend_model>
<comment>This text will display on the frontend.</comment>
</field>
</group>
<group id="Load" translate="label" type="text" sortOrder="60" showInDefault="6" showInWebsite="0" showInStore="0">
<label>Order Load</label>
<field id="number_order" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Order number</label>
<comment>Enter your order number, separated by commas</comment>
</field>
<field id="button_order" translate="label comment" type="button" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Button</frontend_model>
</field>
</group>
</section>
</system>
</config>

View File

@ -1,11 +0,0 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<type name="Magento\Framework\Console\CommandList">
<arguments>
<argument name="commands" xsi:type="array">
<item name="retailcrm_command" xsi:type="object">Retailcrm\Retailcrm\Console\Command\Command</item>
</argument>
</arguments>
</type>
</config>

View File

@ -1,6 +0,0 @@
<?php
\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Retailcrm_Retailcrm',
__DIR__
);

View File

@ -0,0 +1,12 @@
<?php
namespace Retailcrm\Retailcrm\Api;
interface ConfigManagerInterface
{
const URL_PATH = 'retailcrm/general/api_url';
const KEY_PATH = 'retailcrm/general/api_key';
const API_VERSION_PATH = 'retailcrm/general/api_version';
public function getConfigValue($path);
}

View File

@ -0,0 +1,18 @@
<?php
namespace Retailcrm\Retailcrm\ApiClient;
class ApiClientFactory
{
/**
* @param $url
* @param $api_key
* @param null $version
*
* @return \RetailCrm\ApiClient
*/
public function create($url, $api_key, $version = null)
{
return new \RetailCrm\ApiClient($url, $api_key, $version);
}
}

View File

@ -6,18 +6,7 @@ class Button extends \Magento\Config\Block\System\Config\Form\Field
/** /**
* @var string * @var string
*/ */
protected $_template = 'Retailcrm_Retailcrm::system/config/button.phtml'; public $_template = 'Retailcrm_Retailcrm::system/config/button.phtml';
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
array $data = []
) {
parent::__construct($context, $data);
}
/** /**
* Remove scope label * Remove scope label
@ -39,7 +28,7 @@ class Button extends \Magento\Config\Block\System\Config\Form\Field
* *
* @SuppressWarnings(PHPMD.UnusedFormalParameter) * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/ */
protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element) public function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
{ {
return $this->_toHtml(); return $this->_toHtml();
} }

View File

@ -0,0 +1,164 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset;
use Magento\Framework\Data\Form\Element\AbstractElement;
class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
{
/**
* Dummy element
*
* @var \Magento\Framework\DataObject
*/
protected $_dummyElement;
/**
* Field renderer
*
* @var \Magento\Config\Block\System\Config\Form\Field
*/
protected $_fieldRenderer;
private $paymentConfig;
private $client;
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\View\Helper\Js $jsHelper,
\Magento\Payment\Model\Config $paymentConfig,
\Retailcrm\Retailcrm\Helper\Proxy $client,
array $data = []
) {
$this->paymentConfig = $paymentConfig;
$this->client = $client;
parent::__construct($context, $authSession, $jsHelper, $data);
}
/**
* Get field renderer
*
* @return \Magento\Config\Block\System\Config\Form\Field
*/
protected function _getFieldRenderer()
{
if (empty($this->_fieldRenderer)) {
$this->_fieldRenderer = $this->getLayout()->getBlockSingleton(
\Magento\Config\Block\System\Config\Form\Field::class
);
}
return $this->_fieldRenderer;
}
/**
* Get dummy element
*
* @return \Magento\Framework\DataObject
*/
protected function _getDummyElement()
{
if (empty($this->_dummyElement)) {
$this->_dummyElement = new \Magento\Framework\DataObject(['showInDefault' => 1, 'showInWebsite' => 1]);
}
return $this->_dummyElement;
}
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$html .= $this->_getHeaderHtml($element);
if ($this->client->isConfigured()) {
$paymentMethods = $this->paymentConfig->getActiveMethods();
foreach ($paymentMethods as $code => $payment) {
$html .= $this->_getFieldHtml($element, $payment);
}
} else {
$html .= $htmlError;
}
$html .= $this->_getFooterHtml($element);
return $html;
}
/**
* Get options values
*
* @return array
*/
private function getValues()
{
$defaultValues = [
[
'value' => '',
'label' => ''
]
];
$values = [];
$response = $this->client->paymentTypesList();
if ($response === false) {
return $defaultValues;
}
if ($response->isSuccessful()) {
$paymentsTypes = $response['paymentTypes'];
} else {
return $defaultValues;
}
foreach ($paymentsTypes as $paymentType) {
$values[] = [
'label' => $paymentType['name'],
'value' => $paymentType['code']
];
}
return $values;
}
/**
* Get field html
*
* @param \Magento\Framework\Data\Form\Element\AbstractElement $fieldset
* @param \Magento\Payment\Model\Method\AbstractMethod $payment
*
* @return string
*/
protected function _getFieldHtml($fieldset, $payment)
{
$configData = $this->getConfigData();
$path = 'retailcrm/' . $fieldset->getId() . '/' . $payment->getCode();
$data = isset($configData[$path]) ? $configData[$path] : [];
$e = $this->_getDummyElement();
$field = $fieldset->addField(
$payment->getCode(),
'select',
[
'name' => 'groups[' . $fieldset->getId() . '][fields][' . $payment->getCode() . '][value]',
'label' => $payment->getTitle(),
'value' => isset($data) ? $data : '',
'values' => $this->getValues(),
'inherit' => true,
'can_use_default_value' => $this->getForm()->canUseDefaultValue($e),
'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e)
]
)->setRenderer(
$this->_getFieldRenderer()
);
return $field->toHtml();
}
}

View File

@ -0,0 +1,170 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset;
use Magento\Framework\Data\Form\Element\AbstractElement;
class Shipping extends \Magento\Config\Block\System\Config\Form\Fieldset
{
/**
* Dummy element
*
* @var \Magento\Framework\DataObject
*/
protected $_dummyElement;
/**
* Field renderer
*
* @var \Magento\Config\Block\System\Config\Form\Field
*/
protected $_fieldRenderer;
private $shippingConfig;
private $client;
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\View\Helper\Js $jsHelper,
\Magento\Shipping\Model\Config $shippingConfig,
\Retailcrm\Retailcrm\Helper\Proxy $client,
array $data = []
) {
$this->shippingConfig = $shippingConfig;
$this->client = $client;
parent::__construct($context, $authSession, $jsHelper, $data);
}
/**
* Get field renderer
*
* @return \Magento\Config\Block\System\Config\Form\Field
*/
protected function _getFieldRenderer()
{
if (empty($this->_fieldRenderer)) {
$this->_fieldRenderer = $this->getLayout()->getBlockSingleton(
\Magento\Config\Block\System\Config\Form\Field::class
);
}
return $this->_fieldRenderer;
}
/**
* Get dummy element
*
* @return \Magento\Framework\DataObject
*/
protected function _getDummyElement()
{
if (empty($this->_dummyElement)) {
$this->_dummyElement = new \Magento\Framework\DataObject(['showInDefault' => 1, 'showInWebsite' => 1]);
}
return $this->_dummyElement;
}
/**
* Render element
*
* @param AbstractElement $element
* @return string
*/
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$html .= $this->_getHeaderHtml($element);
if ($this->client->isConfigured()) {
$deliveryMethods = $this->shippingConfig->getActiveCarriers();
foreach ($deliveryMethods as $code => $delivery) {
$html .= $this->_getFieldHtml($element, $delivery);
}
} else {
$html .= $htmlError;
}
$html .= $this->_getFooterHtml($element);
return $html;
}
/**
* Get options values
*
* @return array
*/
private function getValues()
{
$defaultValues = [
[
'value' => '',
'label' => ''
]
];
$values = [];
$response = $this->client->deliveryTypesList();
if ($response === false) {
return $defaultValues;
}
if ($response->isSuccessful()) {
$deliveryTypes = $response['deliveryTypes'];
} else {
return $defaultValues;
}
foreach ($deliveryTypes as $deliveryType) {
$values[] = [
'label' => $deliveryType['name'],
'value' => $deliveryType['code']
];
}
return $values;
}
/**
* Get field html
*
* @param \Magento\Framework\Data\Form\Element\AbstractElement $fieldset
* @param \Magento\Shipping\Model\Carrier\AbstractCarrier $shipping
*
* @return string
*/
protected function _getFieldHtml($fieldset, $shipping)
{
$configData = $this->getConfigData();
$path = 'retailcrm/' . $fieldset->getId() . '/' . $shipping->getCarrierCode();
$data = isset($configData[$path]) ? $configData[$path] : [];
$e = $this->_getDummyElement();
$field = $fieldset->addField(
$shipping->getCarrierCode(),
'select',
[
'name' => 'groups[' . $fieldset->getId() . '][fields][' . $shipping->getCarrierCode() . '][value]',
'label' => $shipping->getConfigData('title'),
'value' => isset($data) ? $data : '',
'values' => $this->getValues(),
'inherit' => true,
'can_use_default_value' => $this->getForm()->canUseDefaultValue($e),
'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e)
]
)->setRenderer(
$this->_getFieldRenderer()
);
return $field->toHtml();
}
}

View File

@ -0,0 +1,161 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset;
use Magento\Framework\Data\Form\Element\AbstractElement;
class Site extends \Magento\Config\Block\System\Config\Form\Fieldset
{
/**
* Dummy element
*
* @var \Magento\Framework\DataObject
*/
protected $_dummyElement;
/**
* Field renderer
*
* @var \Magento\Config\Block\System\Config\Form\Field
*/
protected $_fieldRenderer;
private $client;
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\View\Helper\Js $jsHelper,
\Retailcrm\Retailcrm\Helper\Proxy $client,
array $data = []
) {
$this->client = $client;
parent::__construct($context, $authSession, $jsHelper, $data);
}
/**
* Get field renderer
*
* @return \Magento\Config\Block\System\Config\Form\Field
*/
protected function _getFieldRenderer()
{
if (empty($this->_fieldRenderer)) {
$this->_fieldRenderer = $this->getLayout()->getBlockSingleton(
\Magento\Config\Block\System\Config\Form\Field::class
);
}
return $this->_fieldRenderer;
}
/**
* Get dummy element
*
* @return \Magento\Framework\DataObject
*/
protected function _getDummyElement()
{
if (empty($this->_dummyElement)) {
$this->_dummyElement = new \Magento\Framework\DataObject(['showInDefault' => 1, 'showInWebsite' => 0]);
}
return $this->_dummyElement;
}
/**
* Render element
*
* @param AbstractElement $element
* @return string
*/
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$html .= $this->_getHeaderHtml($element);
if ($this->client->isConfigured()) {
$html .= $this->_getFieldHtml($element);
} else {
$html .= $htmlError;
}
$html .= $this->_getFooterHtml($element);
return $html;
}
/**
* Get options values
*
* @return array
*/
private function getValues()
{
$defaultValues = [
[
'value' => '',
'label' => ''
]
];
$values = [];
$response = $this->client->sitesList();
if ($response === false) {
return $defaultValues;
}
if ($response->isSuccessful()) {
$sites = $response['sites'];
} else {
return $defaultValues;
}
foreach ($sites as $site) {
$values[] = [
'label' => $site['name'],
'value' => $site['code']
];
}
return $values;
}
/**
* Get field html
*
* @param \Magento\Framework\Data\Form\Element\AbstractElement $fieldset
* @param \Magento\Shipping\Model\Carrier\AbstractCarrier $shipping
*
* @return string
*/
protected function _getFieldHtml($fieldset)
{
$configData = $this->getConfigData();
$path = 'retailcrm/' . $fieldset->getId() . '/default';
$data = isset($configData[$path]) ? $configData[$path] : [];
$e = $this->_getDummyElement();
$field = $fieldset->addField(
'default',
'select',
[
'name' => 'groups[' . $fieldset->getId() . '][fields][default][value]',
'label' => 'Default site',
'value' => isset($data) ? $data : '',
'values' => $this->getValues(),
'inherit' => isset($data['inherit']) ? $data['inherit'] : '',
'can_use_default_value' => $this->getForm()->canUseDefaultValue($e),
'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e)
]
)->setRenderer(
$this->_getFieldRenderer()
);
return $field->toHtml();
}
}

View File

@ -0,0 +1,168 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset;
use Magento\Framework\Data\Form\Element\AbstractElement;
class Sites extends \Magento\Config\Block\System\Config\Form\Fieldset
{
/**
* Dummy element
*
* @var \Magento\Framework\DataObject
*/
protected $_dummyElement;
/**
* Field renderer
*
* @var \Magento\Config\Block\System\Config\Form\Field
*/
protected $_fieldRenderer;
private $storeManager;
private $client;
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\View\Helper\Js $jsHelper,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Retailcrm\Retailcrm\Helper\Proxy $client,
array $data = []
) {
$this->storeManager = $storeManager;
$this->client = $client;
parent::__construct($context, $authSession, $jsHelper, $data);
}
/**
* Get field renderer
*
* @return \Magento\Config\Block\System\Config\Form\Field
*/
protected function _getFieldRenderer()
{
if (empty($this->_fieldRenderer)) {
$this->_fieldRenderer = $this->getLayout()->getBlockSingleton(
\Magento\Config\Block\System\Config\Form\Field::class
);
}
return $this->_fieldRenderer;
}
/**
* Get dummy element
*
* @return \Magento\Framework\DataObject
*/
protected function _getDummyElement()
{
if (empty($this->_dummyElement)) {
$this->_dummyElement = new \Magento\Framework\DataObject(['showInDefault' => 1, 'showInWebsite' => 0]);
}
return $this->_dummyElement;
}
/**
* Render element
*
* @param AbstractElement $element
* @return string
*/
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$html .= $this->_getHeaderHtml($element);
if ($this->client->isConfigured()) {
$website = $this->storeManager->getWebsite($this->getRequest()->getParam('website', 0));
foreach ($website->getStores() as $store) {
$html .= $this->_getFieldHtml($element, $store);
}
} else {
$html .= $htmlError;
}
$html .= $this->_getFooterHtml($element);
return $html;
}
/**
* Get options values
*
* @return array
*/
private function getValues()
{
$defaultValues = [
[
'value' => '',
'label' => ''
]
];
$values = [];
$response = $this->client->sitesList();
if ($response === false) {
return $defaultValues;
}
if ($response->isSuccessful()) {
$sites = $response['sites'];
} else {
return $defaultValues;
}
foreach ($sites as $site) {
$values[] = [
'label' => $site['name'],
'value' => $site['code']
];
}
return $values;
}
/**
* Get field html
*
* @param \Magento\Framework\Data\Form\Element\AbstractElement $fieldset
* @param \Magento\Shipping\Model\Carrier\AbstractCarrier $shipping
*
* @return string
*/
protected function _getFieldHtml($fieldset, $store)
{
$configData = $this->getConfigData();
$path = 'retailcrm/' . $fieldset->getId() . '/' . $store->getCode();
$data = isset($configData[$path]) ? $configData[$path] : [];
$e = $this->_getDummyElement();
$field = $fieldset->addField(
$store->getCode(),
'select',
[
'name' => 'groups[' . $fieldset->getId() . '][fields][' . $store->getCode() . '][value]',
'label' => $store->getName(),
'value' => isset($data) ? $data : '',
'values' => $this->getValues(),
'inherit' => isset($data['inherit']) ? $data['inherit'] : '',
'can_use_default_value' => $this->getForm()->canUseDefaultValue($e),
'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e)
]
)->setRenderer(
$this->_getFieldRenderer()
);
return $field->toHtml();
}
}

View File

@ -0,0 +1,164 @@
<?php
namespace Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset;
use Magento\Framework\Data\Form\Element\AbstractElement;
class Status extends \Magento\Config\Block\System\Config\Form\Fieldset
{
/**
* Dummy element
*
* @var \Magento\Framework\DataObject
*/
protected $_dummyElement;
/**
* Field renderer
*
* @var \Magento\Config\Block\System\Config\Form\Field
*/
protected $_fieldRenderer;
private $statusCollection;
private $client;
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\View\Helper\Js $jsHelper,
\Magento\Sales\Model\ResourceModel\Order\Status\Collection $statusCollection,
\Retailcrm\Retailcrm\Helper\Proxy $client,
array $data = []
) {
$this->statusCollection = $statusCollection;
$this->client = $client;
parent::__construct($context, $authSession, $jsHelper, $data);
}
/**
* Get field renderer
*
* @return \Magento\Config\Block\System\Config\Form\Field
*/
protected function _getFieldRenderer()
{
if (empty($this->_fieldRenderer)) {
$this->_fieldRenderer = $this->getLayout()->getBlockSingleton(
\Magento\Config\Block\System\Config\Form\Field::class
);
}
return $this->_fieldRenderer;
}
/**
* Get dummy element
*
* @return \Magento\Framework\DataObject
*/
protected function _getDummyElement()
{
if (empty($this->_dummyElement)) {
$this->_dummyElement = new \Magento\Framework\DataObject(['showInDefault' => 1, 'showInWebsite' => 1]);
}
return $this->_dummyElement;
}
public function render(AbstractElement $element)
{
$html = '';
$htmlError = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$html .= $this->_getHeaderHtml($element);
if ($this->client->isConfigured()) {
$statuses = $this->statusCollection->toOptionArray();;
foreach ($statuses as $code => $status) {
$html .= $this->_getFieldHtml($element, $status);
}
} else {
$html .= $htmlError;
}
$html .= $this->_getFooterHtml($element);
return $html;
}
/**
* Get options values
*
* @return array
*/
private function getValues()
{
$defaultValues = [
[
'value' => '',
'label' => ''
]
];
$values = [];
$response = $this->client->statusesList();
if ($response === false) {
return $defaultValues;
}
if ($response->isSuccessful()) {
$statuses = $response['statuses'];
} else {
return $defaultValues;
}
foreach ($statuses as $status) {
$values[] = [
'label' => $status['name'],
'value' => $status['code']
];
}
return $values;
}
/**
* Get field html
*
* @param \Magento\Framework\Data\Form\Element\AbstractElement $fieldset
* @param array $status
*
* @return string
*/
protected function _getFieldHtml($fieldset, $status)
{
$configData = $this->getConfigData();
$path = 'retailcrm/' . $fieldset->getId() . '/' . $status['value'];
$data = isset($configData[$path]) ? $configData[$path] : [];
$e = $this->_getDummyElement();
$field = $fieldset->addField(
$status['value'],
'select',
[
'name' => 'groups[' . $fieldset->getId() . '][fields][' . $status['value'] . '][value]',
'label' => $status['label'],
'value' => isset($data) ? $data : '',
'values' => $this->getValues(),
'inherit' => true,
'can_use_default_value' => $this->getForm()->canUseDefaultValue($e),
'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e)
]
)->setRenderer(
$this->_getFieldRenderer()
);
return $field->toHtml();
}
}

11
src/Block/Display.php Normal file
View File

@ -0,0 +1,11 @@
<?php
namespace Retailcrm\Retailcrm\Block;
class Display extends \Magento\Framework\View\Element\Template
{
public function sayHello()
{
return __('Hello World');
}
}

View File

@ -7,7 +7,8 @@ class Button extends \Magento\Backend\App\Action
/** /**
* @var \Psr\Log\LoggerInterface * @var \Psr\Log\LoggerInterface
*/ */
protected $_logger; private $logger;
private $order;
/** /**
* @param \Magento\Backend\App\Action\Context $context * @param \Magento\Backend\App\Action\Context $context
@ -15,16 +16,16 @@ class Button extends \Magento\Backend\App\Action
*/ */
public function __construct( public function __construct(
\Magento\Backend\App\Action\Context $context, \Magento\Backend\App\Action\Context $context,
\Psr\Log\LoggerInterface $logger \Psr\Log\LoggerInterface $logger,
\Retailcrm\Retailcrm\Model\Order\OrderNumber $order
) { ) {
$this->_logger = $logger; $this->order = $order;
$this->logger = $logger;
parent::__construct($context); parent::__construct($context);
} }
public function execute() public function execute()
{ {
$order = new \Retailcrm\Retailcrm\Model\Order\OrderNumber(); $this->order->exportOrderNumber();
$order->ExportOrderNumber();
} }
} }

View File

@ -4,18 +4,18 @@ namespace Retailcrm\Retailcrm\Controller\Index;
class Display extends \Magento\Framework\App\Action\Action class Display extends \Magento\Framework\App\Action\Action
{ {
protected $_pageFactory; private $pageFactory;
public function __construct( public function __construct(
\Magento\Framework\App\Action\Context $context, \Magento\Framework\App\Action\Context $context,
\Magento\Framework\View\Result\PageFactory $pageFactory \Magento\Framework\View\Result\PageFactory $pageFactory
) { ) {
$this->_pageFactory = $pageFactory; $this->pageFactory = $pageFactory;
return parent::__construct($context); parent::__construct($context);
} }
public function execute() public function execute()
{ {
return $this->_pageFactory->create(); return $this->pageFactory->create();
} }
} }

22
src/Cron/Icml.php Normal file
View File

@ -0,0 +1,22 @@
<?php
namespace Retailcrm\Retailcrm\Cron;
class Icml
{
private $logger;
private $icml;
public function __construct(
\Retailcrm\Retailcrm\Model\Logger\Logger $logger,
\Retailcrm\Retailcrm\Model\Icml\Icml $icml
) {
$this->logger = $logger;
$this->icml = $icml;
}
public function execute()
{
$this->icml->generate();
}
}

23
src/Cron/OrderHistory.php Normal file
View File

@ -0,0 +1,23 @@
<?php
namespace Retailcrm\Retailcrm\Cron;
class OrderHistory
{
private $logger;
private $history;
public function __construct(
\Retailcrm\Retailcrm\Model\Logger\Logger $logger,
\Retailcrm\Retailcrm\Model\History\Exchange $history
) {
$this->logger = $logger;
$this->history = $history;
}
public function execute()
{
$this->history->ordersHistory();
$this->logger->writeRow('Cron Works: OrderHistory');
}
}

120
src/Helper/Data.php Normal file
View File

@ -0,0 +1,120 @@
<?php
namespace Retailcrm\Retailcrm\Helper;
use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\App\Helper\Context;
use Magento\Store\Model\ScopeInterface;
class Data extends AbstractHelper
{
private $storeManager;
const XML_PATH_RETAILCRM = 'retailcrm/';
const XML_PATH_DEFAULT_SITE = 'retailcrm_site/default';
const XML_PATH_SITES = 'retailcrm_sites/';
public function __construct(
Context $context,
StoreManagerInterface $storeManager
) {
$this->storeManager = $storeManager;
parent::__construct($context);
}
public function getConfigValue($field, $storeId = null)
{
return $this->scopeConfig->getValue(
$field,
ScopeInterface::SCOPE_STORE,
$storeId
);
}
public function getGeneralConfig($code, $storeId = null)
{
return $this->getConfigValue(self::XML_PATH_RETAILCRM . $code, $storeId);
}
/**
* Get site code
*
* @param $store
*
* @return mixed|null
*/
public function getSite($store)
{
if (is_int($store)) {
$store = $this->storeManager->getStore($store);
}
$websitesConfig = $this->scopeConfig->getValue(
self::XML_PATH_RETAILCRM . self::XML_PATH_SITES . $store->getCode(),
ScopeInterface::SCOPE_WEBSITES
);
if (!$websitesConfig) {
$defaultSite = $this->scopeConfig->getValue(self::XML_PATH_RETAILCRM . self::XML_PATH_DEFAULT_SITE);
if (!$defaultSite) {
return null;
}
return $defaultSite;
}
return $websitesConfig;
}
public function getMappingSites()
{
$sites = [];
$websites = $this->storeManager->getWebsites();
foreach ($websites as $website) {
foreach ($website->getStores() as $store) {
$site = $this->scopeConfig->getValue(
self::XML_PATH_RETAILCRM . self::XML_PATH_SITES . $store->getCode(),
ScopeInterface::SCOPE_WEBSITES,
$website->getId()
);
$sites[$site] = $store->getId();
}
}
return $sites;
}
/**
* Recursive array filter
*
* @param array $haystack input array
*
* @SuppressWarnings(PHPMD.StaticAccess)
* @SuppressWarnings(PHPMD.ElseExpression)
*
* @return array
*/
public static function filterRecursive($haystack)
{
foreach ($haystack as $key => $value) {
if (is_array($value)) {
$haystack[$key] = self::filterRecursive($haystack[$key]);
}
if ($haystack[$key] === null
|| $haystack[$key] === ''
|| (is_array($haystack[$key]) && empty($haystack[$key]))
) {
unset($haystack[$key]);
} elseif (!is_array($value)) {
$haystack[$key] = trim($value);
}
}
return $haystack;
}
}

176
src/Helper/Proxy.php Normal file
View File

@ -0,0 +1,176 @@
<?php
namespace Retailcrm\Retailcrm\Helper;
use Retailcrm\Retailcrm\Model\Logger\Logger;
use Retailcrm\Retailcrm\Model\Service\ConfigManager;
use Retailcrm\Retailcrm\ApiClient\ApiClientFactory;
class Proxy
{
private $logger;
private $apiClient;
private $url;
private $apiKey;
private $version;
private $apiClientFactory;
private $errorAccount = 'Account does not exist.';
private $errorNotFound = 'Not found';
private $errorApiKey = 'Wrong "apiKey" value.';
/**
* Proxy constructor.
* @param string $pathUrl
* @param string $pathKey
* @param string $pathVersion
* @param ConfigManager $config
* @param Logger $logger
* @param ApiClientFactory $apiClientFactory
*/
public function __construct(
$pathUrl,
$pathKey,
$pathVersion,
ConfigManager $config,
Logger $logger,
ApiClientFactory $apiClientFactory
) {
$this->logger = $logger;
$this->url = $config->getConfigValue($pathUrl);
$this->apiKey = $config->getConfigValue($pathKey);
$this->version = $config->getConfigValue($pathVersion);
$this->apiClientFactory = $apiClientFactory;
if ($this->isConfigured()) {
$this->init();
}
}
public function __call($method, $arguments)
{
try {
$response = call_user_func_array([$this->apiClient->request, $method], $arguments);
if (!$response->isSuccessful()) {
$this->logger->writeRow(
sprintf(
"[HTTP status %s] %s - %s",
$response->getStatusCode(),
$method,
$response->getErrorMsg()
)
);
if (isset($response['errors'])) {
$this->logger->writeRow(implode(' :: ', $response['errors']));
}
}
} catch (\RetailCrm\Exception\CurlException $exception) {
$this->logger->writeRow($exception->getMessage());
return false;
} catch (\RetailCrm\Exception\InvalidJsonException $exception) {
$this->logger->writeRow($exception->getMessage());
return false;
} catch (\InvalidArgumentException $exception) {
$this->logger->writeRow($exception->getMessage());
}
return $response;
}
/**
* Init retailcrm api client
*/
public function init()
{
$this->apiClient = $this->apiClientFactory->create(
$this->url,
$this->apiKey,
$this->version
);
}
/**
* @param $url
*/
public function setUrl($url)
{
$this->url = $url;
}
/**
* @param $apiKey
*/
public function setApiKey($apiKey)
{
$this->apiKey = $apiKey;
}
/**
* @param $version
*/
public function setVersion($version)
{
$this->version = $version;
}
/**
* @return bool
*/
public function isConfigured()
{
return $this->url && $this->apiKey;
}
/**
* Get API version
*
* @return string
*/
public function getVersion()
{
if (!is_object($this->apiClient)) {
return false;
}
return $this->apiClient->getVersion();
}
/**
* Set site code
*
* @param $site
*/
public function setSite($site)
{
if ($this->isConfigured()) {
$this->apiClient->request->setSite($site);
}
}
/**
* Get site code
*
* @return null | mixed
*/
public function getSite()
{
if ($this->isConfigured()) {
return $this->apiClient->request->getSite();
}
return null;
}
/**
* Get error text message
*
* @param string $property
*
* @return string
*/
public function getErrorText($property)
{
return $this->{$property};
}
}

View File

@ -6,15 +6,17 @@ use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class ApiUrl extends \Magento\Framework\App\Config\Value class ApiUrl extends \Magento\Framework\App\Config\Value
{ {
private $api;
/** /**
* ApiUrl constructor.
* @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry * @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection * @param ApiClient $api
* @param string $runModelPath
* @param array $data * @param array $data
*/ */
public function __construct( public function __construct(
@ -22,51 +24,45 @@ class ApiUrl extends \Magento\Framework\App\Config\Value
\Magento\Framework\Registry $registry, \Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config, \Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList, \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
ApiClient $api,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = [] array $data = []
) { ) {
$this->api = $api;
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data); parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
} }
/** /**
* Call before save api url * Call before save api url
* *
* @throws \Magento\Framework\Exception\ValidatorException
*
* @return void * @return void
*/ */
public function beforeSave() public function beforeSave()
{ {
$apiUrl = $this->getValue(); $this->setParams([
$apiKey = $this->getFieldsetDataValue('api_key'); 'url' => $this->getValue(),
$apiVersion = $this->getFieldsetDataValue('api_version'); 'apiKey' => $this->getFieldsetDataValue('api_key'),
'version' => $this->getFieldsetDataValue('api_version')
]);
if (!$this->isUrl($apiUrl)) { if (!$this->isUrl($this->getValue())) {
throw new \Magento\Framework\Exception\ValidatorException(__('Invalid CRM url')); throw new \Magento\Framework\Exception\ValidatorException(__('Invalid CRM url'));
} }
if (!$this->isHttps($apiUrl)) { if (!$this->isHttps($this->getValue())) {
$this->schemeEdit($apiUrl); $this->schemeEdit($this->getValue());
} }
$api = new ApiClient($apiUrl, $apiKey, $apiVersion); if ($this->validateApiUrl($this->api)) {
$this->setValue($this->getValue());
if ($this->validateApiUrl($api)) {
$this->setValue($apiUrl);
} }
parent::beforeSave(); parent::beforeSave();
} }
/**
* Call after save api url
*
* @return void
*/
public function afterSave()
{
return parent::afterSave();
}
/** /**
* Validate selected api url * Validate selected api url
* *
@ -77,7 +73,7 @@ class ApiUrl extends \Magento\Framework\App\Config\Value
* *
* @return boolean * @return boolean
*/ */
protected function validateApiUrl(ApiClient $api) private function validateApiUrl(ApiClient $api)
{ {
$response = $api->availableVersions(); $response = $api->availableVersions();
@ -99,7 +95,7 @@ class ApiUrl extends \Magento\Framework\App\Config\Value
* *
* @return boolean * @return boolean
*/ */
protected function isHttps($url) private function isHttps($url)
{ {
$url_array = parse_url($url); $url_array = parse_url($url);
@ -117,7 +113,7 @@ class ApiUrl extends \Magento\Framework\App\Config\Value
* *
* @return string * @return string
*/ */
protected function schemeEdit(&$url) private function schemeEdit(&$url)
{ {
$url_array = parse_url($url); $url_array = parse_url($url);
@ -135,4 +131,15 @@ class ApiUrl extends \Magento\Framework\App\Config\Value
{ {
return preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', $url); return preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', $url);
} }
/**
* @param array $data
*/
private function setParams(array $data)
{
$this->api->setUrl($data['url']);
$this->api->setApiKey($data['apiKey']);
$this->api->setVersion($data['version']);
$this->api->init();
}
} }

View File

@ -6,15 +6,17 @@ use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class ApiVersion extends \Magento\Framework\App\Config\Value class ApiVersion extends \Magento\Framework\App\Config\Value
{ {
private $api;
/** /**
* ApiVersion constructor.
* @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry * @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection * @param ApiClient $api
* @param string $runModelPath
* @param array $data * @param array $data
*/ */
public function __construct( public function __construct(
@ -22,10 +24,12 @@ class ApiVersion extends \Magento\Framework\App\Config\Value
\Magento\Framework\Registry $registry, \Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config, \Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList, \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
ApiClient $api,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = [] array $data = []
) { ) {
$this->api = $api;
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data); parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
} }
@ -36,27 +40,17 @@ class ApiVersion extends \Magento\Framework\App\Config\Value
*/ */
public function beforeSave() public function beforeSave()
{ {
$apiUrl = $this->getFieldsetDataValue('api_url'); $this->setParams([
$apiKey = $this->getFieldsetDataValue('api_key'); 'url' => $this->getFieldsetDataValue('api_url'),
$apiVersion = $this->getValue(); 'apiKey' => $this->getFieldsetDataValue('api_key'),
'version' => $this->getValue()
]);
$api = new ApiClient($apiUrl, $apiKey, $apiVersion); $this->validateApiVersion($this->api, $this->getValue());
$this->validateApiVersion($api, $apiVersion);
parent::beforeSave(); parent::beforeSave();
} }
/**
* Call after save api version
*
* @return void
*/
public function afterSave()
{
return parent::afterSave();
}
/** /**
* Validate selected api version * Validate selected api version
* *
@ -67,7 +61,7 @@ class ApiVersion extends \Magento\Framework\App\Config\Value
* *
* @return void * @return void
*/ */
protected function validateApiVersion(ApiClient $api, $apiVersion) private function validateApiVersion(ApiClient $api, $apiVersion)
{ {
$apiVersions = [ $apiVersions = [
'v4' => '4.0', 'v4' => '4.0',
@ -90,4 +84,15 @@ class ApiVersion extends \Magento\Framework\App\Config\Value
} }
} }
} }
/**
* @param array $data
*/
private function setParams(array $data)
{
$this->api->setUrl($data['url']);
$this->api->setApiKey($data['apiKey']);
$this->api->setVersion($data['version']);
$this->api->init();
}
} }

View File

@ -2,77 +2,71 @@
namespace Retailcrm\Retailcrm\Model\History; namespace Retailcrm\Retailcrm\Model\History;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
class Exchange class Exchange
{ {
protected $_api; private $api;
protected $_config; private $config;
protected $_helper; private $helper;
protected $_logger; private $logger;
protected $_resourceConfig; private $resourceConfig;
protected $_customerFactory; private $customerFactory;
protected $_quote; private $quote;
protected $_customerRepository; private $customerRepository;
protected $_product; private $product;
protected $_shipconfig; private $shipconfig;
protected $_quoteManagement; private $quoteManagement;
protected $_registry; private $registry;
protected $_cacheTypeList; private $cacheTypeList;
protected $_order; private $order;
protected $_orderManagement; private $orderManagement;
//protected $_transaction; private $eventManager;
//protected $_invoiceService; private $objectManager;
protected $_eventManager; private $orderInterface;
protected $_objectManager; private $storeManager;
private $regionFactory;
public function __construct() public function __construct(
{ \Magento\Framework\App\ObjectManager $objectManager,
$objectManager = \Magento\Framework\App\ObjectManager::getInstance(); \Retailcrm\Retailcrm\Helper\Data $helper,
$helper = $objectManager->get('\Retailcrm\Retailcrm\Helper\Data'); \Magento\Framework\App\Config\ScopeConfigInterface $config,
$config = $objectManager->get('\Magento\Framework\App\Config\ScopeConfigInterface'); \Magento\Config\Model\ResourceModel\Config $resourceConfig,
$resourceConfig = $objectManager->get('Magento\Config\Model\ResourceModel\Config'); \Magento\Customer\Model\CustomerFactory $customerFactory,
$customerFactory = $objectManager->get('\Magento\Customer\Model\CustomerFactory'); \Magento\Quote\Model\QuoteFactory $quote,
$quote = $objectManager->get('\Magento\Quote\Model\QuoteFactory'); \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
$customerRepository = $objectManager->get('\Magento\Customer\Api\CustomerRepositoryInterface'); \Magento\Catalog\Model\Product $product,
$product = $objectManager->get('\Magento\Catalog\Model\Product'); \Magento\Shipping\Model\Config $shipconfig,
$shipconfig = $objectManager->get('\Magento\Shipping\Model\Config'); \Magento\Quote\Model\QuoteManagement $quoteManagement,
$quoteManagement = $objectManager->get('\Magento\Quote\Model\QuoteManagement'); \Magento\Framework\Registry $registry,
$registry = $objectManager->get('\Magento\Framework\Registry'); \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
$cacheTypeList = $objectManager->get('\Magento\Framework\App\Cache\TypeListInterface'); \Magento\Sales\Api\Data\OrderInterface $orderInterface,
$order = $objectManager->get('\Magento\Sales\Api\Data\OrderInterface'); \Magento\Sales\Api\OrderManagementInterface $orderManagement,
$orderManagement = $objectManager->get('\Magento\Sales\Api\OrderManagementInterface'); \Magento\Framework\Event\Manager $eventManager,
//$invoiceService = $objectManager->get('\Magento\Sales\Model\Service\InvoiceService'); \Retailcrm\Retailcrm\Model\Logger\Logger $logger,
//$transaction = $objectManager->get('\Magento\Framework\DB\Transaction'); \Magento\Sales\Model\Order $order,
$eventManager = $objectManager->get('\Magento\Framework\Event\Manager'); \Magento\Store\Model\StoreManagerInterface $storeManager,
$logger = new \Retailcrm\Retailcrm\Model\Logger\Logger($objectManager); \Magento\Directory\Model\RegionFactory $regionFactory,
\Retailcrm\Retailcrm\Helper\Proxy $api
$this->_shipconfig = $shipconfig; ) {
$this->_logger = $logger; $this->shipconfig = $shipconfig;
$this->_helper = $helper; $this->logger = $logger;
$this->_config = $config; $this->helper = $helper;
$this->_resourceConfig = $resourceConfig; $this->config = $config;
$this->_customerFactory = $customerFactory; $this->resourceConfig = $resourceConfig;
$this->_quote = $quote; $this->customerFactory = $customerFactory;
$this->_customerRepository = $customerRepository; $this->quote = $quote;
$this->_product = $product; $this->customerRepository = $customerRepository;
$this->_quoteManagement = $quoteManagement; $this->product = $product;
$this->_registry = $registry; $this->quoteManagement = $quoteManagement;
$this->_cacheTypeList = $cacheTypeList; $this->registry = $registry;
$this->_order = $order; $this->cacheTypeList = $cacheTypeList;
$this->_orderManagement = $orderManagement; $this->orderInterface = $orderInterface;
//$this->_transaction = $transaction; $this->orderManagement = $orderManagement;
//$this->_invoiceService = $invoiceService; $this->eventManager = $eventManager;
$this->_eventManager = $eventManager; $this->objectManager = $objectManager;
$this->_objectManager = $objectManager; $this->order = $order;
$this->storeManager = $storeManager;
$url = $config->getValue('retailcrm/general/api_url'); $this->regionFactory = $regionFactory;
$key = $config->getValue('retailcrm/general/api_key'); $this->api = $api;
$version = $config->getValue('retailcrm/general/api_version');
if (!empty($url) && !empty($key)) {
$this->_api = new ApiClient($url, $key, $version);
}
} }
/** /**
@ -82,22 +76,26 @@ class Exchange
*/ */
public function ordersHistory() public function ordersHistory()
{ {
$this->_registry->register('RETAILCRM_HISTORY', true); if (!$this->api->isConfigured()) {
return false;
}
$this->registry->register('RETAILCRM_HISTORY', true);
$historyFilter = []; $historyFilter = [];
$historyOrder = []; $historyOrder = [];
$historyStart = $this->_config->getValue('retailcrm/general/filter_history'); $historyStart = $this->config->getValue('retailcrm/general/filter_history');
if ($historyStart && $historyStart > 0) { if ($historyStart && $historyStart > 0) {
$historyFilter['sinceId'] = $historyStart; $historyFilter['sinceId'] = $historyStart;
} }
while (true) { while (true) {
$response = $this->_api->ordersHistory($historyFilter); $response = $this->api->ordersHistory($historyFilter);
if ($response === false) { if ($response === false) {
return; return false;
} }
if (!$response->isSuccessful()) { if (!$response->isSuccessful()) {
@ -106,7 +104,7 @@ class Exchange
$orderH = isset($response['history']) ? $response['history'] : []; $orderH = isset($response['history']) ? $response['history'] : [];
if (count($orderH) == 0) { if (empty($orderH)) {
return true; return true;
} }
@ -115,20 +113,25 @@ class Exchange
$historyFilter['sinceId'] = $end['id']; $historyFilter['sinceId'] = $end['id'];
if ($response['pagination']['totalPageCount'] == 1) { if ($response['pagination']['totalPageCount'] == 1) {
$this->_resourceConfig->saveConfig('retailcrm/general/filter_history', $historyFilter['sinceId'], 'default', 0); $this->resourceConfig->saveConfig(
$this->_cacheTypeList->cleanType('config'); 'retailcrm/general/filter_history',
$historyFilter['sinceId'],
'default',
0
);
$this->cacheTypeList->cleanType('config');
$orders = self::assemblyOrder($historyOrder); $orders = self::assemblyOrder($historyOrder);
$this->_logger->writeDump($orders,'OrderHistory'); $this->logger->writeDump($orders, 'OrderHistory');
$this->processOrders($orders); $this->processOrders($orders);
return true; return true;
} }
}//endwhile }
$this->_registry->register('RETAILCRM_HISTORY', false); $this->registry->register('RETAILCRM_HISTORY', false);
} }
/** /**
@ -140,7 +143,7 @@ class Exchange
*/ */
private function processOrders($orders) private function processOrders($orders)
{ {
$this->_logger->writeDump($orders,'processOrders'); $this->logger->writeDump($orders, 'processOrders');
if (!empty($orders)) { if (!empty($orders)) {
foreach ($orders as $order) { foreach ($orders as $order) {
@ -162,17 +165,22 @@ class Exchange
*/ */
private function doCreate($order) private function doCreate($order)
{ {
$this->_logger->writeDump($order,'doCreate'); $this->logger->writeDump($order, 'doCreate');
$payments = $this->_config->getValue('retailcrm/Payment'); $payments = $this->config->getValue('retailcrm/retailcrm_payment');
$shippings = $this->_config->getValue('retailcrm/Shipping'); $shippings = $this->config->getValue('retailcrm/retailcrm_shipping');
$sites = $this->helper->getMappingSites();
$manager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface'); if ($sites) {
$region = $this->_objectManager->get('Magento\Directory\Model\RegionFactory')->create(); $store = $this->storeManager->getStore($sites[$order['site']]);
$store = $manager->getStore(); $websiteId = $store->getWebsiteId();
$websiteId = $manager->getStore()->getWebsiteId(); } else {
$store = $this->storeManager->getStore();
$websiteId = $this->storeManager->getStore()->getWebsiteId();
}
$customer = $this->_customerFactory->create(); $region = $this->regionFactory->create();
$customer = $this->customerFactory->create();
$customer->setWebsiteId($websiteId); $customer->setWebsiteId($websiteId);
if (isset($order['customer']['externalId'])) { if (isset($order['customer']['externalId'])) {
@ -190,10 +198,10 @@ class Exchange
try { try {
$customer->save(); $customer->save();
} catch (\Exception $exception) { } catch (\Exception $exception) {
$this->_logger->writeRow($exception->getMessage()); $this->logger->writeRow($exception->getMessage());
} }
$this->_api->customersFixExternalIds( $this->api->customersFixExternalIds(
[ [
[ [
'id' => $order['customer']['id'], 'id' => $order['customer']['id'],
@ -204,23 +212,23 @@ class Exchange
} }
//Create object of quote //Create object of quote
$quote = $this->_quote->create(); $quote = $this->quote->create();
//set store for which you create quote //set store for which you create quote
$quote->setStore($store); $quote->setStore($store);
// if you have allready buyer id then you can load customer directly // if you have allready buyer id then you can load customer directly
$customer = $this->_customerRepository->getById($customer->getId()); $customer = $this->customerRepository->getById($customer->getId());
$quote->setCurrency(); $quote->setCurrency();
$quote->assignCustomer($customer); //Assign quote to customer $quote->assignCustomer($customer); //Assign quote to customer
//add items in quote //add items in quote
foreach ($order['items'] as $item) { foreach ($order['items'] as $item) {
$product = $this->_product->load($item['offer']['externalId']); $product = $this->product->load($item['offer']['externalId']);
$product->setPrice($item['initialPrice']); $product->setPrice($item['initialPrice']);
$quote->addProduct( $quote->addProduct(
$product, $product,
intval($item['quantity']) (int)$item['quantity']
); );
} }
@ -231,7 +239,7 @@ class Exchange
} }
$orderData = [ $orderData = [
'currency_id' => $manager->getStore()->getCurrentCurrency()->getCode(), 'currency_id' => $this->storeManager->getStore()->getCurrentCurrency()->getCode(),
'email' => $order['email'], 'email' => $order['email'],
'shipping_address' => [ 'shipping_address' => [
'firstname' => $order['firstName'], 'firstname' => $order['firstName'],
@ -267,9 +275,9 @@ class Exchange
->collectShippingRates() ->collectShippingRates()
->setShippingMethod($ShippingMethods); ->setShippingMethod($ShippingMethods);
if ($this->_api->getVersion() == 'v4') { if ($this->api->getVersion() == 'v4') {
$paymentType = $order['paymentType']; $paymentType = $order['paymentType'];
} elseif ($this->_api->getVersion() == 'v5') { } elseif ($this->api->getVersion() == 'v5') {
if ($order['payments']) { if ($order['payments']) {
$paymentType = $this->getPaymentMethod($order['payments']); $paymentType = $this->getPaymentMethod($order['payments']);
} }
@ -287,11 +295,11 @@ class Exchange
$quote->collectTotals()->save(); $quote->collectTotals()->save();
// Create Order From Quote // Create Order From Quote
$magentoOrder = $this->_quoteManagement->submit($quote); $magentoOrder = $this->quoteManagement->submit($quote);
$increment_id = $magentoOrder->getId(); $increment_id = $magentoOrder->getId();
$this->_api->ordersFixExternalIds( $this->api->ordersFixExternalIds(
[ [
[ [
'id' => $order['id'], 'id' => $order['id'],
@ -310,9 +318,9 @@ class Exchange
*/ */
private function doCreateUp($order) private function doCreateUp($order)
{ {
$this->_logger->writeDump($order,'doCreateUp'); $this->logger->writeDump($order, 'doCreateUp');
$response = $this->_api->ordersGet($order['id'], $by = 'id'); $response = $this->api->ordersGet($order['id'], $by = 'id');
if (!$response->isSuccessful()) { if (!$response->isSuccessful()) {
return; return;
@ -322,23 +330,29 @@ class Exchange
$order = $response['order']; $order = $response['order'];
} }
$payments = $this->_config->getValue('retailcrm/Payment'); $payments = $this->config->getValue('retailcrm/retailcrm_payment');
$shippings = $this->_config->getValue('retailcrm/Shipping'); $shippings = $this->config->getValue('retailcrm/retailcrm_shipping');
$manager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface'); $region = $this->regionFactory->create();
$region = $this->_objectManager->get('Magento\Directory\Model\RegionFactory')->create(); $sites = $this->helper->getMappingSites();
$store = $manager->getStore();
$websiteId = $manager->getStore()->getWebsiteId();
$customer = $this->_customerFactory->create(); if ($sites) {
$store = $this->storeManager->getStore($sites[$order['site']]);
$websiteId = $store->getWebsiteId();
} else {
$store = $this->storeManager->getStore();
$websiteId = $this->storeManager->getStore()->getWebsiteId();
}
$customer = $this->customerFactory->create();
$customer->setWebsiteId($websiteId); $customer->setWebsiteId($websiteId);
if (isset($order['customer']['externalId'])) { if (isset($order['customer']['externalId'])) {
$customer->load($order['customer']['externalId']); // load customet by external id $customer->load($order['customer']['externalId']); // load customer by external id
} }
//Create object of quote //Create object of quote
$quote = $this->_quote->create(); $quote = $this->quote->create();
//set store for which you create quote //set store for which you create quote
$quote->setStore($store); $quote->setStore($store);
@ -346,7 +360,7 @@ class Exchange
// if you have all ready buyer id then you can load customer directly // if you have all ready buyer id then you can load customer directly
if ($customer->getId()) { if ($customer->getId()) {
$customer = $this->_customerRepository->getById($customer->getId()); $customer = $this->customerRepository->getById($customer->getId());
$quote->assignCustomer($customer); //Assign quote to customer $quote->assignCustomer($customer); //Assign quote to customer
} else { } else {
$quote->setCustomerEmail($order['email']); $quote->setCustomerEmail($order['email']);
@ -355,11 +369,11 @@ class Exchange
//add items in quote //add items in quote
foreach ($order['items'] as $item) { foreach ($order['items'] as $item) {
$product = $this->_product->load($item['offer']['externalId']); $product = $this->product->load($item['offer']['externalId']);
$product->setPrice($item['initialPrice']); $product->setPrice($item['initialPrice']);
$quote->addProduct( $quote->addProduct(
$product, $product,
intval($item['quantity']) (int)$item['quantity']
); );
} }
@ -370,9 +384,9 @@ class Exchange
} }
$orderData = [ $orderData = [
'currency_id' => $manager->getStore()->getCurrentCurrency()->getCode(), 'currency_id' => $this->storeManager->getStore()->getCurrentCurrency()->getCode(),
'email' => $order['email'], 'email' => $order['email'],
'shipping_address' =>array( 'shipping_address' => [
'firstname' => $order['firstName'], 'firstname' => $order['firstName'],
'lastname' => $order['lastName'], 'lastname' => $order['lastName'],
'street' => $order['delivery']['address']['street'], 'street' => $order['delivery']['address']['street'],
@ -382,7 +396,7 @@ class Exchange
'postcode' => $order['delivery']['address']['index'], 'postcode' => $order['delivery']['address']['index'],
'telephone' => $order['phone'], 'telephone' => $order['phone'],
'save_in_address_book' => 1 'save_in_address_book' => 1
), ],
'items'=> $products 'items'=> $products
]; ];
@ -406,18 +420,17 @@ class Exchange
->collectShippingRates() ->collectShippingRates()
->setShippingMethod($ShippingMethods); ->setShippingMethod($ShippingMethods);
if ($this->_api->getVersion() == 'v4') { if ($this->api->getVersion() == 'v4') {
$paymentType = $order['paymentType']; $paymentType = $order['paymentType'];
} elseif ($this->_api->getVersion() == 'v5') { } elseif ($this->api->getVersion() == 'v5') {
$paymentType = $this->getPaymentMethod($order['payments'], false); $paymentType = $this->getPaymentMethod($order['payments'], false);
} }
$quote->setPaymentMethod($payments[$paymentType]); $quote->setPaymentMethod($payments[$paymentType]);
$quote->setInventoryProcessed(false); $quote->setInventoryProcessed(false);
$originalId = $order['externalId']; $originalId = $order['externalId'];
$oldOrder = $this->_order->load($originalId); $oldOrder = $this->orderInterface->load($originalId);
$orderDataUp = [ $orderDataUp = [
'original_increment_id' => $oldOrder->getIncrementId(), 'original_increment_id' => $oldOrder->getIncrementId(),
@ -437,11 +450,11 @@ class Exchange
$quote->collectTotals()->save(); $quote->collectTotals()->save();
// Create Order From Quote // Create Order From Quote
$magentoOrder = $this->_quoteManagement->submit($quote,$orderDataUp); $magentoOrder = $this->quoteManagement->submit($quote, $orderDataUp);
$oldOrder->setStatus('canceled')->save(); $oldOrder->setStatus('canceled')->save();
$increment_id = $magentoOrder->getId(); $increment_id = $magentoOrder->getId();
$this->_api->ordersFixExternalIds( $this->api->ordersFixExternalIds(
[ [
[ [
'id' => $order['id'], 'id' => $order['id'],
@ -460,16 +473,16 @@ class Exchange
*/ */
private function doUpdate($order) private function doUpdate($order)
{ {
$this->_logger->writeDump($order,'doUpdate'); $this->logger->writeDump($order, 'doUpdate');
$Status = $this->_config->getValue('retailcrm/Status'); $Status = $this->config->getValue('retailcrm/retailcrm_status');
$Status = array_flip(array_filter($Status)); $Status = array_flip(array_filter($Status));
$magentoOrder = $this->_order->load($order['externalId']); $magentoOrder = $this->order->load($order['externalId']);
$magentoOrderArr = $magentoOrder->getData(); $magentoOrderArr = $magentoOrder->getData();
$this->_logger->writeDump($magentoOrderArr, 'magentoOrderArr'); $this->logger->writeDump($magentoOrderArr, 'magentoOrderArr');
$this->_logger->writeDump($Status, 'status'); $this->logger->writeDump($Status, 'status');
if ((!empty($order['order_edit'])) && ($order['order_edit'] == 1)) { if ((!empty($order['order_edit'])) && ($order['order_edit'] == 1)) {
$this->doCreateUp($order); $this->doCreateUp($order);
@ -479,80 +492,13 @@ class Exchange
$change = $Status[$order['status']]; $change = $Status[$order['status']];
if ($change == 'canceled') { if ($change == 'canceled') {
$this->_orderManagement->cancel($magentoOrderArr['entity_id']); $this->orderManagement->cancel($magentoOrderArr['entity_id']);
} }
if($change == 'holded'){ $order_status = $this->order->load($magentoOrder->getId());
$objectManager = \Magento\Framework\App\ObjectManager::getInstance(); $order_status->setStatus($change);
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('holded');
$order_status->save(); $order_status->save();
} }
if(($change == 'complete')||($order['status']== 'complete')){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('complete');
$order_status->save();
}
if($change == 'closed'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('closed');
$order_status->save();
}
if($change == 'processing'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('processing');
$order_status->save();
}
if($change == 'fraud'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('fraud');
$order_status->save();
}
if($change == 'payment_review'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('payment_review');
$order_status->save();
}
if($change == 'paypal_canceled_reversal'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('paypal_canceled_reversal');
$order_status->save();
}
if($change == 'paypal_reversed'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('paypal_reversed');
$order_status->save();
}
if($change == 'pending_payment'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('pending_payment');
$order_status->save();
}
if($change == 'pending_paypal'){
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$order_status = $objectManager->get('Magento\Sales\Model\Order')->load($magentoOrder->getId());
$order_status->setStatus('pending_paypal');
$order_status->save();
}
}
} }
/** /**
@ -567,6 +513,7 @@ class Exchange
$orders = []; $orders = [];
foreach ($orderHistory as $change) { foreach ($orderHistory as $change) {
$orderId = $change['order']['id'];
$change['order'] = self::removeEmpty($change['order']); $change['order'] = self::removeEmpty($change['order']);
if (isset($change['order']['items'])) { if (isset($change['order']['items'])) {
@ -612,7 +559,10 @@ class Exchange
if (isset($orders[$change['order']['id']]['items']) if (isset($orders[$change['order']['id']]['items'])
&& $orders[$change['order']['id']]['items'][$change['item']['id']] && $orders[$change['order']['id']]['items'][$change['item']['id']]
) { ) {
$orders[$change['order']['id']]['items'][$change['item']['id']] = array_merge($orders[$change['order']['id']]['items'][$change['item']['id']], $change['item']); $orders[$change['order']['id']]['items'][$change['item']['id']] = array_merge(
$orders[$change['order']['id']]['items'][$change['item']['id']],
$change['item']
);
} else { } else {
$orders[$change['order']['id']]['items'][$change['item']['id']] = $change['item']; $orders[$change['order']['id']]['items'][$change['item']['id']] = $change['item'];
} }
@ -631,33 +581,41 @@ class Exchange
if (!empty($change['newValue']) && $change['field'] == 'order_product.quantity') { if (!empty($change['newValue']) && $change['field'] == 'order_product.quantity') {
$orders[$change['order']['id']]['order_edit'] = 1; $orders[$change['order']['id']]['order_edit'] = 1;
} }
if (!$orders[$change['order']['id']]['items'][$change['item']['id']]['create'] && $fields['item'][$change['field']]) {
$orders[$change['order']['id']]['items'][$change['item']['id']][$fields['item'][$change['field']]] = $change['newValue'];
}
} else { } else {
if ((isset($fields['delivery'][$change['field']]))&&($fields['delivery'][$change['field']] == 'service')) { if (isset($fields['delivery'][$change['field']])
$orders[$change['order']['id']]['delivery']['service']['code'] = self::newValue($change['newValue']); && $fields['delivery'][$change['field']] == 'service'
) {
$orders[$orderId]['delivery']['service']['code'] = self::newValue($change['newValue']);
} elseif (isset($fields['delivery'][$change['field']])) { } elseif (isset($fields['delivery'][$change['field']])) {
$orders[$change['order']['id']]['delivery'][$fields['delivery'][$change['field']]] = self::newValue($change['newValue']); $field = $fields['delivery'][$change['field']];
$orders[$orderId]['delivery'][$field] = self::newValue($change['newValue']);
unset($field);
} elseif (isset($fields['orderAddress'][$change['field']])) { } elseif (isset($fields['orderAddress'][$change['field']])) {
$orders[$change['order']['id']]['delivery']['address'][$fields['orderAddress'][$change['field']]] = $change['newValue']; $field = $fields['orderAddress'][$change['field']];
$orders[$orderId]['delivery']['address'][$field] = self::newValue($change['newValue']);
unset($field);
} elseif (isset($fields['integrationDelivery'][$change['field']])) { } elseif (isset($fields['integrationDelivery'][$change['field']])) {
$orders[$change['order']['id']]['delivery']['service'][$fields['integrationDelivery'][$change['field']]] = self::newValue($change['newValue']); $field = $fields['integrationDelivery'][$change['field']];
$orders[$orderId]['delivery']['service'][$field] = self::newValue($change['newValue']);
unset($field);
} elseif (isset($fields['customerContragent'][$change['field']])) { } elseif (isset($fields['customerContragent'][$change['field']])) {
$orders[$change['order']['id']][$fields['customerContragent'][$change['field']]] = self::newValue($change['newValue']); $field = $fields['customerContragent'][$change['field']];
$orders[$orderId][$field] = self::newValue($change['newValue']);
unset($field);
} elseif (strripos($change['field'], 'custom_') !== false) { } elseif (strripos($change['field'], 'custom_') !== false) {
$orders[$change['order']['id']]['customFields'][str_replace('custom_', '', $change['field'])] = self::newValue($change['newValue']); $field = str_replace('custom_', '', $change['field']);
$orders[$orderId]['customFields'][$field] = self::newValue($change['newValue']);
unset($field);
} elseif (isset($fields['order'][$change['field']])) { } elseif (isset($fields['order'][$change['field']])) {
$orders[$change['order']['id']][$fields['order'][$change['field']]] = self::newValue($change['newValue']); $orders[$orderId][$fields['order'][$change['field']]] = self::newValue($change['newValue']);
} }
if (isset($change['created'])) { if (isset($change['created'])) {
$orders[$change['order']['id']]['create'] = 1; $orders[$orderId]['create'] = 1;
} }
if (isset($change['deleted'])) { if (isset($change['deleted'])) {
$orders[$change['order']['id']]['deleted'] = 1; $orders[$orderId]['deleted'] = 1;
} }
} }
} }
@ -716,12 +674,9 @@ class Exchange
*/ */
public function getAllShippingMethodsCode($mcode) public function getAllShippingMethodsCode($mcode)
{ {
$activeCarriers = $this->_shipconfig->getActiveCarriers(); $activeCarriers = $this->shipconfig->getActiveCarriers();
$storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
foreach ($activeCarriers as $carrierCode => $carrierModel) { foreach ($activeCarriers as $carrierCode => $carrierModel) {
$options = [];
if ($carrierMethods = $carrierModel->getAllowedMethods()) { if ($carrierMethods = $carrierModel->getAllowedMethods()) {
foreach ($carrierMethods as $methodCode => $method) { foreach ($carrierMethods as $methodCode => $method) {
$code = $carrierCode . '_'. $methodCode; $code = $carrierCode . '_'. $methodCode;
@ -744,7 +699,7 @@ class Exchange
* *
* @return mixed * @return mixed
*/ */
protected function getPaymentMethod($payments, $newOrder = true) private function getPaymentMethod($payments, $newOrder = true)
{ {
if (count($payments) == 1 || $newOrder) { if (count($payments) == 1 || $newOrder) {
$payment = reset($payments); $payment = reset($payments);

394
src/Model/Icml/Icml.php Normal file
View File

@ -0,0 +1,394 @@
<?php
namespace Retailcrm\Retailcrm\Model\Icml;
class Icml
{
private $dd;
private $eCategories;
private $eOffers;
private $shop;
private $manager;
private $category;
private $product;
private $storeManager;
private $StockState;
private $configurable;
private $config;
private $dirList;
private $ddFactory;
public function __construct(
\Magento\Store\Model\StoreManagerInterface $manager,
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $product,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\CatalogInventory\Api\StockStateInterface $StockState,
\Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurable,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\DomDocument\DomDocumentFactory $ddFactory,
\Magento\Framework\Filesystem\DirectoryList $dirList
) {
$this->configurable = $configurable;
$this->StockState = $StockState;
$this->storeManager = $storeManager;
$this->product = $product;
$this->category = $categoryCollectionFactory;
$this->manager = $manager;
$this->config = $config;
$this->ddFactory = $ddFactory;
$this->dirList = $dirList;
}
/**
* Generate icml catelog
*
* @return void
*/
public function generate()
{
$this->shop = $this->manager->getStore()->getId();
$string = '<?xml version="1.0" encoding="UTF-8"?>
<yml_catalog date="'.date('Y-m-d H:i:s').'">
<shop>
<name>'.$this->manager->getStore()->getName().'</name>
<categories/>
<offers/>
</shop>
</yml_catalog>
';
$xml = simplexml_load_string(
$string,
'\Magento\Framework\Simplexml\Element',
LIBXML_NOENT | LIBXML_NOCDATA | LIBXML_COMPACT | LIBXML_PARSEHUGE
);
$this->dd = $this->ddFactory->create();
$this->dd->preserveWhiteSpace = false;
$this->dd->formatOutput = true;
$this->dd->loadXML($xml->asXML());
$this->eCategories = $this->dd
->getElementsByTagName('categories')->item(0);
$this->eOffers = $this->dd
->getElementsByTagName('offers')->item(0);
$this->addCategories();
$this->addOffers();
$this->dd->saveXML();
$shopCode = $this->manager->getStore()->getCode();
$this->dd->save($this->dirList->getRoot() . '/retailcrm_' . $shopCode . '.xml');
}
/**
* Add product categories in icml catalog
*
* @return void
*/
private function addCategories()
{
$collection = $this->category->create();
$collection->addAttributeToSelect('*');
foreach ($collection as $category) {
if ($category->getId() > 1) {
$e = $this->eCategories->appendChild(
$this->dd->createElement('category')
);
$e->appendChild($this->dd->createTextNode($category->getName()));
$e->setAttribute('id', $category->getId());
if ($category->getParentId() > 1) {
$e->setAttribute('parentId', $category->getParentId());
}
}
}
}
/**
* Write products in icml catalog
*
* @return void
*/
private function addOffers()
{
$offers = $this->buildOffers();
foreach ($offers as $offer) {
$this->addOffer($offer);
}
}
/**
* Write product in icml catalog
*
* @param array $offer
*
* @return void
*/
private function addOffer($offer)
{
$e = $this->eOffers->appendChild(
$this->dd->createElement('offer')
);
$e->setAttribute('id', $offer['id']);
$e->setAttribute('productId', $offer['productId']);
if (!empty($offer['quantity'])) {
$e->setAttribute('quantity', (int) $offer['quantity']);
} else {
$e->setAttribute('quantity', 0);
}
if (!empty($offer['categoryId'])) {
foreach ($offer['categoryId'] as $categoryId) {
$e->appendChild(
$this->dd->createElement('categoryId')
)->appendChild(
$this->dd->createTextNode($categoryId)
);
}
} else {
$e->appendChild($this->dd->createElement('categoryId', 1));
}
$e->appendChild($this->dd->createElement('productActivity'))
->appendChild(
$this->dd->createTextNode($offer['productActivity'])
);
$e->appendChild($this->dd->createElement('name'))
->appendChild(
$this->dd->createTextNode($offer['name'])
);
$e->appendChild($this->dd->createElement('productName'))
->appendChild(
$this->dd->createTextNode($offer['productName'])
);
$e->appendChild($this->dd->createElement('price'))
->appendChild(
$this->dd->createTextNode($offer['initialPrice'])
);
if (!empty($offer['purchasePrice'])) {
$e->appendChild($this->dd->createElement('purchasePrice'))
->appendChild(
$this->dd->createTextNode($offer['purchasePrice'])
);
}
if (!empty($offer['picture'])) {
$e->appendChild($this->dd->createElement('picture'))
->appendChild(
$this->dd->createTextNode($offer['picture'])
);
}
if (!empty($offer['url'])) {
$e->appendChild($this->dd->createElement('url'))
->appendChild(
$this->dd->createTextNode($offer['url'])
);
}
if (!empty($offer['vendor'])) {
$e->appendChild($this->dd->createElement('vendor'))
->appendChild(
$this->dd->createTextNode($offer['vendor'])
);
}
if (!empty($offer['params'])) {
foreach ($offer['params'] as $param) {
$paramNode = $this->dd->createElement('param');
$paramNode->setAttribute('name', $param['name']);
$paramNode->setAttribute('code', $param['code']);
$paramNode->appendChild(
$this->dd->createTextNode($param['value'])
);
$e->appendChild($paramNode);
}
}
}
/**
* Build offers array
*
* @return array $offers
*/
private function buildOffers()
{
$offers = [];
$collection = $this->product->create();
$collection->addFieldToFilter('visibility', 4);//catalog, search visible
$collection->addAttributeToSelect('*');
$picUrl = $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
$customAdditionalAttributes = $this->config->getValue('retailcrm/Misc/attributes_to_export_into_icml');
foreach ($collection as $product) {
if ($product->getTypeId() == 'simple') {
$offers[] = $this->buildOffer($product);
}
if ($product->getTypeId() == 'configurable') {
$associated_products = $this->getAssociatedProducts($product);
foreach ($associated_products as $associatedProduct) {
$offers[] = $this->buildOffer($product, $associatedProduct);
}
}
}
return $offers;
}
/**
* Build offer array
*
* @param object $product
* @param object $associatedProduct
* @return array $offer
*/
private function buildOffer($product, $associatedProduct = null)
{
$offer = [];
$picUrl = $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
$offer['id'] = $associatedProduct === null ? $product->getId() : $associatedProduct->getId();
$offer['productId'] = $product->getId();
if ($associatedProduct === null) {
$offer['productActivity'] = $product->isAvailable() ? 'Y' : 'N';
} else {
$offer['productActivity'] = $associatedProduct->isAvailable() ? 'Y' : 'N';
}
$offer['name'] = $associatedProduct === null ? $product->getName() : $associatedProduct->getName();
$offer['productName'] = $product->getName();
$offer['initialPrice'] = $associatedProduct === null
? $product->getFinalPrice()
: $associatedProduct->getFinalPrice();
$offer['url'] = $product->getProductUrl();
if ($associatedProduct === null) {
$offer['picture'] = $picUrl . 'catalog/product' . $product->getImage();
} else {
$offer['picture'] = $picUrl . 'catalog/product' . $associatedProduct->getImage();
}
$offer['quantity'] = $associatedProduct === null
? $this->getStockQuantity($product)
: $this->getStockQuantity($associatedProduct);
$offer['categoryId'] = $associatedProduct === null
? $product->getCategoryIds()
: $associatedProduct->getCategoryIds();
$offer['vendor'] = $associatedProduct === null
? $product->getAttributeText('manufacturer')
: $associatedProduct->getAttributeText('manufacturer');
$offer['params'] = $this->getOfferParams($product, $associatedProduct);
return $offer;
}
/**
* Get parameters offers
*
* @param object $product
* @param object $associatedProduct
* @return array $params
*/
private function getOfferParams($product, $associatedProduct = null)
{
$params = [];
if ($associatedProduct !== null) {
if ($associatedProduct->getResource()->getAttribute('color')) {
$colorAttribute = $associatedProduct->getResource()->getAttribute('color');
$color = $colorAttribute->getSource()->getOptionText($associatedProduct->getColor());
}
if (isset($color)) {
$params[] = [
'name' => 'Color',
'code' => 'color',
'value' => $color
];
}
if ($associatedProduct->getResource()->getAttribute('size')) {
$sizeAttribute = $associatedProduct->getResource()->getAttribute('size');
$size = $sizeAttribute->getSource()->getOptionText($associatedProduct->getSize());
}
if (isset($size)) {
$params[] = [
'name' => 'Size',
'code' => 'size',
'value' => $size
];
}
}
$article = $associatedProduct === null ? $product->getSku() : $associatedProduct->getSku();
if (!empty($article)) {
$params[] = [
'name' => 'Article',
'code' => 'article',
'value' => $article
];
}
$weight = $associatedProduct === null ? $product->getWeight() : $associatedProduct->getWeight();
if (!empty($weight)) {
$params[] = [
'name' => 'Weight',
'code' => 'weight',
'value' => $weight
];
}
return $params;
}
/**
* Get associated products
*
* @param object $product
*
* @return object
*/
private function getAssociatedProducts($product)
{
return $this->configurable
->getUsedProductCollection($product)
->addAttributeToSelect('*')
->addFilterByRequiredOptions();
}
/**
* Get product stock quantity
*
* @param object $offer
* @return int $quantity
*/
private function getStockQuantity($offer)
{
$quantity = $this->StockState->getStockQty(
$offer->getId(),
$offer->getStore()->getWebsiteId()
);
return $quantity;
}
}

View File

@ -6,9 +6,9 @@ class Logger
{ {
private $logDir; private $logDir;
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager) public function __construct(
{ \Magento\Framework\Filesystem\DirectoryList $directory
$directory = $objectManager->get('\Magento\Framework\Filesystem\DirectoryList'); ) {
$this->logDir = $directory->getPath('log'); $this->logDir = $directory->getPath('log');
} }
@ -16,7 +16,7 @@ class Logger
* Write data in log file * Write data in log file
* *
* @param array $data * @param array $data
* @param str $fileName * @param string $fileName
* *
* @return void * @return void
*/ */
@ -41,8 +41,8 @@ class Logger
/** /**
* Write data in log file * Write data in log file
* *
* @param str $data * @param string $data
* @param str $fileName * @param string $fileName
* *
* @return void * @return void
*/ */
@ -65,11 +65,11 @@ class Logger
/** /**
* Clear file * Clear file
* *
* @param str $file * @param string $file
* *
* @return void * @return void
*/ */
protected function clear($file) private function clear($file)
{ {
file_put_contents($file, ''); file_put_contents($file, '');
} }
@ -77,11 +77,11 @@ class Logger
/** /**
* Check file size * Check file size
* *
* @param str $file * @param string $file
* *
* @return boolean * @return boolean
*/ */
protected function checkSize($file) private function checkSize($file)
{ {
if (!file_exists($file)) { if (!file_exists($file)) {
return true; return true;

View File

@ -0,0 +1,66 @@
<?php
namespace Retailcrm\Retailcrm\Model\Observer;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
use Retailcrm\Retailcrm\Helper\Data as Helper;
class Customer implements \Magento\Framework\Event\ObserverInterface
{
private $api;
private $registry;
private $customer;
private $helper;
public function __construct(
\Magento\Framework\Registry $registry,
Helper $helper,
ApiClient $api
) {
$this->api = $api;
$this->helper = $helper;
$this->registry = $registry;
$this->customer = [];
}
public function execute(\Magento\Framework\Event\Observer $observer)
{
if ($this->registry->registry('RETAILCRM_HISTORY') === true
|| !$this->api->isConfigured()
) {
return false;
}
$data = $observer->getEvent()->getCustomer();
$this->customer = [
'externalId' => $data->getId(),
'email' => $data->getEmail(),
'firstName' => $data->getFirstname(),
'patronymic' => $data->getMiddlename(),
'lastName' => $data->getLastname(),
'createdAt' => date('Y-m-d H:i:s', strtotime($data->getCreatedAt()))
];
$response = $this->api->customersEdit($this->customer);
if ($response === false) {
return false;
}
if (!$response->isSuccessful() && $response->errorMsg == $this->api->getErrorText('errorNotFound')) {
$this->api->setSite($this->helper->getSite($data->getStore()));
$this->api->customersCreate($this->customer);
}
return $this;
}
/**
* @return array
*/
public function getCustomer()
{
return $this->customer;
}
}

View File

@ -4,43 +4,44 @@ namespace Retailcrm\Retailcrm\Model\Observer;
use Magento\Framework\Event\Observer; use Magento\Framework\Event\Observer;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient; use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
use RetailCrm\Retailcrm\Helper\Data as Helper;
class OrderCreate implements \Magento\Framework\Event\ObserverInterface class OrderCreate implements \Magento\Framework\Event\ObserverInterface
{ {
protected $_api; protected $api;
protected $_objectManager; protected $config;
protected $_config; protected $logger;
protected $_helper; protected $helper;
protected $_logger;
protected $_registry; private $registry;
private $product;
private $order;
/** /**
* Constructor * Constructor
* *
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Retailcrm\Retailcrm\Model\Logger\Logger $logger
* @param \Magento\Framework\Registry $registry * @param \Magento\Framework\Registry $registry
* @param \Retailcrm\Retailcrm\Model\Logger\Logger $logger
* @param \Magento\Catalog\Model\ProductRepository $product
* @param Helper $helper
* @param ApiClient $api
*/ */
public function __construct( public function __construct(
\Magento\Framework\ObjectManagerInterface $objectManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config, \Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\Registry $registry \Magento\Framework\Registry $registry,
\Retailcrm\Retailcrm\Model\Logger\Logger $logger,
\Magento\Catalog\Model\ProductRepository $product,
Helper $helper,
ApiClient $api
) { ) {
$helper = $objectManager->get('\Retailcrm\Retailcrm\Helper\Data'); $this->logger = $logger;
$this->_logger = $objectManager->get('\Retailcrm\Retailcrm\Model\Logger\Logger'); $this->config = $config;
$this->_helper = $helper; $this->registry = $registry;
$this->_objectManager = $objectManager; $this->product = $product;
$this->_config = $config; $this->helper = $helper;
$this->_registry = $registry; $this->api = $api;
$this->order = [];
$url = $config->getValue('retailcrm/general/api_url');
$key = $config->getValue('retailcrm/general/api_key');
$apiVersion = $config->getValue('retailcrm/general/api_version');
if (!empty($url) && !empty($key)) {
$this->_api = new ApiClient($url, $key, $apiVersion);
}
} }
/** /**
@ -48,66 +49,47 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
* *
* @param Observer $observer * @param Observer $observer
* *
* @return $this * @return mixed
*/ */
public function execute(Observer $observer) public function execute(Observer $observer)
{ {
if ($this->_registry->registry('RETAILCRM_HISTORY') === true) { if ($this->registry->registry('RETAILCRM_HISTORY') === true
return; || !$this->api->isConfigured()
) {
return false;
} }
$order = $observer->getEvent()->getOrder(); $order = $observer->getEvent()->getOrder();
$this->api->setSite($this->helper->getSite($order->getStore()));
if ($this->existsInCrm($order->getId()) === true) { if ($this->existsInCrm($order->getId()) === true) {
return; return false;
} }
$items = [];
$addressObj = $order->getBillingAddress(); $addressObj = $order->getBillingAddress();
foreach ($order->getAllItems() as $item) {
if ($item->getProductType() == "simple") {
$price = $item->getPrice();
if ($price == 0) {
$omproduct = $this->_objectManager->get('Magento\Catalog\Model\ProductRepository')
->getById($item->getProductId());
$price = $omproduct->getPrice();
}
$product = [
'productId' => $item->getProductId(),
'productName' => $item->getName(),
'quantity' => $item->getQtyOrdered(),
'initialPrice' => $price,
'offer' => [
'externalId' => $item->getProductId()
]
];
unset($omproduct);
unset($price);
$items[] = $product;
}
}
$shippingCode = $this->getShippingCode($order->getShippingMethod()); $shippingCode = $this->getShippingCode($order->getShippingMethod());
$preparedOrder = [ $this->order = [
'site' => $order->getStore()->getCode(),
'externalId' => $order->getId(), 'externalId' => $order->getId(),
'number' => $order->getRealOrderId(), 'number' => $order->getRealOrderId(),
'createdAt' => $order->getCreatedAt(), 'createdAt' => $order->getCreatedAt(),
'lastName' => $order->getCustomerLastname() ? $order->getCustomerLastname() : $addressObj->getLastname(), 'lastName' => $order->getCustomerLastname()
'firstName' => $order->getCustomerFirstname() ? $order->getCustomerFirstname() : $addressObj->getFirstname(), ? $order->getCustomerLastname()
'patronymic' => $order->getCustomerMiddlename() ? $order->getCustomerMiddlename() : $addressObj->getMiddlename(), : $addressObj->getLastname(),
'firstName' => $order->getCustomerFirstname()
? $order->getCustomerFirstname()
: $addressObj->getFirstname(),
'patronymic' => $order->getCustomerMiddlename()
? $order->getCustomerMiddlename()
: $addressObj->getMiddlename(),
'email' => $order->getCustomerEmail(), 'email' => $order->getCustomerEmail(),
'phone' => $addressObj->getTelephone(), 'phone' => $addressObj->getTelephone(),
'status' => $this->_config->getValue('retailcrm/Status/' . $order->getStatus()), 'status' => $this->config->getValue('retailcrm/retailcrm_status/' . $order->getStatus()),
'items' => $items, 'items' => $this->getOrderItems($order),
'delivery' => [ 'delivery' => [
'code' => $this->_config->getValue('retailcrm/Shipping/' . $shippingCode), 'code' => $this->config->getValue('retailcrm/retailcrm_shipping/' . $shippingCode),
'cost' => $order->getShippingAmount(), 'cost' => $order->getShippingAmount(),
'address' => [ 'address' => [
'index' => $addressObj->getData('postcode'), 'index' => $addressObj->getData('postcode'),
@ -130,17 +112,21 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
]; ];
if ($addressObj->getData('country_id')) { if ($addressObj->getData('country_id')) {
$preparedOrder['countryIso'] = $addressObj->getData('country_id'); $this->order['countryIso'] = $addressObj->getData('country_id');
} }
if ($this->_api->getVersion() == 'v4') { if ($this->api->getVersion() == 'v4') {
$preparedOrder['paymentType'] = $this->_config->getValue('retailcrm/Payment/'.$order->getPayment()->getMethodInstance()->getCode()); $this->order['paymentType'] = $this->config->getValue(
$preparedOrder['discount'] = abs($order->getDiscountAmount()); 'retailcrm/retailcrm_payment/' . $order->getPayment()->getMethodInstance()->getCode()
} elseif ($this->_api->getVersion() == 'v5') { );
$preparedOrder['discountManualAmount'] = abs($order->getDiscountAmount()); $this->order['discount'] = abs($order->getDiscountAmount());
} elseif ($this->api->getVersion() == 'v5') {
$this->order['discountManualAmount'] = abs($order->getDiscountAmount());
$payment = [ $payment = [
'type' => $this->_config->getValue('retailcrm/Payment/' . $order->getPayment()->getMethodInstance()->getCode()), 'type' => $this->config->getValue(
'retailcrm/retailcrm_payment/' . $order->getPayment()->getMethodInstance()->getCode()
),
'externalId' => $order->getId(), 'externalId' => $order->getId(),
'order' => [ 'order' => [
'externalId' => $order->getId(), 'externalId' => $order->getId(),
@ -151,30 +137,52 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
$payment['status'] = 'paid'; $payment['status'] = 'paid';
} }
$preparedOrder['payments'][] = $payment; $this->order['payments'][] = $payment;
} }
if (trim($preparedOrder['delivery']['code']) == '') { if (trim($this->order['delivery']['code']) == '') {
unset($preparedOrder['delivery']['code']); unset($this->order['delivery']['code']);
} }
if (isset($preparedOrder['paymentType']) && trim($preparedOrder['paymentType']) == '') { if (isset($this->order['paymentType']) && trim($this->order['paymentType']) == '') {
unset($preparedOrder['paymentType']); unset($this->order['paymentType']);
} }
if (trim($preparedOrder['status']) == '') { if (trim($this->order['status']) == '') {
unset($preparedOrder['status']); unset($this->order['status']);
} }
$this->setCustomer(
$order,
$addressObj
);
Helper::filterRecursive($this->order);
$this->logger->writeDump($this->order, 'CreateOrder');
$this->api->ordersCreate($this->order);
return $this;
}
/**
* @param $order
* @param $addressObj
*/
private function setCustomer($order, $addressObj)
{
if ($order->getCustomerIsGuest() == 1) { if ($order->getCustomerIsGuest() == 1) {
$customer = $this->getCustomerByEmail($order->getCustomerEmail()); $customer = $this->getCustomerByEmail($order->getCustomerEmail());
if ($customer !== false) { if ($customer !== false) {
$preparedOrder['customer']['id'] = $customer['id']; $this->order['customer']['id'] = $customer['id'];
} }
} elseif ($order->getCustomerIsGuest() == 0) { }
if ($order->getCustomerIsGuest() == 0) {
if ($this->existsInCrm($order->getCustomerId(), 'customersGet')) { if ($this->existsInCrm($order->getCustomerId(), 'customersGet')) {
$preparedOrder['customer']['externalId'] = $order->getCustomerId(); $this->order['customer']['externalId'] = $order->getCustomerId();
} else { } else {
$preparedCustomer = [ $preparedCustomer = [
'externalId' => $order->getCustomerId(), 'externalId' => $order->getCustomerId(),
@ -189,19 +197,51 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
]; ];
} }
if ($this->_api->customersCreate($preparedCustomer)) { if ($this->api->customersCreate($preparedCustomer)) {
$preparedOrder['customer']['externalId'] = $order->getCustomerId(); $this->order['customer']['externalId'] = $order->getCustomerId();
}
} }
} }
} }
$this->_helper->filterRecursive($preparedOrder); /**
* Get order products
*
* @param object $order
*
* @return array $items
*/
private function getOrderItems($order)
{
$items = [];
$this->_logger->writeDump($preparedOrder,'CreateOrder'); foreach ($order->getAllItems() as $item) {
if ($item->getProductType() == "simple") {
$price = $item->getPrice();
$this->_api->ordersCreate($preparedOrder); if ($price == 0) {
$magentoProduct = $this->product->getById($item->getProductId());
$price = $magentoProduct->getPrice();
}
return $this; $product = [
'productId' => $item->getProductId(),
'productName' => $item->getName(),
'quantity' => $item->getQtyOrdered(),
'initialPrice' => $price,
'offer' => [
'externalId' => $item->getProductId()
]
];
unset($magentoProduct);
unset($price);
$items[] = $product;
}
}
return $items;
} }
/** /**
@ -211,7 +251,7 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
* *
* @return string * @return string
*/ */
protected function getShippingCode($string) public function getShippingCode($string)
{ {
$split = array_values(explode('_', $string)); $split = array_values(explode('_', $string));
$length = count($split); $length = count($split);
@ -224,18 +264,21 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
* Check exists order or customer in CRM * Check exists order or customer in CRM
* *
* @param int $id * @param int $id
* @param string $method
* @param string $by
* @param string $site
* *
* @return boolean * @return boolean
*/ */
protected function existsInCrm($id, $method = 'ordersGet', $by = 'externalId') private function existsInCrm($id, $method = 'ordersGet', $by = 'externalId', $site = null)
{ {
$response = $this->_api->{$method}($id, $by); $response = $this->api->{$method}($id, $by, $site);
if ($response === false) { if ($response === false) {
return; return false;
} }
if (!$response->isSuccessful() && $response->errorMsg == $this->_api->getErrorText('errorNotFound')) { if (!$response->isSuccessful() && $response->errorMsg == $this->api->getErrorText('errorNotFound')) {
return false; return false;
} }
@ -249,9 +292,9 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
* *
* @return mixed * @return mixed
*/ */
protected function getCustomerByEmail($email) private function getCustomerByEmail($email)
{ {
$response = $this->_api->customersList(['email' => $email]); $response = $this->api->customersList(['email' => $email]);
if ($response === false) { if ($response === false) {
return false; return false;
@ -265,4 +308,12 @@ class OrderCreate implements \Magento\Framework\Event\ObserverInterface
return false; return false;
} }
/**
* @return array
*/
public function getOrder()
{
return $this->order;
}
} }

View File

@ -0,0 +1,89 @@
<?php
namespace Retailcrm\Retailcrm\Model\Observer;
use Magento\Framework\Event\Observer;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
use RetailCrm\Retailcrm\Helper\Data as Helper;
class OrderUpdate implements \Magento\Framework\Event\ObserverInterface
{
private $api;
private $config;
private $registry;
private $order;
private $helper;
/**
* Constructor
*
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Framework\Registry $registry
* @param Helper $helper
* @param ApiClient $api
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\Registry $registry,
Helper $helper,
ApiClient $api
) {
$this->config = $config;
$this->registry = $registry;
$this->helper = $helper;
$this->api = $api;
$this->order = [];
}
/**
* Execute update order in CRM
*
* @param Observer $observer
*
* @return mixed
*/
public function execute(Observer $observer)
{
if ($this->registry->registry('RETAILCRM_HISTORY') === true
|| !$this->api->isConfigured()
) {
return false;
}
$order = $observer->getEvent()->getOrder();
if ($order) {
$this->order = [
'externalId' => $order->getId(),
'status' => $this->config->getValue('retailcrm/retailcrm_status/' . $order->getStatus())
];
if ($order->getBaseTotalDue() == 0) {
if ($this->api->getVersion() == 'v4') {
$this->order['paymentStatus'] = 'paid';
} elseif ($this->api->getVersion() == 'v5') {
$payment = [
'externalId' => $order->getPayment()->getId(),
'status' => 'paid'
];
$this->api->ordersPaymentsEdit($payment);
}
}
Helper::filterRecursive($this->order);
$this->api->setSite($this->helper->getSite($order->getStore()));
$this->api->ordersEdit($this->order);
}
return $this;
}
/**
* @return mixed
*/
public function getOrder()
{
return $this->order;
}
}

View File

@ -0,0 +1,145 @@
<?php
namespace Retailcrm\Retailcrm\Model\Order;
use RetailCrm\Retailcrm\Helper\Data as Helper;
use Retailcrm\Retailcrm\Helper\Proxy as ApiClient;
use Retailcrm\Retailcrm\Model\Observer\OrderCreate;
class OrderNumber extends OrderCreate
{
private $salesOrder;
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Framework\Registry $registry,
\Retailcrm\Retailcrm\Model\Logger\Logger $logger,
\Magento\Catalog\Model\ProductRepository $product,
Helper $helper,
ApiClient $api,
\Magento\Sales\Api\Data\OrderInterface $salesOrder
) {
$this->salesOrder = $salesOrder;
parent::__construct($config, $registry, $logger, $product, $helper, $api);
}
public function exportOrderNumber()
{
$ordernumber = $this->config->getValue('retailcrm/Load/number_order');
$ordersId = explode(",", $ordernumber);
$orders = [];
foreach ($ordersId as $id) {
$magentoOrder = $this->salesOrder->load($id);
$orders[$magentoOrder->getStore()->getId()][] = $this->prepareOrder($magentoOrder);
}
foreach ($orders as $storeId => $ordersStore) {
$chunked = array_chunk($ordersStore, 50);
unset($ordersStore);
foreach ($chunked as $chunk) {
$this->api->setSite($this->helper->getSite($storeId));
$this->api->ordersUpload($chunk);
time_nanosleep(0, 250000000);
}
unset($chunked);
}
return true;
}
public function prepareOrder($magentoOrder)
{
$items = [];
$addressObj = $magentoOrder->getBillingAddress();
foreach ($magentoOrder->getAllItems() as $item) {
if ($item->getProductType() == "simple") {
$price = $item->getPrice();
if ($price == 0) {
$magentoProduct = $this->productRepository->getById($item->getProductId());
$price = $magentoProduct->getPrice();
}
$product = [
'productId' => $item->getProductId(),
'productName' => $item->getName(),
'quantity' => $item->getQtyOrdered(),
'initialPrice' => $price,
'offer' => [
'externalId'=>$item->getProductId()
]
];
unset($magentoProduct);
unset($price);
$items[] = $product;
}
}
$ship = $this->getShippingCode($magentoOrder->getShippingMethod());
$preparedOrder = [
'externalId' => $magentoOrder->getRealOrderId(),
'number' => $magentoOrder->getRealOrderId(),
'createdAt' => date('Y-m-d H:i:s'),
'lastName' => $magentoOrder->getCustomerLastname(),
'firstName' => $magentoOrder->getCustomerFirstname(),
'patronymic' => $magentoOrder->getCustomerMiddlename(),
'email' => $magentoOrder->getCustomerEmail(),
'phone' => $addressObj->getTelephone(),
'paymentType' => $this->config->getValue(
'retailcrm/Payment/' . $magentoOrder->getPayment()->getMethodInstance()->getCode()
),
'status' => $this->config->getValue('retailcrm/Status/'.$magentoOrder->getStatus()),
'discount' => abs($magentoOrder->getDiscountAmount()),
'items' => $items,
'delivery' => [
'code' => $this->config->getValue('retailcrm/Shipping/'.$ship),
'cost' => $magentoOrder->getShippingAmount(),
'address' => [
'index' => $addressObj->getData('postcode'),
'city' => $addressObj->getData('city'),
'country' => $addressObj->getData('country_id'),
'street' => $addressObj->getData('street'),
'region' => $addressObj->getData('region'),
'text' => trim(
',',
implode(
',',
[
$addressObj->getData('postcode'),
$addressObj->getData('city'),
$addressObj->getData('street'),
]
)
)
]
]
];
if (trim($preparedOrder['delivery']['code']) == '') {
unset($preparedOrder['delivery']['code']);
}
if (trim($preparedOrder['paymentType']) == '') {
unset($preparedOrder['paymentType']);
}
if (trim($preparedOrder['status']) == '') {
unset($preparedOrder['status']);
}
if ($magentoOrder->getCustomerIsGuest() == 0) {
$preparedOrder['customer']['externalId'] = $magentoOrder->getCustomerId();
}
$this->logger->writeDump($preparedOrder, 'OrderNumber');
return Helper::filterRecursive($preparedOrder);
}
}

View File

@ -0,0 +1,19 @@
<?php
namespace Retailcrm\Retailcrm\Model\Service;
class ConfigManager implements \Retailcrm\Retailcrm\Api\ConfigManagerInterface
{
private $config;
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->config = $config;
}
public function getConfigValue($path)
{
return $this->config->getValue($path);
}
}

View File

@ -4,28 +4,32 @@ namespace Retailcrm\Retailcrm\Model\Setting;
class Attribute implements \Magento\Framework\Option\ArrayInterface class Attribute implements \Magento\Framework\Option\ArrayInterface
{ {
protected $_entityType; private $entityType;
protected $_store; private $store;
public function __construct( public function __construct(
\Magento\Store\Model\Store $store, \Magento\Store\Model\Store $store,
\Magento\Eav\Model\Entity\Type $entityType \Magento\Eav\Model\Entity\Type $entityType
) { ) {
$this->_store = $store; $this->store = $store;
$this->_entityType = $entityType; $this->entityType = $entityType;
} }
public function toOptionArray() public function toOptionArray()
{ {
$types = ['text', 'multiselect', 'decimal']; $types = ['text', 'multiselect', 'decimal'];
$attributes = $this->_entityType->loadByCode('catalog_product')->getAttributeCollection(); $attributes = $this->entityType->loadByCode('catalog_product')->getAttributeCollection();
$attributes->addFieldToFilter('frontend_input', $types); $attributes->addFieldToFilter('frontend_input', $types);
$result = []; $result = [];
foreach ($attributes as $attr) { foreach ($attributes as $attr) {
if ($attr->getFrontendLabel()) { if ($attr->getFrontendLabel()) {
$result[] = array('value' => $attr->getAttributeId(), 'label' => $attr->getFrontendLabel(), 'title' => $attr->getAttributeCode()); $result[] = [
'value' => $attr->getAttributeId(),
'label' => $attr->getFrontendLabel(),
'title' => $attr->getAttributeCode()
];
} }
} }

View File

@ -4,23 +4,26 @@ namespace Retailcrm\Retailcrm\Model\Setting;
class Shipping implements \Magento\Framework\Option\ArrayInterface class Shipping implements \Magento\Framework\Option\ArrayInterface
{ {
protected $_entityType; private $entityType;
protected $_store; private $store;
private $config;
private $shippingConfig;
public function __construct( public function __construct(
\Magento\Store\Model\Store $store, \Magento\Store\Model\Store $store,
\Magento\Eav\Model\Entity\Type $entityType \Magento\Eav\Model\Entity\Type $entityType,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Shipping\Model\Config $shippingConfig
) { ) {
$this->_store = $store; $this->store = $store;
$this->_entityType = $entityType; $this->entityType = $entityType;
$this->config = $config;
$this->shippingConfig = $shippingConfig;
} }
public function toOptionArray() public function toOptionArray()
{ {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance(); $activeShipping = $this->shippingConfig->getActiveCarriers();
$activeShipping = $objectManager->create('Magento\Shipping\Model\Config')->getActiveCarriers();
$config = $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
foreach ($activeShipping as $carrierCode => $carrierModel) { foreach ($activeShipping as $carrierCode => $carrierModel) {
$options = []; $options = [];
@ -36,7 +39,7 @@ class Shipping implements \Magento\Framework\Option\ArrayInterface
]; ];
} }
$carrierTitle = $config->getValue('carriers/' . $carrierCode . '/title'); $carrierTitle = $this->config->getValue('carriers/' . $carrierCode . '/title');
} }
$methods[] = [ $methods[] = [

1
src/README.md Normal file
View File

@ -0,0 +1 @@
Magento 2 module for interaction with retailCRM

View File

@ -0,0 +1,101 @@
<?php
namespace Retailcrm\Retailcrm\Test\Helpers;
class FieldsetTest extends \PHPUnit\Framework\TestCase
{
protected $elementMock;
protected $authSessionMock;
protected $userMock;
protected $requestMock;
protected $urlModelMock;
protected $layoutMock;
protected $helperMock;
protected $groupMock;
protected $objectManager;
protected $context;
protected $form;
protected $testElementId = 'test_element_id';
protected $testFieldSetCss = 'test_fieldset_css';
public function setUp()
{
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
$collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
$escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
$formElementMock = $this->createMock(\Magento\Framework\Data\Form\Element\Select::class);
$factoryMock->expects($this->any())->method('create')->willReturn($formElementMock);
$formElementMock->expects($this->any())->method('setRenderer')->willReturn($formElementMock);
$elementCollection = $this->objectManager->getObject(\Magento\Framework\Data\Form\Element\Collection::class);
// element mock
$this->elementMock = $this->getMockBuilder(\Magento\Framework\Data\Form\Element\AbstractElement::class)
->setMethods([
'getId',
'getHtmlId',
'getName',
'getElements',
'getLegend',
'getComment',
'getIsNested',
'getExpanded',
'getForm',
'addField'
])
->setConstructorArgs([$factoryMock, $collectionFactoryMock, $escaperMock])
->getMockForAbstractClass();
$this->elementMock->expects($this->any())
->method('getId')
->willReturn($this->testElementId);
$this->elementMock->expects($this->any())
->method('getHtmlId')
->willReturn($this->testElementId);
$this->elementMock->expects($this->any())
->method('addField')
->willReturn($formElementMock);
$this->elementMock->expects($this->any())
->method('getElements')
->willReturn($elementCollection);
$this->authSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Auth\Session::class)
->setMethods(['getUser'])
->disableOriginalConstructor()
->getMock();
$this->userMock = $this->getMockBuilder(\Magento\User\Model\User::class)
->setMethods(['getExtra'])
->disableOriginalConstructor()
->getMock();
$this->authSessionMock->expects($this->any())
->method('getUser')
->willReturn($this->userMock);
$this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
->disableOriginalConstructor()
->getMock();
$this->requestMock->expects($this->any())
->method('getParam')
->willReturn('Test Param');
$factoryCollection = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
$elementCollection = $this->createMock(\Magento\Framework\Data\Form\Element\Collection::class);
$factoryCollection->expects($this->any())->method('create')->willReturn($elementCollection);
$rendererMock = $this->createMock(\Magento\Framework\Data\Form\Element\Renderer\RendererInterface::class);
$this->urlModelMock = $this->createMock(\Magento\Backend\Model\Url::class);
$this->layoutMock = $this->createMock(\Magento\Framework\View\Layout::class);
$this->groupMock = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
$this->groupMock->expects($this->any())->method('getFieldsetCss')->will($this->returnValue($this->testFieldSetCss));
$this->context = $this->createMock(\Magento\Backend\Block\Context::class);
$this->context->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
$this->context->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlModelMock);
$this->layoutMock->expects($this->any())->method('getBlockSingleton')->willReturn($rendererMock);
$this->helperMock = $this->createMock(\Magento\Framework\View\Helper\Js::class);
$this->form = $this->createPartialMock(\Magento\Config\Block\System\Config\Form::class, ['getElements', 'getRequest']);
$this->form->expects($this->any())->method('getElements')->willReturn($elementCollection);
$this->form->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
}
}

View File

@ -0,0 +1,123 @@
<?php
namespace Retailcrm\Retailcrm\Test\Unit\Block\Adminhtml\System\Config\Form\Fieldset;
class PaymentTest extends \Retailcrm\Retailcrm\Test\Helpers\FieldsetTest
{
/**
* @param boolean $isSuccessful
* @param boolean $isConfigured
* @dataProvider dataProvider
*/
public function testRender($isSuccessful, $isConfigured)
{
// response
$response = $this->objectManager->getObject(
\RetailCrm\Response\ApiResponse::class,
[
'statusCode' => $isSuccessful ? 200 : 404,
'responseBody' => json_encode($this->getTestResponse())
]
);
// api client mock
$client = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class)
->disableOriginalConstructor()
->setMethods(
[
'isConfigured',
'paymentTypesList'
]
)
->getMock();
$client->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
$client->expects($this->any())
->method('paymentTypesList')
->willReturn($response);
// payment config mock
$paymentConfig = $this->getMockBuilder(\Magento\Payment\Model\Config::class)
->disableOriginalConstructor()
->getMock();
$paymentConfig->expects($this->any())
->method('getActiveMethods')
->willReturn($this->getTestActiveMethods());
$data = [
'authSession' => $this->authSessionMock,
'jsHelper' => $this->helperMock,
'data' => ['group' => $this->groupMock],
'client' => $client,
'paymentConfig' => $paymentConfig,
'context' => $this->context
];
$payment = $this->objectManager->getObject(
\Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Payment::class,
$data
);
$payment->setForm($this->form);
$payment->setLayout($this->layoutMock);
$html = $payment->render($this->elementMock);
$this->assertContains($this->testElementId, $html);
$this->assertContains($this->testFieldSetCss, $html);
if (!$isConfigured) {
$expected = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$this->assertContains($expected, $html);
}
}
protected function getTestActiveMethods()
{
$payment = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
$payment->expects($this->any())
->method('getTitle')
->willReturn('Test Payment');
return ['test_payment' => $payment];
}
private function getTestResponse()
{
return [
'success' => true,
'paymentTypes' => [
[
'code' => 'payment',
'name' => 'Test payment type'
]
]
];
}
public function dataProvider()
{
return [
[
'is_successful' => true,
'is_configured' => true
],
[
'is_successful' => false,
'is_configured' => false
],
[
'is_successful' => true,
'is_configured' => false
],
[
'is_successful' => false,
'is_configured' => true
]
];
}
}

View File

@ -0,0 +1,124 @@
<?php
namespace Retailcrm\Retailcrm\Test\Unit\Block\Adminhtml\System\Config\Form\Fieldset;
class ShippingTest extends \Retailcrm\Retailcrm\Test\Helpers\FieldsetTest
{
/**
* @param $isSuccessful
* @param $isConfigured
* @dataProvider dataProvider
*/
public function testRender($isSuccessful, $isConfigured)
{
// response
$response = $this->objectManager->getObject(
\RetailCrm\Response\ApiResponse::class,
[
'statusCode' => $isSuccessful ? 200 : 404,
'responseBody' => json_encode($this->getTestResponse())
]
);
// api client mock
$client = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class)
->disableOriginalConstructor()
->setMethods(
[
'isConfigured',
'deliveryTypesList'
]
)
->getMock();
$client->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
$client->expects($this->any())
->method('deliveryTypesList')
->willReturn($response);
// shipping config mock
$shippingConfig = $this->getMockBuilder(\Magento\Shipping\Model\Config::class)
->disableOriginalConstructor()
->getMock();
$shippingConfig->expects($this->any())
->method('getActiveCarriers')
->willReturn($this->getTestActiveCarriers());
$data = [
'authSession' => $this->authSessionMock,
'jsHelper' => $this->helperMock,
'data' => ['group' => $this->groupMock],
'client' => $client,
'shippingConfig' => $shippingConfig,
'context' => $this->context
];
$shipping = $this->objectManager->getObject(
\Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Shipping::class,
$data
);
$shipping->setForm($this->form);
$shipping->setLayout($this->layoutMock);
$html = $shipping->render($this->elementMock);
$this->assertContains($this->testElementId, $html);
$this->assertContains($this->testFieldSetCss, $html);
if (!$isConfigured) {
$expected = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$this->assertContains($expected, $html);
}
}
protected function getTestActiveCarriers()
{
$shipping = $this->getMockBuilder(\Magento\Shipping\Model\Carrier\AbstractCarrierInterface::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
$shipping->expects($this->any())
->method('getConfigData')
->with('title')
->willReturn('Test Shipping');
return ['test_shipping' => $shipping];
}
private function getTestResponse()
{
return [
'success' => true,
'deliveryTypes' => [
[
'code' => 'delivery',
'name' => 'Test delivery type'
]
]
];
}
public function dataProvider()
{
return [
[
'is_successful' => true,
'is_configured' => true
],
[
'is_successful' => false,
'is_configured' => false
],
[
'is_successful' => true,
'is_configured' => false
],
[
'is_successful' => false,
'is_configured' => true
]
];
}
}

View File

@ -0,0 +1,101 @@
<?php
namespace Retailcrm\Retailcrm\Test\Unit\Block\Adminhtml\System\Config\Form\Fieldset;
class SiteTest extends \Retailcrm\Retailcrm\Test\Helpers\FieldsetTest
{
/**
* @param boolean $isSuccessful
* @param boolean $isConfigured
* @dataProvider dataProvider
*/
public function testRender($isSuccessful, $isConfigured)
{
// response
$response = $this->objectManager->getObject(
\RetailCrm\Response\ApiResponse::class,
[
'statusCode' => $isSuccessful ? 200 : 404,
'responseBody' => json_encode($this->getTestResponse())
]
);
// api client mock
$client = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class)
->disableOriginalConstructor()
->setMethods(
[
'isConfigured',
'sitesList'
]
)
->getMock();
$client->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
$client->expects($this->any())
->method('sitesList')
->willReturn($response);
$data = [
'authSession' => $this->authSessionMock,
'jsHelper' => $this->helperMock,
'data' => ['group' => $this->groupMock],
'client' => $client,
'context' => $this->context
];
$site = $this->objectManager->getObject(
\Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Site::class,
$data
);
$site->setForm($this->form);
$site->setLayout($this->layoutMock);
$html = $site->render($this->elementMock);
$this->assertContains($this->testElementId, $html);
$this->assertContains($this->testFieldSetCss, $html);
if (!$isConfigured) {
$expected = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$this->assertContains($expected, $html);
}
}
private function getTestResponse()
{
return [
'success' => true,
'sites' => [
[
'code' => 'payment',
'name' => 'Test site'
]
]
];
}
public function dataProvider()
{
return [
[
'is_successful' => true,
'is_configured' => true
],
[
'is_successful' => false,
'is_configured' => false
],
[
'is_successful' => true,
'is_configured' => false
],
[
'is_successful' => false,
'is_configured' => true
]
];
}
}

View File

@ -0,0 +1,130 @@
<?php
namespace Retailcrm\Retailcrm\Test\Unit\Block\Adminhtml\System\Config\Form\Fieldset;
class SitesTest extends \Retailcrm\Retailcrm\Test\Helpers\FieldsetTest
{
/**
* @param boolean $isSuccessful
* @param boolean $isConfigured
* @dataProvider dataProvider
*/
public function testRender($isSuccessful, $isConfigured)
{
// response
$response = $this->objectManager->getObject(
\RetailCrm\Response\ApiResponse::class,
[
'statusCode' => $isSuccessful ? 200 : 404,
'responseBody' => json_encode($this->getTestResponse())
]
);
// api client mock
$client = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class)
->disableOriginalConstructor()
->setMethods(
[
'isConfigured',
'sitesList'
]
)
->getMock();
$client->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
$client->expects($this->any())
->method('sitesList')
->willReturn($response);
$websiteMock = $this->createMock(\Magento\Store\Model\Website::class);
$websiteMock->expects($this->any())->method('getStores')->willReturn($this->getTestStores());
// payment config mock
$storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
$storeManager->expects($this->any())
->method('getWebsite')
->willReturn($websiteMock);
$data = [
'authSession' => $this->authSessionMock,
'jsHelper' => $this->helperMock,
'data' => ['group' => $this->groupMock],
'client' => $client,
'storeManager' => $storeManager,
'context' => $this->context
];
$sites = $this->objectManager->getObject(
\Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Sites::class,
$data
);
$sites->setForm($this->form);
$sites->setLayout($this->layoutMock);
$html = $sites->render($this->elementMock);
$this->assertContains($this->testElementId, $html);
$this->assertContains($this->testFieldSetCss, $html);
if (!$isConfigured) {
$expected = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$this->assertContains($expected, $html);
}
}
protected function getTestStores()
{
$store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
->disableOriginalConstructor()
->getMock();
$store->expects($this->any())
->method('getName')
->willReturn('Test Store');
$store->expects($this->any())
->method('getCode')
->willReturn('test_store_code');
return ['test_site' => $store];
}
private function getTestResponse()
{
return [
'success' => true,
'sites' => [
[
'code' => 'payment',
'name' => 'Test site'
]
]
];
}
public function dataProvider()
{
return [
[
'is_successful' => true,
'is_configured' => true
],
[
'is_successful' => false,
'is_configured' => false
],
[
'is_successful' => true,
'is_configured' => false
],
[
'is_successful' => false,
'is_configured' => true
]
];
}
}

View File

@ -0,0 +1,120 @@
<?php
namespace Retailcrm\Retailcrm\Test\Unit\Block\Adminhtml\System\Config\Form\Fieldset;
class StatusTest extends \Retailcrm\Retailcrm\Test\Helpers\FieldsetTest
{
/**
* @param boolean $isSuccessful
* @param boolean $isConfigured
* @dataProvider dataProvider
*/
public function testRender($isSuccessful, $isConfigured)
{
// response
$response = $this->objectManager->getObject(
\RetailCrm\Response\ApiResponse::class,
[
'statusCode' => $isSuccessful ? 200 : 404,
'responseBody' => json_encode($this->getTestResponse())
]
);
// api client mock
$client = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class)
->disableOriginalConstructor()
->setMethods(
[
'isConfigured',
'statusesList'
]
)
->getMock();
$client->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
$client->expects($this->any())
->method('statusesList')
->willReturn($response);
// status collection mock
$statusCollection = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Status\Collection::class)
->disableOriginalConstructor()
->getMock();
$statusCollection->expects($this->any())
->method('toOptionArray')
->willReturn($this->getTestStatuses());
$data = [
'authSession' => $this->authSessionMock,
'jsHelper' => $this->helperMock,
'data' => ['group' => $this->groupMock],
'client' => $client,
'statusCollection' => $statusCollection,
'context' => $this->context
];
$status = $this->objectManager->getObject(
\Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Status::class,
$data
);
$status->setForm($this->form);
$status->setLayout($this->layoutMock);
$html = $status->render($this->elementMock);
$this->assertContains($this->testElementId, $html);
$this->assertContains($this->testFieldSetCss, $html);
if (!$isConfigured) {
$expected = '<div style="margin-left: 15px;"><b><i>Please check your API Url & API Key</i></b></div>';
$this->assertContains($expected, $html);
}
}
protected function getTestStatuses()
{
$status = [
'label' => 'Test Status',
'value' => 'Test status'
];
return ['test_status' => $status];
}
private function getTestResponse()
{
return [
'success' => true,
'statuses' => [
[
'code' => 'status',
'name' => 'Test status'
]
]
];
}
public function dataProvider()
{
return [
[
'is_successful' => true,
'is_configured' => true
],
[
'is_successful' => false,
'is_configured' => false
],
[
'is_successful' => true,
'is_configured' => false
],
[
'is_successful' => false,
'is_configured' => true
]
];
}
}

View File

@ -4,14 +4,14 @@ namespace Retailcrm\Retailcrm\Test\Unit\Observer;
class CustomerTest extends \PHPUnit\Framework\TestCase class CustomerTest extends \PHPUnit\Framework\TestCase
{ {
protected $mockApi; private $mockApi;
protected $mockResponse; private $mockResponse;
protected $config; private $registry;
protected $registry; private $mockObserver;
protected $mockObserver; private $mockEvent;
protected $mockEvent; private $mockCustomer;
protected $objectManager; private $unit;
protected $mockCustomer; private $helper;
public function setUp() public function setUp()
{ {
@ -19,7 +19,9 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods([ ->setMethods([
'customersEdit', 'customersEdit',
'customersCreate' 'customersCreate',
'isConfigured',
'setSite'
]) ])
->getMock(); ->getMock();
@ -28,9 +30,6 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
->setMethods(['isSuccessful']) ->setMethods(['isSuccessful'])
->getMock(); ->getMock();
$this->config = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
->getMockForAbstractClass();
$this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class) $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@ -44,9 +43,6 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
->setMethods(['getCustomer']) ->setMethods(['getCustomer'])
->getMock(); ->getMock();
$this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
->getMockForAbstractClass();
$this->mockCustomer = $this->getMockBuilder(\Magento\Customer\Model\Customer::class) $this->mockCustomer = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods([ ->setMethods([
@ -54,28 +50,28 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
'getEmail', 'getEmail',
'getFirstname', 'getFirstname',
'getMiddlename', 'getMiddlename',
'getLastname' 'getLastname',
'getStore'
]) ])
->getMock(); ->getMock();
$this->unit = new \Retailcrm\Retailcrm\Model\Observer\Customer( $this->helper = $this->createMock(\Retailcrm\Retailcrm\Helper\Data::class);
$this->objectManager,
$this->config,
$this->registry
);
$reflection = new \ReflectionClass($this->unit); $this->unit = new \Retailcrm\Retailcrm\Model\Observer\Customer(
$reflection_property = $reflection->getProperty('_api'); $this->registry,
$reflection_property->setAccessible(true); $this->helper,
$reflection_property->setValue($this->unit, $this->mockApi); $this->mockApi
);
} }
/** /**
* @param boolean $isSuccessful * @param boolean $isSuccessful
* @param boolean $isConfigured
* @dataProvider dataProviderCustomer * @dataProvider dataProviderCustomer
*/ */
public function testExecute( public function testExecute(
$isSuccessful $isSuccessful,
$isConfigured
) { ) {
$testData = $this->getAfterSaveCustomerTestData(); $testData = $this->getAfterSaveCustomerTestData();
@ -95,38 +91,61 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
->method('customersCreate') ->method('customersCreate')
->willReturn($this->mockResponse); ->willReturn($this->mockResponse);
$this->mockApi->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
// mock Customer // mock Customer
$this->mockCustomer->expects($this->once()) $this->mockCustomer->expects($this->any())
->method('getId') ->method('getId')
->willReturn($testData['id']); ->willReturn($testData['id']);
$this->mockCustomer->expects($this->once()) $this->mockCustomer->expects($this->any())
->method('getEmail') ->method('getEmail')
->willReturn($testData['email']); ->willReturn($testData['email']);
$this->mockCustomer->expects($this->once()) $this->mockCustomer->expects($this->any())
->method('getFirstname') ->method('getFirstname')
->willReturn($testData['firstname']); ->willReturn($testData['firstname']);
$this->mockCustomer->expects($this->once()) $this->mockCustomer->expects($this->any())
->method('getMiddlename') ->method('getMiddlename')
->willReturn($testData['middlename']); ->willReturn($testData['middlename']);
$this->mockCustomer->expects($this->once()) $this->mockCustomer->expects($this->any())
->method('getLastname') ->method('getLastname')
->willReturn($testData['lastname']); ->willReturn($testData['lastname']);
$store = $this->createMock(\Magento\Store\Model\Store::class);
$this->mockCustomer->expects($this->any())
->method('getStore')
->willReturn($store);
// mock Event // mock Event
$this->mockEvent->expects($this->once()) $this->mockEvent->expects($this->any())
->method('getCustomer') ->method('getCustomer')
->willReturn($this->mockCustomer); ->willReturn($this->mockCustomer);
// mock Observer // mock Observer
$this->mockObserver->expects($this->once()) $this->mockObserver->expects($this->any())
->method('getEvent') ->method('getEvent')
->willReturn($this->mockEvent); ->willReturn($this->mockEvent);
$this->unit->execute($this->mockObserver); $customerObserver = $this->unit->execute($this->mockObserver);
if ($isConfigured) {
$this->assertNotEmpty($this->unit->getCustomer());
$this->assertArrayHasKey('externalId', $this->unit->getCustomer());
$this->assertArrayHasKey('email', $this->unit->getCustomer());
$this->assertArrayHasKey('firstName', $this->unit->getCustomer());
$this->assertArrayHasKey('lastName', $this->unit->getCustomer());
$this->assertArrayHasKey('patronymic', $this->unit->getCustomer());
$this->assertArrayHasKey('createdAt', $this->unit->getCustomer());
$this->assertInstanceOf(\RetailCrm\Retailcrm\Model\Observer\Customer::class, $customerObserver);
} else {
$this->assertEmpty($this->unit->getCustomer());
}
} }
/** /**
@ -134,7 +153,7 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
* *
* @return array * @return array
*/ */
protected function getAfterSaveCustomerTestData() private function getAfterSaveCustomerTestData()
{ {
return [ return [
'id' => 1, 'id' => 1,
@ -149,10 +168,20 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
{ {
return [ return [
[ [
'is_successful' => true 'is_successful' => true,
'is_configured' => true
], ],
[ [
'is_successful' => false 'is_successful' => false,
'is_configured' => false
],
[
'is_successful' => false,
'is_configured' => true
],
[
'is_successful' => true,
'is_configured' => false
] ]
]; ];
} }

View File

@ -7,24 +7,24 @@ namespace Retailcrm\Retailcrm\Test\Unit\Observer;
*/ */
class OrderCreateTest extends \PHPUnit\Framework\TestCase class OrderCreateTest extends \PHPUnit\Framework\TestCase
{ {
protected $objectManager; private $config;
protected $_config; private $unit;
protected $_unit; private $mockEvent;
protected $_mockEvent; private $mockObserver;
protected $_mockObserver; private $registry;
protected $_registry; private $mockApi;
protected $_mockApi; private $mockOrder;
protected $_mockOrder; private $mockItem;
protected $_mockItem; private $mockStore;
protected $_mockStore; private $mockBillingAddress;
protected $_mockBillingAddress; private $mockResponse;
protected $_mockResponse; private $mockPayment;
protected $_mockPayment; private $mockPaymentMethod;
protected $_mockPaymentMethod; private $logger;
protected function setUp() public function setUp()
{ {
$this->_mockApi = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class) $this->mockApi = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods([ ->setMethods([
'ordersGet', 'ordersGet',
@ -32,43 +32,33 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
'customersGet', 'customersGet',
'customersCreate', 'customersCreate',
'customersList', 'customersList',
'getVersion' 'getVersion',
'isConfigured',
'setSite'
]) ])
->getMock(); ->getMock();
$this->_mockObserver = $this->getMockBuilder(\Magento\Framework\Event\Observer::class) $this->mockObserver = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->_mockEvent = $this->getMockBuilder(\Magento\Framework\Event::class) $this->mockEvent = $this->getMockBuilder(\Magento\Framework\Event::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods(['getOrder']) ->setMethods(['getOrder'])
->getMock(); ->getMock();
$this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class) $this->config = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
->getMockForAbstractClass(); ->getMockForAbstractClass();
// mock Object Manager $this->logger = $this->getMockBuilder(\Retailcrm\Retailcrm\Model\Logger\Logger::class)
$this->objectManager->expects($this->any())
->method('get')
->with($this->logicalOr(
$this->equalTo('\Retailcrm\Retailcrm\Helper\Data'),
$this->equalTo('\Retailcrm\Retailcrm\Model\Logger\Logger')
))
->will($this->returnCallback([$this, 'getCallbackDataClasses']));
$this->_config = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
->getMockForAbstractClass();
$this->_logger = $this->getMockBuilder(\Retailcrm\Retailcrm\Model\Logger\Logger::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->_registry = $this->getMockBuilder(\Magento\Framework\Registry::class) $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->_mockOrder = $this->getMockBuilder(\Magento\Sales\Order::class) $this->mockOrder = $this->getMockBuilder(\Magento\Sales\Order::class)
->setMethods([ ->setMethods([
'getId', 'getId',
'getRealOrderId', 'getRealOrderId',
@ -91,16 +81,16 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
]) ])
->getMock(); ->getMock();
$this->_mockPayment = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment::class) $this->mockPayment = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment::class)
->setMethods(['getMethodInstance']) ->setMethods(['getMethodInstance'])
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->_mockPaymentMethod = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class) $this->mockPaymentMethod = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMockForAbstractClass(); ->getMockForAbstractClass();
$this->_mockItem = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class) $this->mockItem = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods([ ->setMethods([
'getPrice', 'getPrice',
@ -111,31 +101,35 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
]) ])
->getMock(); ->getMock();
$this->_mockStore = $this->getMockBuilder(\Magento\Store\Model\Store::class) $this->mockStore = $this->getMockBuilder(\Magento\Store\Model\Store::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods(['getCode']) ->setMethods(['getCode'])
->getMock(); ->getMock();
$this->_mockBillingAddress = $this->getMockBuilder(\Magento\Customer\Model\Address\AddressModelInterface::class) $this->mockBillingAddress = $this->getMockBuilder(\Magento\Customer\Model\Address\AddressModelInterface::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods(['getTelephone', 'getData']) ->setMethods(['getTelephone', 'getData'])
->getMockForAbstractClass(); ->getMockForAbstractClass();
$this->_mockResponse = $this->getMockBuilder(\RetailCrm\Response\ApiResponse::class) $this->mockResponse = $this->getMockBuilder(\RetailCrm\Response\ApiResponse::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods(['isSuccessful']) ->setMethods(['isSuccessful'])
->getMock(); ->getMock();
$this->_unit = new \Retailcrm\Retailcrm\Model\Observer\OrderCreate( $product = $this->getMockBuilder(\Magento\Catalog\Model\ProductRepository::class)
$this->objectManager, ->disableOriginalConstructor()
$this->_config, ->getMock();
$this->_registry
);
$reflection = new \ReflectionClass($this->_unit); $helper = $this->createMock(\Retailcrm\Retailcrm\Helper\Data::class);
$reflection_property = $reflection->getProperty('_api');
$reflection_property->setAccessible(true); $this->unit = new \Retailcrm\Retailcrm\Model\Observer\OrderCreate(
$reflection_property->setValue($this->_unit, $this->_mockApi); $this->config,
$this->registry,
$this->logger,
$product,
$helper,
$this->mockApi
);
} }
/** /**
@ -143,54 +137,60 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
* @param string $errorMsg * @param string $errorMsg
* @param int $customerIsGuest * @param int $customerIsGuest
* @param string $apiVersion * @param string $apiVersion
* @param boolean $isConfigured
* @dataProvider dataProviderOrderCreate * @dataProvider dataProviderOrderCreate
*/ */
public function testExecute( public function testExecute(
$isSuccessful, $isSuccessful,
$errorMsg, $errorMsg,
$customerIsGuest, $customerIsGuest,
$apiVersion $apiVersion,
$isConfigured
) { ) {
$testData = $this->getAfterSaveOrderTestData(); $testData = $this->getAfterSaveOrderTestData();
// mock Response // mock Response
$this->_mockResponse->expects($this->any()) $this->mockResponse->expects($this->any())
->method('isSuccessful') ->method('isSuccessful')
->willReturn($isSuccessful); ->willReturn($isSuccessful);
$this->_mockResponse->errorMsg = $errorMsg; $this->mockResponse->errorMsg = $errorMsg;
// mock API // mock API
$this->_mockApi->expects($this->any()) $this->mockApi->expects($this->any())
->method('ordersGet') ->method('ordersGet')
->willReturn($this->_mockResponse); ->willReturn($this->mockResponse);
$this->_mockApi->expects($this->any()) $this->mockApi->expects($this->any())
->method('ordersCreate') ->method('ordersCreate')
->willReturn($this->_mockResponse); ->willReturn($this->mockResponse);
$this->_mockApi->expects($this->any()) $this->mockApi->expects($this->any())
->method('customersGet') ->method('customersGet')
->willReturn($this->_mockResponse); ->willReturn($this->mockResponse);
$this->_mockApi->expects($this->any()) $this->mockApi->expects($this->any())
->method('customersCreate') ->method('customersCreate')
->willReturn($this->_mockResponse); ->willReturn($this->mockResponse);
$this->_mockApi->expects($this->any()) $this->mockApi->expects($this->any())
->method('customersList') ->method('customersList')
->willReturn($this->_mockResponse); ->willReturn($this->mockResponse);
$this->_mockApi->expects($this->any()) $this->mockApi->expects($this->any())
->method('getVersion') ->method('getVersion')
->willReturn($apiVersion); ->willReturn($apiVersion);
$this->mockApi->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
// billing address mock set data // billing address mock set data
$this->_mockBillingAddress->expects($this->any()) $this->mockBillingAddress->expects($this->any())
->method('getTelephone') ->method('getTelephone')
->willReturn($testData['order.billingAddress']['telephone']); ->willReturn($testData['order.billingAddress']['telephone']);
$this->_mockBillingAddress->expects($this->any()) $this->mockBillingAddress->expects($this->any())
->method('getData') ->method('getData')
->with($this->logicalOr( ->with($this->logicalOr(
$this->equalTo('city'), $this->equalTo('city'),
@ -202,113 +202,138 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
->will($this->returnCallback([$this, 'getCallbackDataAddress'])); ->will($this->returnCallback([$this, 'getCallbackDataAddress']));
// store mock set data // store mock set data
$this->_mockStore->expects($this->any()) $this->mockStore->expects($this->any())
->method('getCode') ->method('getCode')
->willReturn(1); ->willReturn(1);
// order item mock set data // order item mock set data
$this->_mockItem->expects($this->any()) $this->mockItem->expects($this->any())
->method('getProductType') ->method('getProductType')
->willReturn('simple'); ->willReturn('simple');
$this->_mockItem->expects($this->any()) $this->mockItem->expects($this->any())
->method('getPrice') ->method('getPrice')
->willReturn(999.99); ->willReturn(999.99);
$this->_mockItem->expects($this->any()) $this->mockItem->expects($this->any())
->method('getProductId') ->method('getProductId')
->willReturn(10); ->willReturn(10);
$this->_mockItem->expects($this->any()) $this->mockItem->expects($this->any())
->method('getName') ->method('getName')
->willReturn('Product name'); ->willReturn('Product name');
$this->_mockItem->expects($this->any()) $this->mockItem->expects($this->any())
->method('getQtyOrdered') ->method('getQtyOrdered')
->willReturn(3); ->willReturn(3);
// order mock set data // order mock set data
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getId') ->method('getId')
->willReturn($testData['order.id']); ->willReturn($testData['order.id']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getBillingAddress') ->method('getBillingAddress')
->willReturn($this->_mockBillingAddress); ->willReturn($this->mockBillingAddress);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getShippingMethod') ->method('getShippingMethod')
->willReturn($testData['order.shippingMethod']); ->willReturn($testData['order.shippingMethod']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getStore') ->method('getStore')
->willReturn($this->_mockStore); ->willReturn($this->mockStore);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getRealOrderId') ->method('getRealOrderId')
->willReturn($testData['order.realOrderId']); ->willReturn($testData['order.realOrderId']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getCreatedAt') ->method('getCreatedAt')
->willReturn(date('Y-m-d H:i:s')); ->willReturn(date('Y-m-d H:i:s'));
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getCustomerLastname') ->method('getCustomerLastname')
->willReturn($testData['order.customerLastname']); ->willReturn($testData['order.customerLastname']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getCustomerFirstname') ->method('getCustomerFirstname')
->willReturn($testData['order.customerFirstname']); ->willReturn($testData['order.customerFirstname']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getCustomerMiddlename') ->method('getCustomerMiddlename')
->willReturn($testData['order.customerMiddlename']); ->willReturn($testData['order.customerMiddlename']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getCustomerEmail') ->method('getCustomerEmail')
->willReturn($testData['order.customerEmail']); ->willReturn($testData['order.customerEmail']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getAllItems') ->method('getAllItems')
->willReturn($testData['order.allItems']); ->willReturn($testData['order.allItems']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getStatus') ->method('getStatus')
->willReturn($testData['order.status']); ->willReturn($testData['order.status']);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getCustomerIsGuest') ->method('getCustomerIsGuest')
->willReturn($customerIsGuest); ->willReturn($customerIsGuest);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getCustomerId') ->method('getCustomerId')
->willReturn(1); ->willReturn(1);
$this->_mockOrder->expects($this->any()) $this->mockOrder->expects($this->any())
->method('getPayment') ->method('getPayment')
->willReturn($this->_mockPayment); ->willReturn($this->mockPayment);
// mock Payment Method // mock Payment Method
$this->_mockPaymentMethod->expects($this->any()) $this->mockPaymentMethod->expects($this->any())
->method('getCode') ->method('getCode')
->willReturn($testData['order.paymentMethod']); ->willReturn($testData['order.paymentMethod']);
// mock Payment // mock Payment
$this->_mockPayment->expects($this->any()) $this->mockPayment->expects($this->any())
->method('getMethodInstance') ->method('getMethodInstance')
->willReturn($this->_mockPaymentMethod); ->willReturn($this->mockPaymentMethod);
// mock Event // mock Event
$this->_mockEvent->expects($this->once()) $this->mockEvent->expects($this->any())
->method('getOrder') ->method('getOrder')
->willReturn($this->_mockOrder); ->willReturn($this->mockOrder);
// mock Observer // mock Observer
$this->_mockObserver->expects($this->once()) $this->mockObserver->expects($this->any())
->method('getEvent') ->method('getEvent')
->willReturn($this->_mockEvent); ->willReturn($this->mockEvent);
$this->_unit->execute($this->_mockObserver); $orderCreateObserver = $this->unit->execute($this->mockObserver);
if ($isConfigured && !$isSuccessful) {
$this->assertNotEmpty($this->unit->getOrder());
$this->assertArrayHasKey('externalId', $this->unit->getOrder());
$this->assertArrayHasKey('number', $this->unit->getOrder());
$this->assertArrayHasKey('createdAt', $this->unit->getOrder());
$this->assertArrayHasKey('lastName', $this->unit->getOrder());
$this->assertArrayHasKey('firstName', $this->unit->getOrder());
$this->assertArrayHasKey('patronymic', $this->unit->getOrder());
$this->assertArrayHasKey('email', $this->unit->getOrder());
$this->assertArrayHasKey('phone', $this->unit->getOrder());
// $this->assertArrayHasKey('status', $this->unit->getOrder());
$this->assertArrayHasKey('items', $this->unit->getOrder());
$this->assertArrayHasKey('delivery', $this->unit->getOrder());
if ($apiVersion == 'v5') {
$this->assertArrayHasKey('payments', $this->unit->getOrder());
} else {
$this->assertArrayHasKey('paymentType', $this->unit->getOrder());
}
$this->assertInstanceOf(\Retailcrm\Retailcrm\Model\Observer\OrderCreate::class, $orderCreateObserver);
} elseif (!$isConfigured || $isSuccessful) {
$this->assertEmpty($this->unit->getOrder());
}
} }
/** /**
@ -316,7 +341,7 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
* *
* @return array $testOrderData * @return array $testOrderData
*/ */
protected function getAfterSaveOrderTestData() private function getAfterSaveOrderTestData()
{ {
$testOrderData = [ $testOrderData = [
'order.id' => 1, 'order.id' => 1,
@ -332,7 +357,7 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
'country_id' => 'RU' 'country_id' => 'RU'
] ]
], ],
'order.allItems' => [$this->_mockItem], 'order.allItems' => [$this->mockItem],
'order.shippingMethod' => 'flatrate_flatrate', 'order.shippingMethod' => 'flatrate_flatrate',
'order.paymentMethod' => 'checkmo', 'order.paymentMethod' => 'checkmo',
'order.customerLastname' => 'Test', 'order.customerLastname' => 'Test',
@ -377,49 +402,57 @@ class OrderCreateTest extends \PHPUnit\Framework\TestCase
'is_successful' => true, 'is_successful' => true,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 1, 'customer_is_guest' => 1,
'api_version' => 'v4' 'api_version' => 'v4',
'is_configured' => true
], ],
[ [
'is_successful' => true, 'is_successful' => true,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 0, 'customer_is_guest' => 0,
'api_version' => 'v4' 'api_version' => 'v4',
'is_configured' => false
], ],
[ [
'is_successful' => false, 'is_successful' => false,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 1, 'customer_is_guest' => 1,
'api_version' => 'v4' 'api_version' => 'v4',
'is_configured' => true
], ],
[ [
'is_successful' => false, 'is_successful' => false,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 0, 'customer_is_guest' => 0,
'api_version' => 'v4' 'api_version' => 'v4',
'is_configured' => false
], ],
[ [
'is_successful' => true, 'is_successful' => true,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 1, 'customer_is_guest' => 1,
'api_version' => 'v5' 'api_version' => 'v5',
'is_configured' => true
], ],
[ [
'is_successful' => true, 'is_successful' => true,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 0, 'customer_is_guest' => 0,
'api_version' => 'v5' 'api_version' => 'v5',
'is_configured' => false
], ],
[ [
'is_successful' => false, 'is_successful' => false,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 1, 'customer_is_guest' => 1,
'api_version' => 'v5' 'api_version' => 'v5',
'is_configured' => true
], ],
[ [
'is_successful' => false, 'is_successful' => false,
'error_msg' => 'Not found', 'error_msg' => 'Not found',
'customer_is_guest' => 0, 'customer_is_guest' => 0,
'api_version' => 'v5' 'api_version' => 'v5',
'is_configured' => false
] ]
]; ];
} }

View File

@ -4,24 +4,26 @@ namespace Retailcrm\Retailcrm\Test\Unit\Observer;
class OrderUpdateTest extends \PHPUnit\Framework\TestCase class OrderUpdateTest extends \PHPUnit\Framework\TestCase
{ {
protected $unit; private $unit;
protected $objectManager; private $objectManager;
protected $config; private $config;
protected $mockApi; private $mockApi;
protected $mockObserver; private $mockObserver;
protected $mockEvent; private $mockEvent;
protected $mockOrder; private $mockOrder;
protected $mockPayment; private $mockPayment;
protected $registry; private $registry;
protected function setUp() public function setUp()
{ {
$this->mockApi = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class) $this->mockApi = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Proxy::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods([ ->setMethods([
'ordersEdit', 'ordersEdit',
'ordersPaymentsEdit', 'ordersPaymentsEdit',
'getVersion' 'getVersion',
'isConfigured',
'setSite'
]) ])
->getMock(); ->getMock();
@ -37,16 +39,14 @@ class OrderUpdateTest extends \PHPUnit\Framework\TestCase
$this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class) $this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
->getMockForAbstractClass(); ->getMockForAbstractClass();
$helper = $this->getMockBuilder(\Retailcrm\Retailcrm\Helper\Data::class) $this->mockOrder = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock();
$this->mockOrder = $this->getMockBuilder(\Magento\Sales\Order::class)
->setMethods([ ->setMethods([
'getId', 'getId',
'getPayment', 'getPayment',
'getBaseTotalDue', 'getBaseTotalDue',
'getStatus' 'getStatus',
'getStore'
]) ])
->getMock(); ->getMock();
@ -55,12 +55,6 @@ class OrderUpdateTest extends \PHPUnit\Framework\TestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
// mock Object Manager
$this->objectManager->expects($this->any())
->method('get')
->with('\Retailcrm\Retailcrm\Helper\Data')
->willReturn($helper);
$this->config = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) $this->config = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
->getMockForAbstractClass(); ->getMockForAbstractClass();
@ -68,26 +62,26 @@ class OrderUpdateTest extends \PHPUnit\Framework\TestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->unit = new \Retailcrm\Retailcrm\Model\Observer\OrderUpdate( $helper = $this->createMock(\Retailcrm\Retailcrm\Helper\Data::class);
$this->objectManager,
$this->config,
$this->registry
);
$reflection = new \ReflectionClass($this->unit); $this->unit = new \Retailcrm\Retailcrm\Model\Observer\OrderUpdate(
$reflection_property = $reflection->getProperty('_api'); $this->config,
$reflection_property->setAccessible(true); $this->registry,
$reflection_property->setValue($this->unit, $this->mockApi); $helper,
$this->mockApi
);
} }
/** /**
* @param int $getBaseTotalDue * @param int $getBaseTotalDue
* @param string $apiVersion * @param string $apiVersion
* @param boolean $isConfigured
* @dataProvider dataProviderOrderUpdate * @dataProvider dataProviderOrderUpdate
*/ */
public function testExecute( public function testExecute(
$getBaseTotalDue, $getBaseTotalDue,
$apiVersion $apiVersion,
$isConfigured
) { ) {
$testData = $this->getAfterUpdateOrderTestData(); $testData = $this->getAfterUpdateOrderTestData();
@ -97,15 +91,15 @@ class OrderUpdateTest extends \PHPUnit\Framework\TestCase
->willReturn(1); ->willReturn(1);
// mock Order // mock Order
$this->mockOrder->expects($this->once()) $this->mockOrder->expects($this->any())
->method('getId') ->method('getId')
->willReturn($testData['order.id']); ->willReturn($testData['order.id']);
$this->mockOrder->expects($this->once()) $this->mockOrder->expects($this->any())
->method('getStatus') ->method('getStatus')
->willReturn($testData['order.status']); ->willReturn($testData['order.status']);
$this->mockOrder->expects($this->once()) $this->mockOrder->expects($this->any())
->method('getBaseTotalDue') ->method('getBaseTotalDue')
->willReturn($getBaseTotalDue); ->willReturn($getBaseTotalDue);
@ -113,30 +107,51 @@ class OrderUpdateTest extends \PHPUnit\Framework\TestCase
->method('getPayment') ->method('getPayment')
->willReturn($this->mockPayment); ->willReturn($this->mockPayment);
$store = $this->createMock(\Magento\Store\Model\Store::class);
$this->mockOrder->expects($this->any())
->method('getStore')
->willReturn($store);
// mock Api // mock Api
$this->mockApi->expects($this->any()) $this->mockApi->expects($this->any())
->method('getVersion') ->method('getVersion')
->willReturn($apiVersion); ->willReturn($apiVersion);
$this->mockApi->expects($this->any())
->method('isConfigured')
->willReturn($isConfigured);
// mock Event // mock Event
$this->mockEvent->expects($this->once()) $this->mockEvent->expects($this->any())
->method('getOrder') ->method('getOrder')
->willReturn($this->mockOrder); ->willReturn($this->mockOrder);
// mock Observer // mock Observer
$this->mockObserver->expects($this->once()) $this->mockObserver->expects($this->any())
->method('getEvent') ->method('getEvent')
->willReturn($this->mockEvent); ->willReturn($this->mockEvent);
$this->unit->execute($this->mockObserver); $updateOrderObserver = $this->unit->execute($this->mockObserver);
if ($isConfigured) {
$this->assertNotEmpty($this->unit->getOrder());
$this->assertArrayHasKey('externalId', $this->unit->getOrder());
$this->assertArrayHasKey('status', $this->unit->getOrder());
$this->assertInstanceOf(
\Retailcrm\Retailcrm\Model\Observer\OrderUpdate::class,
$updateOrderObserver
);
} else {
$this->assertEmpty($this->unit->getOrder());
}
} }
/** /**
* Get test order data * Get test order data
*
* @return array $testOrderData * @return array $testOrderData
*/ */
protected function getAfterUpdateOrderTestData() private function getAfterUpdateOrderTestData()
{ {
$testOrderData = [ $testOrderData = [
'order.id' => 1, 'order.id' => 1,
@ -152,19 +167,23 @@ class OrderUpdateTest extends \PHPUnit\Framework\TestCase
return [ return [
[ [
'get_base_total_due' => 0, 'get_base_total_due' => 0,
'api_version' => 'v4' 'api_version' => 'v4',
'is_configured' => false
], ],
[ [
'get_base_total_due' => 1, 'get_base_total_due' => 1,
'api_version' => 'v4' 'api_version' => 'v4',
'is_configured' => true
], ],
[ [
'get_base_total_due' => 0, 'get_base_total_due' => 0,
'api_version' => 'v5' 'api_version' => 'v5',
'is_configured' => true
], ],
[ [
'get_base_total_due' => 1, 'get_base_total_due' => 1,
'api_version' => 'v5' 'api_version' => 'v5',
'is_configured' => false
] ]
]; ];
} }

View File

@ -2,7 +2,6 @@
"name": "retailcrm/retailcrm", "name": "retailcrm/retailcrm",
"description": "Retailcrm", "description": "Retailcrm",
"require": { "require": {
"php": "~5.5.0|~5.6.0|~7.0.0",
"retailcrm/api-client-php": "~5.0" "retailcrm/api-client-php": "~5.0"
}, },
"type": "magento2-module", "type": "magento2-module",
@ -13,7 +12,7 @@
], ],
"authors": [ "authors": [
{ {
"name": "Retailcrm", "name": "RetailDriver LLC",
"email": "gorokh@retailcrm.ru", "email": "gorokh@retailcrm.ru",
"homepage": "https://www.retailcrm.ru", "homepage": "https://www.retailcrm.ru",
"role": "Developer" "role": "Developer"

View File

@ -0,0 +1,79 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
<tab id="retailcrm" translate="label" sortOrder="10">
<label>Retailcrm</label>
</tab>
<section id="retailcrm" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
<class>separator-top</class>
<label>Setting</label>
<tab>retailcrm</tab>
<resource>Retailcrm_Retailcrm::retailcrm_configuration</resource>
<group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>General Configuration</label>
<field id="api_url" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>API URL</label>
<comment>https://YourCrmName.retailcrm.ru</comment>
<backend_model>Retailcrm\Retailcrm\Model\Config\Backend\ApiUrl</backend_model>
</field>
<field id="api_key" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>API Key</label>
<comment>To generate an API Key, log in to RetailCRM then select Admin > Integration > API Keys</comment>
</field>
<field id="api_version" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>API Version</label>
<source_model>Retailcrm\Retailcrm\Model\Setting\ApiVersions</source_model>
<backend_model>Retailcrm\Retailcrm\Model\Config\Backend\ApiVersion</backend_model>
</field>
</group>
<group id="Misc" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Misc</label>
<field id="attributes_to_export_into_icml" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Attributes to export into icml</label>
<comment>Attributes to export into icml</comment>
<source_model>Retailcrm\Retailcrm\Model\Setting\Attribute</source_model>
</field>
</group>
<group id="shipping" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Shipping</label>
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Shipping</frontend_model>
</group>
<group id="payment" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Payment method</label>
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Payment</frontend_model>
</group>
<group id="status" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Order Status</label>
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Status</frontend_model>
</group>
<group id="Load" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Order Load</label>
<field id="number_order" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Order number</label>
<comment>Enter your order number, separated by commas</comment>
</field>
<field id="button_order" translate="label comment" type="button" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Button</frontend_model>
</field>
</group>
<group id="site" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Site</label>
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Site</frontend_model>
</group>
<group id="sites" translate="label" type="select" sortOrder="70" showInDefault="0" showInWebsite="1" showInStore="0">
<label>Sites</label>
<frontend_model>Retailcrm\Retailcrm\Block\Adminhtml\System\Config\Form\Fieldset\Sites</frontend_model>
</group>
</section>
</system>
</config>

11
src/etc/di.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<type name="Retailcrm\Retailcrm\Helper\Proxy">
<arguments>
<argument name="pathUrl" xsi:type="const">Retailcrm\Retailcrm\Api\ConfigManagerInterface::URL_PATH</argument>
<argument name="pathKey" xsi:type="const">Retailcrm\Retailcrm\Api\ConfigManagerInterface::KEY_PATH</argument>
<argument name="pathVersion" xsi:type="const">Retailcrm\Retailcrm\Api\ConfigManagerInterface::API_VERSION_PATH</argument>
</arguments>
</type>
</config>

6
src/registration.php Normal file
View File

@ -0,0 +1,6 @@
<?php
\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Retailcrm_Retailcrm',
__DIR__
);