{% for customField in customFields.opencart %}
diff --git a/src/upload/catalog/controller/api/retailcrm.php b/src/upload/catalog/controller/api/retailcrm.php
index 6512dd5..5b5153f 100644
--- a/src/upload/catalog/controller/api/retailcrm.php
+++ b/src/upload/catalog/controller/api/retailcrm.php
@@ -1,6 +1,6 @@
load->model('localisation/country');
$this->load->model('setting/setting');
$this->load->library('retailcrm/retailcrm');
- $moduleTitle = $this->retailcrm->getModuleTitle();
- $setting = $this->model_setting_setting->getSetting($moduleTitle);
+ $setting = $this->model_setting_setting->getSetting(\Retailcrm\Retailcrm::MODULE);
$response = array();
- if (isset($setting[$moduleTitle . '_country']) && $setting[$moduleTitle . '_country']) {
- foreach ($setting[$moduleTitle . '_country'] as $country) {
+ if (
+ isset($setting[\Retailcrm\Retailcrm::MODULE . '_country'])
+ && $setting[\Retailcrm\Retailcrm::MODULE . '_country']
+ ) {
+ foreach ($setting[\Retailcrm\Retailcrm::MODULE . '_country'] as $country) {
$response = array_merge($response, $this->getDeliveryTypesByZones($country));
}
}
@@ -60,7 +62,7 @@ class ControllerApiRetailcrm extends Controller
}
protected function getDeliveryTypesByZones($country_id)
- {
+ {
$this->loadModels();
$this->load->model('localisation/zone');
$this->load->model('localisation/country');
@@ -80,7 +82,7 @@ class ControllerApiRetailcrm extends Controller
'postcode' => '',
'city' => ''
);
-
+
foreach ($shippingModules as $shippingModule) {
$this->load->model('extension/shipping/' . $shippingModule['code']);
@@ -98,7 +100,7 @@ class ControllerApiRetailcrm extends Controller
$this->config->set('free_total', 0);
}
}
-
+
if ($this->{'model_extension_shipping_' . $shippingModule['code']}->getQuote($address)) {
$quote_data[] = $this->{'model_extension_shipping_' . $shippingModule['code']}->getQuote($address);
} else {
@@ -139,17 +141,9 @@ class ControllerApiRetailcrm extends Controller
return array('error' => 'Not found api key');
}
- if (isset($this->request->get['key'])
- && !empty($this->request->get['key'])
- ) {
- $this->load->model('account/api');
-
- if ( version_compare(VERSION, '3.0', '<')) {
- $api = $this->model_account_api->getApiByKey($this->request->get['key']);
- } else {
- $this->load->model('extension/retailcrm/api');
- $api = $this->model_extension_retailcrm_api->login($this->request->get['username'], $this->request->get['key']);
- }
+ if (isset($this->request->get['key']) && !empty($this->request->get['key'])) {
+ $this->load->model('extension/retailcrm/api');
+ $api = $this->model_extension_retailcrm_api->login($this->request->get['username'], $this->request->get['key']);
if (!empty($api)) {
return $api;
@@ -161,14 +155,7 @@ class ControllerApiRetailcrm extends Controller
private function loadModels()
{
- if (version_compare(VERSION, '3.0', '<')) {
- $this->load->model('extension/extension');
-
- $this->modelExtension = 'extension_extension';
- } else {
- $this->load->model('setting/extension');
-
- $this->modelExtension = 'setting_extension';
- }
+ $this->load->model('setting/extension');
+ $this->modelExtension = 'setting_extension';
}
}
diff --git a/src/upload/catalog/controller/extension/analytics/daemon_collector.php b/src/upload/catalog/controller/extension/analytics/daemon_collector.php
index 170cfd9..80e6767 100644
--- a/src/upload/catalog/controller/extension/analytics/daemon_collector.php
+++ b/src/upload/catalog/controller/extension/analytics/daemon_collector.php
@@ -2,15 +2,13 @@
class ControllerExtensionAnalyticsDaemonCollector extends Controller {
public function index() {
$this->load->model('setting/setting');
- $this->load->library('retailcrm/retailcrm');
- $moduleTitle = $this->retailcrm->getModuleTitle();
- $settings = $this->model_setting_setting->getSetting($moduleTitle);
- $setting = $settings[$moduleTitle . '_collector'];
+ $settings = $this->model_setting_setting->getSetting(\Retailcrm\Retailcrm::MODULE);
+ $setting = $settings[\Retailcrm\Retailcrm::MODULE . '_collector'];
$siteCode = isset($setting['site_key']) ? $setting['site_key'] : '';
if ($this->customer->isLogged()) $customerId = $this->customer->getID();
-
+
$customer = isset($customerId) ? "'customerId': '" . $customerId . "'" : "";
$labelPromo = !empty($setting['label_promo']) ? $setting['label_promo'] : null;
$labelSend = !empty($setting['label_send']) ? $setting['label_send'] : null;
@@ -54,7 +52,7 @@ class ControllerExtensionAnalyticsDaemonCollector extends Controller {
'period': " . $settings[$moduleTitle . '_collector']['period'] . ",
" . $customForm . "
});";
- }
+ }
} elseif ($labelPromo != null || $labelSend != null) {
$captureForm = "_rc('require', 'capture-form', {
" . $customForm . "
diff --git a/src/upload/catalog/controller/extension/module/retailcrm.php b/src/upload/catalog/controller/extension/module/retailcrm.php
index faf73ae..fc680ff 100644
--- a/src/upload/catalog/controller/extension/module/retailcrm.php
+++ b/src/upload/catalog/controller/extension/module/retailcrm.php
@@ -11,176 +11,108 @@
*/
class ControllerExtensionModuleRetailcrm extends Controller {
- private $retailcrmApiClient;
-
- public function __construct($registry)
- {
- parent::__construct($registry);
-
- $this->load->library('retailcrm/retailcrm');
- $this->retailcrmApiClient = $this->retailcrm->getApiClient();
- }
-
/**
* Create order on event
*
- * @param string $trigger
- * @param array $data
- * @param int $order_id order identificator
+ * @param string $route
+ * @param array $args
+ * @param int $output
*
- * @return void
+ * @return boolean
*/
- public function order_create($trigger, $data, $order_id = null) {
- $this->load->model('checkout/order');
- $this->load->model('account/order');
+ public function orderCreate($route, $args, $output) {
+ if ($route != 'checkout/order/addOrder') {
+ return false;
+ }
+
$this->load->library('retailcrm/retailcrm');
+ $data = $args[0];
+ $data['order_id'] = $output;
+ $retailcrm_order = $this->retailcrm->createObject(\Retailcrm\Order::class);
- $data = $this->model_checkout_order->getOrder($order_id);;
- $data['products'] = $this->model_account_order->getOrderProducts($order_id);
- $data['totals'] = $this->model_account_order->getOrderTotals($order_id);
- $moduleTitle = $this->retailcrm->getModuleTitle();
+ $retailcrm_order->prepare($data);
+ $retailcrm_order->setField('externalId', $output);
+ $retailcrm_order->create($this->retailcrm->getApiClient());
- foreach ($data['products'] as $key => $product) {
- $productOptions = $this->model_account_order->getOrderOptions($order_id, $product['order_product_id']);
-
- if (!empty($productOptions)) {
- $data['products'][$key]['option'] = $productOptions;
- }
- }
-
- if (!isset($data['fromApi'])) {
- $this->load->model('setting/setting');
- $status = $this->model_setting_setting->getSetting($moduleTitle);
-
- if (isset($data['order_status_id']) && $data['order_status_id'] > 0) {
- $data['order_status'] = $status[$moduleTitle . '_status'][$data['order_status_id']];
- }
-
- if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
- $this->load->model('extension/retailcrm/custom/order');
- $order = $this->model_extension_retailcrm_custom_order->processOrder($data);
- $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient);
- } else {
- $this->load->model('extension/retailcrm/order');
- $order = $this->model_extension_retailcrm_order->processOrder($data);
- $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient);
- }
- }
+ return true;
}
/**
* Update order on event
*
- * @param string $trigger
- * @param array $parameter2
+ * @param string $route
+ * @param array $args
*
- * @return void
+ * @return boolean
*/
- public function order_edit($trigger, $parameter2 = null) {
- $order_id = $parameter2[0];
+ public function orderEdit($route, $args) {
+ if ($route != 'checkout/order/editOrder') {
+ return false;
+ }
+
+ $order_id = $args[0];
+ $data = $args[1];
- $this->load->model('checkout/order');
- $this->load->model('account/order');
$this->load->library('retailcrm/retailcrm');
+ $this->load->model('extension/module/retailcrm');
- $moduleTitle = $this->retailcrm->getModuleTitle();
- $data = $this->model_checkout_order->getOrder($order_id);
+ $order_status_id = $this->model_extension_module_retailcrm->getOrderStatusId($order_id);
+ $data['order_status_id'] = $order_status_id;
+ $retailcrm_order = $this->retailcrm->createObject(\Retailcrm\Order::class);
- if ($data['order_status_id'] == 0) {
- return;
- }
+ $retailcrm_order->prepare($data);
+ $retailcrm_order->setField('externalId', $order_id);
+ $retailcrm_order->edit($this->retailcrm->getApiClient());
- $data['products'] = $this->model_account_order->getOrderProducts($order_id);
- $data['totals'] = $this->model_account_order->getOrderTotals($order_id);
-
- foreach ($data['products'] as $key => $product) {
- $productOptions = $this->model_account_order->getOrderOptions($order_id, $product['order_product_id']);
-
- if (!empty($productOptions)) {
- $data['products'][$key]['option'] = $productOptions;
- }
- }
-
- if (!isset($data['fromApi'])) {
- $this->load->model('setting/setting');
- $status = $this->model_setting_setting->getSetting($moduleTitle);
-
- if ($data['order_status_id'] > 0) {
- $data['order_status'] = $status[$moduleTitle . '_status'][$data['order_status_id']];
- }
-
- if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
- $this->load->model('extension/retailcrm/custom/order');
- $order = $this->model_extension_retailcrm_custom_order->processOrder($data, false);
- $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, false);
- } else {
- $this->load->model('extension/retailcrm/order');
- $order = $this->model_extension_retailcrm_order->processOrder($data, false);
- $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, false);
- }
- }
+ return true;
}
/**
* Create customer on event
*
- * @param int $customerId customer identificator
+ * @param string $route
+ * @param array $args
+ * @param int $output
*
- * @return void
+ * @return boolean
*/
- public function customer_create($parameter1, $parameter2 = null, $parameter3 = null) {
- $this->load->model('account/customer');
- $this->load->model('localisation/country');
- $this->load->model('localisation/zone');
-
- $customerId = $parameter3;
- $customer = $this->model_account_customer->getCustomer($customerId);
-
- if ($this->request->post) {
- $country = $this->model_localisation_country->getCountry($this->request->post['country_id']);
- $zone = $this->model_localisation_zone->getZone($this->request->post['zone_id']);
-
- $customer['address'] = array(
- 'address_1' => $this->request->post['address_1'],
- 'address_2' => $this->request->post['address_2'],
- 'city' => $this->request->post['city'],
- 'postcode' => $this->request->post['postcode'],
- 'iso_code_2' => $country['iso_code_2'],
- 'zone' => $zone['name']
- );
+ public function customerCreate($route, $args, $output) {
+ if ($route != 'account/customer/addCustomer') {
+ return false;
}
- if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/customer.php')) {
- $this->load->model('extension/retailcrm/custom/customer');
- $this->model_extension_retailcrm_custom_customer->sendToCrm($customer, $this->retailcrmApiClient);
- } else {
- $this->load->model('extension/retailcrm/customer');
- $this->model_extension_retailcrm_customer->sendToCrm($customer, $this->retailcrmApiClient);
- }
+ $this->load->library('retailcrm/retailcrm');
+ $retailcrm_customer = $this->retailcrm->createObject(\Retailcrm\Customer::class);
+
+ $retailcrm_customer->prepare($args[0]);
+ $retailcrm_customer->setField('externalId', $output);
+ $retailcrm_customer->create($this->retailcrm->getApiClient());
+
+ return true;
}
/**
* Update customer on event
*
- * @param int $customerId customer identificator
- *
- * @return void
+ * @param string $route
+ * @param array $args
+ * @return boolean
*/
- public function customer_edit($parameter1, $parameter2, $parameter3) {
- $customerId = $this->customer->getId();
-
- $this->load->model('account/customer');
- $customer = $this->model_account_customer->getCustomer($customerId);
-
- $this->load->model('account/address');
- $customer['address'] = $this->model_account_address->getAddress($customer['address_id']);
-
- if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/customer.php')) {
- $this->load->model('extension/retailcrm/custom/customer');
- $this->model_extension_retailcrm_custom_customer->changeInCrm($customer, $this->retailcrmApiClient);
- } else {
- $this->load->model('extension/retailcrm/customer');
- $this->model_extension_retailcrm_customer->changeInCrm($customer, $this->retailcrmApiClient);
+ public function customerEdit($route, $args) {
+ if ($route != 'account/customer/editCustomer') {
+ return false;
}
+
+ $customer_id = $args[0];
+ $data = $args[1];
+
+ $this->load->library('retailcrm/retailcrm');
+ $retailcrm_customer = $this->retailcrm->createObject(\Retailcrm\Customer::class);
+
+ $retailcrm_customer->process($data);
+ $retailcrm_customer->setField('externalId', $customer_id);
+ $retailcrm_customer->edit($this->retailcrm->getApiClient());
+
+ return true;
}
}
diff --git a/src/upload/catalog/model/extension/retailcrm/customer.php b/src/upload/catalog/model/extension/retailcrm/customer.php
deleted file mode 100644
index fd586e0..0000000
--- a/src/upload/catalog/model/extension/retailcrm/customer.php
+++ /dev/null
@@ -1,104 +0,0 @@
-load->model('setting/setting');
- $this->load->library('retailcrm/retailcrm');
-
- $this->moduleTitle = $this->retailcrm->getModuleTitle();
- $this->settings = $this->model_setting_setting->getSetting($this->moduleTitle);
- }
-
- /**
- * Create customer
- *
- * @param array $customer
- *
- * @return mixed
- */
- public function sendToCrm($customer, $retailcrmApiClient)
- {
- if (empty($customer) || $retailcrmApiClient === false) {
- return false;
- }
-
- $customerToCrm = $this->process($customer);
-
- $retailcrmApiClient->customersCreate($customerToCrm);
-
- return $customerToCrm;
- }
-
- /**
- * Edit customer
- *
- * @param array $customer
- *
- * @return mixed
- */
- public function changeInCrm($customer, $retailcrmApiClient)
- {
- if (empty($customer) || $retailcrmApiClient === false) {
- return false;
- }
-
- $customerToCrm = $this->process($customer);
-
- $retailcrmApiClient->customersEdit($customerToCrm);
-
- return $customerToCrm;
- }
-
- /**
- * Process customer
- *
- * @param array $customer
- *
- * @return array $customerToCrm
- */
- private function process($customer) {
- $customerToCrm = array(
- 'externalId' => $customer['customer_id'],
- 'firstName' => $customer['firstname'],
- 'lastName' => $customer['lastname'],
- 'email' => $customer['email'],
- 'phones' => array(
- array(
- 'number' => $customer['telephone']
- )
- ),
- 'createdAt' => $customer['date_added']
- );
-
- if (isset($customer['address'])) {
- $customerToCrm['address'] = array(
- 'index' => $customer['address']['postcode'],
- 'countryIso' => $customer['address']['iso_code_2'],
- 'region' => $customer['address']['zone'],
- 'city' => $customer['address']['city'],
- 'text' => $customer['address']['address_1'] . ' ' . $customer['address']['address_2']
- );
- }
-
- if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $customer['custom_field']) {
- $customFields = json_decode($customer['custom_field']);
-
- foreach ($customFields as $key => $value) {
- if (isset($this->settings[$this->moduleTitle . '_custom_field']['c_' . $key])) {
- $customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['c_' . $key]] = $value;
- }
- }
-
- if (isset($customFieldsToCrm)) {
- $customerToCrm['customFields'] = $customFieldsToCrm;
- }
- }
-
- return $customerToCrm;
- }
-}
diff --git a/src/upload/catalog/model/extension/retailcrm/order.php b/src/upload/catalog/model/extension/retailcrm/order.php
index bbffb03..69a4f87 100644
--- a/src/upload/catalog/model/extension/retailcrm/order.php
+++ b/src/upload/catalog/model/extension/retailcrm/order.php
@@ -1,350 +1,9 @@
db->query("SELECT order_status_id FROM " . DB_PREFIX . "order WHERE order_id = '" . (int)$order_id . "'");
- public function __construct($registry) {
- parent::__construct($registry);
- $this->load->model('setting/setting');
- $this->load->library('retailcrm/retailcrm');
-
- $this->moduleTitle = $this->retailcrm->getModuleTitle();
- $this->settings = $this->model_setting_setting->getSetting($this->moduleTitle);
- }
-
- /**
- * Create order in CRM
- *
- * @param array $order
- * @param \RetailcrmProxy $retailcrmApiClient
- * @param bool $create (default = true)
- *
- * @return mixed
- */
- public function sendToCrm($order, $retailcrmApiClient, $create = true) {
- if (isset($this->request->post['fromApi']) || $retailcrmApiClient === false) {
- return false;
- }
-
- if (!isset($order['customer']['externalId'])) {
- $customer = $this->searchCustomer($order['phone'], $order['email'], $retailcrmApiClient);
-
- if ($customer) {
- $order['customer']['id'] = $customer['id'];
- }
- }
-
- if ($create) {
- $retailcrmApiClient->ordersCreate($order);
- } else {
- $order_payment = reset($order['payments']);
- unset($order['payments']);
- $response = $retailcrmApiClient->ordersEdit($order);
-
- if ($this->settings[$this->moduleTitle . '_apiversion'] == 'v5' && $response->isSuccessful()) {
- $this->updatePayment($order_payment, $order['externalId'], $retailcrmApiClient);
- }
- }
-
- return $order;
- }
-
- /**
- * Process order
- *
- * @param array $order_data
- * @param bool $create (default = true)
- *
- * @return array $order
- */
- public function processOrder($order_data, $create = true) {
- $this->load->model('setting/setting');
- $this->load->model('catalog/product');
- $this->settings = $this->model_setting_setting->getSetting($this->moduleTitle);
- $order_id = $order_data['order_id'];
-
- if (!empty($order_data['payment_code']) && isset($this->settings[$this->moduleTitle . '_payment'][$order_data['payment_code']])) {
- $payment_code = $this->settings[$this->moduleTitle . '_payment'][$order_data['payment_code']];
- } else {
- $payment_code = '';
- }
-
- if (!empty($order_data['shipping_code'])) {
- $shippingCode = explode('.', $order_data['shipping_code']);
- $shippingModule = $shippingCode[0];
-
- if (isset($this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']])) {
- $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']];
- } elseif (isset($this->settings[$this->moduleTitle . '_delivery'][$shippingModule])) {
- $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shippingModule];
- }
- }
-
- if (!isset($delivery_code) && isset($shippingModule)) {
- if (isset($this->settings[$this->moduleTitle . '_delivery'])
- && $this->settings[$this->moduleTitle . '_delivery']
- ) {
- $deliveries = array_keys($this->settings[$this->moduleTitle . '_delivery']);
- $shipping_code = '';
-
- array_walk($deliveries, function ($item, $key) use ($shippingModule, &$shipping_code) {
- if (strripos($item, $shippingModule) !== false) {
- $shipping_code = $item;
- }
- });
-
- $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shipping_code];
- }
- }
-
- if (!empty($order_data['payment_iso_code_2'])) {
- $order['countryIso'] = $order_data['payment_iso_code_2'];
- }
-
- if (isset($this->settings[$this->moduleTitle . '_order_number'])
- && $this->settings[$this->moduleTitle . '_order_number'] == 1
- ) {
- $order['number'] = $order_data['order_id'];
- }
-
- $order['externalId'] = $order_id;
- $order['firstName'] = $order_data['firstname'];
- $order['lastName'] = $order_data['lastname'];
- $order['phone'] = $order_data['telephone'];
- $order['customerComment'] = $order_data['comment'];
-
- if ($order_data['customer_id']) {
- $order['customer']['externalId'] = $order_data['customer_id'];
- }
-
- if (!empty($order_data['email'])) {
- $order['email'] = $order_data['email'];
- }
-
- $deliveryCost = 0;
- $couponTotal = 0;
- $orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $order_data['order_total'] ;
-
- $totals = $this->explodeTotals($orderTotals);
-
- if (isset($totals['shipping'])) {
- $deliveryCost = $totals['shipping'];
- }
-
- if (isset($totals['coupon'])) {
- $couponTotal += abs($totals['coupon']);
- }
-
- if (isset($totals['reward'])) {
- $couponTotal += abs($totals['reward']);
- }
-
- $order['createdAt'] = $order_data['date_added'];
-
- if ($this->settings[$this->moduleTitle . '_apiversion'] != 'v5') {
- $order['paymentType'] = $payment_code;
- if ($couponTotal > 0) {
- $order['discount'] = $couponTotal;
- }
- } else {
- if ($couponTotal > 0) {
- $order['discountManualAmount'] = $couponTotal;
- }
- }
-
- $country = isset($order_data['shipping_country']) ? $order_data['shipping_country'] : '' ;
-
- $order['delivery'] = array(
- 'code' => isset($delivery_code) ? $delivery_code : '',
- 'address' => array(
- 'index' => $order_data['shipping_postcode'],
- 'city' => $order_data['shipping_city'],
- 'countryIso' => $order_data['shipping_iso_code_2'],
- 'region' => $order_data['shipping_zone'],
- 'text' => implode(', ', array(
- $order_data['shipping_postcode'],
- $country,
- $order_data['shipping_city'],
- $order_data['shipping_address_1'],
- $order_data['shipping_address_2']
- ))
- )
- );
-
- if (!empty($deliveryCost)){
- $order['delivery']['cost'] = $deliveryCost;
- }
-
- $orderProducts = isset($order_data['products']) ? $order_data['products'] : $order_data['order_product'];
- $offerOptions = array('select', 'radio');
-
- foreach ($orderProducts as $product) {
- $offerId = '';
-
- if (!empty($product['option'])) {
- $options = array();
-
- $productOptions = $this->model_catalog_product->getProductOptions($product['product_id']);
-
- foreach ($product['option'] as $option) {
- if ($option['type'] == 'checkbox') {
- $properties[] = array(
- 'code' => $option['product_option_value_id'],
- 'name' => $option['name'],
- 'value' => $option['value']
- );
- }
-
- if (!in_array($option['type'], $offerOptions)) continue;
- foreach($productOptions as $productOption) {
- if($productOption['product_option_id'] = $option['product_option_id']) {
- foreach($productOption['product_option_value'] as $productOptionValue) {
- if($productOptionValue['product_option_value_id'] == $option['product_option_value_id']) {
- $options[$option['product_option_id']] = $productOptionValue['option_value_id'];
- }
- }
- }
- }
- }
-
- ksort($options);
-
- $offerId = array();
- foreach ($options as $optionKey => $optionValue) {
- $offerId[] = $optionKey.'-'.$optionValue;
- }
- $offerId = implode('_', $offerId);
- }
-
- if ($this->settings[$this->moduleTitle . '_apiversion'] != 'v3') {
- $item = array(
- 'offer' => array(
- 'externalId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
- ),
- 'productName' => $product['name'],
- 'initialPrice' => $product['price'],
- 'quantity' => $product['quantity'],
- );
- } else {
- $item = array(
- 'productName' => $product['name'],
- 'initialPrice' => $product['price'],
- 'quantity' => $product['quantity'],
- 'productId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
- );
- }
-
- if (isset($properties)) $item['properties'] = $properties;
-
- $order['items'][] = $item;
-
- if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
- $order['status'] = $this->settings[$this->moduleTitle . '_status'][$order_data['order_status_id']];
- } elseif (isset($order_data['order_status_id']) && $order_data['order_status_id'] == 0) {
- $order['status'] = $this->settings[$this->moduleTitle . '_missing_status'];
- }
-
- if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $order_data['custom_field']) {
- $customFields = $order_data['custom_field'];
-
- foreach ($customFields as $key => $value) {
- if (isset($this->settings[$this->moduleTitle . '_custom_field']['o_' . $key])) {
- $customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['o_' . $key]] = $value;
- }
- }
-
- if (isset($customFieldsToCrm)) {
- $order['customFields'] = $customFieldsToCrm;
- }
- }
- }
-
- $payment = array(
- 'externalId' => $order_id,
- 'type' => $payment_code,
- 'amount' => $totals['total']
- );
-
- if (!$create) {
- $payment['order'] = array(
- 'externalId' => $order_id
- );
- }
-
- $order['payments'][] = $payment;
-
- return $order;
- }
-
- /**
- * Update payment in CRM
- *
- * @param array $order_payment
- * @param int $orderId
- *
- * @return void
- */
- private function updatePayment($order_payment, $orderId, $retailcrmApiClient) {
- $response_order = $retailcrmApiClient->ordersGet($orderId);
-
- if ($response_order->isSuccessful()) {
- $order_info = $response_order['order'];
- }
-
- foreach ($order_info['payments'] as $payment_data) {
- if (isset($payment_data['externalId']) && $payment_data['externalId'] == $orderId) {
- $payment = $payment_data;
- }
- }
-
- if (isset($payment) && $payment['type'] != $order_payment['type']) {
- $response = $retailcrmApiClient->ordersPaymentDelete($payment['id']);
-
- if ($response->isSuccessful()) {
- $retailcrmApiClient->ordersPaymentCreate($order_payment);
- }
- } elseif (isset($payment) && $payment['type'] == $order_payment['type']) {
- $retailcrmApiClient->ordersPaymentEdit($order_payment);
- }
- }
-
- private function searchCustomer($phone, $email, $retailcrmApiClient) {
- $customer = array();
-
- $response = $retailcrmApiClient->customersList(
- array(
- 'name' => $phone,
- 'email' => $email
- ),
- 1,
- 100
- );
-
- if ($response->isSuccessful() && isset($response['customers'])) {
- $customers = $response['customers'];
-
- if ($customers) {
- $customer = end($customers);
- }
- }
-
- return $customer;
- }
-
- /**
- * @param $totals
- *
- * @return array
- */
- private function explodeTotals($totals)
- {
- $resultTotals = array();
-
- foreach ($totals as $total) {
- $resultTotals[$total['code']] = $total['value'];
- }
-
- return $resultTotals;
+ return $query->rows;
}
}
diff --git a/src/upload/catalog/model/extension/retailcrm/products.php b/src/upload/catalog/model/extension/retailcrm/products.php
new file mode 100644
index 0000000..735a290
--- /dev/null
+++ b/src/upload/catalog/model/extension/retailcrm/products.php
@@ -0,0 +1,9 @@
+load->model('catalog/product');
+
+ return $this->model_catalog_product->getProductOptions($product_id);
+ }
+}
diff --git a/src/upload/system/cron/dispatch.php b/src/upload/system/cron/dispatch.php
index 98987d1..4c9c8c3 100644
--- a/src/upload/system/cron/dispatch.php
+++ b/src/upload/system/cron/dispatch.php
@@ -11,7 +11,7 @@ if (!isset($cli_action)) {
}
// Version
-$version = '2.3.0';
+$version = '3.1';
$indexFile = file_get_contents(realpath(dirname(__FILE__)) . '/../../index.php');
preg_match("/define\([\s]*['\"]VERSION['\"][\s]*,[\s]*['\"](.*)['\"][\s]*\)[\s]*;/mi", $indexFile, $versionMatches);
@@ -132,16 +132,13 @@ $registry->set('cache', $cache);
$registry->set('response', $response);
-if (version_compare(VERSION, '3.0', '<')) {
- $session = new Session();
-} else {
- $session = new Session($config->get('session_engine'), $registry);
-}
+$session = new Session($config->get('session_engine'), $registry);
$registry->set('session', $session);
$languages = array();
$query = $db->query("SELECT * FROM " . DB_PREFIX . "language");
+
foreach ($query->rows as $result) {
$languages[$result['code']] = $result;
}
@@ -149,33 +146,24 @@ foreach ($query->rows as $result) {
$adminLanguageCode = $config->get('config_admin_language');
$config->set('config_language_id', $languages[$adminLanguageCode]['language_id']);
-if (version_compare(VERSION, '2.3', '<')) {
- $language = new Language($languages[$adminLanguageCode]['directory']);
-} else {
- $language = new Language($adminLanguageCode);
-}
+$language = new Language($languages[$adminLanguageCode]['directory']);
if(isset($languages[$adminLanguageCode]['filename'])) {
$language->load($languages[$adminLanguageCode]['filename']);
} else {
$language->load($languages[$adminLanguageCode]['directory']);
}
+
$registry->set('language', $language);
$document = new Document();
$registry->set('document', $document);
-
-
$registry->set('currency', new Cart\Currency($registry));
$registry->set('weight', new Cart\Weight($registry));
$registry->set('length', new Cart\Length($registry));
$registry->set('user', new Cart\User($registry));
-if (version_compare(VERSION, '3.0', '<')) {
- $controller = new Front($registry);
-} else {
- $controller = new Router($registry);
-}
+$controller = new Router($registry);
$action = new Action($cli_action);
$controller->dispatch($action, new Action('error/not_found'));
diff --git a/src/upload/system/cron/icml.php b/src/upload/system/cron/icml.php
deleted file mode 100644
index 7c7f21c..0000000
--- a/src/upload/system/cron/icml.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
- * @license https://opensource.org/licenses/MIT MIT License
- * @link http://www.retailcrm.ru/docs/Developers/ApiVersion3
- */
-class RetailcrmApiClient3
-{
- protected $client;
-
- /**
- * Site code
- */
- protected $siteCode;
-
- /**
- * Client creating
- *
- * @param string $url
- * @param string $apiKey
- * @param string $site
- * @return mixed
- */
- public function __construct($url, $apiKey, $version = null, $site = null)
- {
- if ('/' != substr($url, strlen($url) - 1, 1)) {
- $url .= '/';
- }
-
- $url = $version == null ? $url . 'api' : $url . 'api/' . $version;
-
- $this->client = new RetailcrmHttpClient($url, array('apiKey' => $apiKey));
- $this->siteCode = $site;
- }
-
- /**
- * Returns api versions list
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function apiVersions()
- {
- return $this->client->makeRequest('/api-versions', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Create a order
- *
- * @param array $order
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function ordersCreate(array $order, $site = null)
- {
- if (!sizeof($order)) {
- throw new InvalidArgumentException('Parameter `order` must contains a data');
- }
-
- return $this->client->makeRequest("/orders/create", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
- 'order' => json_encode($order)
- )));
- }
-
- /**
- * Edit a order
- *
- * @param array $order
- * @param string $by
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function ordersEdit(array $order, $by = 'externalId', $site = null)
- {
- if (!sizeof($order)) {
- throw new InvalidArgumentException('Parameter `order` must contains a data');
- }
-
- $this->checkIdParameter($by);
-
- if (!isset($order[$by])) {
- throw new InvalidArgumentException(sprintf('Order array must contain the "%s" parameter.', $by));
- }
-
- return $this->client->makeRequest(
- "/orders/" . $order[$by] . "/edit",
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array(
- 'order' => json_encode($order),
- 'by' => $by,
- ))
- );
- }
-
- /**
- * Upload array of the orders
- *
- * @param array $orders
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function ordersUpload(array $orders, $site = null)
- {
- if (!sizeof($orders)) {
- throw new InvalidArgumentException('Parameter `orders` must contains array of the orders');
- }
-
- return $this->client->makeRequest("/orders/upload", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
- 'orders' => json_encode($orders),
- )));
- }
-
- /**
- * Get order by id or externalId
- *
- * @param string $id
- * @param string $by (default: 'externalId')
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function ordersGet($id, $by = 'externalId', $site = null)
- {
- $this->checkIdParameter($by);
-
- return $this->client->makeRequest("/orders/$id", RetailcrmHttpClient::METHOD_GET, $this->fillSite($site, array(
- 'by' => $by
- )));
- }
-
- /**
- * Returns a orders history
- *
- * @param DateTime $startDate (default: null)
- * @param DateTime $endDate (default: null)
- * @param int $limit (default: 100)
- * @param int $offset (default: 0)
- * @param bool $skipMyChanges (default: true)
- * @return ApiResponse
- */
- public function ordersHistory(
- DateTime $startDate = null,
- DateTime $endDate = null,
- $limit = 100,
- $offset = 0,
- $skipMyChanges = true
- ) {
- $parameters = array();
-
- if ($startDate) {
- $parameters['startDate'] = $startDate->format('Y-m-d H:i:s');
- }
- if ($endDate) {
- $parameters['endDate'] = $endDate->format('Y-m-d H:i:s');
- }
- if ($limit) {
- $parameters['limit'] = (int) $limit;
- }
- if ($offset) {
- $parameters['offset'] = (int) $offset;
- }
- if ($skipMyChanges) {
- $parameters['skipMyChanges'] = (bool) $skipMyChanges;
- }
-
- return $this->client->makeRequest('/orders/history', RetailcrmHttpClient::METHOD_GET, $parameters);
- }
-
- /**
- * Returns filtered orders list
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- * @return ApiResponse
- */
- public function ordersList(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (sizeof($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest('/orders', RetailcrmHttpClient::METHOD_GET, $parameters);
- }
-
- /**
- * Returns statuses of the orders
- *
- * @param array $ids (default: array())
- * @param array $externalIds (default: array())
- * @return ApiResponse
- */
- public function ordersStatuses(array $ids = array(), array $externalIds = array())
- {
- $parameters = array();
-
- if (sizeof($ids)) {
- $parameters['ids'] = $ids;
- }
- if (sizeof($externalIds)) {
- $parameters['externalIds'] = $externalIds;
- }
-
- return $this->client->makeRequest('/orders/statuses', RetailcrmHttpClient::METHOD_GET, $parameters);
- }
-
- /**
- * Save order IDs' (id and externalId) association in the CRM
- *
- * @param array $ids
- * @return ApiResponse
- */
- public function ordersFixExternalIds(array $ids)
- {
- if (!sizeof($ids)) {
- throw new InvalidArgumentException('Method parameter must contains at least one IDs pair');
- }
-
- return $this->client->makeRequest("/orders/fix-external-ids", RetailcrmHttpClient::METHOD_POST, array(
- 'orders' => json_encode($ids),
- ));
- }
-
- /**
- * Get orders assembly history
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- * @return ApiResponse
- */
- public function ordersPacksHistory(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (sizeof($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest('/orders/packs/history', RetailcrmHttpClient::METHOD_GET, $parameters);
- }
-
- /**
- * Create a customer
- *
- * @param array $customer
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function customersCreate(array $customer, $site = null)
- {
- if (!sizeof($customer)) {
- throw new InvalidArgumentException('Parameter `customer` must contains a data');
- }
-
- return $this->client->makeRequest("/customers/create", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
- 'customer' => json_encode($customer)
- )));
- }
-
- /**
- * Edit a customer
- *
- * @param array $customer
- * @param string $by (default: 'externalId')
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function customersEdit(array $customer, $by = 'externalId', $site = null)
- {
- if (!sizeof($customer)) {
- throw new InvalidArgumentException('Parameter `customer` must contains a data');
- }
-
- $this->checkIdParameter($by);
-
- if (!isset($customer[$by])) {
- throw new InvalidArgumentException(sprintf('Customer array must contain the "%s" parameter.', $by));
- }
-
- return $this->client->makeRequest(
- "/customers/" . $customer[$by] . "/edit",
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite(
- $site,
- array(
- 'customer' => json_encode($customer),
- 'by' => $by
- )
- )
- );
- }
-
- /**
- * Upload array of the customers
- *
- * @param array $customers
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function customersUpload(array $customers, $site = null)
- {
- if (!sizeof($customers)) {
- throw new InvalidArgumentException('Parameter `customers` must contains array of the customers');
- }
-
- return $this->client->makeRequest("/customers/upload", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
- 'customers' => json_encode($customers),
- )));
- }
-
- /**
- * Get customer by id or externalId
- *
- * @param string $id
- * @param string $by (default: 'externalId')
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function customersGet($id, $by = 'externalId', $site = null)
- {
- $this->checkIdParameter($by);
-
- return $this->client->makeRequest("/customers/$id", RetailcrmHttpClient::METHOD_GET, $this->fillSite($site, array(
- 'by' => $by
- )));
- }
-
- /**
- * Returns filtered customers list
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- * @return ApiResponse
- */
- public function customersList(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (sizeof($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest('/customers', RetailcrmHttpClient::METHOD_GET, $parameters);
- }
-
- /**
- * Save customer IDs' (id and externalId) association in the CRM
- *
- * @param array $ids
- * @return ApiResponse
- */
- public function customersFixExternalIds(array $ids)
- {
- if (!sizeof($ids)) {
- throw new InvalidArgumentException('Method parameter must contains at least one IDs pair');
- }
-
- return $this->client->makeRequest("/customers/fix-external-ids", RetailcrmHttpClient::METHOD_POST, array(
- 'customers' => json_encode($ids),
- ));
- }
-
- /**
- * Get purchace prices & stock balance
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function storeInventories(array $filter = array(), $page = null, $limit = null, $site = null)
- {
- $parameters = array();
-
- if (sizeof($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest('/store/inventories', RetailcrmHttpClient::METHOD_GET, $this->fillSite($site, $parameters));
- }
-
- /**
- * Upload store inventories
- *
- * @param array $offers
- * @param string $site (default: null)
- * @return ApiResponse
- */
- public function storeInventoriesUpload(array $offers, $site = null)
- {
- if (!sizeof($offers)) {
- throw new InvalidArgumentException('Parameter `offers` must contains array of the customers');
- }
-
- return $this->client->makeRequest(
- "/store/inventories/upload",
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('offers' => json_encode($offers)))
- );
- }
-
- /**
- * Returns deliveryServices list
- *
- * @return ApiResponse
- */
- public function deliveryServicesList()
- {
- return $this->client->makeRequest('/reference/delivery-services', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns deliveryTypes list
- *
- * @return ApiResponse
- */
- public function deliveryTypesList()
- {
- return $this->client->makeRequest('/reference/delivery-types', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns orderMethods list
- *
- * @return ApiResponse
- */
- public function orderMethodsList()
- {
- return $this->client->makeRequest('/reference/order-methods', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns orderTypes list
- *
- * @return ApiResponse
- */
- public function orderTypesList()
- {
- return $this->client->makeRequest('/reference/order-types', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns paymentStatuses list
- *
- * @return ApiResponse
- */
- public function paymentStatusesList()
- {
- return $this->client->makeRequest('/reference/payment-statuses', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns paymentTypes list
- *
- * @return ApiResponse
- */
- public function paymentTypesList()
- {
- return $this->client->makeRequest('/reference/payment-types', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns productStatuses list
- *
- * @return ApiResponse
- */
- public function productStatusesList()
- {
- return $this->client->makeRequest('/reference/product-statuses', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns statusGroups list
- *
- * @return ApiResponse
- */
- public function statusGroupsList()
- {
- return $this->client->makeRequest('/reference/status-groups', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns statuses list
- *
- * @return ApiResponse
- */
- public function statusesList()
- {
- return $this->client->makeRequest('/reference/statuses', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns sites list
- *
- * @return ApiResponse
- */
- public function sitesList()
- {
- return $this->client->makeRequest('/reference/sites', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns stores list
- *
- * @return ApiResponse
- */
- public function storesList()
- {
- return $this->client->makeRequest('/reference/stores', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Edit deliveryService
- *
- * @param array $data delivery service data
- * @return ApiResponse
- */
- public function deliveryServicesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/delivery-services/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'deliveryService' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit deliveryType
- *
- * @param array $data delivery type data
- * @return ApiResponse
- */
- public function deliveryTypesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/delivery-types/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'deliveryType' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit orderMethod
- *
- * @param array $data order method data
- * @return ApiResponse
- */
- public function orderMethodsEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/order-methods/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'orderMethod' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit orderType
- *
- * @param array $data order type data
- * @return ApiResponse
- */
- public function orderTypesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/order-types/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'orderType' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit paymentStatus
- *
- * @param array $data payment status data
- * @return ApiResponse
- */
- public function paymentStatusesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/payment-statuses/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'paymentStatus' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit paymentType
- *
- * @param array $data payment type data
- * @return ApiResponse
- */
- public function paymentTypesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/payment-types/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'paymentType' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit productStatus
- *
- * @param array $data product status data
- * @return ApiResponse
- */
- public function productStatusesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/product-statuses/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'productStatus' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit order status
- *
- * @param array $data status data
- * @return ApiResponse
- */
- public function statusesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/statuses/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'status' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit site
- *
- * @param array $data site data
- * @return ApiResponse
- */
- public function sitesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/sites/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'site' => json_encode($data)
- )
- );
- }
-
- /**
- * Edit store
- *
- * @param array $data site data
- * @return ApiResponse
- */
- public function storesEdit(array $data)
- {
- if (!isset($data['code'])) {
- throw new InvalidArgumentException('Data must contain "code" parameter.');
- }
-
- if (!isset($data['name'])) {
- throw new InvalidArgumentException('Data must contain "name" parameter.');
- }
-
- return $this->client->makeRequest(
- '/reference/stores/' . $data['code'] . '/edit',
- RetailcrmHttpClient::METHOD_POST,
- array(
- 'store' => json_encode($data)
- )
- );
- }
-
- /**
- * Update CRM basic statistic
- *
- * @return ApiResponse
- */
- public function statisticUpdate()
- {
- return $this->client->makeRequest('/statistic/update', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Return current site
- *
- * @return string
- */
- public function getSite()
- {
- return $this->siteCode;
- }
-
- /**
- * Set site
- *
- * @param string $site
- * @return void
- */
- public function setSite($site)
- {
- $this->siteCode = $site;
- }
-
- /**
- * Check ID parameter
- *
- * @param string $by
- * @return bool
- */
- protected function checkIdParameter($by)
- {
- $allowedForBy = array('externalId', 'id');
- if (!in_array($by, $allowedForBy)) {
- throw new InvalidArgumentException(sprintf(
- 'Value "%s" for parameter "by" is not valid. Allowed values are %s.',
- $by,
- implode(', ', $allowedForBy)
- ));
- }
-
- return true;
- }
-
- /**
- * Fill params by site value
- *
- * @param string $site
- * @param array $params
- * @return array
- */
- protected function fillSite($site, array $params)
- {
- if ($site) {
- $params['site'] = $site;
- } elseif ($this->siteCode) {
- $params['site'] = $this->siteCode;
- }
-
- return $params;
- }
-}
diff --git a/src/upload/system/library/retailcrm/RetailcrmApiClient4.php b/src/upload/system/library/retailcrm/RetailcrmApiClient4.php
deleted file mode 100644
index 1436175..0000000
--- a/src/upload/system/library/retailcrm/RetailcrmApiClient4.php
+++ /dev/null
@@ -1,1771 +0,0 @@
-
- * @license https://opensource.org/licenses/MIT MIT License
- * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
- */
-class RetailcrmApiClient4
-{
- protected $client;
-
- /**
- * Site code
- */
- protected $siteCode;
-
- /**
- * Client creating
- *
- * @param string $url api url
- * @param string $apiKey api key
- * @param string $site site code
- *
- * @throws \InvalidArgumentException
- *
- * @return mixed
- */
- public function __construct($url, $apiKey, $version = null, $site = null)
- {
- if ('/' !== $url[strlen($url) - 1]) {
- $url .= '/';
- }
-
- $url = $version == null ? $url . 'api' : $url . 'api/' . $version;
-
- $this->client = new RetailcrmHttpClient($url, array('apiKey' => $apiKey));
- $this->siteCode = $site;
- }
-
- /**
- * Returns api versions list
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function apiVersions()
- {
- return $this->client->makeRequest('/api-versions', RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns users list
- *
- * @param array $filter
- * @param null $page
- * @param null $limit
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function usersList(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/users',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Returns user data
- *
- * @param integer $id user ID
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function usersGet($id)
- {
- return $this->client->makeRequest("/users/$id", RetailcrmHttpClient::METHOD_GET);
- }
-
- /**
- * Returns filtered orders list
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersList(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/orders',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Create a order
- *
- * @param array $order order data
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersCreate(array $order, $site = null)
- {
- if (!count($order)) {
- throw new \InvalidArgumentException(
- 'Parameter `order` must contains a data'
- );
- }
-
- return $this->client->makeRequest(
- '/orders/create',
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('order' => json_encode($order)))
- );
- }
-
- /**
- * Save order IDs' (id and externalId) association in the CRM
- *
- * @param array $ids order identificators
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersFixExternalIds(array $ids)
- {
- if (! count($ids)) {
- throw new \InvalidArgumentException(
- 'Method parameter must contains at least one IDs pair'
- );
- }
-
- return $this->client->makeRequest(
- '/orders/fix-external-ids',
- RetailcrmHttpClient::METHOD_POST,
- array('orders' => json_encode($ids)
- )
- );
- }
-
- /**
- * Returns statuses of the orders
- *
- * @param array $ids (default: array())
- * @param array $externalIds (default: array())
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersStatuses(array $ids = array(), array $externalIds = array())
- {
- $parameters = array();
-
- if (count($ids)) {
- $parameters['ids'] = $ids;
- }
- if (count($externalIds)) {
- $parameters['externalIds'] = $externalIds;
- }
-
- return $this->client->makeRequest(
- '/orders/statuses',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Upload array of the orders
- *
- * @param array $orders array of orders
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersUpload(array $orders, $site = null)
- {
- if (!count($orders)) {
- throw new \InvalidArgumentException(
- 'Parameter `orders` must contains array of the orders'
- );
- }
-
- return $this->client->makeRequest(
- '/orders/upload',
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('orders' => json_encode($orders)))
- );
- }
-
- /**
- * Get order by id or externalId
- *
- * @param string $id order identificator
- * @param string $by (default: 'externalId')
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersGet($id, $by = 'externalId', $site = null)
- {
- $this->checkIdParameter($by);
-
- return $this->client->makeRequest(
- "/orders/$id",
- RetailcrmHttpClient::METHOD_GET,
- $this->fillSite($site, array('by' => $by))
- );
- }
-
- /**
- * Edit a order
- *
- * @param array $order order data
- * @param string $by (default: 'externalId')
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersEdit(array $order, $by = 'externalId', $site = null)
- {
- if (!count($order)) {
- throw new \InvalidArgumentException(
- 'Parameter `order` must contains a data'
- );
- }
-
- $this->checkIdParameter($by);
-
- if (!array_key_exists($by, $order)) {
- throw new \InvalidArgumentException(
- sprintf('Order array must contain the "%s" parameter.', $by)
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/orders/%s/edit', $order[$by]),
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite(
- $site,
- array('order' => json_encode($order), 'by' => $by)
- )
- );
- }
-
- /**
- * Get orders history
- * @param array $filter
- * @param null $page
- * @param null $limit
- *
- * @return ApiResponse
- */
- public function ordersHistory(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/orders/history',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Returns filtered customers list
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function customersList(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/customers',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Create a customer
- *
- * @param array $customer customer data
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function customersCreate(array $customer, $site = null)
- {
- if (! count($customer)) {
- throw new \InvalidArgumentException(
- 'Parameter `customer` must contains a data'
- );
- }
-
- return $this->client->makeRequest(
- '/customers/create',
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('customer' => json_encode($customer)))
- );
- }
-
- /**
- * Save customer IDs' (id and externalId) association in the CRM
- *
- * @param array $ids ids mapping
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function customersFixExternalIds(array $ids)
- {
- if (! count($ids)) {
- throw new \InvalidArgumentException(
- 'Method parameter must contains at least one IDs pair'
- );
- }
-
- return $this->client->makeRequest(
- '/customers/fix-external-ids',
- RetailcrmHttpClient::METHOD_POST,
- array('customers' => json_encode($ids))
- );
- }
-
- /**
- * Upload array of the customers
- *
- * @param array $customers array of customers
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function customersUpload(array $customers, $site = null)
- {
- if (! count($customers)) {
- throw new \InvalidArgumentException(
- 'Parameter `customers` must contains array of the customers'
- );
- }
-
- return $this->client->makeRequest(
- '/customers/upload',
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('customers' => json_encode($customers)))
- );
- }
-
- /**
- * Get customer by id or externalId
- *
- * @param string $id customer identificator
- * @param string $by (default: 'externalId')
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function customersGet($id, $by = 'externalId', $site = null)
- {
- $this->checkIdParameter($by);
-
- return $this->client->makeRequest(
- "/customers/$id",
- RetailcrmHttpClient::METHOD_GET,
- $this->fillSite($site, array('by' => $by))
- );
- }
-
- /**
- * Edit a customer
- *
- * @param array $customer customer data
- * @param string $by (default: 'externalId')
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function customersEdit(array $customer, $by = 'externalId', $site = null)
- {
- if (!count($customer)) {
- throw new \InvalidArgumentException(
- 'Parameter `customer` must contains a data'
- );
- }
-
- $this->checkIdParameter($by);
-
- if (!array_key_exists($by, $customer)) {
- throw new \InvalidArgumentException(
- sprintf('Customer array must contain the "%s" parameter.', $by)
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/customers/%s/edit', $customer[$by]),
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite(
- $site,
- array('customer' => json_encode($customer), 'by' => $by)
- )
- );
- }
-
- /**
- * Get customers history
- * @param array $filter
- * @param null $page
- * @param null $limit
- *
- * @return ApiResponse
- */
- public function customersHistory(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/customers/history',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Get orders assembly list
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersPacksList(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/orders/packs',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Create orders assembly
- *
- * @param array $pack pack data
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersPacksCreate(array $pack, $site = null)
- {
- if (!count($pack)) {
- throw new \InvalidArgumentException(
- 'Parameter `pack` must contains a data'
- );
- }
-
- return $this->client->makeRequest(
- '/orders/packs/create',
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('pack' => json_encode($pack)))
- );
- }
-
- /**
- * Get orders assembly history
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersPacksHistory(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/orders/packs/history',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Get orders assembly by id
- *
- * @param string $id pack identificator
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersPacksGet($id)
- {
- if (empty($id)) {
- throw new \InvalidArgumentException('Parameter `id` must be set');
- }
-
- return $this->client->makeRequest(
- "/orders/packs/$id",
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Delete orders assembly by id
- *
- * @param string $id pack identificator
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersPacksDelete($id)
- {
- if (empty($id)) {
- throw new \InvalidArgumentException('Parameter `id` must be set');
- }
-
- return $this->client->makeRequest(
- sprintf('/orders/packs/%s/delete', $id),
- RetailcrmHttpClient::METHOD_POST
- );
- }
-
- /**
- * Edit orders assembly
- *
- * @param array $pack pack data
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function ordersPacksEdit(array $pack, $site = null)
- {
- if (!count($pack) || empty($pack['id'])) {
- throw new \InvalidArgumentException(
- 'Parameter `pack` must contains a data & pack `id` must be set'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/orders/packs/%s/edit', $pack['id']),
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('pack' => json_encode($pack)))
- );
- }
-
- /**
- * Get purchace prices & stock balance
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function storeInventories(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/store/inventories',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Get store settings
- *
- * @param string $code get settings code
- *
- * @return ApiResponse
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function storeSettingsGet($code)
- {
- if (empty($code)) {
- throw new \InvalidArgumentException('Parameter `code` must be set');
- }
-
- return $this->client->makeRequest(
- "/store/setting/$code",
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit store configuration
- *
- * @param array $configuration
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function storeSettingsEdit(array $configuration)
- {
- if (!count($configuration) || empty($configuration['code'])) {
- throw new \InvalidArgumentException(
- 'Parameter `configuration` must contains a data & configuration `code` must be set'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/store/setting/%s/edit', $configuration['code']),
- RetailcrmHttpClient::METHOD_POST,
- $configuration
- );
- }
-
- /**
- * Upload store inventories
- *
- * @param array $offers offers data
- * @param string $site (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function storeInventoriesUpload(array $offers, $site = null)
- {
- if (!count($offers)) {
- throw new \InvalidArgumentException(
- 'Parameter `offers` must contains array of the offers'
- );
- }
-
- return $this->client->makeRequest(
- '/store/inventories/upload',
- RetailcrmHttpClient::METHOD_POST,
- $this->fillSite($site, array('offers' => json_encode($offers)))
- );
- }
-
- /**
- * Get products
- *
- * @param array $filter (default: array())
- * @param int $page (default: null)
- * @param int $limit (default: null)
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function storeProducts(array $filter = array(), $page = null, $limit = null)
- {
- $parameters = array();
-
- if (count($filter)) {
- $parameters['filter'] = $filter;
- }
- if (null !== $page) {
- $parameters['page'] = (int) $page;
- }
- if (null !== $limit) {
- $parameters['limit'] = (int) $limit;
- }
-
- return $this->client->makeRequest(
- '/store/products',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Upload prices
- *
- * @param array $prices (default: array())
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function storePricesUpload(array $prices = array())
- {
- return $this->client->makeRequest(
- '/store/prices/upload',
- RetailcrmHttpClient::METHOD_POST,
- array('prices' => json_encode($prices))
- );
- }
-
- /**
- * Get delivery settings
- *
- * @param string $code
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function deliverySettingsGet($code)
- {
- if (empty($code)) {
- throw new \InvalidArgumentException('Parameter `code` must be set');
- }
-
- return $this->client->makeRequest(
- "/delivery/generic/setting/$code",
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit delivery configuration
- *
- * @param array $configuration
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function deliverySettingsEdit(array $configuration)
- {
- if (!count($configuration) || empty($configuration['code'])) {
- throw new \InvalidArgumentException(
- 'Parameter `configuration` must contains a data & configuration `code` must be set'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/delivery/generic/setting/%s/edit', $configuration['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('configuration' => json_encode($configuration))
- );
- }
-
- /**
- * Delivery tracking update
- *
- * @param string $code
- * @param array $statusUpdate
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function deliveryTracking($code, array $statusUpdate)
- {
- if (empty($code)) {
- throw new \InvalidArgumentException('Parameter `code` must be set');
- }
-
- if (!count($statusUpdate)) {
- throw new \InvalidArgumentException(
- 'Parameter `statusUpdate` must contains a data'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/delivery/generic/%s/tracking', $code),
- RetailcrmHttpClient::METHOD_POST,
- $statusUpdate
- );
- }
-
- /**
- * Returns available county list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function countriesList()
- {
- return $this->client->makeRequest(
- '/reference/countries',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Returns deliveryServices list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function deliveryServicesList()
- {
- return $this->client->makeRequest(
- '/reference/delivery-services',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit deliveryService
- *
- * @param array $data delivery service data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function deliveryServicesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/delivery-services/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('deliveryService' => json_encode($data))
- );
- }
-
- /**
- * Returns deliveryTypes list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function deliveryTypesList()
- {
- return $this->client->makeRequest(
- '/reference/delivery-types',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit deliveryType
- *
- * @param array $data delivery type data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function deliveryTypesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/delivery-types/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('deliveryType' => json_encode($data))
- );
- }
-
- /**
- * Returns orderMethods list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function orderMethodsList()
- {
- return $this->client->makeRequest(
- '/reference/order-methods',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit orderMethod
- *
- * @param array $data order method data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function orderMethodsEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/order-methods/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('orderMethod' => json_encode($data))
- );
- }
-
- /**
- * Returns orderTypes list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function orderTypesList()
- {
- return $this->client->makeRequest(
- '/reference/order-types',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit orderType
- *
- * @param array $data order type data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function orderTypesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/order-types/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('orderType' => json_encode($data))
- );
- }
-
- /**
- * Returns paymentStatuses list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function paymentStatusesList()
- {
- return $this->client->makeRequest(
- '/reference/payment-statuses',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit paymentStatus
- *
- * @param array $data payment status data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function paymentStatusesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/payment-statuses/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('paymentStatus' => json_encode($data))
- );
- }
-
- /**
- * Returns paymentTypes list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function paymentTypesList()
- {
- return $this->client->makeRequest(
- '/reference/payment-types',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit paymentType
- *
- * @param array $data payment type data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function paymentTypesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/payment-types/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('paymentType' => json_encode($data))
- );
- }
-
- /**
- * Returns productStatuses list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function productStatusesList()
- {
- return $this->client->makeRequest(
- '/reference/product-statuses',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit productStatus
- *
- * @param array $data product status data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function productStatusesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/product-statuses/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('productStatus' => json_encode($data))
- );
- }
-
- /**
- * Returns sites list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function sitesList()
- {
- return $this->client->makeRequest(
- '/reference/sites',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit site
- *
- * @param array $data site data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function sitesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/sites/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('site' => json_encode($data))
- );
- }
-
- /**
- * Returns statusGroups list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function statusGroupsList()
- {
- return $this->client->makeRequest(
- '/reference/status-groups',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Returns statuses list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function statusesList()
- {
- return $this->client->makeRequest(
- '/reference/statuses',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit order status
- *
- * @param array $data status data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function statusesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/statuses/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('status' => json_encode($data))
- );
- }
-
- /**
- * Returns stores list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function storesList()
- {
- return $this->client->makeRequest(
- '/reference/stores',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit store
- *
- * @param array $data site data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function storesEdit(array $data)
- {
- if (!array_key_exists('code', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "code" parameter.'
- );
- }
-
- if (!array_key_exists('name', $data)) {
- throw new \InvalidArgumentException(
- 'Data must contain "name" parameter.'
- );
- }
-
- return $this->client->makeRequest(
- sprintf('/reference/stores/%s/edit', $data['code']),
- RetailcrmHttpClient::METHOD_POST,
- array('store' => json_encode($data))
- );
- }
-
- /**
- * Returns price types list
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function priceTypesList()
- {
- return $this->client->makeRequest(
- '/reference/price-types',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Get telephony settings
- *
- * @param string $code
- *
- * @throws \RetailCrm\Exception\InvalidJsonException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \InvalidArgumentException
- *
- * @return ApiResponse
- */
- public function telephonySettingsGet($code)
- {
- if (empty($code)) {
- throw new \InvalidArgumentException('Parameter `code` must be set');
- }
-
- return $this->client->makeRequest(
- "/telephony/setting/$code",
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Edit telephony settings
- *
- * @param string $code symbolic code
- * @param string $clientId client id
- * @param boolean $active telephony activity
- * @param mixed $name service name
- * @param mixed $makeCallUrl service init url
- * @param mixed $image service logo url(svg file)
- *
- * @param array $additionalCodes
- * @param array $externalPhones
- * @param bool $allowEdit
- * @param bool $inputEventSupported
- * @param bool $outputEventSupported
- * @param bool $hangupEventSupported
- * @param bool $changeUserStatusUrl
- *
- * @return ApiResponse
- */
- public function telephonySettingsEdit(
- $code,
- $clientId,
- $active = false,
- $name = false,
- $makeCallUrl = false,
- $image = false,
- $additionalCodes = array(),
- $externalPhones = array(),
- $allowEdit = false,
- $inputEventSupported = false,
- $outputEventSupported = false,
- $hangupEventSupported = false,
- $changeUserStatusUrl = false
- )
- {
- if (!isset($code)) {
- throw new \InvalidArgumentException('Code must be set');
- }
-
- $parameters['code'] = $code;
-
- if (!isset($clientId)) {
- throw new \InvalidArgumentException('client id must be set');
- }
-
- $parameters['clientId'] = $clientId;
-
- if (!isset($active)) {
- $parameters['active'] = false;
- } else {
- $parameters['active'] = $active;
- }
-
- if (!isset($name)) {
- throw new \InvalidArgumentException('name must be set');
- }
-
- if (isset($name)) {
- $parameters['name'] = $name;
- }
-
- if (isset($makeCallUrl)) {
- $parameters['makeCallUrl'] = $makeCallUrl;
- }
-
- if (isset($image)) {
- $parameters['image'] = $image;
- }
-
- if (isset($additionalCodes)) {
- $parameters['additionalCodes'] = $additionalCodes;
- }
-
- if (isset($externalPhones)) {
- $parameters['externalPhones'] = $externalPhones;
- }
-
- if (isset($allowEdit)) {
- $parameters['allowEdit'] = $allowEdit;
- }
-
- if (isset($inputEventSupported)) {
- $parameters['inputEventSupported'] = $inputEventSupported;
- }
-
- if (isset($outputEventSupported)) {
- $parameters['outputEventSupported'] = $outputEventSupported;
- }
-
- if (isset($hangupEventSupported)) {
- $parameters['hangupEventSupported'] = $hangupEventSupported;
- }
-
- if (isset($changeUserStatusUrl)) {
- $parameters['changeUserStatusUrl'] = $changeUserStatusUrl;
- }
-
- return $this->client->makeRequest(
- "/telephony/setting/$code/edit",
- RetailcrmHttpClient::METHOD_POST,
- array('configuration' => json_encode($parameters))
- );
- }
-
- /**
- * Call event
- *
- * @param string $phone phone number
- * @param string $type call type
- * @param array $codes
- * @param string $hangupStatus
- * @param string $externalPhone
- * @param array $webAnalyticsData
- *
- * @return ApiResponse
- * @internal param string $code additional phone code
- * @internal param string $status call status
- *
- */
- public function telephonyCallEvent(
- $phone,
- $type,
- $codes,
- $hangupStatus,
- $externalPhone = null,
- $webAnalyticsData = array()
- )
- {
- if (!isset($phone)) {
- throw new \InvalidArgumentException('Phone number must be set');
- }
-
- if (!isset($type)) {
- throw new \InvalidArgumentException('Type must be set (in|out|hangup)');
- }
-
- if (empty($codes)) {
- throw new \InvalidArgumentException('Codes array must be set');
- }
-
- $parameters['phone'] = $phone;
- $parameters['type'] = $type;
- $parameters['codes'] = $codes;
- $parameters['hangupStatus'] = $hangupStatus;
- $parameters['callExternalId'] = $externalPhone;
- $parameters['webAnalyticsData'] = $webAnalyticsData;
-
-
- return $this->client->makeRequest(
- '/telephony/call/event',
- RetailcrmHttpClient::METHOD_POST,
- array('event' => json_encode($parameters))
- );
- }
-
- /**
- * Upload calls
- *
- * @param array $calls calls data
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function telephonyCallsUpload(array $calls)
- {
- if (!count($calls)) {
- throw new \InvalidArgumentException(
- 'Parameter `calls` must contains array of the calls'
- );
- }
-
- return $this->client->makeRequest(
- '/telephony/calls/upload',
- RetailcrmHttpClient::METHOD_POST,
- array('calls' => json_encode($calls))
- );
- }
-
- /**
- * Get call manager
- *
- * @param string $phone phone number
- * @param bool $details detailed information
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function telephonyCallManager($phone, $details)
- {
- if (!isset($phone)) {
- throw new \InvalidArgumentException('Phone number must be set');
- }
-
- $parameters['phone'] = $phone;
- $parameters['details'] = isset($details) ? $details : 0;
-
- return $this->client->makeRequest(
- '/telephony/manager',
- RetailcrmHttpClient::METHOD_GET,
- $parameters
- );
- }
-
- /**
- * Update CRM basic statistic
- *
- * @throws \InvalidArgumentException
- * @throws \RetailCrm\Exception\CurlException
- * @throws \RetailCrm\Exception\InvalidJsonException
- *
- * @return ApiResponse
- */
- public function statisticUpdate()
- {
- return $this->client->makeRequest(
- '/statistic/update',
- RetailcrmHttpClient::METHOD_GET
- );
- }
-
- /**
- * Return current site
- *
- * @return string
- */
- public function getSite()
- {
- return $this->siteCode;
- }
-
- /**
- * Set site
- *
- * @param string $site site code
- *
- * @return void
- */
- public function setSite($site)
- {
- $this->siteCode = $site;
- }
-
- /**
- * Check ID parameter
- *
- * @param string $by identify by
- *
- * @throws \InvalidArgumentException
- *
- * @return bool
- */
- protected function checkIdParameter($by)
- {
- $allowedForBy = array(
- 'externalId',
- 'id'
- );
-
- if (!in_array($by, $allowedForBy, false)) {
- throw new \InvalidArgumentException(
- sprintf(
- 'Value "%s" for "by" param is not valid. Allowed values are %s.',
- $by,
- implode(', ', $allowedForBy)
- )
- );
- }
-
- return true;
- }
-
- /**
- * Fill params by site value
- *
- * @param string $site site code
- * @param array $params input parameters
- *
- * @return array
- */
- protected function fillSite($site, array $params)
- {
- if ($site) {
- $params['site'] = $site;
- } elseif ($this->siteCode) {
- $params['site'] = $this->siteCode;
- }
-
- return $params;
- }
-}
diff --git a/src/upload/system/library/retailcrm/CurlException.php b/src/upload/system/library/retailcrm/api/CurlException.php
similarity index 100%
rename from src/upload/system/library/retailcrm/CurlException.php
rename to src/upload/system/library/retailcrm/api/CurlException.php
diff --git a/src/upload/system/library/retailcrm/InvalidJsonException.php b/src/upload/system/library/retailcrm/api/InvalidJsonException.php
similarity index 100%
rename from src/upload/system/library/retailcrm/InvalidJsonException.php
rename to src/upload/system/library/retailcrm/api/InvalidJsonException.php
diff --git a/src/upload/system/library/retailcrm/OpencartApiClient.php b/src/upload/system/library/retailcrm/api/OpencartApiClient.php
similarity index 84%
rename from src/upload/system/library/retailcrm/OpencartApiClient.php
rename to src/upload/system/library/retailcrm/api/OpencartApiClient.php
index 8f92be2..20b4ce3 100644
--- a/src/upload/system/library/retailcrm/OpencartApiClient.php
+++ b/src/upload/system/library/retailcrm/api/OpencartApiClient.php
@@ -14,9 +14,11 @@ class OpencartApiClient {
public function __construct(Registry &$registry) {
$this->registry = $registry;
- $moduleTitle = $this->getModuleTitle();
- $settings = $this->model_setting_setting->getSetting($moduleTitle);
- $this->cookieFileName = $settings[$moduleTitle . '_apikey'];
+ $settings = $this->model_setting_setting->getSetting(\Retailcrm\Retailcrm::MODULE);
+
+ if (isset($settings[\Retailcrm\Retailcrm::MODULE . '_apikey'])) {
+ $this->cookieFileName = $settings[\Retailcrm\Retailcrm::MODULE . '_apikey'];
+ }
$this->auth();
}
@@ -47,22 +49,19 @@ class OpencartApiClient {
}
private function request($method, $getParams, $postParams) {
+ $this->load->model('setting/store');
$opencartStoreInfo = $this->model_setting_store->getStore($this->opencartStoreId);
if ($this->apiToken !== false) {
- if (version_compare(VERSION, '3.0', '<')) {
- $getParams['key'] = $this->apiToken['key'];
- } else {
- $getParams['key'] = $this->apiToken['key'];
- $getParams['username'] = $this->apiToken['username'];
+ $getParams['key'] = $this->apiToken['key'];
+ $getParams['username'] = $this->apiToken['username'];
- if (isset($this->session->data['user_token'])) {
- $getParams['api_token'] = $this->session->data['user_token'];
- } else {
- $session = $this->registry->get('session');
- $session->start();
- $getParams['api_token'] = $session->getId();
- }
+ if (isset($this->session->data['user_token'])) {
+ $getParams['api_token'] = $this->session->data['user_token'];
+ } else {
+ $session = $this->registry->get('session');
+ $session->start();
+ $getParams['api_token'] = $session->getId();
}
}
@@ -143,7 +142,7 @@ class OpencartApiClient {
/**
* Get delivery types
- *
+ *
* @return array
*/
public function getDeliveryTypes()
@@ -153,10 +152,10 @@ class OpencartApiClient {
/**
* Add history order
- *
+ *
* @param int $order_id
* @param int $order_status_id
- *
+ *
* @return void
*/
public function addHistory($order_id, $order_status_id)
@@ -166,7 +165,7 @@ class OpencartApiClient {
/**
* Get module name
- *
+ *
* @return string
*/
private function getModuleTitle()
diff --git a/src/upload/system/library/retailcrm/RetailcrmApiClient5.php b/src/upload/system/library/retailcrm/api/RetailcrmApiClient5.php
similarity index 100%
rename from src/upload/system/library/retailcrm/RetailcrmApiClient5.php
rename to src/upload/system/library/retailcrm/api/RetailcrmApiClient5.php
diff --git a/src/upload/system/library/retailcrm/RetailcrmApiResponse.php b/src/upload/system/library/retailcrm/api/RetailcrmApiResponse.php
similarity index 100%
rename from src/upload/system/library/retailcrm/RetailcrmApiResponse.php
rename to src/upload/system/library/retailcrm/api/RetailcrmApiResponse.php
diff --git a/src/upload/system/library/retailcrm/RetailcrmHistoryHelper.php b/src/upload/system/library/retailcrm/api/RetailcrmHistoryHelper.php
similarity index 100%
rename from src/upload/system/library/retailcrm/RetailcrmHistoryHelper.php
rename to src/upload/system/library/retailcrm/api/RetailcrmHistoryHelper.php
diff --git a/src/upload/system/library/retailcrm/RetailcrmHttpClient.php b/src/upload/system/library/retailcrm/api/RetailcrmHttpClient.php
similarity index 100%
rename from src/upload/system/library/retailcrm/RetailcrmHttpClient.php
rename to src/upload/system/library/retailcrm/api/RetailcrmHttpClient.php
diff --git a/src/upload/system/library/retailcrm/RetailcrmProxy.php b/src/upload/system/library/retailcrm/api/RetailcrmProxy.php
similarity index 74%
rename from src/upload/system/library/retailcrm/RetailcrmProxy.php
rename to src/upload/system/library/retailcrm/api/RetailcrmProxy.php
index bbf687f..789c131 100644
--- a/src/upload/system/library/retailcrm/RetailcrmProxy.php
+++ b/src/upload/system/library/retailcrm/api/RetailcrmProxy.php
@@ -6,37 +6,43 @@
*/
class RetailcrmProxy
{
-
private $api;
private $log;
+ private $debug;
- public function __construct($url, $key, $log, $version = null)
- {
+ public function __construct($url, $key, $log, $version = null, $debug = false)
+ {
switch ($version) {
case 'v5':
$this->api = new RetailcrmApiClient5($url, $key, $version);
break;
- case 'v4':
- $this->api = new RetailcrmApiClient4($url, $key, $version);
- break;
- case 'v3':
- $this->api = new RetailcrmApiClient3($url, $key, $version);
- break;
- case null:
- $this->api = new RetailcrmApiClient3($url, $key, $version);
+
+ default:
+ $this->api = new RetailcrmApiClient5($url, $key, $version);
break;
}
$this->log = $log;
+ $this->debug = $debug;
}
public function __call($method, $arguments)
- {
+ {
$date = date('[Y-m-d H:i:s]');
-
+
try {
$response = call_user_func_array(array($this->api, $method), $arguments);
+ if ($this->debug) {
+ $logger = new Log($method);
+ $logger->write(
+ array(
+ 'data' => $arguments,
+ 'response' => $response
+ )
+ );
+ }
+
if (!$response->isSuccessful()) {
error_log($date . " [$method] " . $response->getErrorMsg() . "\n", 3, $this->log);
if (isset($response['errors'])) {
diff --git a/src/upload/system/library/retailcrm/bootstrap.php b/src/upload/system/library/retailcrm/api/bootstrap.php
similarity index 100%
rename from src/upload/system/library/retailcrm/bootstrap.php
rename to src/upload/system/library/retailcrm/api/bootstrap.php
diff --git a/src/upload/system/library/retailcrm/base.php b/src/upload/system/library/retailcrm/base.php
new file mode 100644
index 0000000..de0cadd
--- /dev/null
+++ b/src/upload/system/library/retailcrm/base.php
@@ -0,0 +1,213 @@
+registry = $registry;
+ }
+
+ /**
+ * @param $name
+ *
+ * @return mixed
+ */
+ public function __get($name) {
+ return $this->registry->get($name);
+ }
+
+ /**
+ * @return array
+ */
+ public function getData() {
+ return $this->data;
+ }
+
+ /**
+ * @param $field
+ * @param $value
+ *
+ * @return bool
+ */
+ public function setField($field, $value) {
+ if (!array_key_exists($field, $this->data)) {
+ return false;
+ }
+
+ $this->data[$field] = $value;
+
+ return true;
+ }
+
+ /**
+ * @param $fields
+ */
+ public function setFields($fields) {
+ foreach ($fields as $field => $value) {
+ $this->setField($field, $value);
+ }
+ }
+
+ /**
+ * @param $data
+ * @param $element
+ */
+ public function setDataArray($data, $element) {
+ if (is_array($data)) {
+ $this->setField($element, $data);
+ }
+ }
+
+ /**
+ * Prepare data array
+ *
+ * @param array $data
+ *
+ * @return void
+ */
+ public function prepare($data)
+ {
+ unset($data);
+ $this->data = Retailcrm::filterRecursive($this->data);
+ }
+
+ /**
+ * Upload to CRM
+ *
+ * @param $retailcrm_api_client
+ * @param array $data
+ * @param string $method
+ *
+ * @return boolean
+ */
+ public function upload($retailcrm_api_client, $data = array(), $method = 'orders')
+ {
+ if (!$data) {
+ return false;
+ }
+
+ $upload = array();
+ $countOrders = count($data);
+ $countIterations = (int) ($countOrders / 50);
+
+ foreach ($data as $key => $entity) {
+ $this->prepare($entity);
+ $upload[] = $this->data;
+ $this->resetData();
+
+ if ($countIterations > 0) {
+ unset($data[$key]);
+ }
+
+ if (($countIterations == 0 && count($data) == count($upload))
+ || count($upload) == 50
+ ) {
+ /** @var \RetailcrmApiClient5 $retailcrm_api_client */
+ $retailcrm_api_client->{$method . 'Upload'}($upload);
+ $upload = array();
+ $countIterations--;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * @param array $custom_fields
+ * @param array $setting
+ * @param string $prefix
+ *
+ * @return array
+ */
+ protected function prepareCustomFields($custom_fields, $setting, $prefix) {
+ $result = array();
+
+ if (!$custom_fields || empty($custom_fields)) {
+ return $result;
+ }
+
+ foreach ($custom_fields as $loc => $custom_field) {
+ if (\is_int($loc)) {
+ $result = $this->getCustomFields($custom_field, $setting, $prefix);
+ } elseif (\is_string($loc)) {
+ foreach ($custom_field as $field) {
+ if (!$field) {
+ continue;
+ }
+
+ $result = $this->getCustomFields($field, $setting, $prefix);
+ }
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * @param array $custom_fields
+ * @param array $setting
+ * @param string $prefix
+ *
+ * @return array $result
+ */
+ private function getCustomFields($custom_fields, $setting, $prefix) {
+ $result = array();
+
+ foreach ($custom_fields as $key => $field) {
+ if (isset($setting[\Retailcrm\Retailcrm::MODULE. '_custom_field'][$prefix . $key])) {
+ $result[$setting[\Retailcrm\Retailcrm::MODULE. '_custom_field'][$prefix . $key]] = $field;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Reset data on default
+ */
+ private function resetData()
+ {
+ $numericValues = array(
+ 'externalId',
+ 'discountManualAmount'
+ );
+
+ foreach ($this->data as $field => $value) {
+ if (in_array($field, $numericValues)) {
+ $this->data[$field] = 0;
+ } elseif (is_array($value)) {
+ $this->data[$field] = array();
+ } else {
+ $this->data[$field] = null;
+ }
+ }
+ }
+}
diff --git a/src/upload/system/library/retailcrm/custom/Base.php b/src/upload/system/library/retailcrm/custom/Base.php
new file mode 100644
index 0000000..3a8a2aa
--- /dev/null
+++ b/src/upload/system/library/retailcrm/custom/Base.php
@@ -0,0 +1,13 @@
+ 0,
+ 'createdAt' => null,
+ 'firstName' => null,
+ 'lastName' => null,
+ 'patronymic' => null,
+ 'email' => null,
+ 'phones' => array(),
+ 'address' => array(),
+ 'customFields' => array()
+ );
+
+ public function prepare($customer) {
+ if (file_exists(DIR_SYSTEM . 'library/retailcrm/custom/customer.php')) {
+ $custom = new \Retailcrm\Custom\Customer($this->registry);
+ $this->data = $custom->prepare($customer);
+ } else {
+ $this->load->model('setting/setting');
+ $setting = $this->model_setting_setting->getSetting(\Retailcrm\Retailcrm::MODULE);
+
+ if (isset($customer['firstname']) && $customer['firstname']) {
+ $this->setField('firstName', $customer['firstname']);
+ }
+
+ if (isset($customer['lastname']) && $customer['lastname']) {
+ $this->setField('lastName', $customer['lastname']);
+ }
+
+ if (isset($customer['telephone']) && $customer['telephone']) {
+ $phones = array(
+ array(
+ 'number' => $customer['telephone']
+ )
+ );
+ $this->setDataArray($phones, 'phones');
+ }
+
+ $this->setField('email', $customer['email']);
+ $this->setField('createdAt', date('Y-m-d H:i:s'));
+
+ if (isset($customer['customer_id']) && !$this->data['externalId']) {
+ $this->setField('externalId', $customer['customer_id']);
+ }
+
+ if (isset($settings[\Retailcrm\Retailcrm::MODULE . '_custom_field']) && $customer['custom_field']) {
+ $custom_fields = $this->prepareCustomFields($customer['custom_field'], $setting, 'c_');
+
+ if ($custom_fields) {
+ $this->setDataArray($custom_fields, 'customFields');
+ }
+ }
+ }
+
+ parent::prepare($customer);
+ }
+
+ /**
+ * @param $retailcrm_api_client
+ *
+ * @return mixed
+ */
+ public function create($retailcrm_api_client) {
+ if ($retailcrm_api_client === false) {
+ return false;
+ }
+
+ $response = $retailcrm_api_client->customersCreate($this->data);
+
+ return $response;
+ }
+
+ /**
+ * @param $retailcrm_api_client
+ *
+ * @return mixed
+ */
+ public function edit($retailcrm_api_client) {
+ if ($retailcrm_api_client === false) {
+ return false;
+ }
+
+ $response = $retailcrm_api_client->customersEdit($this->data);
+
+ return $response;
+ }
+}
diff --git a/src/upload/system/library/retailcrm/order.php b/src/upload/system/library/retailcrm/order.php
new file mode 100644
index 0000000..8f4dab5
--- /dev/null
+++ b/src/upload/system/library/retailcrm/order.php
@@ -0,0 +1,388 @@
+ 0,
+ 'createdAt' => null,
+ 'countryIso' => null,
+ 'externalId' => 0,
+ 'customer' => array(),
+ 'status' => null,
+ 'firstName' => null,
+ 'lastName' => null,
+ 'patronymic' => null,
+ 'email' => null,
+ 'phone' => null,
+ 'discountManualAmount' => 0,
+ 'customerComment' => null,
+ 'items' => array(),
+ 'delivery' => array(),
+ 'customFields' => array(),
+ 'payments' => array()
+ );
+
+ public function prepare($order) {
+ if (file_exists(DIR_SYSTEM . 'library/retailcrm/custom/order.php')) {
+ $custom = new \Retailcrm\Custom\Order($this->registry);
+ $this->data = $custom->prepare($order);
+ } else {
+ $this->load->model('setting/setting');
+ $this->load->model('catalog/product');
+ $this->load->model('extension/retailcrm/products');
+
+ $settings = $this->model_setting_setting->getSetting(\Retailcrm\Retailcrm::MODULE);
+ $delivery_settings = isset($settings[\Retailcrm\Retailcrm::MODULE . '_delivery'])
+ ? $settings[\Retailcrm\Retailcrm::MODULE . '_delivery']
+ : array();
+ $payments_settings = isset($settings[\Retailcrm\Retailcrm::MODULE . '_payment'])
+ ? $settings[\Retailcrm\Retailcrm::MODULE . '_payment']
+ : array();
+ $status_settings = isset($settings[\Retailcrm\Retailcrm::MODULE . '_status'])
+ ? $settings[\Retailcrm\Retailcrm::MODULE . '_status']
+ : array();
+
+ $totals = $this->explodeTotals($order['totals']);
+ $coupon_total = 0;
+ $delivery_cost = 0;
+
+ if (isset($totals['shipping'])) {
+ $delivery_cost = $totals['shipping'];
+ }
+
+ if (isset($totals['coupon'])) {
+ $coupon_total += abs($totals['coupon']);
+ }
+
+ if (isset($totals['reward'])) {
+ $coupon_total += abs($totals['reward']);
+ }
+
+ if (isset($order['order_status_id']) && $order['order_status_id'] > 0) {
+ $status = $status_settings[$order['order_status_id']];
+ } elseif (!isset($order['order_status_id'])) {
+ $status = $settings[\Retailcrm\Retailcrm::MODULE . '_missing_status'];
+ }
+
+ if (isset($settings[\Retailcrm\Retailcrm::MODULE . '_order_number'])
+ && $settings[\Retailcrm\Retailcrm::MODULE . '_order_number'] == 1
+ ) {
+ $this->setField('number', $order['order_id']);
+ }
+
+ $fields = array(
+ 'firstName' => $order['firstname'],
+ 'lastName' => $order['lastname'],
+ 'email' => $order['email'],
+ 'phone' => $order['telephone'],
+ 'customerComment' => $order['comment'],
+ 'createdAt' => isset($order['date_added']) ? $order['date_added'] : date('Y-m-d H:i:s'),
+ 'discountManualAmount' => $coupon_total,
+ 'status' => $status
+ );
+
+ if (isset($order['order_id']) && !$this->data['externalId']) {
+ $fields['externalId'] = $order['order_id'];
+ }
+
+ $this->setFields($fields);
+
+ if (isset($order['shipping_code'])) {
+ $delivery_code = $this->getDeliveryMethod($order['shipping_code'], $delivery_settings);
+ }
+
+ $delivery = array(
+ 'address' => array(
+ 'index' => isset($order['shipping_postcode']) ? $order['shipping_postcode'] : '',
+ 'city' => isset($order['shipping_city']) ? $order['shipping_city'] : '',
+ 'region' => isset($order['shipping_zone']) ? $order['shipping_zone'] : '',
+ 'text' => implode(', ', array(
+ isset($order['shipping_postcode']) ? $order['shipping_postcode'] : '',
+ isset($order['shipping_country']) ? $order['shipping_country'] : '',
+ isset($order['shipping_city']) ? $order['shipping_city'] : '',
+ isset($order['shipping_address_1']) ? $order['shipping_address_1'] : '',
+ isset($order['shipping_address_2']) ? $order['shipping_address_2'] : ''
+ ))
+ )
+ );
+
+ if (isset($delivery_code)) {
+ $delivery['code'] = $delivery_code;
+ }
+
+ if ($delivery_cost) {
+ $delivery['cost'] = $delivery_cost;
+ }
+
+ $this->setDataArray($delivery, 'delivery');
+ $this->setOrderProducts($order['products']);
+ $payments = array();
+
+ if (isset($payments_settings[$order['payment_code']])) {
+ $payment = array(
+ 'order' => array(
+ 'externalId' => $order['order_id']
+ ),
+ 'externalId' => $order['order_id'],
+ 'type' => $payments_settings[$order['payment_code']],
+ 'amount' => $order['total']
+ );
+
+ $payments[] = $payment;
+ }
+
+ $this->setDataArray($payments, 'payments');
+
+ if (isset($settings[\Retailcrm\Retailcrm::MODULE . '_custom_field']) && $order['custom_field']) {
+ $custom_fields = $this->prepareCustomFields($order['custom_field'], $settings, 'o_');
+
+ if ($custom_fields) {
+ $this->setDataArray($custom_fields, 'customFields');
+ }
+ }
+
+ if ($order['customer_id']) {
+ $this->setDataArray(
+ array(
+ 'externalId' => $order['customer_id']
+ ),
+ 'customer'
+ );
+ }
+ }
+
+ parent::prepare($order);
+ }
+
+ /**
+ * @param $retailcrm_api_client
+ *
+ * @return bool|mixed
+ */
+ public function create($retailcrm_api_client) {
+ if ($retailcrm_api_client === false) {
+ return false;
+ }
+
+ if (!$this->data['customer']) {
+ $customer = $this->searchCustomer($this->data['phone'], $this->data['email'], $retailcrm_api_client);
+
+ if ($customer) {
+ $this->setDataArray(
+ array(
+ 'id' => $customer['id']
+ ),
+ 'customer'
+ );
+ }
+ }
+
+ $response = $retailcrm_api_client->ordersCreate($this->data);
+
+ return $response;
+ }
+
+ /**
+ * @param $retailcrm_api_client
+ *
+ * @return bool|mixed
+ */
+ public function edit($retailcrm_api_client) {
+ if ($retailcrm_api_client === false) {
+ return false;
+ }
+
+ $order_payment = reset($this->data['payments']);
+ unset($this->data['payments']);
+
+ $response = $retailcrm_api_client->ordersEdit($this->data);
+
+ if ($response->isSuccessful()) {
+ $this->updatePayment($order_payment, $this->data['externalId'], $retailcrm_api_client);
+ }
+
+ return $response;
+ }
+
+ /**
+ * Update payment in CRM
+ *
+ * @param array $order_payment
+ * @param int $order_id
+ * @param \RetailcrmProxy $retailcrm_api_client
+ *
+ * @return boolean
+ */
+ private function updatePayment($order_payment, $order_id, $retailcrm_api_client) {
+ $response_order = $retailcrm_api_client->ordersGet($order_id);
+
+ if (!$response_order->isSuccessful()) {
+ return false;
+ }
+
+ $order_info = $response_order['order'];
+
+ foreach ($order_info['payments'] as $payment_data) {
+ if (isset($payment_data['externalId']) && $payment_data['externalId'] == $order_id) {
+ $payment = $payment_data;
+ }
+ }
+
+ if (isset($payment) && $payment['type'] != $order_payment['type']) {
+ $response = $retailcrm_api_client->ordersPaymentDelete($payment['id']);
+ if ($response->isSuccessful()) {
+ $retailcrm_api_client->ordersPaymentCreate($order_payment);
+ }
+ } elseif (isset($payment) && $payment['type'] == $order_payment['type']) {
+ $retailcrm_api_client->ordersPaymentEdit($order_payment);
+ }
+
+ return true;
+ }
+
+ /**
+ * @param $phone
+ * @param $email
+ * @param $retailcrm_api_client
+ *
+ * @return array|mixed
+ */
+ private function searchCustomer($phone, $email, $retailcrm_api_client) {
+ $customer = array();
+ $response = $retailcrm_api_client->customersList(
+ array(
+ 'name' => $phone,
+ 'email' => $email
+ ),
+ 1,
+ 100
+ );
+
+ if ($response->isSuccessful() && isset($response['customers'])) {
+ $customers = $response['customers'];
+ if ($customers) {
+ $customer = end($customers);
+ }
+ }
+ return $customer;
+ }
+
+ /**
+ * @param string $shipping_code
+ * @param array $deliveries
+ *
+ * @return mixed
+ */
+ private function getDeliveryMethod($shipping_code, $deliveries) {
+ if (!empty($shipping_code)) {
+ $shipping_code_array = explode('.', $shipping_code);
+ $shipping_module = $shipping_code_array[0];
+
+ if (isset($deliveries[$shipping_code])) {
+ $delivery_code = $deliveries[$shipping_code];
+ } elseif (isset($deliveries[$shipping_module])) {
+ $delivery_code = $deliveries[$shipping_module];
+ }
+ }
+
+ if (!isset($delivery_code) && isset($shipping_module) && $deliveries) {
+ $delivery = '';
+
+ array_walk($deliveries, function ($item, $key) use ($shipping_module, &$delivery) {
+ if (strripos($item, $shipping_module) !== false) {
+ $delivery = $item;
+ }
+ });
+
+ $delivery_code = $deliveries[$delivery];
+ }
+
+ return isset($delivery_code) ? $delivery_code : null;
+ }
+
+ /**
+ * @param array $products
+ *
+ * @return void
+ */
+ private function setOrderProducts($products) {
+ $offer_options = array('select', 'radio');
+ $items = array();
+
+ foreach ($products as $product) {
+ if (!empty($product['option'])) {
+ $offer_id = '';
+ $options = array();
+ $properties = array();
+
+ foreach ($product['option'] as $option) {
+ if ($option['type'] == 'checkbox') {
+ $properties[] = array(
+ 'code' => $option['product_option_value_id'],
+ 'name' => $option['name'],
+ 'value' => $option['value']
+ );
+ }
+
+ if (!in_array($option['type'], $offer_options)) {
+ continue;
+ }
+
+ $productOptions = $this->model_extension_retailcrm_products->getProductOptions($product['product_id']);
+
+ foreach ($productOptions as $productOption) {
+ if ($productOption['product_option_id'] == $option['product_option_id']) {
+ foreach ($productOption['product_option_value'] as $productOptionValue) {
+ if ($productOptionValue['product_option_value_id'] == $option['product_option_value_id']) {
+ $options[$option['product_option_id']] = $productOptionValue['option_value_id'];
+ }
+ }
+ }
+ }
+ }
+
+ ksort($options);
+
+ foreach ($options as $optionKey => $optionValue) {
+ $offer_id .= $optionKey . '-' . $optionValue;
+ }
+ }
+
+ $item = array(
+ 'offer' => array(
+ 'externalId' => !empty($offer_id) ? $product['product_id'] . '#' . $offer_id : $product['product_id']
+ ),
+ 'productName' => $product['name'],
+ 'initialPrice' => $product['price'],
+ 'quantity' => $product['quantity'],
+ );
+
+ if (!empty($properties)) {
+ $item['properties'] = $properties;
+ }
+
+ $items[] = $item;
+ }
+
+ $this->setDataArray($items, 'items');
+ }
+
+ /**
+ * @param $totals
+ *
+ * @return array
+ */
+ private function explodeTotals($totals)
+ {
+ $resultTotals = array();
+
+ foreach ($totals as $total) {
+ $resultTotals[$total['code']] = $total['value'];
+ }
+
+ return $resultTotals;
+ }
+}
diff --git a/src/upload/system/library/retailcrm/retailcrm.php b/src/upload/system/library/retailcrm/retailcrm.php
index 525a43b..8edc9a0 100644
--- a/src/upload/system/library/retailcrm/retailcrm.php
+++ b/src/upload/system/library/retailcrm/retailcrm.php
@@ -1,13 +1,14 @@
registry = $registry;
@@ -17,6 +18,10 @@ class Retailcrm {
return $this->registry->get($name);
}
+ public function createObject($object) {
+ return new $object($this->registry);
+ }
+
/**
* Get api client object
*
@@ -24,25 +29,31 @@ class Retailcrm {
* @param string $apiKey (default = null)
* @param string $apiVersion (default = null)
*
- * @return mixed object | boolean
+ * @return mixed object | boolean
*/
public function getApiClient($apiUrl = null, $apiKey = null, $apiVersion = null)
{
$this->load->model('setting/setting');
- $setting = $this->model_setting_setting->getSetting($this->getModuleTitle());
+ $setting = $this->model_setting_setting->getSetting(self::MODULE);
if ($apiUrl === null && $apiKey === null) {
- $apiUrl = isset($setting[$this->getModuleTitle() . '_url'])
- ? $setting[$this->getModuleTitle() . '_url'] : '';
- $apiKey = isset($setting[$this->getModuleTitle() . '_apikey'])
- ? $setting[$this->getModuleTitle() . '_apikey'] : '';
- $apiVersion = isset($setting[$this->getModuleTitle() . '_apiversion'])
- ? $setting[$this->getModuleTitle() . '_apiversion'] : '';
+ $apiUrl = isset($setting[self::MODULE . '_url'])
+ ? $setting[self::MODULE . '_url'] : '';
+ $apiKey = isset($setting[self::MODULE . '_apikey'])
+ ? $setting[self::MODULE . '_apikey'] : '';
+ $apiVersion = isset($setting[self::MODULE . '_apiversion'])
+ ? $setting[self::MODULE . '_apiversion'] : '';
+ }
+
+ $debug = false;
+
+ if (isset($setting[self::MODULE . '_debug_mode']) && $setting[self::MODULE . '_debug_mode']) {
+ $debug = true;
}
if ($apiUrl && $apiKey) {
- return new \RetailcrmProxy($apiUrl, $apiKey, DIR_LOGS . 'retailcrm.log', $apiVersion);
+ return new \RetailcrmProxy($apiUrl, $apiKey, DIR_LOGS . 'retailcrm.log', $apiVersion, $debug);
}
return false;
@@ -60,48 +71,17 @@ class Retailcrm {
return new \OpencartApiClient($registry);
}
- /**
- * Get module title for this version
- *
- * @return string $title
- */
- public function getModuleTitle()
- {
- if (version_compare(VERSION, '3.0', '<')) {
- $title = 'retailcrm';
- } else {
- $title = 'module_retailcrm';
- }
-
- return $title;
- }
-
- /**
- * Get token param name
- *
- * @return string $token
- */
- public function getTokenTitle()
- {
- if (version_compare(VERSION, '3.0', '<')) {
- $token = 'token';
- } else {
- $token = 'user_token';
- }
-
- return $token;
- }
-
public function getOffers($product)
{
+ $this->load->model('extension/retailcrm/products');
// Формируем офферы отнсительно доступных опций
- $options = $this->model_catalog_product->getProductOptions($product['product_id']);
+ $options = $this->model_extension_retailcrm_products->getProductOptions($product['product_id']);
$offerOptions = array('select', 'radio');
$requiredOptions = array();
$notRequiredOptions = array();
// Оставляем опции связанные с вариациями товаров, сортируем по параметру обязательный или нет
- foreach($options as $option) {
- if(in_array($option['type'], $offerOptions)) {
+ foreach ($options as $option) {
+ if (in_array($option['type'], $offerOptions)) {
if($option['required']) {
$requiredOptions[] = $option;
} else {
@@ -112,19 +92,19 @@ class Retailcrm {
$offers = array();
// Сначала совмещаем все обязательные опции
- foreach($requiredOptions as $requiredOption) {
+ foreach ($requiredOptions as $requiredOption) {
// Если первая итерация
- if(empty($offers)) {
- foreach($requiredOption['product_option_value'] as $optionValue) {
+ if (empty($offers)) {
+ foreach ($requiredOption['product_option_value'] as $optionValue) {
$offers[$requiredOption['product_option_id'].':'.$requiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
'price' => (float)$optionValue['price'],
'qty' => $optionValue['quantity']
);
}
} else {
- foreach($offers as $optionKey => $optionAttr) {
+ foreach ($offers as $optionKey => $optionAttr) {
unset($offers[$optionKey]); // Работая в контексте обязательных опций не забываем удалять прошлые обязательные опции, т.к. они должны быть скомбинированы с другими обязательными опциями
- foreach($requiredOption['product_option_value'] as $optionValue) {
+ foreach ($requiredOption['product_option_value'] as $optionValue) {
$offers[$optionKey.'_'.$requiredOption['product_option_id'].':'.$requiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
'price' => $optionAttr['price'] + (float)$optionValue['price'],
'qty' => ($optionAttr['qty'] > $optionValue['quantity']) ?
@@ -134,21 +114,21 @@ class Retailcrm {
}
}
}
-
+
// Совмещаем или добавляем необязательные опции, учитывая тот факт что обязательных опций может и не быть.
- foreach($notRequiredOptions as $notRequiredOption) {
+ foreach ($notRequiredOptions as $notRequiredOption) {
// Если обязательных опцией не оказалось и первая итерация
- if(empty($offers)) {
+ if (empty($offers)) {
$offers['0:0-0'] = 0; // В случае работы с необязательными опциями мы должны учитывать товарное предложение без опций, поэтому создадим "пустую" опцию
- foreach($notRequiredOption['product_option_value'] as $optionValue) {
+ foreach ($notRequiredOption['product_option_value'] as $optionValue) {
$offers[$notRequiredOption['product_option_id'].':'.$notRequiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
'price' => (float)$optionValue['price'],
'qty' => $optionValue['quantity']
);
}
} else {
- foreach($offers as $optionKey => $optionAttr) {
- foreach($notRequiredOption['product_option_value'] as $optionValue) {
+ foreach ($offers as $optionKey => $optionAttr) {
+ foreach ($notRequiredOption['product_option_value'] as $optionValue) {
$offers[$optionKey.'_'.$notRequiredOption['product_option_id'].':'.$notRequiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
'price' => $optionAttr['price'] + (float)$optionValue['price'],
'qty' => ($optionAttr['qty'] > $optionValue['quantity']) ?
@@ -159,10 +139,36 @@ class Retailcrm {
}
}
- if(empty($offers)) {
+ if (empty($offers)) {
$offers = array('0:0-0' => array('price' => '0', 'qty' => '0'));
}
return $offers;
}
+
+ /**
+ * Filter result array
+ *
+ * @param $haystack
+ *
+ * @return mixed
+ */
+ public static 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] === ''
+ || (is_array($haystack[$key]) && count($haystack[$key]) == 0)
+ ) {
+ unset($haystack[$key]);
+ } elseif (!is_array($value)) {
+ $haystack[$key] = trim($value);
+ }
+ }
+
+ return $haystack;
+ }
}
diff --git a/tests/admin/ControllerRetailcrmAdminTest.php b/tests/admin/ControllerRetailcrmAdminTest.php
index bc8dd01..88121ab 100644
--- a/tests/admin/ControllerRetailcrmAdminTest.php
+++ b/tests/admin/ControllerRetailcrmAdminTest.php
@@ -1,20 +1,24 @@
db->query("SELECT permission from ".DB_PREFIX."user_group WHERE name = 'Administrator'");
+ parent::setUp();
+
+ $query = $this->db->query("SELECT permission from " . DB_PREFIX . "user_group WHERE name = 'Administrator'");
$permissions = json_decode($query->row['permission'],true);
- if (!in_array('extension/module/retailcrm',$permissions['access'])) {
+ if (!in_array('extension/module/retailcrm', $permissions['access'])) {
$permissions['access'][] = 'extension/module/retailcrm';
$this->db->query("UPDATE ".DB_PREFIX."user_group SET permission='".$this->db->escape(json_encode($permissions))."' WHERE name = 'Administrator'");
}
- $this->retailcrm = $this->getMockBuilder('\retailcrm\Retailcrm')
+ $this->retailcrm = $this->getMockBuilder('\retailcrm\retailcrm')
->disableOriginalConstructor()
->getMock();
}
@@ -22,36 +26,15 @@ class ControllerRetailcrmAdminTest extends OpenCartTest
public function testIndex()
{
$this->login('admin', 'admin');
-
$response = $this->dispatchAction('extension/module/retailcrm');
+
$this->assertRegExp('/Connection settings/', $response->getOutput());
}
public function testIcml()
{
$this->login('admin', 'admin');
-
- $response = $this->dispatchAction('extension/module/retailcrm/icml');
-
- $this->assertRegExp('/Connection settings/', $response->getOutput());
+ $this->dispatchAction('extension/module/retailcrm/icml');
$this->assertFileExists(DIR_SYSTEM . '../' . 'retailcrm.xml');
}
-
- public function testInstallCollector()
- {
- $this->login('admin', 'admin');
-
- $response = $this->dispatchAction('extension/module/retailcrm/install_collector');
-
- $this->assertRegExp('/Connection settings/', $response->getOutput());
- }
-
- public function testUnnstallCollector()
- {
- $this->login('admin', 'admin');
-
- $response = $this->dispatchAction('extension/module/retailcrm/uninstall_collector');
-
- $this->assertRegExp('/Connection settings/', $response->getOutput());
- }
}
diff --git a/tests/admin/ModelRetailcrmOrderAdminTest.php b/tests/admin/ModelRetailcrmOrderAdminTest.php
index 3ed8d70..edec29c 100644
--- a/tests/admin/ModelRetailcrmOrderAdminTest.php
+++ b/tests/admin/ModelRetailcrmOrderAdminTest.php
@@ -1,187 +1,12 @@
orderModel = $this->loadModel('extension/retailcrm/order');
-
- $this->apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
- ->disableOriginalConstructor()
- ->setMethods(array(
- 'ordersUpload',
- 'customersList',
- 'ordersCreate',
- 'ordersPaymentCreate',
- 'customersCreate'
- ))
- ->getMock();
-
- $this->settingModel = $this->loadModel('setting/setting');
- $this->retailcrm = new \retailcrm\Retailcrm(self::$registry);
-
- $this->settingModel->editSetting(
- $this->retailcrm->getModuleTitle(),
- array(
- $this->retailcrm->getModuleTitle() . '_apiversion' => 'v5',
- $this->retailcrm->getModuleTitle() . '_order_number' => 1,
- $this->retailcrm->getModuleTitle() . '_status' => array(
- 1 => 'new'
- ),
- $this->retailcrm->getModuleTitle() . '_delivery' => array(
- 'flat.flat' => 'flat'
- ),
- $this->retailcrm->getModuleTitle() . '_payment' => array(
- 'cod' => 'cod'
- )
- )
- );
- }
-
- public function testUploadToCrm()
- {
- $saleOrderModel = $this->loadModel('sale/order');
- $orders = $saleOrderModel->getOrders();
- $fullOrders = array();
-
- foreach ($orders as $order) {
- $fullOrder = $saleOrderModel->getOrder($order['order_id']);
-
- $fullOrder['order_total'] = $saleOrderModel->getOrderTotals($order['order_id']);
- $fullOrder['products'] = $saleOrderModel->getOrderProducts($order['order_id']);
-
- foreach($fullOrder['products'] as $key => $product) {
- $fullOrder['products'][$key]['option'] = $saleOrderModel->getOrderOptions($product['order_id'], $product['order_product_id']);
- }
-
- $fullOrders[] = $fullOrder;
- }
-
- $chunkedOrders = $this->orderModel->uploadToCrm($fullOrders, $this->apiClientMock);
-
- $order = $chunkedOrders[0][0];
-
- $this->assertInternalType('array', $chunkedOrders);
- $this->assertInternalType('array', $chunkedOrders[0]);
- $this->assertNotEmpty($chunkedOrders[0]);
- $this->assertArrayHasKey('externalId', $order);
- $this->assertArrayHasKey('number', $order);
- $this->assertArrayHasKey('firstName', $order);
- $this->assertArrayHasKey('lastName', $order);
- $this->assertArrayHasKey('email', $order);
- $this->assertArrayHasKey('phone', $order);
- $this->assertArrayHasKey('createdAt', $order);
- $this->assertArrayHasKey('delivery', $order);
- $this->assertArrayHasKey('status', $order);
- $this->assertArrayHasKey('items', $order);
- $this->assertArrayHasKey('payments', $order);
- $this->assertNotEmpty($order['payments']);
- }
-
- public function testUploadWithCustomerTest()
- {
- $saleOrderModel = $this->loadModel('sale/order');
- $order = $saleOrderModel->getOrder(self::ORDER_WITH_CUST_ID);
-
- $order['totals'] = $saleOrderModel->getOrderTotals($order['order_id']);
- $order['products'] = $saleOrderModel->getOrderProducts($order['order_id']);
-
- foreach($order['products'] as $key => $product) {
- $order['products'][$key]['option'] = $saleOrderModel->getOrderOptions($product['order_id'], $product['order_product_id']);
- }
-
- $response = new \RetailcrmApiResponse(
- 201,
- json_encode(
- array(
- 'success' => true,
- 'id' => 1
- )
- )
- );
-
- $this->apiClientMock->expects($this->any())->method('ordersCreate')->willReturn($response);
- $orderSend = $this->orderModel->uploadOrder($order, $this->apiClientMock);
-
- $this->assertArrayHasKey('status', $orderSend);
- $this->assertEquals('new', $orderSend['status']);
- $this->assertArrayHasKey('externalId', $orderSend);
- $this->assertArrayHasKey('number', $orderSend);
- $this->assertArrayHasKey('firstName', $orderSend);
- $this->assertEquals('Test', $orderSend['firstName']);
- $this->assertArrayHasKey('lastName', $orderSend);
- $this->assertEquals('Test', $orderSend['lastName']);
- $this->assertArrayHasKey('email', $orderSend);
- $this->assertEquals('test@mail.ru', $orderSend['email']);
- $this->assertArrayHasKey('phone', $orderSend);
- $this->assertEquals('+7 (000) 000-00-00', $orderSend['phone']);
- $this->assertArrayHasKey('createdAt', $orderSend);
- $this->assertArrayHasKey('delivery', $orderSend);
- $this->assertInternalType('array', $orderSend['delivery']);
- $this->assertEquals('flat', $orderSend['delivery']['code']);
- $this->assertEquals('Test', $orderSend['delivery']['address']['city']);
- $this->assertEquals('Rostov-na-Donu', $orderSend['delivery']['address']['region']);
- $this->assertEquals('111111', $orderSend['delivery']['address']['index']);
- $this->assertArrayHasKey('items', $orderSend);
- $this->assertArrayHasKey('customerComment', $orderSend);
- $this->assertArrayHasKey('customer', $orderSend);
- $this->assertArrayHasKey('externalId', $orderSend['customer']);
- $this->assertEquals(self::CUSTOMER_ID, $orderSend['customer']['externalId']);
- $this->assertArrayHasKey('payments', $orderSend);
- $this->assertEquals('cod', $orderSend['payments'][0]['type']);
- $this->assertNotEmpty($orderSend['payments']);
- }
-
- public function testUploadWithoutCustomerTest()
- {
- $saleOrderModel = $this->loadModel('sale/order');
- $order = $saleOrderModel->getOrder(self::ORDER_ID);
-
- $order['totals'] = $saleOrderModel->getOrderTotals($order['order_id']);
- $order['products'] = $saleOrderModel->getOrderProducts($order['order_id']);
-
- foreach($order['products'] as $key => $product) {
- $order['products'][$key]['option'] = $saleOrderModel->getOrderOptions($product['order_id'], $product['order_product_id']);
- }
-
- $response = new \RetailcrmApiResponse(
- 201,
- json_encode(
- array(
- 'success' => true,
- 'id' => 1
- )
- )
- );
-
- $this->apiClientMock->expects($this->any())->method('ordersCreate')->willReturn($response);
- $orderSend = $this->orderModel->uploadOrder($order, $this->apiClientMock);
-
- $this->assertArrayHasKey('status', $orderSend);
- $this->assertArrayHasKey('externalId', $orderSend);
- $this->assertArrayHasKey('number', $orderSend);
- $this->assertArrayHasKey('firstName', $orderSend);
- $this->assertArrayHasKey('lastName', $orderSend);
- $this->assertArrayHasKey('email', $orderSend);
- $this->assertArrayHasKey('phone', $orderSend);
- $this->assertArrayHasKey('createdAt', $orderSend);
- $this->assertArrayHasKey('delivery', $orderSend);
- $this->assertArrayHasKey('items', $orderSend);
- $this->assertContains('#', $orderSend['items'][0]['offer']['externalId']);
- $this->assertArrayHasKey('payments', $orderSend);
- $this->assertArrayHasKey('customerComment', $orderSend);
- $this->assertArrayNotHasKey('customer', $orderSend);
- $this->assertNotEmpty($orderSend['payments']);
+ $this->assertTrue(true);
+ // todo test
}
}
diff --git a/tests/admin/ModelRetailcrmPricesAdminTest.php b/tests/admin/ModelRetailcrmPricesAdminTest.php
index 150cfee..073c539 100644
--- a/tests/admin/ModelRetailcrmPricesAdminTest.php
+++ b/tests/admin/ModelRetailcrmPricesAdminTest.php
@@ -1,5 +1,7 @@
getMock();
$this->settingModel = $this->loadModel('setting/setting');
- $this->retailcrm = new \retailcrm\Retailcrm(self::$registry);
+ $this->retailcrm = new \Retailcrm\Retailcrm(self::$registry);
$this->settingModel->editSetting(
- $this->retailcrm->getModuleTitle(),
+ \Retailcrm\Retailcrm::MODULE,
array(
- $this->retailcrm->getModuleTitle() . '_apiversion' => 'v5',
- $this->retailcrm->getModuleTitle() . '_special' => 'special'
+ \Retailcrm\Retailcrm::MODULE . '_apiversion' => 'v5',
+ \Retailcrm\Retailcrm::MODULE . '_special' => 'special'
)
);
}
public function testUploadPrices()
{
+ $response = new \RetailcrmApiResponse(200, json_encode($this->getSites()));
+ $this->apiClientMock->expects($this->any())->method('sitesList')->willReturn($response);
+
$productModel = $this->loadModel('catalog/product');
$products = $productModel->getProducts();
- $prices = $this->pricesModel->uploadPrices($products, $this->apiClientMock);
+ $prices = $this->pricesModel->uploadPrices($products, $this->apiClientMock, $this->retailcrm);
$price = $prices[0][0];
$this->assertInternalType('array', $prices);
@@ -45,7 +50,20 @@ class ModelRetailcrmPricesAdminTest extends OpenCartTest
$this->assertInternalType('array', $price);
$this->assertArrayHasKey('externalId', $price);
$this->assertArrayHasKey('site', $price);
+ $this->assertEquals('test_site', $price['site']);
$this->assertArrayHasKey('prices', $price);
$this->assertInternalType('array', $price['prices']);
}
+
+ private function getSites()
+ {
+ return array(
+ 'success' => true,
+ 'sites' => array(
+ array(
+ 'code' => 'test_site'
+ )
+ )
+ );
+ }
}
\ No newline at end of file
diff --git a/tests/admin/ModelRetailcrmProductsAdminTest.php b/tests/admin/ModelRetailcrmProductsAdminTest.php
new file mode 100644
index 0000000..ee5b523
--- /dev/null
+++ b/tests/admin/ModelRetailcrmProductsAdminTest.php
@@ -0,0 +1,14 @@
+loadModel('extension/retailcrm/products');
+ $options = $model->getProductOptions(42);
+
+ $this->assertNotEmpty($options);
+ }
+}
diff --git a/tests/catalog/ControllerRetailcrmApiCatalogTest.php b/tests/catalog/ControllerRetailcrmApiCatalogTest.php
index 6afaff5..b617301 100644
--- a/tests/catalog/ControllerRetailcrmApiCatalogTest.php
+++ b/tests/catalog/ControllerRetailcrmApiCatalogTest.php
@@ -1,9 +1,12 @@
db->query("SELECT * FROM `" . DB_PREFIX . "api` WHERE api_id = 1");
$api = $query->row;
$this->apiKey = $api['key'];
- $this->retailcrm = new \retailcrm\Retailcrm(self::$registry);
+ $this->username = $api['username'];
+ $this->retailcrm = new \Retailcrm\Retailcrm(self::$registry);
$this->setSetting(
- $this->retailcrm->getModuleTitle(),
+ \Retailcrm\Retailcrm::MODULE,
array(
- $this->retailcrm->getModuleTitle() . '_country' => array(1),
+ \Retailcrm\Retailcrm::MODULE . '_country' => array(1),
)
);
@@ -36,6 +40,8 @@ class ControllerRetailcrmApiCatalogTest extends OpenCartTest
$this->assertEquals('Not found api key', $data->error);
$this->request->get['key'] = $this->apiKey;
+ $this->request->get['username'] = $this->username;
+
$response = $this->dispatchAction('api/retailcrm/getDeliveryTypes');
$data = json_decode($response->getOutput());
@@ -50,6 +56,7 @@ class ControllerRetailcrmApiCatalogTest extends OpenCartTest
$this->assertEquals('Not found api key', $data->error);
$this->request->get['key'] = $this->apiKey;
+ $this->request->get['username'] = $this->username;
$response = $this->dispatchAction('api/retailcrm/addOrderHistory');
$data = json_decode($response->getOutput());
diff --git a/tests/catalog/ModelRetailcrmCustomerCatalogTest.php b/tests/catalog/ModelRetailcrmCustomerCatalogTest.php
deleted file mode 100644
index 9101a0a..0000000
--- a/tests/catalog/ModelRetailcrmCustomerCatalogTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-customerModel = $this->loadModel('extension/retailcrm/customer');
-
- $this->apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
- ->disableOriginalConstructor()
- ->setMethods(array(
- 'customersCreate',
- 'customersEdit'
- ))
- ->getMock();
- }
-
- public function testSendToCrm()
- {
- $customerModel = $this->loadModel('account/customer');
- $customer = $customerModel->getCustomer(self::CUSTOMER_ID);
-
- $customerSend = $this->customerModel->sendToCrm($customer, $this->apiClientMock);
-
- $this->assertArrayHasKey('externalId', $customerSend);
- $this->assertEquals(self::CUSTOMER_ID, $customerSend['externalId']);
- $this->assertArrayHasKey('firstName', $customerSend);
- $this->assertEquals('Test', $customerSend['firstName']);
- $this->assertArrayHasKey('lastName', $customerSend);
- $this->assertEquals('Test', $customerSend['lastName']);
- $this->assertArrayHasKey('email', $customerSend);
- $this->assertEquals('test@mail.ru', $customerSend['email']);
- $this->assertArrayHasKey('phones', $customerSend);
- $this->assertEquals('+7 (000) 000-00-00', $customerSend['phones'][0]['number']);
- }
-
- public function testChangeInCrm()
- {
- $customerModel = $this->loadModel('account/customer');
- $customer = $customerModel->getCustomer(self::CUSTOMER_ID);
-
- $customerSend = $this->customerModel->changeInCrm($customer, $this->apiClientMock);
-
- $this->assertArrayHasKey('externalId', $customerSend);
- $this->assertEquals(self::CUSTOMER_ID, $customerSend['externalId']);
- $this->assertArrayHasKey('firstName', $customerSend);
- $this->assertEquals('Test', $customerSend['firstName']);
- $this->assertArrayHasKey('lastName', $customerSend);
- $this->assertEquals('Test', $customerSend['lastName']);
- $this->assertArrayHasKey('email', $customerSend);
- $this->assertEquals('test@mail.ru', $customerSend['email']);
- $this->assertArrayHasKey('phones', $customerSend);
- $this->assertEquals('+7 (000) 000-00-00', $customerSend['phones'][0]['number']);
- }
-}
\ No newline at end of file
diff --git a/tests/catalog/ModelRetailcrmOrderCatalogTest.php b/tests/catalog/ModelRetailcrmOrderCatalogTest.php
index 88ee084..bf45735 100644
--- a/tests/catalog/ModelRetailcrmOrderCatalogTest.php
+++ b/tests/catalog/ModelRetailcrmOrderCatalogTest.php
@@ -1,192 +1,15 @@
loadModel('extension/retailcrm/order');
+ $status_id = $model->getOrderStatusId(1);
- $this->orderModel = $this->loadModel('extension/retailcrm/order');
-
- $this->apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
- ->disableOriginalConstructor()
- ->setMethods(array(
- 'ordersCreate',
- 'ordersEdit',
- 'ordersGet',
- 'ordersPaymentEdit',
- 'customersList'
- ))
- ->getMock();
-
- $this->retailcrm = new \retailcrm\Retailcrm(self::$registry);
-
- $this->setSetting(
- $this->retailcrm->getModuleTitle(),
- array(
- $this->retailcrm->getModuleTitle() . '_apiversion' => 'v5',
- $this->retailcrm->getModuleTitle() . '_order_number' => 1,
- $this->retailcrm->getModuleTitle() . '_status' => array(
- 1 => 'new'
- ),
- $this->retailcrm->getModuleTitle() . '_delivery' => array(
- 'flat.flat' => 'flat'
- ),
- $this->retailcrm->getModuleTitle() . '_payment' => array(
- 'cod' => 'cod'
- )
- )
- );
- }
-
- public function testCreateOrderWithCustomer()
- {
- $orderCheckoutModel = $this->loadModel('checkout/order');
- $orderAccountModel = $this->loadModel('account/order');
- $order_id = self::ORDER_WITH_CUST_ID;
- $order = $orderCheckoutModel->getOrder($order_id);
- $order['products'] = $orderAccountModel->getOrderProducts($order_id);
- $order['totals'] = $orderAccountModel->getOrderTotals($order_id);
-
- foreach ($order['products'] as $key => $product) {
- $productOptions = $orderAccountModel->getOrderOptions($order_id, $product['order_product_id']);
-
- if (!empty($productOptions)) {
- $order['products'][$key]['option'] = $productOptions;
- }
- }
-
- $orderProcess = $this->orderModel->processOrder($order);
- $orderSend = $this->orderModel->sendToCrm($orderProcess, $this->apiClientMock);
-
- $this->assertArrayHasKey('status', $orderSend);
- $this->assertEquals('new', $orderSend['status']);
- $this->assertArrayHasKey('externalId', $orderSend);
- $this->assertArrayHasKey('number', $orderSend);
- $this->assertArrayHasKey('firstName', $orderSend);
- $this->assertEquals('Test', $orderSend['firstName']);
- $this->assertArrayHasKey('lastName', $orderSend);
- $this->assertEquals('Test', $orderSend['lastName']);
- $this->assertArrayHasKey('email', $orderSend);
- $this->assertEquals('test@mail.ru', $orderSend['email']);
- $this->assertArrayHasKey('phone', $orderSend);
- $this->assertEquals('+7 (000) 000-00-00', $orderSend['phone']);
- $this->assertArrayHasKey('createdAt', $orderSend);
- $this->assertArrayHasKey('delivery', $orderSend);
- $this->assertInternalType('array', $orderSend['delivery']);
- $this->assertEquals('flat', $orderSend['delivery']['code']);
- $this->assertEquals('Test', $orderSend['delivery']['address']['city']);
- $this->assertEquals('Rostov-na-Donu', $orderSend['delivery']['address']['region']);
- $this->assertEquals('111111', $orderSend['delivery']['address']['index']);
- $this->assertArrayHasKey('items', $orderSend);
- $this->assertArrayHasKey('customerComment', $orderSend);
- $this->assertArrayHasKey('customer', $orderSend);
- $this->assertArrayHasKey('externalId', $orderSend['customer']);
- $this->assertEquals(self::CUSTOMER_ID, $orderSend['customer']['externalId']);
- $this->assertArrayHasKey('payments', $orderSend);
- $this->assertEquals('cod', $orderSend['payments'][0]['type']);
- $this->assertNotEmpty($orderSend['payments']);
- }
-
- public function testEditOrderWithCustomer()
- {
- $orderCheckoutModel = $this->loadModel('checkout/order');
- $orderAccountModel = $this->loadModel('account/order');
- $order_id = self::ORDER_WITH_CUST_ID;
- $order = $orderCheckoutModel->getOrder($order_id);
- $order['products'] = $orderAccountModel->getOrderProducts($order_id);
- $order['totals'] = $orderAccountModel->getOrderTotals($order_id);
-
- foreach ($order['products'] as $key => $product) {
- $productOptions = $orderAccountModel->getOrderOptions($order_id, $product['order_product_id']);
-
- if (!empty($productOptions)) {
- $order['products'][$key]['option'] = $productOptions;
- }
- }
-
- $orderEditResponse = new \RetailcrmApiResponse(
- 200,
- json_encode(
- array(
- 'success' => true,
- 'id' => 1
- )
- )
- );
-
- $ordersGetResponse = new \RetailcrmApiResponse(
- 200,
- json_encode(
- array(
- 'success' => true,
- 'order' => $this->getOrder($order_id)
- )
- )
- );
-
- $this->apiClientMock->expects($this->any())->method('ordersEdit')->willReturn($orderEditResponse);
- $this->apiClientMock->expects($this->any())->method('ordersGet')->willReturn($ordersGetResponse);
- $orderProcess = $this->orderModel->processOrder($order);
- $orderSend = $this->orderModel->sendToCrm($orderProcess, $this->apiClientMock, false);
-
- $this->assertArrayHasKey('status', $orderSend);
- $this->assertEquals('new', $orderSend['status']);
- $this->assertArrayHasKey('externalId', $orderSend);
- $this->assertArrayHasKey('number', $orderSend);
- $this->assertArrayHasKey('firstName', $orderSend);
- $this->assertEquals('Test', $orderSend['firstName']);
- $this->assertArrayHasKey('lastName', $orderSend);
- $this->assertEquals('Test', $orderSend['lastName']);
- $this->assertArrayHasKey('email', $orderSend);
- $this->assertEquals('test@mail.ru', $orderSend['email']);
- $this->assertArrayHasKey('phone', $orderSend);
- $this->assertEquals('+7 (000) 000-00-00', $orderSend['phone']);
- $this->assertArrayHasKey('createdAt', $orderSend);
- $this->assertArrayHasKey('delivery', $orderSend);
- $this->assertInternalType('array', $orderSend['delivery']);
- $this->assertEquals('flat', $orderSend['delivery']['code']);
- $this->assertEquals('Test', $orderSend['delivery']['address']['city']);
- $this->assertEquals('Rostov-na-Donu', $orderSend['delivery']['address']['region']);
- $this->assertEquals('111111', $orderSend['delivery']['address']['index']);
- $this->assertArrayHasKey('items', $orderSend);
- $this->assertArrayHasKey('customerComment', $orderSend);
- }
-
- protected function setSetting($code, $data, $store_id = 0) {
- $this->db->query("DELETE FROM `" . DB_PREFIX . "setting` WHERE store_id = '" . (int)$store_id . "' AND `code` = '" . $this->db->escape($code) . "'");
-
- foreach ($data as $key => $value) {
- if (substr($key, 0, strlen($code)) == $code) {
- if (!is_array($value)) {
- $this->db->query("INSERT INTO " . DB_PREFIX . "setting SET store_id = '" . (int)$store_id . "', `code` = '" . $this->db->escape($code) . "', `key` = '" . $this->db->escape($key) . "', `value` = '" . $this->db->escape($value) . "'");
- } else {
- $this->db->query("INSERT INTO " . DB_PREFIX . "setting SET store_id = '" . (int)$store_id . "', `code` = '" . $this->db->escape($code) . "', `key` = '" . $this->db->escape($key) . "', `value` = '" . $this->db->escape(json_encode($value, true)) . "', serialized = '1'");
- }
- }
- }
- }
-
- private function getOrder($id)
- {
- return array(
- 'payments' => array(
- array(
- 'id' => 1,
- 'status' => 'not-paid',
- 'type' => 'cod',
- 'externalId' => $id,
- 'amount' => '100'
- )
- )
- );
+ $this->assertNotEmpty($status_id);
+ $this->assertNotNull($status_id);
}
}
diff --git a/tests/catalog/ModelRetailcrmProductsCatalogTest.php b/tests/catalog/ModelRetailcrmProductsCatalogTest.php
new file mode 100644
index 0000000..e8f2903
--- /dev/null
+++ b/tests/catalog/ModelRetailcrmProductsCatalogTest.php
@@ -0,0 +1,14 @@
+loadModel('extension/retailcrm/products');
+ $options = $model->getProductOptions(42);
+
+ $this->assertNotEmpty($options);
+ }
+}
\ No newline at end of file
diff --git a/tests/admin/ModelRetailcrmCustomerAdminTest.php b/tests/library/CustomerRetailcrmLibraryTest.php
similarity index 51%
rename from tests/admin/ModelRetailcrmCustomerAdminTest.php
rename to tests/library/CustomerRetailcrmLibraryTest.php
index 80bf169..1cd062d 100644
--- a/tests/admin/ModelRetailcrmCustomerAdminTest.php
+++ b/tests/library/CustomerRetailcrmLibraryTest.php
@@ -1,8 +1,10 @@
customerModel = $this->loadModel('extension/retailcrm/customer');
-
$this->apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
->disableOriginalConstructor()
->setMethods(array(
- 'customersUpload',
+ 'customersCreate',
'customersEdit'
))
->getMock();
+
+ $retailcrm = new \Retailcrm\Retailcrm(self::$registry);
+ $this->customer = $retailcrm->createObject(\Retailcrm\Customer::class);
}
- public function testUploadToCrm()
+ public function testPrepareCustomer()
{
- $customerModel = $this->loadModel('customer/customer');
- $customers = $customerModel->getCustomers();
-
- $customersSend = $this->customerModel->uploadToCrm($customers, $this->apiClientMock);
- $customer = $customersSend[0][0];
-
- $this->assertInternalType('array', $customersSend);
- $this->assertInternalType('array', $customersSend[0]);
- $this->assertArrayHasKey('externalId', $customer);
- $this->assertArrayHasKey('firstName', $customer);
- $this->assertArrayHasKey('lastName', $customer);
- $this->assertArrayHasKey('email', $customer);
- }
-
- public function testChangeInCrm()
- {
- $customerModel = $this->loadModel('customer/customer');
+ $customerModel = $this->loadModel('account/customer');
$customer = $customerModel->getCustomer(self::CUSTOMER_ID);
- $customerSend = $this->customerModel->changeInCrm($customer, $this->apiClientMock);
+ $this->customer->prepare($customer);
+ $customerSend = $this->customer->getData();
$this->assertArrayHasKey('externalId', $customerSend);
$this->assertEquals(self::CUSTOMER_ID, $customerSend['externalId']);
@@ -56,4 +44,4 @@ class ModelRetailcrmCustomerAdminTest extends OpenCartTest
$this->assertArrayHasKey('phones', $customerSend);
$this->assertEquals('+7 (000) 000-00-00', $customerSend['phones'][0]['number']);
}
-}
+}
\ No newline at end of file
diff --git a/tests/library/OrderRetailcrmLibraryTest.php b/tests/library/OrderRetailcrmLibraryTest.php
new file mode 100644
index 0000000..6050696
--- /dev/null
+++ b/tests/library/OrderRetailcrmLibraryTest.php
@@ -0,0 +1,306 @@
+apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
+ ->disableOriginalConstructor()
+ ->setMethods(array(
+ 'ordersCreate',
+ 'ordersEdit',
+ 'ordersGet',
+ 'ordersPaymentEdit',
+ 'customersList'
+ ))
+ ->getMock();
+
+ $this->retailcrm = new \Retailcrm\Retailcrm(self::$registry);
+
+ $this->order = $this->retailcrm->createObject(\Retailcrm\Order::class);
+
+ $this->setSetting(
+ \Retailcrm\Retailcrm::MODULE,
+ array(
+ \Retailcrm\Retailcrm::MODULE . '_apiversion' => 'v5',
+ \Retailcrm\Retailcrm::MODULE . '_order_number' => 1,
+ \Retailcrm\Retailcrm::MODULE . '_status' => array(
+ 1 => 'new'
+ ),
+ \Retailcrm\Retailcrm::MODULE . '_delivery' => array(
+ 'flat.flat' => 'flat'
+ ),
+ \Retailcrm\Retailcrm::MODULE . '_payment' => array(
+ 'cod' => 'cod'
+ )
+ )
+ );
+ }
+
+ public function testPrepareCreateOrderWithCustomer()
+ {
+ $orderCheckoutModel = $this->loadModel('checkout/order');
+ $orderAccountModel = $this->loadModel('account/order');
+ $order_id = self::ORDER_WITH_CUST_ID;
+ $order = $orderCheckoutModel->getOrder($order_id);
+ $order['products'] = $orderAccountModel->getOrderProducts($order_id);
+ $order['totals'] = $orderAccountModel->getOrderTotals($order_id);
+
+ foreach ($order['products'] as $key => $product) {
+ $productOptions = $orderAccountModel->getOrderOptions($order_id, $product['order_product_id']);
+
+ if (!empty($productOptions)) {
+ $order['products'][$key]['option'] = $productOptions;
+ }
+ }
+
+ $this->order->prepare($order);
+ $orderPrepare = $this->order->getData();
+
+ $this->assertArrayHasKey('status', $orderPrepare);
+ $this->assertEquals('new', $orderPrepare['status']);
+ $this->assertArrayHasKey('externalId', $orderPrepare);
+ $this->assertArrayHasKey('number', $orderPrepare);
+ $this->assertArrayHasKey('firstName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['firstName']);
+ $this->assertArrayHasKey('lastName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['lastName']);
+ $this->assertArrayHasKey('email', $orderPrepare);
+ $this->assertEquals('test@mail.ru', $orderPrepare['email']);
+ $this->assertArrayHasKey('phone', $orderPrepare);
+ $this->assertEquals('+7 (000) 000-00-00', $orderPrepare['phone']);
+ $this->assertArrayHasKey('createdAt', $orderPrepare);
+ $this->assertArrayHasKey('delivery', $orderPrepare);
+ $this->assertInternalType('array', $orderPrepare['delivery']);
+ $this->assertEquals('flat', $orderPrepare['delivery']['code']);
+ $this->assertEquals('Test', $orderPrepare['delivery']['address']['city']);
+ $this->assertEquals('Rostov-na-Donu', $orderPrepare['delivery']['address']['region']);
+ $this->assertEquals('111111', $orderPrepare['delivery']['address']['index']);
+ $this->assertArrayHasKey('items', $orderPrepare);
+ $this->assertArrayHasKey('customer', $orderPrepare);
+ $this->assertArrayHasKey('externalId', $orderPrepare['customer']);
+ $this->assertEquals(self::CUSTOMER_ID, $orderPrepare['customer']['externalId']);
+ $this->assertArrayHasKey('payments', $orderPrepare);
+ $this->assertEquals('cod', $orderPrepare['payments'][0]['type']);
+ $this->assertNotEmpty($orderPrepare['payments']);
+ }
+
+ public function testPrepareEditOrderWithCustomer()
+ {
+ $orderCheckoutModel = $this->loadModel('checkout/order');
+ $orderAccountModel = $this->loadModel('account/order');
+ $order_id = self::ORDER_WITH_CUST_ID;
+ $order = $orderCheckoutModel->getOrder($order_id);
+ $order['products'] = $orderAccountModel->getOrderProducts($order_id);
+ $order['totals'] = $orderAccountModel->getOrderTotals($order_id);
+
+ foreach ($order['products'] as $key => $product) {
+ $productOptions = $orderAccountModel->getOrderOptions($order_id, $product['order_product_id']);
+
+ if (!empty($productOptions)) {
+ $order['products'][$key]['option'] = $productOptions;
+ }
+ }
+
+ $orderEditResponse = new \RetailcrmApiResponse(
+ 200,
+ json_encode(
+ array(
+ 'success' => true,
+ 'id' => 1
+ )
+ )
+ );
+
+ $ordersGetResponse = new \RetailcrmApiResponse(
+ 200,
+ json_encode(
+ array(
+ 'success' => true,
+ 'order' => $this->getOrder($order_id)
+ )
+ )
+ );
+
+ $this->apiClientMock->expects($this->any())->method('ordersEdit')->willReturn($orderEditResponse);
+ $this->apiClientMock->expects($this->any())->method('ordersGet')->willReturn($ordersGetResponse);
+ $this->order->prepare($order);
+ $orderPrepare = $this->order->getData();
+
+ $this->assertArrayHasKey('status', $orderPrepare);
+ $this->assertEquals('new', $orderPrepare['status']);
+ $this->assertArrayHasKey('externalId', $orderPrepare);
+ $this->assertArrayHasKey('number', $orderPrepare);
+ $this->assertArrayHasKey('firstName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['firstName']);
+ $this->assertArrayHasKey('lastName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['lastName']);
+ $this->assertArrayHasKey('email', $orderPrepare);
+ $this->assertEquals('test@mail.ru', $orderPrepare['email']);
+ $this->assertArrayHasKey('phone', $orderPrepare);
+ $this->assertEquals('+7 (000) 000-00-00', $orderPrepare['phone']);
+ $this->assertArrayHasKey('createdAt', $orderPrepare);
+ $this->assertArrayHasKey('delivery', $orderPrepare);
+ $this->assertInternalType('array', $orderPrepare['delivery']);
+ $this->assertEquals('flat', $orderPrepare['delivery']['code']);
+ $this->assertEquals('Test', $orderPrepare['delivery']['address']['city']);
+ $this->assertEquals('Rostov-na-Donu', $orderPrepare['delivery']['address']['region']);
+ $this->assertEquals('111111', $orderPrepare['delivery']['address']['index']);
+ $this->assertArrayHasKey('items', $orderPrepare);
+ $this->assertArrayHasKey('customer', $orderPrepare);
+ $this->assertArrayHasKey('externalId', $orderPrepare['customer']);
+ $this->assertEquals(self::CUSTOMER_ID, $orderPrepare['customer']['externalId']);
+ }
+
+ public function testPrepareCreateOrderWithoutCustomer()
+ {
+ $orderCheckoutModel = $this->loadModel('checkout/order');
+ $orderAccountModel = $this->loadModel('account/order');
+ $order_id = self::ORDER_ID;
+ $order = $orderCheckoutModel->getOrder($order_id);
+ $order['products'] = $orderAccountModel->getOrderProducts($order_id);
+ $order['totals'] = $orderAccountModel->getOrderTotals($order_id);
+
+ foreach ($order['products'] as $key => $product) {
+ $productOptions = $orderAccountModel->getOrderOptions($order_id, $product['order_product_id']);
+
+ if (!empty($productOptions)) {
+ $order['products'][$key]['option'] = $productOptions;
+ }
+ }
+
+ $this->order->prepare($order);
+ $orderPrepare = $this->order->getData();
+
+ $this->assertArrayHasKey('status', $orderPrepare);
+ $this->assertEquals('new', $orderPrepare['status']);
+ $this->assertArrayHasKey('externalId', $orderPrepare);
+ $this->assertArrayHasKey('number', $orderPrepare);
+ $this->assertArrayHasKey('firstName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['firstName']);
+ $this->assertArrayHasKey('lastName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['lastName']);
+ $this->assertArrayHasKey('email', $orderPrepare);
+ $this->assertEquals('test@mail.ru', $orderPrepare['email']);
+ $this->assertArrayHasKey('phone', $orderPrepare);
+ $this->assertEquals('+7 (000) 000-00-00', $orderPrepare['phone']);
+ $this->assertArrayHasKey('createdAt', $orderPrepare);
+ $this->assertArrayHasKey('delivery', $orderPrepare);
+ $this->assertInternalType('array', $orderPrepare['delivery']);
+ $this->assertEquals('flat', $orderPrepare['delivery']['code']);
+ $this->assertEquals('Test', $orderPrepare['delivery']['address']['city']);
+ $this->assertEquals('Rostov-na-Donu', $orderPrepare['delivery']['address']['region']);
+ $this->assertEquals('111111', $orderPrepare['delivery']['address']['index']);
+ $this->assertArrayHasKey('items', $orderPrepare);
+ $this->assertArrayNotHasKey('customer', $orderPrepare);
+ $this->assertArrayHasKey('payments', $orderPrepare);
+ $this->assertEquals('cod', $orderPrepare['payments'][0]['type']);
+ $this->assertNotEmpty($orderPrepare['payments']);
+ }
+
+ public function testPrepareEditOrderWithoutCustomer()
+ {
+ $orderCheckoutModel = $this->loadModel('checkout/order');
+ $orderAccountModel = $this->loadModel('account/order');
+ $order_id = self::ORDER_ID;
+ $order = $orderCheckoutModel->getOrder($order_id);
+ $order['products'] = $orderAccountModel->getOrderProducts($order_id);
+ $order['totals'] = $orderAccountModel->getOrderTotals($order_id);
+
+ foreach ($order['products'] as $key => $product) {
+ $productOptions = $orderAccountModel->getOrderOptions($order_id, $product['order_product_id']);
+
+ if (!empty($productOptions)) {
+ $order['products'][$key]['option'] = $productOptions;
+ }
+ }
+
+ $orderEditResponse = new \RetailcrmApiResponse(
+ 200,
+ json_encode(
+ array(
+ 'success' => true,
+ 'id' => 1
+ )
+ )
+ );
+
+ $ordersGetResponse = new \RetailcrmApiResponse(
+ 200,
+ json_encode(
+ array(
+ 'success' => true,
+ 'order' => $this->getOrder($order_id)
+ )
+ )
+ );
+
+ $this->apiClientMock->expects($this->any())->method('ordersEdit')->willReturn($orderEditResponse);
+ $this->apiClientMock->expects($this->any())->method('ordersGet')->willReturn($ordersGetResponse);
+ $this->order->prepare($order);
+ $orderPrepare = $this->order->getData();
+
+ $this->assertArrayHasKey('status', $orderPrepare);
+ $this->assertEquals('new', $orderPrepare['status']);
+ $this->assertArrayHasKey('externalId', $orderPrepare);
+ $this->assertArrayHasKey('number', $orderPrepare);
+ $this->assertArrayHasKey('firstName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['firstName']);
+ $this->assertArrayHasKey('lastName', $orderPrepare);
+ $this->assertEquals('Test', $orderPrepare['lastName']);
+ $this->assertArrayHasKey('email', $orderPrepare);
+ $this->assertEquals('test@mail.ru', $orderPrepare['email']);
+ $this->assertArrayHasKey('phone', $orderPrepare);
+ $this->assertEquals('+7 (000) 000-00-00', $orderPrepare['phone']);
+ $this->assertArrayHasKey('createdAt', $orderPrepare);
+ $this->assertArrayHasKey('delivery', $orderPrepare);
+ $this->assertInternalType('array', $orderPrepare['delivery']);
+ $this->assertEquals('flat', $orderPrepare['delivery']['code']);
+ $this->assertEquals('Test', $orderPrepare['delivery']['address']['city']);
+ $this->assertEquals('Rostov-na-Donu', $orderPrepare['delivery']['address']['region']);
+ $this->assertEquals('111111', $orderPrepare['delivery']['address']['index']);
+ $this->assertArrayHasKey('items', $orderPrepare);
+ $this->assertArrayNotHasKey('customer', $orderPrepare);
+ }
+
+ protected function setSetting($code, $data, $store_id = 0) {
+ $this->db->query("DELETE FROM `" . DB_PREFIX . "setting` WHERE store_id = '" . (int)$store_id . "' AND `code` = '" . $this->db->escape($code) . "'");
+
+ foreach ($data as $key => $value) {
+ if (substr($key, 0, strlen($code)) == $code) {
+ if (!is_array($value)) {
+ $this->db->query("INSERT INTO " . DB_PREFIX . "setting SET store_id = '" . (int)$store_id . "', `code` = '" . $this->db->escape($code) . "', `key` = '" . $this->db->escape($key) . "', `value` = '" . $this->db->escape($value) . "'");
+ } else {
+ $this->db->query("INSERT INTO " . DB_PREFIX . "setting SET store_id = '" . (int)$store_id . "', `code` = '" . $this->db->escape($code) . "', `key` = '" . $this->db->escape($key) . "', `value` = '" . $this->db->escape(json_encode($value, true)) . "', serialized = '1'");
+ }
+ }
+ }
+ }
+
+ private function getOrder($id)
+ {
+ return array(
+ 'payments' => array(
+ array(
+ 'id' => 1,
+ 'status' => 'not-paid',
+ 'type' => 'cod',
+ 'externalId' => $id,
+ 'amount' => '100'
+ )
+ )
+ );
+ }
+}
\ No newline at end of file
diff --git a/tests/opencart_sample_data.sql b/tests/opencart_sample_data.sql
index cb4812d..20718b6 100644
--- a/tests/opencart_sample_data.sql
+++ b/tests/opencart_sample_data.sql
@@ -1,5 +1,5 @@
TRUNCATE TABLE `oc_customer`;
-INSERT INTO `oc_customer` (`customer_id`, `customer_group_id`, `store_id`, `language_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `password`, `salt`, `cart`, `wishlist`, `newsletter`, `address_id`, `custom_field`, `ip`, `status`, `approved`, `safe`, `token`, `code`, `date_added`) VALUES ('1', '1', '0', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', 'ed3798da75d6cdd695e99e87a60d587a10aa95ff', '51TalnrgH', '', '', '0', '1', '', '172.21.0.1', '1', '1', '0', '', '', '2018-06-07 13:50:08');
+INSERT INTO `oc_customer` (`customer_id`, `customer_group_id`, `store_id`, `language_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `password`, `salt`, `cart`, `wishlist`, `newsletter`, `address_id`, `custom_field`, `ip`, `status`, `safe`, `token`, `code`, `date_added`) VALUES ('1', '1', '0', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', 'ed3798da75d6cdd695e99e87a60d587a10aa95ff', '51TalnrgH', '', '', '0', '1', '', '172.21.0.1', '1', '0', '', '', '2018-06-07 13:50:08');
TRUNCATE TABLE `oc_customer_activity`;
TRUNCATE TABLE `oc_customer_group`;
@@ -23,7 +23,6 @@ TRUNCATE TABLE `oc_order`;
INSERT INTO `oc_order` (`order_id`, `invoice_no`, `invoice_prefix`, `store_id`, `store_name`, `store_url`, `customer_id`, `customer_group_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `custom_field`, `payment_firstname`, `payment_lastname`, `payment_company`, `payment_address_1`, `payment_address_2`, `payment_city`, `payment_postcode`, `payment_country`, `payment_country_id`, `payment_zone`, `payment_zone_id`, `payment_address_format`, `payment_custom_field`, `payment_method`, `payment_code`, `shipping_firstname`, `shipping_lastname`, `shipping_company`, `shipping_address_1`, `shipping_address_2`, `shipping_city`, `shipping_postcode`, `shipping_country`, `shipping_country_id`, `shipping_zone`, `shipping_zone_id`, `shipping_address_format`, `shipping_custom_field`, `shipping_method`, `shipping_code`, `comment`, `total`, `order_status_id`, `affiliate_id`, `commission`, `marketing_id`, `tracking`, `language_id`, `currency_id`, `currency_code`, `currency_value`, `ip`, `forwarded_ip`, `user_agent`, `accept_language`, `date_added`, `date_modified`) VALUES ('1', '0', 'INV-2016-00', '0', 'Opencart', 'http://localhost:8000/', '1', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', '', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Cash on delivery', 'cod', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Flat Rate', 'flat.flat', '', '106.0000', '1', '0', '0.0000', '0', '', '1', '1', 'USD', '1.00000000', '172.21.0.1', '', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.62 Safari/537.36', 'ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7', '2018-06-07 13:51:10', '2018-06-07 13:51:23');
INSERT INTO `oc_order` (`order_id`, `invoice_no`, `invoice_prefix`, `store_id`, `store_name`, `store_url`, `customer_id`, `customer_group_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `custom_field`, `payment_firstname`, `payment_lastname`, `payment_company`, `payment_address_1`, `payment_address_2`, `payment_city`, `payment_postcode`, `payment_country`, `payment_country_id`, `payment_zone`, `payment_zone_id`, `payment_address_format`, `payment_custom_field`, `payment_method`, `payment_code`, `shipping_firstname`, `shipping_lastname`, `shipping_company`, `shipping_address_1`, `shipping_address_2`, `shipping_city`, `shipping_postcode`, `shipping_country`, `shipping_country_id`, `shipping_zone`, `shipping_zone_id`, `shipping_address_format`, `shipping_custom_field`, `shipping_method`, `shipping_code`, `comment`, `total`, `order_status_id`, `affiliate_id`, `commission`, `marketing_id`, `tracking`, `language_id`, `currency_id`, `currency_code`, `currency_value`, `ip`, `forwarded_ip`, `user_agent`, `accept_language`, `date_added`, `date_modified`) VALUES ('2', '0', 'INV-2016-00', '0', 'Opencart', 'http://localhost:8000/', '0', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', '[]', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Cash on delivery', 'cod', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Flat Rate', 'flat.flat', '', '85.0000', '1', '0', '0.0000', '0', '', '1', '1', 'USD', '1.00000000', '172.21.0.1', '', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.62 Safari/537.36', 'ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7', '2018-06-07 13:53:50', '2018-06-07 13:54:00');
-TRUNCATE TABLE `oc_order_custom_field`;
TRUNCATE TABLE `oc_order_history`;
INSERT INTO `oc_order_history` (`order_history_id`, `order_id`, `order_status_id`, `notify`, `comment`, `date_added`) VALUES ('19', '2', '1', '0', '', '2018-06-07 13:54:00');
INSERT INTO `oc_order_history` (`order_history_id`, `order_id`, `order_status_id`, `notify`, `comment`, `date_added`) VALUES ('18', '1', '1', '0', '', '2018-06-07 13:51:23');
diff --git a/tests/test-config.php b/tests/test-config.php
new file mode 100644
index 0000000..77b4059
--- /dev/null
+++ b/tests/test-config.php
@@ -0,0 +1,70 @@
+ array(
+ 'event/language/before'
+ ),
+ 'controller/*/after' => array(
+ 'event/language/after'
+ ),
+ 'view/*/before' => array(
+ 500 => 'event/theme/override',
+ 998 => 'event/language',
+ 1000 => 'event/theme'
+ ),
+ 'language/*/after' => array(
+ 'event/translation'
+ ),
+ //'view/*/before' => array(
+ // 1000 => 'event/debug/before'
+ //),
+ 'controller/*/after' => array(
+ 'event/debug/after'
+ )
+);
+
+if (defined('HTTP_CATALOG')) { // is defined iff in catalog
+
+ // Actions
+ $_['action_pre_action'] = array(
+ 'startup/startup',
+ 'startup/error',
+ 'startup/event',
+ 'startup/sass',
+ 'startup/login',
+ 'startup/permission'
+ );
+} else { // admin
+ // Actions
+ $_['action_pre_action'] = array(
+ 'startup/startup',
+ 'startup/error',
+ 'startup/event',
+ 'startup/maintenance',
+ 'startup/seo_url'
+ );
+}
+
+// Test Settings
+$_['session_engine'] = 'test';
+$_['session_autostart'] = false;
+
+$_['template_engine'] = 'twig';
+$_['template_directory'] = '';
+$_['template_cache'] = false;