RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-04-06 07:13:33 +03:00
Code Issues Projects Releases Wiki Activity

corporate client fixes

Browse source
This commit is contained in:
Pavel 2020-05-26 17:34:31 +03:00
parent efb8be92b9
commit 51dd47a89f
9 changed files with 185 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/include/api/class-wc-retailcrm-proxy.php
View file

@ -16,11 +16,9 @@ if ( ! class_exists( 'WC_Retailcrm_Proxy' ) ) :
{
protected $retailcrm;
protected $corporateEnabled;
protected $logger;
public function __construct($api_url, $api_key, $api_vers = null, $corporateEnabled = false)
{
$this->logger = new WC_Logger();
{
$this->corporateEnabled = $corporateEnabled;
if ( ! class_exists( 'WC_Retailcrm_Client_V4' ) ) {
@ -54,41 +52,97 @@ if ( ! class_exists( 'WC_Retailcrm_Proxy' ) ) :
return $this->corporateEnabled;
}
private static function reduceErrors($errors)
{
$result = '';
foreach ($errors as $key => $error) {
$result .= " [$key] => $error";
}
return $result;
}
/**
* Response will be omitted in debug logs for those methods
*
* @return string[]
*/
private function methodsWithoutDebugResponse()
{
return array_map(
function ($val) {
return get_class($this->retailcrm) . '::' . $val;
},
array('statusesList', 'paymentTypesList', 'deliveryTypesList', 'orderMethodsList')
);
}
public function __call($method, $arguments)
{
$result = '';
$response = null;
$called = sprintf('%s::%s', get_class($this->retailcrm), $method);
try {
WC_Retailcrm_Logger::debug(
$called,
empty($arguments) ? '[no params]' : print_r($arguments, true)
);
/** @var \WC_Retailcrm_Response $response */
$response = call_user_func_array(array($this->retailcrm, $method), $arguments);
if (is_string($response)) {
WC_Retailcrm_Logger::debug($called, $response);
return $response;
}
if ($response->isSuccessful()) {
// Don't print long lists in debug logs (errors while calling this will be easy to detect anyway)
// Also don't call useless array_map at all while debug mode is off.
if (retailcrm_is_debug()) {
if (in_array(
$called,
$this->methodsWithoutDebugResponse()
)) {
WC_Retailcrm_Logger::debug($called, '[request was successful, but response is omitted]');
} else {
WC_Retailcrm_Logger::debug($called, $response->getRawResponse());
}
}
$result = ' Ok';
} else {
$result = sprintf(
$method ." : Error: [HTTP-code %s] %s",
$called ." : Error: [HTTP-code %s] %s",
$response->getStatusCode(),
$response->getErrorMsg()
$response->getErrorString()
);
if (isset($response['errors'])) {
foreach ($response['errors'] as $key => $error) {
$result .= " [$key] => $error";
}
$result .= self::reduceErrors($response['errors']);
}
WC_Retailcrm_Logger::debug($called, $response->getErrorString());
WC_Retailcrm_Logger::debug($called, $response->getRawResponse());
}
$this->logger->add('retailcrm', sprintf("[%s] %s", $method, $result));
WC_Retailcrm_Logger::add(sprintf("[%s] %s", $called, $result));
} catch (WC_Retailcrm_Exception_Curl $exception) {
$this->logger->add('retailcrm', sprintf("[%s] %s - %s", $method, $exception->getMessage(), $result));
WC_Retailcrm_Logger::debug(get_class($this->retailcrm).'::'.$called, $exception->getMessage());
WC_Retailcrm_Logger::debug('', $exception->getTraceAsString());
WC_Retailcrm_Logger::add(sprintf("[%s] %s - %s", $called, $exception->getMessage(), $result));
} catch (WC_Retailcrm_Exception_Json $exception) {
$this->logger->add('retailcrm', sprintf("[%s] %s - %s", $method, $exception->getMessage(), $result));
WC_Retailcrm_Logger::debug(get_class($this->retailcrm).'::'.$called, $exception->getMessage());
WC_Retailcrm_Logger::debug('', $exception->getTraceAsString());
WC_Retailcrm_Logger::add(sprintf("[%s] %s - %s", $called, $exception->getMessage(), $result));
} catch (InvalidArgumentException $exception) {
$this->logger->add('retailcrm', sprintf("[%s] %s - %s", $method, $exception->getMessage(), $result));
WC_Retailcrm_Logger::debug(get_class($this->retailcrm).'::'.$called, $exception->getMessage());
WC_Retailcrm_Logger::debug('', $exception->getTraceAsString());
WC_Retailcrm_Logger::add(sprintf("[%s] %s - %s", $called, $exception->getMessage(), $result));
}
return $response;
return !empty($response) ?: new WC_Retailcrm_Response(900, '{}');
}
}
endif;

12
src/include/api/class-wc-retailcrm-response.php
View file

@ -24,6 +24,9 @@ class WC_Retailcrm_Response implements \ArrayAccess
// response assoc array
protected $response;
// response raw data
protected $rawResponse;
/**
* ApiResponse constructor.
*
@ -35,6 +38,7 @@ class WC_Retailcrm_Response implements \ArrayAccess
public function __construct($statusCode, $responseBody = null)
{
$this->statusCode = (int) $statusCode;
$this->rawResponse = $responseBody;
if (!empty($responseBody)) {
$response = json_decode($responseBody, true);
@ -192,4 +196,12 @@ class WC_Retailcrm_Response implements \ArrayAccess
return '';
}
/**
* @return mixed|null
*/
public function getRawResponse()
{
return $this->rawResponse;
}
}

5
src/include/class-wc-retailcrm-base.php
View file

@ -96,6 +96,7 @@ if (!class_exists('WC_Retailcrm_Base')) {
add_action('admin_print_footer_scripts', array($this, 'ajax_selected_order'), 99);
add_action('woocommerce_created_customer', array($this, 'create_customer'), 10, 1);
add_action('woocommerce_update_customer', array($this, 'update_customer'), 10, 1);
add_action('profile_update', array($this, 'update_customer'), 10, 2);
add_action('wp_print_scripts', array($this, 'initialize_analytics'), 98);
add_action('wp_print_scripts', array($this, 'initialize_daemon_collector'), 99);
add_action('wp_print_footer_scripts', array($this, 'send_analytics'), 99);
@ -321,6 +322,10 @@ if (!class_exists('WC_Retailcrm_Base')) {
return;
}
if (empty($customer_id)) {
return;
}
$this->customers->updateCustomer($customer_id);
}

4
src/include/class-wc-retailcrm-customers.php
View file

@ -449,7 +449,7 @@ if (!class_exists('WC_Retailcrm_Customers')) :
*
* @return bool|array
*/
public function searchCustomer($filter)
private function searchCustomer($filter)
{
if (isset($filter['externalId'])) {
$search = $this->retailcrm->customersGet($filter['externalId']);
@ -508,7 +508,7 @@ if (!class_exists('WC_Retailcrm_Customers')) :
$customer = $this->searchCustomer(array('externalId' => $customerExternalId));
}
if (!$customer) {
if (!$customer && !empty($customerEmailOrPhone)) {
$customer = $this->searchCustomer(array('email' => $customerEmailOrPhone));
}

12
src/include/class-wc-retailcrm-history.php
View file

@ -90,8 +90,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$this->customersHistory($this->startDateCustomers->format('Y-m-d H:i:s'), $customers_since_id);
$this->ordersHistory($this->startDateOrders->format('Y-m-d H:i:s'), $orders_since_id);
} catch (\Exception $exception) {
$logger = new WC_Logger();
$logger->add('retailcrm',
WC_Retailcrm_Logger::add(
sprintf("[%s] - %s", $exception->getMessage(),
'Exception in file - ' . $exception->getFile() . ' on line ' . $exception->getLine())
);
@ -222,8 +221,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$this->update_total($wc_order);
}
} catch (Exception $exception) {
$logger = new WC_Logger();
$logger->add('retailcrm',
WC_Retailcrm_Logger::add(
sprintf("[%s] - %s", $exception->getMessage(),
'Exception in file - ' . $exception->getFile() . ' on line ' . $exception->getLine())
);
@ -574,8 +572,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$companyName = '';
if ($wc_order instanceof WP_Error) {
$logger = new WC_Logger();
$logger->add('retailcrm', sprintf(
WC_Retailcrm_Logger::add(sprintf(
'[%d] error while creating order: %s',
$order['id'],
print_r($wc_order->get_error_messages(), true)
@ -775,8 +772,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
if (!empty($crmOrder) && isset($crmOrder['items'][$item['id']])) {
$woocommerceId = $crmOrder['items'][$item['id']]['woocomerceId'];
} else {
$logger = new WC_Logger();
$logger->add('retailcrm',
WC_Retailcrm_Logger::add(
sprintf(
"Order externalId=`%s`: item doesn't have woocomerceId, skipping... (item id=`%s`)",
$order['externalId'],

76
src/include/class-wc-retailcrm-logger.php Normal file
View file

@ -0,0 +1,76 @@
<?php
/**
* RetailCRM Integration.
*
* @package WC_Retailcrm_Customers
* @category Integration
* @author RetailCRM
*/
if (!class_exists('WC_Retailcrm_Logger') && class_exists('WC_Log_Levels')):
/**
* Class WC_Retailcrm_Logger
*/
class WC_Retailcrm_Logger
{
/** @var string */
const HANDLE = 'retailcrm';
/**
* @var \WC_Logger_Interface $instance
*/
private static $instance;
/**
* WC_Retailcrm_Logger constructor.
*/
private function __construct() {}
/**
* Instantiates logger with file handler.
*
* @return \WC_Logger_Interface
*/
private static function getInstance()
{
if (empty(static::$instance)) {
static::$instance = new WC_Logger();
}
return static::$instance;
}
/**
* Regular logging
*
* @param string $message
* @param string $level
*/
public static function add($message, $level = WC_Log_Levels::NOTICE)
{
self::getInstance()->add(self::HANDLE, $message, $level);
}
/**
* Debug logging. Contains a lot of debug data like full requests & responses.
*
* @param string $method
* @param string $message
* @param string $level
*/
public static function debug($method, $message, $level = WC_Log_Levels::DEBUG)
{
if (retailcrm_is_debug()) {
if (!empty($method)) {
$message = sprintf(
'<%s> => %s',
$method,
$message
);
}
self::getInstance()->add(self::HANDLE . '_debug', $message, $level);
}
}
}
endif;

19
src/include/class-wc-retailcrm-orders.php
View file

@ -282,16 +282,15 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
}
if ($this->retailcrm->getCorporateEnabled() && static::isCorporateOrder($wcOrder)) {
$crmCorporate = array();
$crmCorporateList = $this->customers->searchCorporateCustomer(array(
$crmCorporate = $this->customers->searchCorporateCustomer(array(
'contactIds' => array($foundCustomerId),
'companyName' => $wcOrder->get_billing_company()
), true);
));
if (empty($crmCorporateList)) {
$crmCorporateList = $this->customers->searchCorporateCustomer(array(
if (empty($crmCorporate)) {
$crmCorporate = $this->customers->searchCorporateCustomer(array(
'companyName' => $wcOrder->get_billing_company()
), true);
));
}
if (empty($crmCorporate)) {
@ -575,15 +574,13 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
return;
}
$handle = 'retailcrm';
$logger = new WC_Logger();
$logger->add($handle, $prefix);
WC_Retailcrm_Logger::add($prefix);
foreach ($errors as $orderId => $error) {
$logger->add($handle, sprintf("[%d] => %s", $orderId, $error));
WC_Retailcrm_Logger::add(sprintf("[%d] => %s", $orderId, $error));
}
$logger->add($handle, '==================================');
WC_Retailcrm_Logger::add('==================================');
}
}
endif;

10
src/include/functions.php
View file

@ -98,3 +98,13 @@ function retailcrm_get_wc_product($id, $settings) {
return wc_get_product($id);
}
/**
* Returns true if either wordpress debug mode or module debugging is enabled
*
* @return bool
*/
function retailcrm_is_debug() {
return (defined('WP_DEBUG') && WP_DEBUG == true)
|| (defined('RCRM_DEBUG') && RCRM_DEBUG == true);
}

1
src/retailcrm.php
View file

@ -41,6 +41,7 @@ if (!class_exists( 'WC_Integration_Retailcrm')) :
$this->load_plugin_textdomain();
if (class_exists( 'WC_Integration' )) {
require_once(dirname(__FILE__ ) . '/include/class-wc-retailcrm-logger.php');
require_once(dirname(__FILE__ ) . '/include/abstracts/class-wc-retailcrm-abstracts-settings.php');
require_once(dirname(__FILE__ ) . '/include/abstracts/class-wc-retailcrm-abstracts-data.php');
require_once(dirname(__FILE__ ) . '/include/abstracts/class-wc-retailcrm-abstracts-address.php');