diff --git a/admin/view/template/extension/module/retailcrm.twig b/admin/view/template/extension/module/retailcrm.twig
index 0d44af4..8aa941d 100644
--- a/admin/view/template/extension/module/retailcrm.twig
+++ b/admin/view/template/extension/module/retailcrm.twig
@@ -1,4 +1,4 @@
-{{ header }}{{ column_left }}
+{{ header }} {{ column_left }}
+ {% if saved_settings.retailcrm_apiversion is defined and saved_settings.retailcrm_apiversion != 'v3' %}
+
{{ special_price_settings }}
+
+
+
+
+ {% endif %}
diff --git a/catalog/controller/api/retailcrm.php b/catalog/controller/api/retailcrm.php
index cfa69c3..e8164fa 100644
--- a/catalog/controller/api/retailcrm.php
+++ b/catalog/controller/api/retailcrm.php
@@ -1,17 +1,24 @@
load->model('localisation/country');
- $this->load->model('setting/setting');
- $this->load->library('retailcrm/retailcrm');
- $moduleTitle = $this->retailcrm->getModuleTitle();
- $countries = $this->model_setting_setting->getSetting($moduleTitle)[$moduleTitle . '_country'];
- $deliveryTypes = array();
+ $api = $this->auth();
- foreach ($countries as $country) {
- $deliveryTypes = array_merge($deliveryTypes, $this->getDeliveryTypesByZones($country));
+ if (isset($api['error'])) {
+ $response = $api;
+ } else {
+ $this->load->model('localisation/country');
+ $this->load->model('setting/setting');
+ $this->load->library('retailcrm/retailcrm');
+ $moduleTitle = $this->retailcrm->getModuleTitle();
+ $countries = $this->model_setting_setting->getSetting($moduleTitle)[$moduleTitle . '_country'];
+ $response = array();
+
+ foreach ($countries as $country) {
+ $response = array_merge($response, $this->getDeliveryTypesByZones($country));
+ }
}
if (isset($this->request->server['HTTP_ORIGIN'])) {
@@ -22,7 +29,32 @@ class ControllerApiRetailcrm extends Controller
}
$this->response->addHeader('Content-Type: application/json');
- $this->response->setOutput(json_encode($deliveryTypes));
+ $this->response->setOutput(json_encode($response));
+ }
+
+ public function addOrderHistory()
+ {
+ $api = $this->auth();
+
+ if (isset($api['error'])) {
+ $response = $api;
+ } elseif (!isset($this->request->post['order_id']) || !isset($this->request->post['order_status_id'])) {
+ $response = array('error' => 'Not found data');
+ } else {
+ $this->load->model('checkout/order');
+ $this->model_checkout_order->addOrderHistory($this->request->post['order_id'], $this->request->post['order_status_id']);
+ $response = array('success' => true);
+ }
+
+ if (isset($this->request->server['HTTP_ORIGIN'])) {
+ $this->response->addHeader('Access-Control-Allow-Origin: ' . $this->request->server['HTTP_ORIGIN']);
+ $this->response->addHeader('Access-Control-Allow-Methods: GET, PUT, POST, DELETE, OPTIONS');
+ $this->response->addHeader('Access-Control-Max-Age: 1000');
+ $this->response->addHeader('Access-Control-Allow-Headers: Content-Type, Authorization, X-Requested-With');
+ }
+
+ $this->response->addHeader('Content-Type: application/json');
+ $this->response->setOutput(json_encode($response));
}
protected function getDeliveryTypesByZones($country_id)
@@ -49,6 +81,7 @@ class ControllerApiRetailcrm extends Controller
foreach ($shippingModules as $shippingModule) {
$this->load->model('extension/shipping/' . $shippingModule['code']);
+
if (version_compare(VERSION, '3.0', '<')) {
$shippingCode = $shippingModule['code'];
} else {
@@ -64,8 +97,21 @@ class ControllerApiRetailcrm extends Controller
}
}
- if($this->{'model_extension_shipping_' . $shippingModule['code']}->getQuote($address)) {
+ if ($this->{'model_extension_shipping_' . $shippingModule['code']}->getQuote($address)) {
$quote_data[] = $this->{'model_extension_shipping_' . $shippingModule['code']}->getQuote($address);
+ } else {
+ $this->load->language('extension/shipping/' . $shippingModule['code']);
+
+ $quote_data[] = array(
+ 'code' => $shippingModule['code'],
+ 'title' => $this->language->get('text_title'),
+ 'quote' => array(
+ array(
+ 'code' => $shippingModule['code'],
+ 'title' => $this->language->get('text_title')
+ )
+ )
+ );
}
}
}
@@ -74,17 +120,47 @@ class ControllerApiRetailcrm extends Controller
$deliveryTypes = array();
foreach ($quote_data as $shipping) {
-
foreach ($shipping['quote'] as $shippingMethod) {
$deliveryTypes[$shipping['code']]['title'] = $shipping['title'];
$deliveryTypes[$shipping['code']][$shippingMethod['code']] = $shippingMethod;
}
-
}
return $deliveryTypes;
}
+ private function auth()
+ {
+ if (!isset($this->request->get['key'])
+ || !$this->request->get['key']
+ ) {
+ 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 {
+ $api = $this->model_account_api->login($this->request->get['username'], $this->request->get['key']);
+
+ if (empty($api)) {
+ $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;
+ }
+
+ return array('error' => 'Invalid api key');
+ }
+ }
+
private function loadModels()
{
if (version_compare(VERSION, '3.0', '<')) {
diff --git a/catalog/model/extension/retailcrm/api.php b/catalog/model/extension/retailcrm/api.php
new file mode 100644
index 0000000..b884a98
--- /dev/null
+++ b/catalog/model/extension/retailcrm/api.php
@@ -0,0 +1,11 @@
+db->query("SELECT * FROM `" . DB_PREFIX . "api` WHERE `username` = '" . $this->db->escape($username) . "' AND `key` = '" . $this->db->escape($key) . "' AND status = '1'");
+
+ return $query->row;
+ }
+}
diff --git a/catalog/model/extension/retailcrm/order.php b/catalog/model/extension/retailcrm/order.php
index bee0aaa..669dbb8 100644
--- a/catalog/model/extension/retailcrm/order.php
+++ b/catalog/model/extension/retailcrm/order.php
@@ -135,10 +135,15 @@ class ModelExtensionRetailcrmOrder extends Model {
$payment_code = '';
}
- if (!empty($order_data['shipping_code']) && isset($this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']])) {
- $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']];
- } else {
- $delivery_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];
+ }
}
$order['number'] = $order_data['order_id'];
@@ -151,7 +156,7 @@ class ModelExtensionRetailcrmOrder extends Model {
if(!empty($order_data['email'])) {
$order['email'] = $order_data['email'];
}
-
+
$deliveryCost = 0;
$orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $order_data['order_total'] ;
@@ -169,9 +174,13 @@ class ModelExtensionRetailcrmOrder extends Model {
if ($this->settings[$this->moduleTitle . '_apiversion'] != 'v5') {
$order['paymentType'] = $payment_code;
- if (isset($couponTotal)) $order['discount'] = $couponTotal;
+ if (isset($couponTotal)) {
+ $order['discount'] = $couponTotal;
+ }
} else {
- if (isset($couponTotal)) $order['discountManualAmount'] = $couponTotal;
+ if (isset($couponTotal)) {
+ $order['discountManualAmount'] = $couponTotal;
+ }
}
$country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ;
diff --git a/system/cron/dispatch.php b/system/cron/dispatch.php
index e1ababf..98987d1 100644
--- a/system/cron/dispatch.php
+++ b/system/cron/dispatch.php
@@ -11,12 +11,14 @@ if (!isset($cli_action)) {
}
// Version
-$version = '1.5.6';
+$version = '2.3.0';
$indexFile = file_get_contents(realpath(dirname(__FILE__)) . '/../../index.php');
preg_match("/define\([\s]*['\"]VERSION['\"][\s]*,[\s]*['\"](.*)['\"][\s]*\)[\s]*;/mi", $indexFile, $versionMatches);
-if(isset($versionMatches[1])) {
+
+if (isset($versionMatches[1])) {
$version = $versionMatches[1];
}
+
define('VERSION', $version);
// Configuration (note we're using the admin config)
@@ -118,6 +120,7 @@ function error_handler($errno, $errstr, $errfile, $errline) {
return true;
}
+
set_error_handler('error_handler');
$request = new Request();
$registry->set('request', $request);
@@ -145,7 +148,13 @@ foreach ($query->rows as $result) {
$adminLanguageCode = $config->get('config_admin_language');
$config->set('config_language_id', $languages[$adminLanguageCode]['language_id']);
-$language = new Language($languages[$adminLanguageCode]['directory']);
+
+if (version_compare(VERSION, '2.3', '<')) {
+ $language = new Language($languages[$adminLanguageCode]['directory']);
+} else {
+ $language = new Language($adminLanguageCode);
+}
+
if(isset($languages[$adminLanguageCode]['filename'])) {
$language->load($languages[$adminLanguageCode]['filename']);
} else {
diff --git a/system/cron/getmyip.php b/system/cron/getmyip.php
deleted file mode 100644
index 439471b..0000000
--- a/system/cron/getmyip.php
+++ /dev/null
@@ -1,2 +0,0 @@
-model_setting_store->getStore($this->opencartStoreId);
- if(!empty($this->apiToken)) {
+ if ($this->apiToken !== false) {
if (version_compare(VERSION, '3.0', '<')) {
- $getParams['token'] = $this->apiToken;
+ $getParams['key'] = $this->apiToken['key'];
} else {
- $getParams['api_token'] = $this->apiToken;
+ $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();
+ }
}
-
}
$postParams['fromApi'] = true;
@@ -112,6 +122,7 @@ class OpencartApiClient {
$apiUsers = $this->model_user_api->getApis();
$api = array();
+
foreach ($apiUsers as $apiUser) {
if($apiUser['status'] == 1) {
$api = $apiUser;
@@ -119,257 +130,38 @@ class OpencartApiClient {
}
}
- if(!isset($api['api_id']))
+ if (!isset($api['api_id'])) {
return false;
-
-
- $alreadyBinded = false;
-
- $innerIp = $this->getInnerIpAddr();
- $apiIps = $this->model_user_api->getApiIps($api['api_id']);
- foreach($apiIps as $apiIp) {
- if($apiIp['ip'] == $innerIp)
- $alreadyBinded = true;
}
- if(!$alreadyBinded) {
- $this->model_user_api->addApiIp($api['api_id'], $innerIp);
- }
-
- if (version_compare(VERSION, '3.0', '<')){
- $apiAnswer = $this->request('login', array(), $api);
- $this->apiToken = $apiAnswer['token'];
+ if (isset($api) && !empty($api)) {
+ $this->apiToken = $api;
} else {
- $this->apiToken = $this->apiLogin();
+ $this->apiToken = false;
}
-
- if (isset($apiAnswer))
- return $apiAnswer;
- }
-
- public function editOrder($order_id, $data) {
- $data['telephone'] = trim($data['telephone']);
- $customer = array(
- 'currency' => isset($data['currency']) ? $data['currency'] : '',
- 'customer' => $data['customer'],
- 'customer_id' => $data['customer_id'],
- 'customer_group_id' => $data['customer_group_id'],
- 'firstname' => $data['firstname'],
- 'lastname' => $data['lastname'],
- 'email' => $data['email'],
- 'telephone' => !empty($data['telephone']) ? $data['telephone'] : '0000',
- 'fax' => $data['fax']
- );
-
- if (isset($data['custom_field'])) {
- $customer['custom_field'] = $data['custom_field'];
- }
-
- $this->request('customer', array(), $customer);
-
- $products = array();
- foreach ($data['order_product'] as $order_product) {
- $products[] = array(
- 'product_id' => $order_product['product_id'],
- 'quantity' => $order_product['quantity'],
- 'option' => $order_product['option']
- );
- }
- $this->request('cart/add', array(), array('product' => $products));
-
- $payment_address = array(
- 'payment_address' => $data['payment_address'],
- 'firstname' => $data['payment_firstname'],
- 'lastname' => $data['payment_lastname'],
- 'company' => $data['payment_company'],
- 'address_1'=> $data['payment_address_1'],
- 'address_2' => $data['payment_address_2'],
- 'city' => !empty($data['payment_city']) ? $data['payment_city'] : 'none',
- 'postcode' => $data['payment_postcode'],
- 'country_id' => $data['payment_country_id'],
- 'zone_id' => !empty($data['payment_zone_id']) ? $data['payment_zone_id'] : 0,
- );
- $this->request('payment/address', array(), $payment_address);
-
- $this->request('payment/methods', array(), array());
- $payment_method = array(
- 'payment_method' => $data['payment_code']
- );
- $this->request('payment/method', array(), $payment_method);
-
- $shipping_address = array(
- 'shipping_address' => $data['shipping_address'],
- 'firstname' => $data['shipping_firstname'],
- 'lastname' => $data['shipping_lastname'],
- 'company' => $data['shipping_company'],
- 'address_1' => $data['shipping_address_1'],
- 'address_2' => $data['shipping_address_2'],
- 'city' => !empty($data['shipping_city']) ? $data['shipping_city'] : 'none',
- 'postcode' => $data['shipping_postcode'],
- 'country_id' => $data['shipping_country_id'],
- 'zone_id' => !empty($data['shipping_zone_id']) ? $data['shipping_zone_id'] : 0,
- );
- $this->request('shipping/address', array(), $shipping_address);
-
- $this->request('shipping/methods', array(), array());
- $shipping_method = array(
- 'shipping_method' => $data['shipping_code']
- );
- $this->request('shipping/method', array(), $shipping_method);
-
- $order = array(
- 'shipping_method' => $data['shipping_code'],
- 'payment_method' => $data['payment_code'],
- 'order_status_id' => $data['order_status_id'],
- 'comment' => $data['comment'],
- 'affiliate_id' => $data['affiliate_id'],
- );
- $this->request('order/edit', array('order_id' => $order_id), $order);
- }
-
- public function addOrder($data) {
- $currency = $this->getCookieValue('currency');
- if($currency) {
- $a = $this->request('currency', array(), array('currency' => $currency));
- }
-
- $customer = array(
- 'store_id' => $data['store_id'],
- 'currency' => $currency != false ? $currency : '',
- 'customer' => $data['customer'],
- 'customer_id' => $data['customer_id'],
- 'customer_group_id' => $data['customer_group_id'],
- 'firstname' => $data['firstname'],
- 'lastname' => $data['lastname'],
- 'email' => $data['email'],
- 'telephone' => $data['telephone'],
- 'fax' => $data['fax'],
- );
- $this->request('customer', array(), $customer);
-
- $products = array();
- foreach ($data['order_product'] as $order_product) {
- $products[] = array(
- 'product_id' => $order_product['product_id'],
- 'quantity' => $order_product['quantity'],
- 'option' => $order_product['option']
- );
- }
- $this->request('cart/add', array(), array('product' => $products));
-
- $payment_address = array(
- 'payment_address' => $data['payment_address'],
- 'firstname' => $data['payment_firstname'],
- 'lastname' => $data['payment_lastname'],
- 'company' => $data['payment_company'],
- 'address_1' => $data['payment_address_1'],
- 'address_2' => $data['payment_address_2'],
- 'city' => $data['payment_city'],
- 'postcode' => $data['payment_postcode'],
- 'country_id' => $data['payment_country_id'],
- 'zone_id' => $data['payment_zone_id'],
- );
- $this->request('payment/address', array(), $payment_address);
-
- $shipping_address = array(
- 'shipping_address' => $data['shipping_address'],
- 'firstname' => $data['shipping_firstname'],
- 'lastname' => $data['shipping_lastname'],
- 'company' => $data['shipping_company'],
- 'address_1' => $data['shipping_address_1'],
- 'address_2' => $data['shipping_address_2'],
- 'city' => $data['shipping_city'],
- 'postcode' => $data['shipping_postcode'],
- 'country_id' => $data['shipping_country_id'],
- 'zone_id' => !empty($data['shipping_zone_id']) ? $data['shipping_zone_id'] : 0,
- );
- $this->request('shipping/address', array(), $shipping_address);
-
- $this->request('shipping/methods', array(), array());
- $shipping_method = array(
- 'shipping_method' => $data['shipping_code']
- );
- $this->request('shipping/method', array(), $shipping_method);
-
- $this->request('payment/methods', array(), array());
- $payment_method = array(
- 'payment_method' => $data['payment_code']
- );
- $this->request('payment/method', array(), $payment_method);
-
- $order = array(
- 'shipping_method' => $data['shipping_code'],
- 'payment_method' => $data['payment_code'],
- 'order_status_id' => $data['order_status_id'],
- 'comment' => $data['comment'],
- 'affiliate_id' => $data['affiliate_id'],
- );
- $response = $this->request('order/add', array(), $order);
-
- if (isset($response['order_id'])) {
- return $response['order_id'];
- }
- }
-
- private function getInnerIpAddr() {
- $opencartStoreInfo = $this->model_setting_store->getStore($this->opencartStoreId);
-
- if ($opencartStoreInfo) {
- $url = $opencartStoreInfo['ssl'];
- } else {
- $url = HTTPS_CATALOG;
- }
-
- $curl = curl_init();
-
- // Set SSL if required
- if (substr($url, 0, 5) == 'https') {
- curl_setopt($curl, CURLOPT_PORT, 443);
- }
-
- curl_setopt($curl, CURLOPT_HEADER, false);
- curl_setopt($curl, CURLINFO_HEADER_OUT, true);
- curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
- curl_setopt($curl, CURLOPT_FORBID_REUSE, false);
- curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($curl, CURLOPT_URL, $url . 'system/cron/getmyip.php');
-
- return curl_exec($curl);
}
/**
- * Login api user for opencart version > 3.0
- *
- * @return string
+ * Get delivery types
+ *
+ * @return array
*/
- private function apiLogin() {
- $this->load->model('user/api');
+ public function getDeliveryTypes()
+ {
+ return $this->request('retailcrm/getDeliveryTypes', array(), array());
+ }
- $api_info = $this->model_user_api->getApi($this->config->get('config_api_id'));
-
- if ($this->session->data) {
- $this->session->data['api_id'] = $api_info['api_id'];
- $api_token = $this->session->getId();
- } else {
- $session = new Session($this->config->get('session_engine'), $this->registry);
- $session_id = $this->getCookieValue('OCSESSID');
-
- if ($session_id) {
- $session->start($session_id);
- } else {
- $session->start();
- }
-
- $this->model_user_api->deleteApiSessionBySessonId($session->getId());
- $this->model_user_api->addApiSession($api_info['api_id'], $session->getId(), $this->getInnerIpAddr());
-
- $session->data['api_id'] = $api_info['api_id'];
- $api_token = $session->getId();
- $this->registry->set('session', $session);
- }
-
- return $api_token;
+ /**
+ * Add history order
+ *
+ * @param int $order_id
+ * @param int $order_status_id
+ *
+ * @return void
+ */
+ public function addHistory($order_id, $order_status_id)
+ {
+ $this->request('retailcrm/addOrderHistory', array(), array('order_id' => $order_id, 'order_status_id' => $order_status_id));
}
/**
diff --git a/system/library/retailcrm/RetailcrmApiClient4.php b/system/library/retailcrm/RetailcrmApiClient4.php
index 5fee131..1436175 100644
--- a/system/library/retailcrm/RetailcrmApiClient4.php
+++ b/system/library/retailcrm/RetailcrmApiClient4.php
@@ -862,6 +862,26 @@ class RetailcrmApiClient4
);
}
+ /**
+ * 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
*
@@ -1412,6 +1432,23 @@ class RetailcrmApiClient4
);
}
+ /**
+ * 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
*
diff --git a/system/library/retailcrm/RetailcrmApiClient5.php b/system/library/retailcrm/RetailcrmApiClient5.php
index 8ffd4e1..1ea4619 100644
--- a/system/library/retailcrm/RetailcrmApiClient5.php
+++ b/system/library/retailcrm/RetailcrmApiClient5.php
@@ -1504,6 +1504,26 @@ class RetailcrmApiClient5
);
}
+ /**
+ * 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
*
@@ -2054,6 +2074,23 @@ class RetailcrmApiClient5
);
}
+ /**
+ * 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
*
diff --git a/system/library/retailcrm/RetailcrmHistoryHelper.php b/system/library/retailcrm/RetailcrmHistoryHelper.php
index f762ebb..23522d4 100644
--- a/system/library/retailcrm/RetailcrmHistoryHelper.php
+++ b/system/library/retailcrm/RetailcrmHistoryHelper.php
@@ -55,7 +55,10 @@ class RetailcrmHistoryHelper {
$orders[$change['order']['id']]['items'][$change['item']['id']]['delete'] = true;
}
- if (!isset($orders[$change['order']['id']]['items'][$change['item']['id']]['create']) && $fields['item'][$change['field']]) {
+ if (!isset($orders[$change['order']['id']]['items'][$change['item']['id']]['create'])
+ && isset($fields['item'][$change['field']])
+ && $fields['item'][$change['field']]
+ ) {
$orders[$change['order']['id']]['items'][$change['item']['id']][$fields['item'][$change['field']]] = $change['newValue'];
}
} else {
diff --git a/system/library/retailcrm/retailcrm.php b/system/library/retailcrm/retailcrm.php
index 1740251..f6ae4d5 100644
--- a/system/library/retailcrm/retailcrm.php
+++ b/system/library/retailcrm/retailcrm.php
@@ -89,4 +89,78 @@ class Retailcrm {
return $token;
}
+
+ public function getOffers($product)
+ {
+ // Формируем офферы отнсительно доступных опций
+ $options = $this->model_catalog_product->getProductOptions($product['product_id']);
+ $offerOptions = array('select', 'radio');
+ $requiredOptions = array();
+ $notRequiredOptions = array();
+ // Оставляем опции связанные с вариациями товаров, сортируем по параметру обязательный или нет
+ foreach($options as $option) {
+ if(in_array($option['type'], $offerOptions)) {
+ if($option['required']) {
+ $requiredOptions[] = $option;
+ } else {
+ $notRequiredOptions[] = $option;
+ }
+ }
+ }
+
+ $offers = array();
+ // Сначала совмещаем все обязательные опции
+ foreach($requiredOptions as $requiredOption) {
+ // Если первая итерация
+ 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) {
+ unset($offers[$optionKey]); // Работая в контексте обязательных опций не забываем удалять прошлые обязательные опции, т.к. они должны быть скомбинированы с другими обязательными опциями
+ 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']) ?
+ $optionValue['quantity'] : $optionAttr['qty']
+ );
+ }
+ }
+ }
+ }
+
+ // Совмещаем или добавляем необязательные опции, учитывая тот факт что обязательных опций может и не быть.
+ foreach($notRequiredOptions as $notRequiredOption) {
+ // Если обязательных опцией не оказалось и первая итерация
+ if(empty($offers)) {
+ $offers['0:0-0'] = 0; // В случае работы с необязательными опциями мы должны учитывать товарное предложение без опций, поэтому создадим "пустую" опцию
+ 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) {
+ $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']) ?
+ $optionValue['quantity'] : $optionAttr['qty']
+ );
+ }
+ }
+ }
+ }
+
+ if(empty($offers)) {
+ $offers = array('0:0-0' => array('price' => '0', 'qty' => '0'));
+ }
+
+ return $offers;
+ }
}