From 22ba5c906a7edd75f955de495b0d7b9a0dd23558 Mon Sep 17 00:00:00 2001 From: Alex Lushpai Date: Tue, 21 Jul 2015 15:21:12 +0300 Subject: [PATCH] restruct & custom --- CHANGELOG.md | 13 + README.md | 25 +- docs/images/add.png | Bin 0 -> 15633 bytes retailcrm/classes/References.php | 210 +++++++++++ retailcrm/config_ru.xml | 13 + retailcrm/{index.php => job_icml.php} | 0 retailcrm/{sync.php => job_sync.php} | 0 retailcrm/retailcrm.php | 515 +++++++------------------- retailcrm/translations/ru.php | 77 ++-- 9 files changed, 434 insertions(+), 419 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 docs/images/add.png create mode 100644 retailcrm/classes/References.php create mode 100644 retailcrm/config_ru.xml rename retailcrm/{index.php => job_icml.php} (100%) rename retailcrm/{sync.php => job_sync.php} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e98883b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +Changelog +========= + +v0.2 + +* Ребрендинг, intarocrm заменено на retailcrm +* Обновлена библиотека api-client-php +* Сборка через composer больше надоступна, все необходимые файлы включены в основноую поставку +* Добавлен механизм кастомизации +* Добавлены переводы +* Генерация ICML перенесена с контроллера на cron для более эффективного использования ресурсов +* Устранен раяд ошибок + diff --git a/README.md b/README.md index ac5580b..ca4554d 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,31 @@ Prestashop module -============= +================= -Prestashop module for interaction with [IntaroCRM](http://www.intarocrm.com) through [REST API](http://docs.intarocrm.ru/rest-api/). +Модуль интеграции CMS Prestashop c [RetailCRM](http://www.retailcrm.com) -Module allows: +Модуль позволяет: -* Send to IntaroCRM new orders -* Configure relations between dictionaries of IntaroCRM and Prestashop (statuses, payments, delivery types and etc) -* Generate [ICML](http://docs.intarocrm.ru/index.php?n=Пользователи.ФорматICML) (IntaroCRM Markup Language) for catalog loading by IntaroCRM +* Экспортировать в CRM заказы +* Синхронизировать справочники (способы доставки и оплаты, статусы заказов и т.п.) +* Выгружать каталог товаров в формате [ICML](http://retailcrm.ru/docs/Разработчики/ФорматICML) (IntaroCRM Markup Language) -Installation +Установка ------------- -### 1. Manual installation +### 1. Ручная установка -#### Clone module. +#### Скопируйте модуль ``` git clone git@github.com:/intarocrm/prestashop-module.git ``` -#### Create .zip file. +#### Создайте загружаемый .zip архив. ``` cd prestashop-module zip -r retailcrm.zip retailcrm ``` -#### Install via Admin interface. +#### Установите через административный интерфейс управления модулями. - -Go to Modules -> Add module. After that upload your zipped module and activate it. +![Установка модуля](/docs/images/add.png) diff --git a/docs/images/add.png b/docs/images/add.png new file mode 100644 index 0000000000000000000000000000000000000000..68bfb2a147ec0da49cd689e171dc764669c7a4cf GIT binary patch literal 15633 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 = $client; + $this->default_lang = (int) Configuration::get('PS_LANG_DEFAULT'); + $this->default_currency = (int) Configuration::get('PS_CURRENCY_DEFAULT'); + $this->default_country = (int) Configuration::get('PS_COUNTRY_DEFAULT'); + } + + public function getDeliveryTypes() + { + $deliveryTypes = array(); + + $carriers = Carrier::getCarriers( + $this->default_lang, true, false, false, + null, PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE + ); + + if (!empty($carriers)) { + foreach ($carriers as $carrier) { + $deliveryTypes[] = array( + 'type' => 'select', + 'label' => $carrier['name'], + 'name' => 'RETAILCRM_API_DELIVERY[' . $carrier['id_carrier'] . ']', + 'required' => false, + 'options' => array( + 'query' => $this->getApiDeliveryTypes(), + 'id' => 'id_option', + 'name' => 'name' + ) + ); + } + } + + return $deliveryTypes; + } + + public function getStatuses() + { + $statusTypes = array(); + $states = array_merge( + OrderState::getOrderStates($this->default_lang, true), + OrderReturnState::getOrderReturnStates($this->default_lang, true) + ); + + if (!empty($states)) { + foreach ($states as $state) { + if ($state['name'] != ' ') { + $statusTypes[] = array( + 'type' => 'select', + 'label' => $state['name'], + 'name' => 'RETAILCRM_API_STATUS[' . $state['id_order_state'] . ']', + 'required' => false, + 'options' => array( + 'query' => $this->getApiStatuses(), + 'id' => 'id_option', + 'name' => 'name' + ) + ); + } + } + } + + return $statusTypes; + } + + public function getPaymentTypes() + { + $payments = $this->getSystemPaymentModules(); + $paymentTypes = array(); + + if (!empty($payments)) { + foreach ($payments as $payment) { + $paymentTypes[] = array( + 'type' => 'select', + 'label' => $payment['name'], + 'name' => 'RETAILCRM_API_PAYMENT[' . $payment['code'] . ']', + 'required' => false, + 'options' => array( + 'query' => $this->getApiPaymentTypes(), + 'id' => 'id_option', + 'name' => 'name' + ) + ); + } + } + + return $paymentTypes; + } + + protected function getSystemPaymentModules() + { + $shop_id = Context::getContext()->shop->id; + + /* Get all modules then select only payment ones */ + $modules = Module::getModulesOnDisk(true); + + foreach ($modules as $module) { + if ($module->tab == 'payments_gateways') { + if ($module->id) { + if (!get_class($module) == 'SimpleXMLElement') $module->country = array(); + $countries = DB::getInstance()->executeS('SELECT id_country FROM ' . _DB_PREFIX_ . 'module_country WHERE id_module = ' . (int) $module->id . ' AND `id_shop`=' . (int) $shop_id); + foreach ($countries as $country) $module->country[] = $country['id_country']; + if (!get_class($module) == 'SimpleXMLElement') $module->currency = array(); + $currencies = DB::getInstance()->executeS('SELECT id_currency FROM ' . _DB_PREFIX_ . 'module_currency WHERE id_module = ' . (int) $module->id . ' AND `id_shop`=' .(int) $shop_id); + foreach ($currencies as $currency) $module->currency[] = $currency['id_currency']; + if (!get_class($module) == 'SimpleXMLElement') $module->group = array(); + $groups = DB::getInstance()->executeS('SELECT id_group FROM ' . _DB_PREFIX_ . 'module_group WHERE id_module = ' . (int) $module->id . ' AND `id_shop`=' . (int) $shop_id); + foreach ($groups as $group) $module->group[] = $group['id_group']; + } else { + $module->country = null; + $module->currency = null; + $module->group = null; + } + + if ($module->active != 0) { + $this->payment_modules[] = array( + 'id' => $module->id, + 'code' => $module->name, + 'name' => $module->displayName + ); + } + } + } + + return $this->payment_modules; + } + + protected function getApiDeliveryTypes() + { + $crmDeliveryTypes = array(); + + try { + $request = $this->api->deliveryTypesList(); + if ($request->isSuccessful()) { + $crmDeliveryTypes[] = array(); + foreach ($request->deliveryTypes as $dType) { + $crmDeliveryTypes[] = array( + 'id_option' => $dType['code'], + 'name' => $dType['name'], + ); + } + } + } + catch (CurlException $e) { + error_log('deliveryTypesList: connection error', 3, _PS_ROOT_DIR . "log/retailcrm.log"); + } + catch (InvalidJsonException $e) { + error_log('deliveryTypesList: ' . $e->getMessage(), 3, _PS_ROOT_DIR . "log/retailcrm.log"); + } + + return $crmDeliveryTypes; + + } + + protected function getApiStatuses() + { + $crmStatusTypes = array(); + + try { + $request = $this->api->statusesList(); + if ($request->isSuccessful()) { + $crmStatusTypes[] = array(); + foreach ($request->statuses as $sType) { + $crmStatusTypes[] = array( + 'id_option' => $sType['code'], + 'name' => $sType['name'] + ); + } + } + } + catch (CurlException $e) { + error_log('statusTypesList: connection error', 3, _PS_ROOT_DIR . "log/retailcrm.log"); + } + catch (InvalidJsonException $e) { + error_log('statusTypesList: ' . $e->getMessage(), 3, _PS_ROOT_DIR . "log/retailcrm.log"); + } + + return $crmStatusTypes; + } + + protected function getApiPaymentTypes() + { + $crmPaymentTypes = array(); + + try { + $request = $this->api->paymentTypesList(); + if ($request->isSuccessful()) { + $crmPaymentTypes[] = array(); + foreach ($request->paymentTypes as $pType) { + $crmPaymentTypes[] = array( + 'id_option' => $pType['code'], + 'name' => $pType['name'] + ); + } + } + } + catch (CurlException $e) { + error_log('paymentTypesList: connection error', 3, _PS_ROOT_DIR . "log/retailcrm.log"); + } + catch (InvalidJsonException $e) { + error_log('paymentTypesList: ' . $e->getMessage(), 3, _PS_ROOT_DIR . "log/retailcrm.log"); + } + + return $crmPaymentTypes; + } +} diff --git a/retailcrm/config_ru.xml b/retailcrm/config_ru.xml new file mode 100644 index 0000000..754c073 --- /dev/null +++ b/retailcrm/config_ru.xml @@ -0,0 +1,13 @@ + + + retailcrm + + + + + + + 1 + 1 + + diff --git a/retailcrm/index.php b/retailcrm/job_icml.php similarity index 100% rename from retailcrm/index.php rename to retailcrm/job_icml.php diff --git a/retailcrm/sync.php b/retailcrm/job_sync.php similarity index 100% rename from retailcrm/sync.php rename to retailcrm/job_sync.php diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php index d4eeae3..cd6ee62 100644 --- a/retailcrm/retailcrm.php +++ b/retailcrm/retailcrm.php @@ -4,6 +4,12 @@ require 'classes/Retailcrm.php'; require 'classes/Service.php'; require 'classes/Icml.php'; +if (file_exists('classes/ReferencesCustom.php')) { + require 'classes/ReferencesCustom.php'; +} else { + require 'classes/References.php'; +} + if (!defined('_PS_VERSION_')) { exit; } @@ -31,9 +37,9 @@ class RetailCRM extends Module ); } - $this->default_lang = (int)Configuration::get('PS_LANG_DEFAULT'); - $this->default_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); - $this->default_country = (int)Configuration::get('PS_COUNTRY_DEFAULT'); + $this->default_lang = (int) Configuration::get('PS_LANG_DEFAULT'); + $this->default_currency = (int) Configuration::get('PS_CURRENCY_DEFAULT'); + $this->default_country = (int) Configuration::get('PS_COUNTRY_DEFAULT'); $this->response = array(); $this->customerFix = array(); @@ -44,6 +50,8 @@ class RetailCRM extends Module $this->customer = null; + $this->ref = new References($this->api); + parent::__construct(); } @@ -78,9 +86,9 @@ class RetailCRM extends Module $token = Configuration::get('RETAILCRM_API_TOKEN'); if (!$address || $address == '') { - $output .= $this->displayError( $this->l('Invalid crm address') ); + $output .= $this->displayError( $this->l('Invalid or empty crm address') ); } elseif (!$token || $token == '') { - $output .= $this->displayError( $this->l('Invalid crm api token') ); + $output .= $this->displayError( $this->l('Invalid or empty crm api token') ); } else { $output .= $this->displayConfirmation( $this->l('Timezone settings must be identical to both of your crm and shop') . @@ -162,7 +170,7 @@ class RetailCRM extends Module 'legend' => array( 'title' => $this->l('Delivery'), ), - 'input' => $this->getDeliveryTypes(), + 'input' => $this->ref->getDeliveryTypes(), ); /* @@ -172,7 +180,7 @@ class RetailCRM extends Module 'legend' => array( 'title' => $this->l('Order statuses'), ), - 'input' => $this->getStatusTypes(), + 'input' => $this->ref->getStatuses(), ); /* @@ -182,7 +190,7 @@ class RetailCRM extends Module 'legend' => array( 'title' => $this->l('Payment types'), ), - 'input' => $this->getPaymentTypes(), + 'input' => $this->ref->getPaymentTypes(), ); } @@ -295,7 +303,7 @@ class RetailCRM extends Module public function hookActionOrderStatusPostUpdate($params) { $address_id = Address::getFirstCustomerAddressId($params['cart']->id_customer); - $sql = 'SELECT * FROM '._DB_PREFIX_.'address WHERE id_address='.(int)$address_id; + $sql = 'SELECT * FROM '._DB_PREFIX_.'address WHERE id_address='.(int) $address_id; $address = Db::getInstance()->ExecuteS($sql); $address = $address[0]; $delivery = json_decode(Configuration::get('RETAILCRM_API_DELIVERY')); @@ -410,349 +418,11 @@ class RetailCRM extends Module } } - protected function getApiDeliveryTypes() - { - $crmDeliveryTypes = array(); - - if (!empty($this->apiUrl) && !empty($this->apiKey)) { - try { - $deliveryTypes = $this->api->deliveryTypesList(); - } - catch (CurlException $e) { - error_log('deliveryTypesList: connection error', 3, _PS_ROOT_DIR . "log/retailcrm.log"); - } - catch (InvalidJsonException $e) { - error_log('deliveryTypesList: ' . $e->getMessage(), 3, _PS_ROOT_DIR . "log/retailcrm.log"); - } - - if (!empty($deliveryTypes)) { - $crmDeliveryTypes[] = array(); - foreach ($deliveryTypes as $dType) { - $crmDeliveryTypes[] = array( - 'id_option' => $dType['code'], - 'name' => $dType['name'], - ); - } - } - } - - return $crmDeliveryTypes; - - } - - protected function getDeliveryTypes() - { - $deliveryTypes = array(); - - $carriers = Carrier::getCarriers( - $this->default_lang, true, false, false, - null, PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE - ); - - if (!empty($carriers)) { - foreach ($carriers as $carrier) { - $deliveryTypes[] = array( - 'type' => 'select', - 'label' => $carrier['name'], - 'name' => 'RETAILCRM_API_DELIVERY[' . $carrier['id_carrier'] . ']', - 'required' => false, - 'options' => array( - 'query' => $this->getApiDeliveryTypes(), - 'id' => 'id_option', - 'name' => 'name' - ) - ); - } - } - - return $deliveryTypes; - } - - protected function getApiStatuses() - { - $crmStatusTypes = array(); - - if (!empty($this->apiUrl) && !empty($this->apiKey)) { - try { - $statusTypes = $this->api->statusesList(); - } - catch (CurlException $e) { - error_log('statusTypesList: connection error', 3, _PS_ROOT_DIR . "log/retailcrm.log"); - } - catch (InvalidJsonException $e) { - error_log('statusTypesList: ' . $e->getMessage(), 3, _PS_ROOT_DIR . "log/retailcrm.log"); - } - - if (!empty($statusTypes)) { - $crmStatusTypes[] = array(); - foreach ($statusTypes as $sType) { - $crmStatusTypes[] = array( - 'id_option' => $sType['code'], - 'name' => $sType['name'] - ); - } - } - } - - return $crmStatusTypes; - } - - protected function getStatusTypes() - { - $statusTypes = array(); - $states = OrderState::getOrderStates($this->default_lang, true); - - if (!empty($states)) { - foreach ($states as $state) { - if ($state['name'] != ' ') { - $statusTypes[] = array( - 'type' => 'select', - 'label' => $state['name'], - 'name' => 'RETAILCRM_API_STATUS[' . $state['id_order_state'] . ']', - 'required' => false, - 'options' => array( - 'query' => $this->getApiStatuses(), - 'id' => 'id_option', - 'name' => 'name' - ) - ); - } - } - } - - return $statusTypes; - } - - protected function getApiPaymentTypes() - { - $crmPaymentTypes = array(); - - if (!empty($this->apiUrl) && !empty($this->apiKey)) { - try { - $paymentTypes = $this->api->paymentTypesList(); - } - catch (CurlException $e) { - error_log('paymentTypesList: connection error', 3, _PS_ROOT_DIR . "log/retailcrm.log"); - } - catch (InvalidJsonException $e) { - error_log('paymentTypesList: ' . $e->getMessage(), 3, _PS_ROOT_DIR . "log/retailcrm.log"); - } - - if (!empty($paymentTypes)) { - $crmPaymentTypes[] = array(); - foreach ($paymentTypes as $pType) { - $crmPaymentTypes[] = array( - 'id_option' => $pType['code'], - 'name' => $pType['name'] - ); - } - } - } - - return $crmPaymentTypes; - } - - protected function getPaymentTypes() - { - $payments = $this->getSystemPaymentModules(); - $paymentTypes = array(); - - if (!empty($payments)) { - foreach ($payments as $payment) { - $paymentTypes[] = array( - 'type' => 'select', - 'label' => $payment['name'], - 'name' => 'RETAILCRM_API_PAYMENT[' . $payment['code'] . ']', - 'required' => false, - 'options' => array( - 'query' => $this->getApiPaymentTypes(), - 'id' => 'id_option', - 'name' => 'name' - ) - ); - } - } - - return $paymentTypes; - } - - protected function getSystemPaymentModules() - { - $shop_id = Context::getContext()->shop->id; - - /* Get all modules then select only payment ones */ - $modules = Module::getModulesOnDisk(true); - /* - * Hack for knivesland - */ - if (Module::getInstanceByName('advancedcheckout') === false) { - foreach ($modules as $module) { - if ($module->tab == 'payments_gateways') - { - if ($module->id) - { - if (!get_class($module) == 'SimpleXMLElement') - $module->country = array(); - $countries = DB::getInstance()->executeS(' - SELECT id_country - FROM '._DB_PREFIX_.'module_country - WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id - ); - foreach ($countries as $country) - $module->country[] = $country['id_country']; - - if (!get_class($module) == 'SimpleXMLElement') - $module->currency = array(); - $currencies = DB::getInstance()->executeS(' - SELECT id_currency - FROM '._DB_PREFIX_.'module_currency - WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id - ); - foreach ($currencies as $currency) - $module->currency[] = $currency['id_currency']; - - if (!get_class($module) == 'SimpleXMLElement') - $module->group = array(); - $groups = DB::getInstance()->executeS(' - SELECT id_group - FROM '._DB_PREFIX_.'module_group - WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id - ); - foreach ($groups as $group) - $module->group[] = $group['id_group']; - } - else - { - $module->country = null; - $module->currency = null; - $module->group = null; - } - - if ($module->active != 0) { - $this->payment_modules[] = array( - 'id' => $module->id, - 'code' => $module->name, - 'name' => $module->displayName - ); - } - - } - } - } else { - require_once(dirname(__FILE__) . '/../advancedcheckout/classes/Payment.php'); - $modules = Payment::getPaymentMethods(); - foreach ($modules as $module) { - $this->payment_modules[] = array( - 'id' => $module['id_payment'], - 'code' => $module['name'], - 'name' => $module['name'] - ); - } - } - - return $this->payment_modules; - } - - protected function getAddressFields() - { - $addressFields = array(); - $address = explode(' ', str_replace("\n", ' ', AddressFormat::getAddressCountryFormat($this->context->country->id))); - - if (!empty($address)) { - foreach ($address as $idx => $a) { - if (!strpos($a, ':')) { - $addressFields[] = array( - 'type' => 'select', - 'label' => $this->l((string)$a), - 'name' => 'RETAILCRM_API_ADDR[' . $idx . ']', - 'required' => false, - 'options' => array( - 'query' => array( - array( - 'name' => '', - 'id_option' => '' - ), - array( - 'name' => $this->l('FIRST_NAME'), - 'id_option' => 'first_name' - ), - array( - 'name' => $this->l('LAST_NAME'), - 'id_option' => 'last_name' - ), - array( - 'name' => $this->l('PHONE'), - 'id_option' => 'phone' - ), - array( - 'name' => $this->l('EMAIL'), - 'id_option' => 'email' - ), - array( - 'name' => $this->l('ADDRESS'), - 'id_option' => 'address' - ), - array( - 'name' => $this->l('COUNTRY'), - 'id_option' => 'country' - ), - array( - 'name' => $this->l('REGION'), - 'id_option' => 'region' - ), - array( - 'name' => $this->l('CITY'), - 'id_option' => 'city' - ), - array( - 'name' => $this->l('ZIP'), - 'id_option' => 'index' - ), - array( - 'name' => $this->l('STREET'), - 'id_option' => 'street' - ), - array( - 'name' => $this->l('BUILDING'), - 'id_option' => 'building' - ), - array( - 'name' => $this->l('FLAT'), - 'id_option' => 'flat' - ), - array( - 'name' => $this->l('INTERCOMCODE'), - 'id_option' => 'intercomcode' - ), - array( - 'name' => $this->l('FLOOR'), - 'id_option' => 'floor' - ), - array( - 'name' => $this->l('BLOCK'), - 'id_option' => 'block' - ), - array( - 'name' => $this->l('HOUSE'), - 'ID' => 'house' - ) - ), - 'id' => 'id_option', - 'name' => 'name' - ) - ); - } - } - } - - return $addressFields; - } - public function exportCatalog() { global $smarty; $shop_url = (Configuration::get('PS_SSL_ENABLED') ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_); - $id_lang = (int)Configuration::get('PS_LANG_DEFAULT'); + $id_lang = (int) Configuration::get('PS_LANG_DEFAULT'); $currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); if ($currency->iso_code == 'RUB') { $currency->iso_code = 'RUR'; @@ -952,9 +622,9 @@ class RetailCRM extends Module $cart->id_currency = $this->default_currency; $cart->id_lang = $this->default_lang; $cart->id_customer = $this->customer_id; - $cart->id_address_delivery = (int)$this->address_id; - $cart->id_address_invoice = (int)$this->address_id; - $cart->id_carrier = (int)$deliveries[$delivery]; + $cart->id_address_delivery = (int) $this->address_id; + $cart->id_address_invoice = (int) $this->address_id; + $cart->id_carrier = (int) $deliveries[$delivery]; $cart->add(); @@ -962,9 +632,9 @@ class RetailCRM extends Module if(!empty($order['items'])) { foreach ($order['items'] as $item) { $product = array(); - $product['id_product'] = (int)$item['offer']['externalId']; + $product['id_product'] = (int) $item['offer']['externalId']; $product['quantity'] = $item['quantity']; - $product['id_address_delivery'] = (int)$this->address_id; + $product['id_address_delivery'] = (int) $this->address_id; $products[] = $product; } } @@ -977,13 +647,13 @@ class RetailCRM extends Module */ $newOrder = new Order(); - $newOrder->id_address_delivery = (int)$this->address_id; - $newOrder->id_address_invoice = (int)$this->address_id; - $newOrder->id_cart = (int)$cart->id; + $newOrder->id_address_delivery = (int) $this->address_id; + $newOrder->id_address_invoice = (int) $this->address_id; + $newOrder->id_cart = (int) $cart->id; $newOrder->id_currency = $this->default_currency; $newOrder->id_lang = $this->default_lang; - $newOrder->id_customer = (int)$this->customer_id; - $newOrder->id_carrier = (int)$deliveries[$delivery]; + $newOrder->id_customer = (int) $this->customer_id; + $newOrder->id_carrier = (int) $deliveries[$delivery]; $newOrder->payment = $payments[$payment]; $newOrder->module = (Module::getInstanceByName('advancedcheckout') === false) ? $payments[$payment] @@ -999,7 +669,7 @@ class RetailCRM extends Module $newOrder->total_shipping_tax_incl = $order['deliveryCost']; $newOrder->total_shipping_tax_excl = $order['deliveryCost']; $newOrder->conversion_rate = 1.000000; - $newOrder->current_state = (int)$statuses[$state]; + $newOrder->current_state = (int) $statuses[$state]; $newOrder->delivery_date = $order['deliveryDate']; $newOrder->date_add = $order['createdAt']; $newOrder->date_upd = $order['createdAt']; @@ -1029,7 +699,7 @@ class RetailCRM extends Module */ $product_list = array(); foreach ($order['items'] as $item) { - $product = new Product((int)$item['offer']['externalId'], false, $this->default_lang); + $product = new Product((int) $item['offer']['externalId'], false, $this->default_lang); $qty = $item['quantity']; $product_list[] = array('product' =>$product, 'quantity' => $qty); } @@ -1046,14 +716,14 @@ class RetailCRM extends Module foreach ($product_list as $product) { $query .= '(' - .(int)$newOrder->id.', + .(int) $newOrder->id.', 0, '. $this->context->shop->id.', - '.(int)$product['product']->id.', + '.(int) $product['product']->id.', 0, '.implode('', array('\'', $product['product']->name, '\'')).', - '.(int)$product['quantity'].', - '.(int)$product['quantity'].', + '.(int) $product['quantity'].', + '.(int) $product['quantity'].', '.$product['product']->price.', '.implode('', array('\'', $product['product']->reference, '\'')).', '.$product['product']->price.', @@ -1087,7 +757,7 @@ class RetailCRM extends Module */ $toUpdate[] = $order['id']; if ($order['paymentType'] != null && $order['deliveryType'] != null && $order['status'] != null) { - $orderToUpdate = new Order((int)$order['externalId']); + $orderToUpdate = new Order((int) $order['externalId']); /* * check status @@ -1098,7 +768,7 @@ class RetailCRM extends Module Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'orders` SET `current_state` = \''.$statuses[$stype].'\' - WHERE `id_order` = '.(int)$order['externalId']); + WHERE `id_order` = '.(int) $order['externalId']); } } @@ -1111,7 +781,7 @@ class RetailCRM extends Module Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'orders` SET `id_carrier` = \''.$deliveries[$dtype].'\' - WHERE `id_order` = '.(int)$order['externalId']); + WHERE `id_order` = '.(int) $order['externalId']); Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'order_carrier` SET `id_carrier` = \''.$deliveries[$dtype].'\' @@ -1128,7 +798,7 @@ class RetailCRM extends Module Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'orders` SET `payment` = \''.$payments[$ptype].'\' - WHERE `id_order` = '.(int)$order['externalId']); + WHERE `id_order` = '.(int) $order['externalId']); Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'order_payment` SET `payment_method` = \''.$payments[$ptype].'\' @@ -1180,7 +850,7 @@ class RetailCRM extends Module */ if (!empty($order['items'])) { foreach ($order['items'] as $key => $newItem) { - $product = new Product((int)$newItem['offer']['externalId'], false, $this->default_lang); + $product = new Product((int) $newItem['offer']['externalId'], false, $this->default_lang); $qty = $newItem['quantity']; $product_list[] = array('product' =>$product, 'quantity' => $qty); } @@ -1198,14 +868,14 @@ class RetailCRM extends Module foreach ($product_list as $product) { $query .= '(' - .(int)$orderToUpdate->id.', + .(int) $orderToUpdate->id.', 0, '. $this->context->shop->id.', - '.(int)$product['product']->id.', + '.(int) $product['product']->id.', 0, '.implode('', array('\'', $product['product']->name, '\'')).', - '.(int)$product['quantity'].', - '.(int)$product['quantity'].', + '.(int) $product['quantity'].', + '.(int) $product['quantity'].', '.$product['product']->price.', '.implode('', array('\'', $product['product']->reference, '\'')).', '.$product['product']->price.', @@ -1251,7 +921,7 @@ class RetailCRM extends Module `total_paid` = '.$orderTotal.', `total_paid_tax_incl` = '.$orderTotal.', `total_paid_tax_excl` = '.$orderTotal.' - WHERE `id_order` = '.(int)$order['externalId']); + WHERE `id_order` = '.(int) $order['externalId']); } } } @@ -1281,4 +951,101 @@ class RetailCRM extends Module } } + + public function getAddressFields() + { + $addressFields = array(); + $address = explode(' ', str_replace("\n", ' ', AddressFormat::getAddressCountryFormat($this->context->country->id))); + + if (!empty($address)) { + foreach ($address as $idx => $a) { + if (!strpos($a, ':')) { + $a = preg_replace('/_/', ' ', $a); + $a = preg_replace('/[\,\.]/', '', $a); + $addressFields[] = array( + 'type' => 'select', + 'label' => $this->l((string) ucfirst($a)), + 'name' => 'RETAILCRM_API_ADDR[' . $idx . ']', + 'required' => false, + 'options' => array( + 'query' => array( + array( + 'name' => '', + 'id_option' => '' + ), + array( + 'name' => $this->l('FIRST_NAME'), + 'id_option' => 'first_name' + ), + array( + 'name' => $this->l('LAST_NAME'), + 'id_option' => 'last_name' + ), + array( + 'name' => $this->l('PHONE'), + 'id_option' => 'phone' + ), + array( + 'name' => $this->l('EMAIL'), + 'id_option' => 'email' + ), + array( + 'name' => $this->l('ADDRESS'), + 'id_option' => 'address' + ), + array( + 'name' => $this->l('COUNTRY'), + 'id_option' => 'country' + ), + array( + 'name' => $this->l('REGION'), + 'id_option' => 'region' + ), + array( + 'name' => $this->l('CITY'), + 'id_option' => 'city' + ), + array( + 'name' => $this->l('ZIP'), + 'id_option' => 'index' + ), + array( + 'name' => $this->l('STREET'), + 'id_option' => 'street' + ), + array( + 'name' => $this->l('BUILDING'), + 'id_option' => 'building' + ), + array( + 'name' => $this->l('FLAT'), + 'id_option' => 'flat' + ), + array( + 'name' => $this->l('INTERCOMCODE'), + 'id_option' => 'intercomcode' + ), + array( + 'name' => $this->l('FLOOR'), + 'id_option' => 'floor' + ), + array( + 'name' => $this->l('BLOCK'), + 'id_option' => 'block' + ), + array( + 'name' => $this->l('HOUSE'), + 'ID' => 'house' + ) + ), + 'id' => 'id_option', + 'name' => 'name' + ) + ); + } + } + } + + return $addressFields; + } } diff --git a/retailcrm/translations/ru.php b/retailcrm/translations/ru.php index bc44b2e..901ffc1 100644 --- a/retailcrm/translations/ru.php +++ b/retailcrm/translations/ru.php @@ -2,35 +2,48 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{intarocrm}prestashop>intarocrm_03c4d9465b9b3a7533d18cacc79c7fe4'] = 'IntaroCRM'; -$_MODULE['<{intarocrm}prestashop>intarocrm_5e695dc9fe273b7bc074e608113f4662'] = 'Модуль интеграции с IntaroCRM'; -$_MODULE['<{intarocrm}prestashop>intarocrm_876f23178c29dc2552c0b48bf23cd9bd'] = 'Вы уверены, что хотите удалить модуль?'; -$_MODULE['<{intarocrm}prestashop>intarocrm_5effd5157947e8ba4a08883f198b2e31'] = 'Неверный адрес CRM'; -$_MODULE['<{intarocrm}prestashop>intarocrm_576300f5b6faeb746bb6d034d98e7afd'] = 'Неверный API ключ'; -$_MODULE['<{intarocrm}prestashop>intarocrm_fba05687b61bc936d1a9a92371ba8bcf'] = 'Внимание! Часовой пояс в CRM должен совпадать с часовым поясом в магазине, настроки часового пояса CRM можно задать по адресу:'; -$_MODULE['<{intarocrm}prestashop>intarocrm_c888438d14855d7d96a2724ee9c306bd'] = 'Настройки обновлены'; -$_MODULE['<{intarocrm}prestashop>intarocrm_51af428aa0dcceb5230acb267ecb91c5'] = 'Настройка соединения'; -$_MODULE['<{intarocrm}prestashop>intarocrm_4cbd5dbeeef7392e50358b1bc00dd592'] = 'Адрес CRM'; -$_MODULE['<{intarocrm}prestashop>intarocrm_7f775042e08eddee6bbfd8fbe0add4a3'] = 'Ключ авторизации'; -$_MODULE['<{intarocrm}prestashop>intarocrm_c9cc8cce247e49bae79f15173ce97354'] = 'Сохранить'; -$_MODULE['<{intarocrm}prestashop>intarocrm_065ab3a28ca4f16f55f103adc7d0226f'] = 'Способы доставки'; -$_MODULE['<{intarocrm}prestashop>intarocrm_33af8066d3c83110d4bd897f687cedd2'] = 'Статусы заказов'; -$_MODULE['<{intarocrm}prestashop>intarocrm_bab959acc06bb03897b294fbb892be6b'] = 'Способы оплаты'; -$_MODULE['<{intarocrm}prestashop>intarocrm_dd7bf230fde8d4836917806aff6a6b27'] = 'Адрес'; -$_MODULE['<{intarocrm}prestashop>intarocrm_630f6dc397fe74e52d5189e2c80f282b'] = 'Вернуться к списку'; -$_MODULE['<{intarocrm}prestashop>intarocrm_5c1cf6cfec2dad86c8ca5286a0294516'] = 'Имя'; -$_MODULE['<{intarocrm}prestashop>intarocrm_c695cfe527a6fcd680114851b86b7555'] = 'Фамилия'; -$_MODULE['<{intarocrm}prestashop>intarocrm_f9dd946cc89c1f3b41a0edbe0f36931d'] = 'Телефон'; -$_MODULE['<{intarocrm}prestashop>intarocrm_61a649a33f2869e5e35fbb7aff3a80d9'] = 'Email'; -$_MODULE['<{intarocrm}prestashop>intarocrm_2664f03ac6b8bb9eee4287720e407db3'] = 'Адрес'; -$_MODULE['<{intarocrm}prestashop>intarocrm_6ddc09dc456001d9854e9fe670374eb2'] = 'Страна'; -$_MODULE['<{intarocrm}prestashop>intarocrm_69aede266809f89b89fe70681f6a129f'] = 'Область/Край/Республика'; -$_MODULE['<{intarocrm}prestashop>intarocrm_859214628431995197c0558f7b5f8ffc'] = 'Город'; -$_MODULE['<{intarocrm}prestashop>intarocrm_4348f938bbddd8475e967ccb47ecb234'] = 'Почтовый индекс'; -$_MODULE['<{intarocrm}prestashop>intarocrm_78fce82336bbbdca7f6da7564b8f9325'] = 'Улица'; -$_MODULE['<{intarocrm}prestashop>intarocrm_71a6834884666147c0334f0c40bc7295'] = 'Дом/Строение'; -$_MODULE['<{intarocrm}prestashop>intarocrm_f88a77e3d68d251c3dc4008c327b5a0c'] = 'Квартира'; -$_MODULE['<{intarocrm}prestashop>intarocrm_d977f846d110fcb7f71c6f97330c9d10'] = 'Код домофона'; -$_MODULE['<{intarocrm}prestashop>intarocrm_56c1e354d36beb85b0d881c5b2e24cbe'] = 'Этаж'; -$_MODULE['<{intarocrm}prestashop>intarocrm_4d34f53389ed7f28ca91fc31ea360a66'] = 'Корпус'; -$_MODULE['<{intarocrm}prestashop>intarocrm_49354b452ec305136a56fe7731834156'] = 'Дом/Строение'; +$_MODULE['<{retailcrm}prestashop>retailcrm_463dc31aa1a0b6e871b1a9fed8e9860a'] = 'RetailCRM'; +$_MODULE['<{retailcrm}prestashop>retailcrm_30de6237576b9a24f6fc599c22a35a4b'] = 'Модуль интеграции с RetailCRM'; +$_MODULE['<{retailcrm}prestashop>retailcrm_876f23178c29dc2552c0b48bf23cd9bd'] = 'Вы уверены, что хотите удалить модуль?'; +$_MODULE['<{retailcrm}prestashop>retailcrm_b9b2d9f66d0112f3aae7dbdbd4e22a43'] = 'Некорректный или пустой адрес CRM'; +$_MODULE['<{retailcrm}prestashop>retailcrm_942010ef43f3fec28741f62a0d9ff29c'] = 'Некорректный или пустой ключ CRM'; +$_MODULE['<{retailcrm}prestashop>retailcrm_fba05687b61bc936d1a9a92371ba8bcf'] = 'Внимание! Часовой пояс в CRM должен совпадать с часовым поясом в магазине, настроки часового пояса CRM можно задать по адресу:'; +$_MODULE['<{retailcrm}prestashop>retailcrm_5effd5157947e8ba4a08883f198b2e31'] = 'Неверный или пустой адрес CRM'; +$_MODULE['<{retailcrm}prestashop>retailcrm_576300f5b6faeb746bb6d034d98e7afd'] = 'Неверный или пустой API ключ'; +$_MODULE['<{retailcrm}prestashop>retailcrm_c888438d14855d7d96a2724ee9c306bd'] = 'Настройки обновлены'; +$_MODULE['<{retailcrm}prestashop>retailcrm_51af428aa0dcceb5230acb267ecb91c5'] = 'Настройка соединения'; +$_MODULE['<{retailcrm}prestashop>retailcrm_4cbd5dbeeef7392e50358b1bc00dd592'] = 'URL адрес CRM'; +$_MODULE['<{retailcrm}prestashop>retailcrm_7f775042e08eddee6bbfd8fbe0add4a3'] = 'API ключ'; +$_MODULE['<{retailcrm}prestashop>retailcrm_c9cc8cce247e49bae79f15173ce97354'] = 'Сохранить'; +$_MODULE['<{retailcrm}prestashop>retailcrm_065ab3a28ca4f16f55f103adc7d0226f'] = 'Способы доставки'; +$_MODULE['<{retailcrm}prestashop>retailcrm_33af8066d3c83110d4bd897f687cedd2'] = 'Статусы заказов'; +$_MODULE['<{retailcrm}prestashop>retailcrm_bab959acc06bb03897b294fbb892be6b'] = 'Способы оплаты'; +$_MODULE['<{retailcrm}prestashop>retailcrm_dd7bf230fde8d4836917806aff6a6b27'] = 'Адрес'; +$_MODULE['<{retailcrm}prestashop>retailcrm_630f6dc397fe74e52d5189e2c80f282b'] = 'Вернуться к списку'; +$_MODULE['<{retailcrm}prestashop>retailcrm_5c1cf6cfec2dad86c8ca5286a0294516'] = 'Имя'; +$_MODULE['<{retailcrm}prestashop>retailcrm_c695cfe527a6fcd680114851b86b7555'] = 'Фамилия'; +$_MODULE['<{retailcrm}prestashop>retailcrm_f9dd946cc89c1f3b41a0edbe0f36931d'] = 'Телефон'; +$_MODULE['<{retailcrm}prestashop>retailcrm_61a649a33f2869e5e35fbb7aff3a80d9'] = 'Email'; +$_MODULE['<{retailcrm}prestashop>retailcrm_2664f03ac6b8bb9eee4287720e407db3'] = 'Адрес'; +$_MODULE['<{retailcrm}prestashop>retailcrm_6ddc09dc456001d9854e9fe670374eb2'] = 'Страна'; +$_MODULE['<{retailcrm}prestashop>retailcrm_69aede266809f89b89fe70681f6a129f'] = 'Область/Край/Республика'; +$_MODULE['<{retailcrm}prestashop>retailcrm_859214628431995197c0558f7b5f8ffc'] = 'Город'; +$_MODULE['<{retailcrm}prestashop>retailcrm_4348f938bbddd8475e967ccb47ecb234'] = 'Почтовый индекс'; +$_MODULE['<{retailcrm}prestashop>retailcrm_78fce82336bbbdca7f6da7564b8f9325'] = 'Улица'; +$_MODULE['<{retailcrm}prestashop>retailcrm_71a6834884666147c0334f0c40bc7295'] = 'Дом/Строение'; +$_MODULE['<{retailcrm}prestashop>retailcrm_f88a77e3d68d251c3dc4008c327b5a0c'] = 'Квартира'; +$_MODULE['<{retailcrm}prestashop>retailcrm_d977f846d110fcb7f71c6f97330c9d10'] = 'Код домофона'; +$_MODULE['<{retailcrm}prestashop>retailcrm_56c1e354d36beb85b0d881c5b2e24cbe'] = 'Этаж'; +$_MODULE['<{retailcrm}prestashop>retailcrm_4d34f53389ed7f28ca91fc31ea360a66'] = 'Корпус'; +$_MODULE['<{retailcrm}prestashop>retailcrm_49354b452ec305136a56fe7731834156'] = 'Дом/Строение'; +$_MODULE['<{retailcrm}prestashop>retailcrm_04176f095283bc729f1e3926967e7034'] = 'Имя'; +$_MODULE['<{retailcrm}prestashop>retailcrm_dff4bf10409100d989495c6d5486035e'] = 'Фамилия'; +$_MODULE['<{retailcrm}prestashop>retailcrm_1c76cbfe21c6f44c1d1e59d54f3e4420'] = 'Компания'; +$_MODULE['<{retailcrm}prestashop>retailcrm_1aadcc03a9dbba84a3c5a5cbfde8a162'] = 'ИНН'; +$_MODULE['<{retailcrm}prestashop>retailcrm_93d03fe37ab3c6abc2a19dd8e41543bd'] = 'Адрес строка 1'; +$_MODULE['<{retailcrm}prestashop>retailcrm_22fcffe02ab9eda5b769387122f2ddce'] = 'Адрес строка 2'; +$_MODULE['<{retailcrm}prestashop>retailcrm_8bcdc441379cbf584638b0589a3f9adb'] = 'Почтовый индекс'; +$_MODULE['<{retailcrm}prestashop>retailcrm_69aede266809f89b89fe70681f6a129f'] = 'Область/Край/Республика'; +$_MODULE['<{retailcrm}prestashop>retailcrm_57d056ed0984166336b7879c2af3657f'] = 'Город'; +$_MODULE['<{retailcrm}prestashop>retailcrm_bcc254b55c4a1babdf1dcb82c207506b'] = 'Телефон'; +$_MODULE['<{retailcrm}prestashop>retailcrm_f0e1fc6f97d36cb80f29196e2662ffde'] = 'Мобильный телефон';