From 5a9567804e58bd2c7a0939cdd3c3a0f3c509dc33 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 21 Feb 2023 09:41:42 +0100 Subject: [PATCH] Prestashop 2.0 --- README.md | 14 +- .../ecomailemailmarketing.php | 984 ++++++++++++++++++ ecomailemailmarketing/index.php | 31 + ecomailemailmarketing/lib/api.php | 240 +++++ ecomailemailmarketing/lib/index.php | 31 + ecomailemailmarketing/logo.png | Bin 0 -> 3484 bytes ecomailemailmarketing/override/index.php | 31 + .../override/modules/index.php | 31 + .../modules/ps_emailsubscription/index.php | 31 + .../ps_emailsubscription.php | 40 + ...ilmarketingEcomailemailmarketing.cs-CZ.xlf | 177 ++++ .../translations/cs-CZ/index.php | 28 + ecomailemailmarketing/translations/index.php | 28 + ecomailemailmarketing/views/index.php | 31 + .../views/templates/hook/ecomail_scripts.tpl | 60 ++ .../views/templates/hook/index.php | 31 + .../views/templates/index.php | 31 + ecomailemailmarketing/webhook.php | 44 + monster_ecomail/lib/api.php | 166 --- monster_ecomail/logo.png | Bin 6616 -> 0 bytes monster_ecomail/mm_logo.png | Bin 14752 -> 0 bytes monster_ecomail/monster_ecomail.php | 640 ------------ .../blocknewsletter/blocknewsletter.php | 21 - .../ps_emailsubscription.php | 53 - monster_ecomail/readme_1.5.html | 74 -- monster_ecomail/webhook.php | 27 - 26 files changed, 1856 insertions(+), 988 deletions(-) create mode 100644 ecomailemailmarketing/ecomailemailmarketing.php create mode 100644 ecomailemailmarketing/index.php create mode 100644 ecomailemailmarketing/lib/api.php create mode 100644 ecomailemailmarketing/lib/index.php create mode 100644 ecomailemailmarketing/logo.png create mode 100644 ecomailemailmarketing/override/index.php create mode 100644 ecomailemailmarketing/override/modules/index.php create mode 100644 ecomailemailmarketing/override/modules/ps_emailsubscription/index.php create mode 100644 ecomailemailmarketing/override/modules/ps_emailsubscription/ps_emailsubscription.php create mode 100644 ecomailemailmarketing/translations/cs-CZ/ModulesEcomailemailmarketingEcomailemailmarketing.cs-CZ.xlf create mode 100644 ecomailemailmarketing/translations/cs-CZ/index.php create mode 100644 ecomailemailmarketing/translations/index.php create mode 100644 ecomailemailmarketing/views/index.php create mode 100644 ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl create mode 100644 ecomailemailmarketing/views/templates/hook/index.php create mode 100644 ecomailemailmarketing/views/templates/index.php create mode 100644 ecomailemailmarketing/webhook.php delete mode 100644 monster_ecomail/lib/api.php delete mode 100644 monster_ecomail/logo.png delete mode 100644 monster_ecomail/mm_logo.png delete mode 100644 monster_ecomail/monster_ecomail.php delete mode 100644 monster_ecomail/override/modules/blocknewsletter/blocknewsletter.php delete mode 100644 monster_ecomail/override/modules/ps_emailsubscription/ps_emailsubscription.php delete mode 100644 monster_ecomail/readme_1.5.html delete mode 100644 monster_ecomail/webhook.php diff --git a/README.md b/README.md index 343e0b8..c36388e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# Prestashop plugin 1.5-1.7 -Modul pro propojení Ecomail s Prestahopem 1.5 a 1.7 +# Prestashop 1.7+ plugin +Ecomail to Prestashop 1.7+ plugin -Tento modul automaticky synchronizuje vaše kontakty do vybraného seznamu u Ecomailu, objednávky a instaluje automaticky trackovací kód pro sledování chování kontaktů na vašich stránkách. +This plugin automatically synchronizes your contacts to a selected list at Ecomail, orders and installs automatically a tracking code to monitor the behavior of contacts on your site. -# Stáhnutí modulu +# Download module -Aktualní verzi modulu můžete stáhnout zde: +You can download the latest version of the module here: -https://github.com/Ecomailcz/Prestashop-1.6/releases/download/1.9.703/monster_ecomail_1.9.702.zip +https://github.com/Ecomailcz/Prestashop-1.6/releases/download/2.0.0/ecomail_2.0.0.zip -Nápovědu k použití modulu naleznete zde: +Help on how to use the module can be found here: https://support.ecomail.cz/hc/cs/articles/209707269-Prestashop-plugin-1-6 diff --git a/ecomailemailmarketing/ecomailemailmarketing.php b/ecomailemailmarketing/ecomailemailmarketing.php new file mode 100644 index 0000000..a2c2f0f --- /dev/null +++ b/ecomailemailmarketing/ecomailemailmarketing.php @@ -0,0 +1,984 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} + +class ecomailemailmarketing extends Module +{ + protected $overridenModules = ['Ps_Emailsubscription']; + + public function __construct() + { + $this->module_key = '3c90ebaffe6722aece11c7a66bc18bec'; + $this->name = 'ecomailemailmarketing'; + $this->tab = 'emailing'; + $this->version = '2.0.0'; + $this->author = 'Ecomail'; + $this->need_instance = 0; + $this->ps_versions_compliancy = ['min' => '1.7.0.0', 'max' => '8.0.1']; + $this->bootstrap = true; + + parent::__construct(); + + $this->displayName = $this->l('Ecomail email marketing'); + $this->description = $this->l('Connection of the e-shop to Ecomail.'); + + $this->confirmUninstall = $this->l('Do you really want to uninstall Ecomail?'); + } + + public function install(): bool + { + return parent::install() && + $this->setValues() && + $this->setTab() && + $this->setDatabase() && + $this->setHooks() && + $this->createWebserviceKey() && + unlink(_PS_CACHE_DIR_ . '/class_index.php'); + } + + public function uninstall(): bool + { + return parent::uninstall() && + $this->unsetValues() && + $this->unsetTab() && + $this->unsetDatabase(); + } + + // Config values + public function setValues(): bool + { + return + Configuration::updateValue('ECOMAIL_SKIP_CONFIRM', 1) && + Configuration::updateValue('PS_WEBSERVICE', 1) && + Configuration::updateValue('PS_WEBSERVICE_CGI_HOST', 1); + } + + public function unsetValues(): bool + { + return + Configuration::deleteByName('ECOMAIL_API_KEY') && + Configuration::deleteByName('ECOMAIL_APP_ID') && + Configuration::deleteByName('ECOMAIL_FORM_ID') && + Configuration::deleteByName('ECOMAIL_FORM_ACCOUNT') && + Configuration::deleteByName('ECOMAIL_WEBSERVICE_KEY') && + Configuration::deleteByName('ECOMAIL_LIST_ID'); + } + + // Admin tabs + public function setTab(): bool + { + return true; + } + + public function unsetTab(): bool + { + return true; + } + + // DB tables + public function setDatabase(): bool + { + return true; + } + + public function unsetDatabase(): bool + { + return true; + } + + // Hooks + public function setHooks(): bool + { + return + $this->registerHook('actionCustomerAccountAdd') && + $this->registerHook('actionValidateOrder') && + $this->registerHook('displayFooter') && + $this->registerHook('actionCustomerNewsletterSubscribed') && + $this->registerHook('actionCartSave') && + $this->registerHook('actionCustomerAccountUpdate') && + $this->registerHook('actionSubmitCustomerAddressForm') && + $this->registerHook('addWebserviceResources'); + } + + public function getContent(): string + { + $output = null; + + if (Tools::isSubmit('submit' . $this->name)) { + $apiKey = Configuration::get('ECOMAIL_API_KEY'); + Configuration::updateValue('ECOMAIL_API_KEY', Tools::getValue('api_key')); + + if (Tools::getValue('api_key') !== $apiKey) { + if (!$this->getAPI()->isApiKeyValid()) { + $output .= $this->displayError($this->l('Invalid API key')); + Configuration::deleteByName('ECOMAIL_API_KEY'); + } + } + + Configuration::updateValue('ECOMAIL_APP_ID', Tools::getValue('app_id')); + Configuration::updateValue('ECOMAIL_FORM_ID', Tools::getValue('form_id')); + Configuration::updateValue('ECOMAIL_FORM_ACCOUNT', Tools::getValue('form_account')); + + // Call initial sync + if ( + Tools::getValue('sync_existing') && + Configuration::get('ECOMAIL_API_KEY') && + ( + (Tools::getValue('sync_existing') !== Configuration::get('ECOMAIL_SYNC_EXISTING')) || + (Configuration::get('ECOMAIL_LIST_ID') !== Tools::getValue('list_id')) + ) + ) { + PrestaShopLogger::addLog('Sync customers and orders'); + $this->syncCustomers(Tools::getValue('list_id')); + $this->syncOrders(); + $output .= $this->displayConfirmation($this->l('Synchronisation of existing contacts and orders was successful.')); + } + + Configuration::updateValue('ECOMAIL_LIST_ID', Tools::getValue('list_id')); + Configuration::updateValue('ECOMAIL_LOAD_ORDER_DATA', Tools::getValue('load_order_data')); + Configuration::updateValue('ECOMAIL_LOAD_NAME', Tools::getValue('load_name')); + Configuration::updateValue('ECOMAIL_LOAD_ADDRESS', Tools::getValue('load_address')); + Configuration::updateValue('ECOMAIL_LOAD_BIRTHDAY', Tools::getValue('load_birthday')); + Configuration::updateValue('ECOMAIL_LOAD_CART', Tools::getValue('load_cart')); + Configuration::updateValue('ECOMAIL_SKIP_CONFIRM', Tools::getValue('skip_confirmation')); + Configuration::updateValue('ECOMAIL_SYNC_EXISTING', Tools::getValue('sync_existing')); + Configuration::updateValue('ECOMAIL_LOAD_GROUP', Tools::getValue('load_group')); + Configuration::updateValue('ECOMAIL_TRIGGER_AUTORESPONDERS', Tools::getValue('trigger_autoresponders')); + } + + if (Configuration::get('ECOMAIL_API_KEY') && !$this->getAPI()->getListsCollection()) { + $output .= $this->displayError($this->l('Unable to connect to Ecomail. Please check your API key.')); + } + + if (Configuration::get('ECOMAIL_API_KEY') && $this->getAPI()->getListsCollection()) { + $output .= $this->displayConfirmation($this->l('Connection to Ecomail is active.')); + $output .= $this->displayConfirmation($this->l('The webhook for updating contacts is at ') . '' . (isset($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . '/modules/ecomailemailmarketing/webhook.php'); + } + + return $output . $this->displayForm(); + } + + public function displayForm(): string + { + // Get default language + $default_lang = (int) Configuration::get('PS_LANG_DEFAULT'); + + if (Configuration::get('ECOMAIL_API_KEY') && $this->getAPI()->getListsCollection()) { + $options = []; + if (Configuration::get('ECOMAIL_API_KEY')) { + $listsCollection = $this->getAPI() + ->getListsCollection(); + foreach ($listsCollection as $list) { + $options[] = [ + 'id_option' => $list->id, + 'name' => $list->name, + ]; + } + } + + // Init Fields form array + $fields_form[0]['form'] = [ + 'legend' => [ + 'title' => $this->l('Ecomail configuration'), + ], + 'input' => [ + [ + 'type' => 'text', + 'label' => $this->l('Enter your API key'), + 'name' => 'api_key', + 'rows' => 20, + 'required' => true, + ], + [ + 'type' => 'select', + 'label' => $this->l('Select a contact list:'), + 'desc' => $this->l( + 'Select the contact list in which the new customers will be synchronised. If you have only just created it, it may take up to 30 minutes to connect to it.' + ), + 'name' => 'list_id', + 'required' => true, + 'options' => [ + 'query' => $options, + 'id' => 'id_option', + 'name' => 'name', + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Update data based on order data'), + 'name' => 'load_order_data', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Send customer names'), + 'name' => 'load_name', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Send customer addresses'), + 'name' => 'load_address', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Send birthday of customers'), + 'name' => 'load_birthday', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Send products in cart'), + 'name' => 'load_cart', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Send customer groups to tags'), + 'name' => 'load_group', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Skip double opt-in'), + 'name' => 'skip_confirmation', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Trigger pipelines for new contacts'), + 'name' => 'trigger_autoresponders', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + [ + 'type' => 'switch', + 'class' => 't', + 'label' => $this->l('Synchronise existing contacts and orders (this operation may take a few minutes)'), + 'name' => 'sync_existing', + 'values' => [ + [ + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Yes'), + ], + [ + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('No'), + ], + ], + ], + ], + 'warning' => $this->l('Click the save button to start synchronizing the data. Wait for the page to reload.'), + 'submit' => [ + 'title' => $this->l('Save'), + 'class' => 'btn btn-default pull-right', + ], + ]; + + $fields_form[1]['form'] = [ + 'legend' => [ + 'title' => $this->l('Tracking'), + ], + 'input' => [ + [ + 'type' => 'text', + 'label' => $this->l('Enter your appId'), + 'desc' => $this->l( + 'This information is used to activate the tracking code and track transactions - only for the Marketer+ tariff' + ), + 'name' => 'app_id', + 'rows' => 20, + ], + ], + 'submit' => [ + 'title' => $this->l('Save'), + 'class' => 'btn btn-default pull-right', + ], + ]; + + $fields_form[2]['form'] = [ + 'legend' => [ + 'title' => $this->l('Sign-up form'), + ], + 'input' => [ + [ + 'type' => 'text', + 'label' => $this->l('Insert Ecomail Form ID'), + 'desc' => $this->l( + 'The js.id value in the form code. See the help for more information' + ), + 'name' => 'form_id', + 'rows' => 20, + ], + [ + 'type' => 'text', + 'label' => $this->l('Insert your Ecomail account name'), + 'name' => 'form_account', + 'rows' => 20, + ], + ], + 'submit' => [ + 'title' => $this->l('Save'), + 'class' => 'btn btn-default pull-right', + ], + ]; + } else { + $fields_form[0]['form'] = [ + 'legend' => [ + 'title' => $this->l('Ecomail configuration'), + ], + 'input' => [ + [ + 'type' => 'text', + 'label' => $this->l('Enter your API key'), + 'name' => 'api_key', + 'rows' => 20, + 'required' => true, + 'desc' => $this->l('Once your API key is loaded correctly, you will select a list of contacts for your e-shop.'), + ], + ], + 'submit' => [ + 'title' => $this->l('Save'), + 'class' => 'btn btn-default pull-right', + ], + ]; + } + + $helper = new HelperForm(); + + // Module, token and currentIndex + $helper->module = $this; + $helper->name_controller = $this->name; + $helper->token = Tools::getAdminTokenLite('AdminModules'); + $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name; + + // Language + $helper->default_form_language = $default_lang; + $helper->allow_employee_form_lang = $default_lang; + + // Title and toolbar + $helper->title = $this->displayName; + $helper->show_toolbar = true; + $helper->toolbar_scroll = true; + $helper->submit_action = 'submit' . $this->name; + $helper->toolbar_btn = [ + 'save' => [ + 'desc' => $this->l('Save'), + 'href' => AdminController::$currentIndex . '&configure=' . $this->name . '&save' . $this->name . + '&token=' . Tools::getAdminTokenLite('AdminModules'), + ], + 'back' => [ + 'href' => AdminController::$currentIndex . '&token=' . Tools::getAdminTokenLite('AdminModules'), + 'desc' => $this->l('Back to list'), + ], + ]; + + // Load current value + $helper->fields_value['api_key'] = Configuration::get('ECOMAIL_API_KEY'); + $helper->fields_value['app_id'] = Configuration::get('ECOMAIL_APP_ID'); + $helper->fields_value['form_id'] = Configuration::get('ECOMAIL_FORM_ID'); + $helper->fields_value['form_account'] = Configuration::get('ECOMAIL_FORM_ACCOUNT'); + $helper->fields_value['list_id'] = Configuration::get('ECOMAIL_LIST_ID'); + $helper->fields_value['load_order_data'] = Configuration::get('ECOMAIL_LOAD_ORDER_DATA'); + + $helper->fields_value['load_name'] = Configuration::get('ECOMAIL_LOAD_NAME'); + $helper->fields_value['load_address'] = Configuration::get('ECOMAIL_LOAD_ADDRESS'); + $helper->fields_value['load_birthday'] = Configuration::get('ECOMAIL_LOAD_BIRTHDAY'); + $helper->fields_value['load_cart'] = Configuration::get('ECOMAIL_LOAD_CART'); + $helper->fields_value['skip_confirmation'] = Configuration::get('ECOMAIL_SKIP_CONFIRM'); + $helper->fields_value['sync_existing'] = Configuration::get('ECOMAIL_SYNC_EXISTING'); + $helper->fields_value['load_group'] = Configuration::get('ECOMAIL_LOAD_GROUP'); + $helper->fields_value['trigger_autoresponders'] = Configuration::get('ECOMAIL_TRIGGER_AUTORESPONDERS'); + + return $helper->generateForm($fields_form); + } + + protected function getAPI(): EcomailAPI + { + require_once __DIR__ . '/lib/api.php'; + + $obj = new EcomailAPI(); + $obj->setAPIKey(Configuration::get('ECOMAIL_API_KEY')); + + return $obj; + } + + // customer registration, cart registration, order without registration + public function hookActionCustomerAccountAdd(array $params): void + { + $newsletter = $params['newCustomer']->newsletter; + $email = $params['newCustomer']->email; + + if (Configuration::get('ECOMAIL_API_KEY')) { + $nameData = []; + $birthdayData = []; + + if (Configuration::get('ECOMAIL_LOAD_NAME')) { + $firstname = $params['newCustomer']->firstname; + $lastname = $params['newCustomer']->lastname; + + $nameData = [ + 'name' => $firstname, + 'surname' => $lastname, + ]; + } + + if (Configuration::get('ECOMAIL_LOAD_BIRTHDAY')) { + $birthdayData = [ + 'birthday' => $params['newCustomer']->birthday, + ]; + } + + $groupTags = []; + if (Configuration::get('ECOMAIL_LOAD_GROUP')) { + $customer = new Customer($email); + $groups = $customer->getGroups(); + + foreach ($groups as $group) { + $group = new Group((int) $group); + $group = (array) $group->name; + + if (count($group) === 0) { + continue; + } + + $groupTags[] = $group[array_key_first($group)]; + } + } + + $newsletterTags = $newsletter ? ['prestashop', 'prestashop_newsletter'] : ['prestashop']; + + $this->getAPI() + ->subscribeToList( + Configuration::get('ECOMAIL_LIST_ID'), + array_merge( + ['email' => $email], + $nameData, + $birthdayData, + ['tags' => array_merge($groupTags, $newsletterTags)] + ) + ); + } + } + + // blocknewsletter - customer subscribe + public function hookActionCustomerNewsletterSubscribed(array $params): void + { + if (Configuration::get('ECOMAIL_API_KEY')) { + $customer = Customer::getCustomersByEmail($params['email']); + + if ($customer) { + $customer = end($customer); + + $nameData = []; + $birthdayData = []; + $addressData = []; + + if (Configuration::get('ECOMAIL_LOAD_NAME')) { + $nameData = [ + 'name' => $customer['firstname'], + 'surname' => $customer['lastname'], + ]; + } + + if (Configuration::get('ECOMAIL_LOAD_BIRTHDAY')) { + $birthdayData = [ + 'birthday' => $customer['birthday'], + ]; + } + + if (Configuration::get('ECOMAIL_LOAD_ADDRESS')) { + if (isset($params['order'])) { + $address = new Address($params['order']->id_address_invoice); + $country = new Country($address->id_country); + + $addressData = [ + 'company' => $customer['company'], + 'country' => $country->iso_code, + ]; + } + } + + $groupTags = []; + if (Configuration::get('ECOMAIL_LOAD_GROUP')) { + $groups = $customer->getGroups(); + + foreach ($groups as $group) { + $group = new Group((int) $group); + $group = (array) $group->name; + + if (count($group) === 0) { + continue; + } + + $groupTags[] = $group[array_key_first($group)]; + } + } + + $newsletterTags = $customer->newsletter ? ['prestashop', 'prestashop_newsletter'] : ['prestashop']; + + $this->getAPI() + ->subscribeToList( + Configuration::get('ECOMAIL_LIST_ID'), + array_merge( + ['email' => $customer['email']], + $nameData, + $birthdayData, + $addressData, + ['tags' => array_merge($groupTags, $newsletterTags)] + ) + ); + } else { + $this->getAPI() + ->subscribeToList( + Configuration::get('ECOMAIL_LIST_ID'), + ['email' => $params['email']] + ); + } + } + } + + // Order submitted + public function hookActionValidateOrder(array $params): void + { + if (Configuration::get('ECOMAIL_LOAD_ORDER_DATA')) { + $customer = new Customer($params['order']->id_customer); + + $nameData = []; + $birthdayData = []; + $addressData = []; + + if (Configuration::get('ECOMAIL_LOAD_NAME')) { + $nameData = [ + 'name' => $customer->firstname, + 'surname' => $customer->lastname, + ]; + } + + if (Configuration::get('ECOMAIL_LOAD_BIRTHDAY')) { + $birthdayData = [ + 'birthday' => $customer->birthday, + ]; + } + + if (Configuration::get('ECOMAIL_LOAD_ADDRESS')) { + $address = new Address($params['order']->id_address_invoice); + $country = new Country($address->id_country); + + $addressData = [ + 'city' => $address->city, + 'street' => $address->address1, + 'zip' => $address->postcode, + 'country' => $country->iso_code, + 'company' => $address->company, + ]; + } + + $groupTags = []; + if (Configuration::get('ECOMAIL_LOAD_GROUP')) { + $groups = $customer->getGroups(); + + foreach ($groups as $group) { + $group = new Group((int) $group); + $group = (array) $group->name; + + if (count($group) === 0) { + continue; + } + + $groupTags[] = $group[array_key_first($group)]; + } + } + + $newsletterTags = $customer->newsletter ? ['prestashop', 'prestashop_newsletter'] : ['prestashop']; + + $this->getAPI() + ->subscribeToList( + Configuration::get('ECOMAIL_LIST_ID'), + array_merge( + [ + 'email' => $customer->email, + 'tags' => array_merge($newsletterTags, $groupTags), + ], + $nameData, + $birthdayData, + $addressData + ) + ); + } + + $this->getAPI()->createTransaction($params['order']); + } + + public function hookActionCartSave(array $params): void + { + if (Configuration::get('ECOMAIL_LOAD_CART')) { + if (!isset($this->context->cart)) { + return; + } + + $cartProducts = $this->context->cart->getProducts(); + + $products = []; + foreach ($cartProducts as $p) { + $productCat = new Category($p['id_category_default']); + $products[] = [ + 'productId' => $p['id_product'], + 'img_url' => $this->context->link->getImageLink($p['link_rewrite'], $p['id_image']), + 'url' => $this->context->link->getProductLink((int) $p['id_product'], $p['link_rewrite'], $productCat->link_rewrite[$this->context->language->id]), + 'name' => $p['name'], + 'price' => $p['price_wt'], + ]; + } + + if (!$this->context->customer->email) { + return; + } + + $result = $this->getAPI()->sendBasket($this->context->customer->email, $products); + + if (isset($result->errors)) { + PrestaShopLogger::addLog('Ecomail failed: ' . json_encode($result), 1, null, 'Cart', (int) $this->context->cart->id, true); + } + } + } + + public function hookDisplayFooter(array $params): string + { + $this->context->smarty->assign( + [ + 'ECOMAIL_APP_ID' => Configuration::get('ECOMAIL_APP_ID'), + 'ECOMAIL_FORM_ID' => Configuration::get('ECOMAIL_FORM_ID'), + 'ECOMAIL_FORM_ACCOUNT' => Configuration::get('ECOMAIL_FORM_ACCOUNT'), + 'EMAIL' => $this->context->cookie->email ?? 'empty', + ] + ); + + return $this->display(__FILE__, 'ecomail_scripts.tpl'); + } + + public function createWebserviceKey(): bool + { + $apiAccess = new WebserviceKey(); + $apiAccess->key = substr(str_shuffle('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 1, 32); + $apiAccess->description = 'Ecomail webservice key'; + $apiAccess->save(); + + $permissions = [ + 'customers' => ['GET' => 1], + 'orders' => ['GET' => 1], + 'products' => ['GET' => 1], + 'tags' => ['GET' => 1], + ]; + + WebserviceKey::setPermissionForAccount($apiAccess->id, $permissions); + Configuration::updateValue('ECOMAIL_WEBSERVICE_KEY', $apiAccess->key); + + return true; + } + + public function syncCustomers(string $listId): void + { + $allCustomers = $this->requestGet(sprintf('%s%sapi/', _PS_BASE_URL_, __PS_BASE_URI__), 'customers'); + + $customersToImport = []; + + if (!$allCustomers || !isset($allCustomers['customers'])) { + return; + } + + foreach ($allCustomers['customers'] as $customer) { + $groupTags = []; + + if (isset($customer['associations']) && isset($customer['associations']['groups'])) { + foreach ($customer['associations']['groups'] as $group) { + $group = new Group((int) $group['id']); + $group = (array) $group->name; + $groupTags[] = $group[array_key_first($group)]; + } + } + + $newsletterTags = $customer['newsletter'] === '1' ? ['prestashop_newsletter', 'prestashop'] : ['prestashop']; + + $customersToImport[] = [ + 'name' => $customer['firstname'], + 'surname' => $customer['lastname'], + 'email' => $customer['email'], + 'birthday' => $customer['birthday'], + 'tags' => array_merge($groupTags, $newsletterTags), + ]; + } + + if (count($customersToImport) > 0) { + $chunks = array_chunk($customersToImport, 3000); + + foreach ($chunks as $chunk) { + $this->getAPI()->bulkSubscribeToList($listId, $chunk); + } + } + } + + public function requestGet(string $url, string $event): ?array + { + $ch = curl_init(); + $display = '?display=full'; + $url = $url . $event . $display; + + $headers = [ + 'output_format:JSON', + 'Authorization: Basic ' . base64_encode(Configuration::get('ECOMAIL_WEBSERVICE_KEY') . ':'), + ]; + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + $response = curl_exec($ch); + + curl_close($ch); + + return json_decode(stripslashes($response), true, JSON_UNESCAPED_SLASHES); + } + + public function syncOrders(): void + { + $allOrders = $this->requestGet(sprintf('%s%sapi/', _PS_BASE_URL_, __PS_BASE_URI__), 'orders'); + + $ordersToImport = []; + + if (!$allOrders || !isset($allOrders['orders'])) { + return; + } + + foreach ($allOrders['orders'] as $order) { + if (!isset($order['associations']['order_rows'])) { + continue; + } + + $transaction = $this->getAPI()->buildTransaction($order); + $transactionItems = []; + + foreach ($order['associations']['order_rows'] as $item) { + $transactionItems[] = $this->getAPI()->buildTransactionItems($item, $order['date_add']); + } + + $ordersToImport[] = [ + 'transaction' => $transaction, + 'transaction_items' => $transactionItems, + ]; + } + + if (count($ordersToImport) > 0) { + $chunks = array_chunk($ordersToImport, 1000); + + foreach ($chunks as $chunk) { + $this->getAPI()->bulkOrders($chunk); + } + } + } + + public function hookActionCustomerAccountUpdate(array $params): void + { + $newsletter = $params['customer']->newsletter; + $email = $params['customer']->email; + + if (Configuration::get('ECOMAIL_API_KEY')) { + $nameData = []; + $birthdayData = []; + + if (Configuration::get('ECOMAIL_LOAD_NAME')) { + $firstname = $params['customer']->firstname; + $lastname = $params['customer']->lastname; + + $nameData = [ + 'name' => $firstname, + 'surname' => $lastname, + ]; + } + + if (Configuration::get('ECOMAIL_LOAD_BIRTHDAY')) { + $birthday = $params['customer']->birthday; + + $birthdayData = [ + 'birthday' => $birthday, + ]; + } + + $groupTags = []; + if (Configuration::get('ECOMAIL_LOAD_GROUP')) { + $customer = new Customer($email); + $groups = $customer->getGroups(); + + foreach ($groups as $group) { + $group = new Group((int) $group); + $group = (array) $group->name; + + if (count($group) === 0) { + continue; + } + + $groupTags[] = $group[array_key_first($group)]; + } + } + + $newsletterTags = $newsletter ? ['prestashop', 'prestashop_newsletter'] : ['prestashop']; + + $this->getAPI() + ->subscribeToList( + Configuration::get('ECOMAIL_LIST_ID'), + array_merge( + ['email' => $email], + $nameData, + $birthdayData, + ['tags' => array_merge($groupTags, $newsletterTags)] + ) + ); + } + } + + public function hookActionSubmitCustomerAddressForm(array $params): void + { + if (Configuration::get('ECOMAIL_LOAD_ADDRESS')) { + $country = new Country($params['address']->id_country); + $customer = new Customer($params['address']->id_customer); + + $addressData = [ + 'city' => $params['address']->city, + 'street' => $params['address']->address1, + 'zip' => $params['address']->postcode, + 'country' => $country->iso_code, + 'company' => $params['address']->company, + 'phone' => $params['address']->phone, + ]; + + $this->getAPI() + ->subscribeToList( + Configuration::get('ECOMAIL_LIST_ID'), + array_merge( + ['email' => $customer->email], + $addressData, + ) + ); + } + } + + public function hookAddWebserviceResources(array $params): bool + { + return true; + } +} diff --git a/ecomailemailmarketing/index.php b/ecomailemailmarketing/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/lib/api.php b/ecomailemailmarketing/lib/api.php new file mode 100644 index 0000000..65b4b8d --- /dev/null +++ b/ecomailemailmarketing/lib/api.php @@ -0,0 +1,240 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +class EcomailAPI +{ + protected string $APIKey; + + public function setAPIKey($arg): self + { + $this->APIKey = $arg; + + return $this; + } + + public function getListsCollection() + { + return $this->call('lists'); + } + + public function subscribeToList(string $listId, array $customerData) + { + return $this->call( + sprintf( + 'lists/%d/subscribe', + $listId + ), + 'POST', + [ + 'subscriber_data' => $customerData, + 'resubscribe' => true, + 'update_existing' => true, + 'skip_confirmation' => (bool) Configuration::get('ECOMAIL_SKIP_CONFIRM'), + 'trigger_autoresponders' => (bool) Configuration::get('ECOMAIL_TRIGGER_AUTORESPONDERS'), + ] + ); + } + + public function sendBasket(string $email, array $products) + { + $data = json_encode([ + 'data' => [ + 'data' => [ + 'action' => 'Basket', + 'products' => $products, + ], + ], + ]); + + return $this->call( + 'tracker/events', + 'POST', + [ + 'event' => [ + 'email' => $email, + 'category' => 'ue', + 'action' => count($products) === 0 ? 'PrestaEmptyBasket' : 'PrestaBasket', + 'label' => 'Basket', + 'value' => "$data", + ], + ] + ); + } + + public function createTransaction(Order $order) + { + $arr = []; + + foreach ($order->getProducts() as $orderProduct) { + $arr[] = $this->buildTransactionItems($orderProduct, (int) $order->date_add); + } + + return $this->call( + 'tracker/transaction', + 'POST', + [ + 'transaction' => $this->buildTransaction($order), + 'transaction_items' => $arr, + ] + ); + } + + protected function call(string $url, string $method = 'GET', ?array $data = null) + { + $ch = curl_init(); + + curl_setopt( + $ch, + CURLOPT_URL, + 'https://api2.ecomailapp.cz/' . $url + ); + curl_setopt( + $ch, + CURLOPT_RETURNTRANSFER, + true + ); + curl_setopt( + $ch, + CURLOPT_HEADER, + false + ); + curl_setopt( + $ch, + CURLOPT_HTTPHEADER, + [ + 'Content-Type: application/json', + 'Key: ' . $this->APIKey, + ] + ); + + if (in_array($method, ['POST', 'PUT'])) { + curl_setopt( + $ch, + CURLOPT_CUSTOMREQUEST, + $method + ); + + curl_setopt( + $ch, + CURLOPT_POSTFIELDS, + json_encode($data) + ); + } + + $response = curl_exec($ch); + curl_close($ch); + + return json_decode($response); + } + + public function bulkSubscribeToList(string $listId, array $data) + { + return $this->call( + sprintf( + 'lists/%d/subscribe-bulk', + $listId + ), + 'POST', + [ + 'subscriber_data' => $data, + 'resubscribe' => true, + 'update_existing' => true, + 'skip_confirmation' => (bool) Configuration::get('ECOMAIL_SKIP_CONFIRM'), + ] + ); + } + + public function bulkOrders(array $data) + { + return $this->call( + 'tracker/transaction-bulk', + 'POST', + [ + 'transaction_data' => $data, + ], + ); + } + + /** + * @param array|Order $order + * + * @return array + */ + public function buildTransaction($order): array + { + $addressData = []; + + if (Configuration::get('ECOMAIL_LOAD_ADDRESS')) { + $addressDelivery = new Address($order->id_address_delivery); + + $addressDeliveryCountry = new Country($addressDelivery->id_country); + $iso_code = $addressDeliveryCountry->iso_code; + + $addressData = [ + 'city' => $addressDelivery->city, + 'country' => $iso_code, + ]; + } + + if (is_array($order)) { + $customer = new Customer($order['id_customer']); + } else { + $customer = $order->getCustomer(); + $order = (array) $order; + } + + return array_merge( + [ + 'order_id' => 'presta_' . $order['id'], + 'email' => $customer->email, + 'shop' => 'prestashop', + 'amount' => round($order['total_paid_tax_incl'], 2), + 'tax' => round($order['total_paid_tax_incl'] - $order['total_paid_tax_excl'], 2), + 'shipping' => round($order['total_shipping'], 2), + 'timestamp' => strtotime($order['date_add']), + ], + $addressData + ); + } + + public function buildTransactionItems(array $orderProduct, int $timestamp): array + { + $product = new Product($orderProduct['product_id']); + $category = new Category($product->getDefaultCategory()); + + return [ + 'code' => $orderProduct['product_reference'], + 'title' => $orderProduct['product_name'], + 'category' => $category->getName(), + 'price' => round($orderProduct['unit_price_tax_incl'], 2), + 'amount' => $orderProduct['product_quantity'], + 'timestamp' => strtotime($timestamp), + ]; + } + + public function isApiKeyValid(): bool + { + $response = (array) $this->call('account'); + + return !(isset($response['message']) && $response['message'] === 'Wrong api key'); + } +} diff --git a/ecomailemailmarketing/lib/index.php b/ecomailemailmarketing/lib/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/lib/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/logo.png b/ecomailemailmarketing/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ed0f3b85b6975b7932730684be7b0875a3899053 GIT binary patch literal 3484 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 V2c4!~y16g@FA;Gra1BU1{(oY)?_&S} literal 0 HcmV?d00001 diff --git a/ecomailemailmarketing/override/index.php b/ecomailemailmarketing/override/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/override/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/override/modules/index.php b/ecomailemailmarketing/override/modules/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/override/modules/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/override/modules/ps_emailsubscription/index.php b/ecomailemailmarketing/override/modules/ps_emailsubscription/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/override/modules/ps_emailsubscription/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/override/modules/ps_emailsubscription/ps_emailsubscription.php b/ecomailemailmarketing/override/modules/ps_emailsubscription/ps_emailsubscription.php new file mode 100644 index 0000000..4657140 --- /dev/null +++ b/ecomailemailmarketing/override/modules/ps_emailsubscription/ps_emailsubscription.php @@ -0,0 +1,40 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} + +class Ps_EmailsubscriptionOverride extends Ps_Emailsubscription +{ + protected function register($email, $register_status) + { + Hook::exec('actionCustomerNewsletterSubscribed', ['email' => $email]); + + if ($register_status == self::GUEST_NOT_REGISTERED) { + return $this->registerGuest($email); + } + + if ($register_status == self::CUSTOMER_NOT_REGISTERED) { + return $this->registerUser($email); + } + + return false; + } +} diff --git a/ecomailemailmarketing/translations/cs-CZ/ModulesEcomailemailmarketingEcomailemailmarketing.cs-CZ.xlf b/ecomailemailmarketing/translations/cs-CZ/ModulesEcomailemailmarketingEcomailemailmarketing.cs-CZ.xlf new file mode 100644 index 0000000..c08ac4e --- /dev/null +++ b/ecomailemailmarketing/translations/cs-CZ/ModulesEcomailemailmarketingEcomailemailmarketing.cs-CZ.xlf @@ -0,0 +1,177 @@ + + + + + + Invalid API key + Invalid API key + Line: + + + Ecomail email marketing + Ecomail email marketing + Line: + + + Connection of the e-shop to Ecomail. + Napojení e-shopu na Ecomail. + Line: + + + Do you really want to uninstall Ecomail? + Opravdu si přejete odinstalovat napojení na Ecomail? + Line: + + + Synchronisation of existing contacts and orders was successful. + Synchronizece existujících kontaktů a objednávek proběhla v pořádku. + Line: + + + Unable to connect to Ecomail. Please check your API key. + Nepodařilo se spojit se službou Ecomail. Zkontrolujte prosím svůj API klíč. + Line: + + + Connection to Ecomail is active. + Spojení se službou Ecomail je aktivní. + Line: + + + The webhook for updating contacts is at + Webhook pro zpětnou aktualizaci kontaktů je na adrese + Line: + + + Ecomail configuration + Konfigurace Ecomail + Line: + + + Enter your API key + Vložte Váš API klíč + Line: + + + Select a contact list: + Vyberte seznam kontaktů: + Line: + + + Select the contact list in which the new customers will be synchronised. If you have only just created it, it may take up to 30 minutes to connect to it. + Vyberte list do kterého budou zapsáni noví zákazníci. Pokud jste jej vytvořili teprve nyní, může trvat až 30 minut, než bude možné se na něj napojit. + Line: + + + Update data based on order data + Aktualizovat údaje na základě dat z objednávek + Line: + + + Yes + Ano + Line: + + + No + Ne + Line: + + + Send customer names + Odesílat jména zákazníků + Line: + + + Send customer addresses + Odesílat adresy zákazníků + Line: + + + Send birthday of customers + Odesílat data narození zákazníků + Line: + + + Send products in cart + Odesílat produkty v košíku + Line: + + + Send customer groups to tags + Odesílat skupiny zákazníka do štítků + Line: + + + Skip double opt-in + Přeskočit double opt-in + Line: + + + Trigger pipelines for new contacts + Spustit automatizace pro nové kontakty + Line: + + + Synchronise existing contacts and orders (this operation may take a few minutes) + Synchronizovat existující kontakty a objednávky (tato operace může trvat několik minut) + Line: + + + Click the save button to start synchronizing the data. Wait for the page to reload. + Kliknutím na tlačítko uložit zahájíte synchronizaci dat. Počkejte, až se stránka znovu načte. + Line: + + + Save + Uložit + Line: + + + Tracking + Sledování uživatelů + Line: + + + Enter your appId + Vložte Vaše appId + Line: + + + This information is used to activate the tracking code and track transactions - only for the Marketer+ tariff + Tento údaj slouží pro aktivaci trackovacího kódu a sledování transakcí - pouze pro tarif Marketer+ + Line: + + + Sign-up form + Formulář + Line: + + + Insert Ecomail Form ID + Vložte ID Ecomail formuláře + Line: + + + The js.id value in the form code. See the help for more information + Hodnota js.id v kódu formuláře. Více informací se dozvíte v nápovědě + Line: + + + Insert your Ecomail account name + Vložte název Vašeho účtu u Ecomailu + Line: + + + Once your API key is loaded correctly, you will select a list of contacts for your e-shop. + Po správném načtení vašeho API klíče si zvolíte seznam kontaktů pro váš e-shop. + Line: + + + Back to list + Zpět do seznamu + Line: + + + + diff --git a/ecomailemailmarketing/translations/cs-CZ/index.php b/ecomailemailmarketing/translations/cs-CZ/index.php new file mode 100644 index 0000000..296d682 --- /dev/null +++ b/ecomailemailmarketing/translations/cs-CZ/index.php @@ -0,0 +1,28 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/translations/index.php b/ecomailemailmarketing/translations/index.php new file mode 100644 index 0000000..296d682 --- /dev/null +++ b/ecomailemailmarketing/translations/index.php @@ -0,0 +1,28 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/views/index.php b/ecomailemailmarketing/views/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/views/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl b/ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl new file mode 100644 index 0000000..a5f3458 --- /dev/null +++ b/ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl @@ -0,0 +1,60 @@ +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to https://devdocs.prestashop.com/ for more information. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + *} +{* Ecomail starts *} + +{* Ecomail stops *} +{* Ecomail form start *} + +{* Ecomail form end *} diff --git a/ecomailemailmarketing/views/templates/hook/index.php b/ecomailemailmarketing/views/templates/hook/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/views/templates/hook/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/views/templates/index.php b/ecomailemailmarketing/views/templates/index.php new file mode 100644 index 0000000..089aa56 --- /dev/null +++ b/ecomailemailmarketing/views/templates/index.php @@ -0,0 +1,31 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +if (!defined('_PS_VERSION_')) { + exit; +} +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../'); +exit; diff --git a/ecomailemailmarketing/webhook.php b/ecomailemailmarketing/webhook.php new file mode 100644 index 0000000..1eaf0b0 --- /dev/null +++ b/ecomailemailmarketing/webhook.php @@ -0,0 +1,44 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + */ +require dirname(__FILE__) . '/../../config/config.inc.php'; + +$requestJson = Tools::file_get_contents('php://input'); + +if ($requestJson) { + $request = json_decode($requestJson); + + $email = $request->payload->email; + + $customer = new Customer(); + + $customers = $customer->getCustomersByEmail($email); + + if ($request->payload->status === 'SUBSCRIBED') { + $newsletterStatus = '1'; + } else { + $newsletterStatus = '0'; + } + + foreach ($customers as $customer) { + $customerObject = new Customer($customer['id_customer']); + $customerObject->newsletter = $newsletterStatus; + $customerObject->save(); + } +} diff --git a/monster_ecomail/lib/api.php b/monster_ecomail/lib/api.php deleted file mode 100644 index 8c08ff9..0000000 --- a/monster_ecomail/lib/api.php +++ /dev/null @@ -1,166 +0,0 @@ -APIKey = $arg; - - return $this; - } - - public function getListsCollection() { - - return $this->call( 'lists' ); - - } - - public function subscribeToList( $listId, $customerData ) { - - return $this->call( - sprintf( - 'lists/%d/subscribe', - $listId - ), - 'POST', - array( - 'subscriber_data' => $customerData, - 'resubscribe' => true, - 'update_existing' => true, - 'skip_confirmation' => Configuration::get('MONSTER_ECOMAIL_SKIP_CONFIRM')?true:false - ) - ); - - } - - public function sendBasket($email, $products ) { - $data = json_encode( - array( - 'data' => array( - 'data' => array( - 'action' => 'Basket', - 'products' => $products - ) - ) - )); - return $this->call( - 'tracker/events', - 'POST', - array( - 'event' => array( - 'email' => $email, - 'category' => 'ue', - 'action' => 'Basket', - 'label' => 'Basket', - 'value' => "$data" - ) - ) - ); - } - - public function createTransaction( Order $order ) { - - $shopUrl = new ShopUrl( $order->id_shop ); - - $addressData = array(); - if(Configuration::get('MONSTER_ECOMAIL_LOAD_ADDRESS')) { - $addressDelivery = new Address($order->id_address_delivery); - - $addressData = array( - 'city' => $addressDelivery->city, - 'country' => $addressDelivery->country - ); - } - - $arr = array(); - foreach ($order->getProducts() as $orderProduct) { - $product = new Product($orderProduct['product_id']); - $category = new Category($product->getDefaultCategory()); - $arr[] = array( - 'code' => $orderProduct['product_reference'], - 'title' => $orderProduct['product_name'], - 'category' => $category->getName(), - 'price' => round($orderProduct['unit_price_tax_incl'], 2), - 'amount' => $orderProduct['product_quantity'], - 'timestamp' => strtotime($order->date_add) - ); - } - - return $this->call( - 'tracker/transaction', - 'POST', - array( - 'transaction' => array_merge( - array( - 'order_id' => $order->id, - 'email' => $order->getCustomer()->email, - 'shop' => $shopUrl->getURL(), - 'amount' => round($order->total_paid_tax_incl, 2), - 'tax' => round($order->total_paid_tax_incl - $order->total_paid_tax_excl, 2), - 'shipping' => round($order->total_shipping, 2), - 'timestamp' => strtotime( $order->date_add ) - ), $addressData), - 'transaction_items' => $arr - ) - ); - - } - - protected function call( $url, $method = 'GET', $data = null ) { - $ch = curl_init(); - - curl_setopt( - $ch, - CURLOPT_URL, - "http://api2.ecomailapp.cz/" . $url - ); - curl_setopt( - $ch, - CURLOPT_RETURNTRANSFER, - TRUE - ); - curl_setopt( - $ch, - CURLOPT_HEADER, - FALSE - ); - curl_setopt( - $ch, - CURLOPT_HTTPHEADER, - array( - "Content-Type: application/json", - 'Key: ' . $this->APIKey - ) - ); - - if( in_array( - $method, - array( - 'POST', - 'PUT' - ) - ) - ) { - - curl_setopt( - $ch, - CURLOPT_CUSTOMREQUEST, - $method - ); - - curl_setopt( - $ch, - CURLOPT_POSTFIELDS, - json_encode( $data ) - ); - - } - - $response = curl_exec( $ch ); - curl_close( $ch ); - - return json_decode( $response ); - } - -} \ No newline at end of file diff --git a/monster_ecomail/logo.png b/monster_ecomail/logo.png deleted file mode 100644 index 39c1325289770cbccf873b7ce22320ece79f84c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6616 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 eX$mX2Lo_x#Vlmb)sNsA47aXa55%)dyYx diff --git a/monster_ecomail/mm_logo.png b/monster_ecomail/mm_logo.png deleted file mode 100644 index aead4a28eb04946502f2f0c5c593d3efdd342a13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14752 zcmeHu^;=s{&~JiMtSuBNUV%a>T1apxRV2{j4h2H-Ai*U-A*E=GH+TyaclRQ}p~VRj z++6|$x%uAv58Pkh=XuZbBxm>R%-|VOQ(-kT<;vrt*t&-nOk}}_gKjQ0Fp1>y;Ril zoZg;o@?L&D&b7XNZRu;rhh|le0ojEecF`{v@%9>)R1_=3)ufdditE=C=@{CTTNc0S zWsS~$%C%DTrW#~%BKo6S=WDzrQ8(Z=uyOCG>nAawzhegyLvPr>S?ERu&?rBt09d02B>##76!Jb+ zullRU91UeikOQ7fo>KuK_DuDJJ;!pxk91_H{*tQJ~k-Sf803>YtnJ*NWv>~EUTxT_lU zX*Bv&-i;d&gW^B#!~Xt{cHFwR_QcujW9V;y39f|$b2D}1vvhkRK(6{m7eoZ8+mN>M z#X#Wy@eF(eLQ*2Fe%}IgE5j`j7Mox|Og4%{F)EWF($g&x;Qvb$kPx~{xBf1myGO)s zkvX3*iFNXf(<)y6-}3SbTJ^20nf0%od3Q;{P;FpLq|~Js&wxRqz`wHaYnFT>E-L3I z3o^b^9j&6NywotqU_$jgx3}z1ivr63iig902)CYF(+dMzKaDT&X;$pzEa&;u<#!Mo zt#TwaqekgEzGkYoKG>xv2j3b8GS74dqP}e`7=;|`r$iD6^08g~l`r|IB0Z=ko*GlN zPPRoFP*zJ2lYqy&fM(yZt2&^+dUOm}iYy?rcx_oJXTv6tI3+IdINz(Jsx>V8T$PEd z*5+QVj7&AIKKzc>f(?azELW|U19w~WfHV8m#rB^24GrRt8y~~$x}f{0c`Y?$B4~-Z zwL?vz1|yg9ToJDpgoBN-;j5zAGN`xA)~qiu)NI&FeWyIz=2idCxN=!Ki9u4txs0FT zWHcX9iXSPufCt=ie`Bph>!IbdCy4%(W6#ARH`bwuduH~!U^#Y4LyG|pM38;BV3Eq7 zG8f9{E);GMc3QxSEPSFq(i%b{k^Wqfw)N$OK#>#i%hNgvq92L3VkQ*th_-%$_?T2q z)JIwCwC#^(x~L~^aPPUM;V)s7ccyxO%fM(1iaa(7>c73LPqh0Ur@RLc;Y_-B|1BQ z$>k8FS8##{g%`z#Pia#sytc8X6-QispjOkbOIj1y1eq90&j94&ZJ9Iw#Xq-IL~@av z(Sjb>&2#yPIfQr4*ka#qmeeC&bY|vhz4|&)A8ULA0i3 z#i7$rE0kels|3o>V2xJpS&e?#f}U2fth9=WE{*k{hzTn9fNi z1#PCZ+JUg+SJj^Q{OvI{Oer|9^QXIF)V}PsA?@$f2CZ#~(16TJhRd^$ zTp}l%Ej0r^U%{qfZrU0uC+NiBX(ER)^7dti!I(Cg*CXw>@s~mvFh=%bMjQ+(5#{KTau2#l1IqIkh>mLqIXZOcQr9MG4{y6iLi_6aU zApuwQJ<`Zx+mu_C>k=wuaV$z3kp<$JmHa^i)&}xapCCN66yuqO>`^RQtpZ~#vxTc? zaZgHFs^?ZM)yJXT&2x@>8uwDZHSI8CXKGc69{1+ep6HnUgmJRL-bGmB|MGJIUUdYp<#J7L59CjjQSzEH+@P!3oAAwg(Q& z!3R7a1DiKO1(7CR4a-%g`HU^5C=1-b?7L5T7z{=GZ4O%af0^FV-C~>>CBEsG6fiU+ zcQ<>VGxI(3_!(O@X-81hfvDG3Sk!_o*_!uP0f(LMlyO-`?b6KYGh=|Ii)mshRnuOsz2#+ZUe@6* z1=IP+R}mVu^OWk+Ic~@e_;9W?;K{L{u3G7x^i6q*fB@X2e}Fxmbbv?dx^*!s9N%j$ zRu78aX@5F}$`tdSkP8aHt1$t}LG6M)^N(X)=4I+kKFdqIu-|&b9M$V}Z%afDH4rg) zj>;ImucvSd?IA74(A?E6IUeGn5Oy)_aMF!`7o&Yw2~Oy#7t_r&_bo!v{2k{dUTz!- z??=;A5Eg;*3a31Ax|K#CwL8v|D!_<)p9dee=8+Hn26oSVGC)R5%Z+{6vk_aU`{6QQ zP^A!^ccslF3_D#VpH&E5+^zu)1kka#8vhvL-HsjktT?Fq#{Z^Di2+C}DNU6l6`RXE z>Q0KKe z$}CXc5|)%#wN1m~&00?vFiPJzWVepmRvkT#kv% zS&6%75>Vd6+4*kw9w_)$_i2zl_+_8N&yoCn3-2#nYgG;}qMWyvi4X$Db(yxwRcb*? zQi=Do_}li%rC@0sV&R*|-SY>%kK^K~-+xoSx6P?!vM52l2R&>^dESQRITn(OveTU9 z0IPFGc}9okBJ|6}swL3dY7_y5cVb6MF7|3uT@DeYVJD?1nBytxu~;={`5@WKa%a)_La7qR*F6UvcoBDS~07eZ&$rm zleV|pM5 z7W5Wj-w|%uqonR&okg8V8~RO|Ic@p}URZm+spJDq6_KTtCN|`ff4R(LNSW)qHv2nP zkmCE(+luw1*NE*nEhD!1t-NcLAL}8sF3q_`TlV7NSntZ3V73B8`Q6k!(v7M)8_J{I z9FBj+_hcuwNmA|X=-EEG|~jjiOP@L{^$MJRnX{}*U939*20-zqRUifW5KA> z2;-TBuseNjG+V{PiRhgzo>o4a$YfJCNKZtS=i;mdzHGnw>smJ|YQEw=*O$sx&KP3^ zVZ=N1+x+U{8~|OPESL%sj2<=b9^h%;d+0W#5Y_cO?lc+55K?0j!a?;v%0kj@rj+jK zwwu|HDa;qPqlIVrTmRzspR4Zg_xc!#JK*I?P&aep&zL66uQ7oBF`QbA>xXXqY#PXT z2p1k0<%1|xHD>m?{`2arv7H{yHvN?}%9_P8aJ*dTl{K+WX2i#X@P7ZANEN=A*oqk4 z9fivq1|=Cy#{~^a$XCwYNk;6T1F(Y|i4`F9qQ$0ayEmehCsE-I`=HFGq(t&b&()p4 zj$t6C_wl`?X?|5hRj(F$H!aHfKKC~Vp2XlOuPcJ7EBTD0=GTKIzfD!5@q*!iGx$2T zizq;WF~=y)-vd595(5pa!o--qcXCv}&I#kZ(I`#cPmx?b~tkls5% zDO4z#)0JE7@I$H3S$C5^LKjsrtLHAh;5=E)b>5$SFUf#b9K;ulG8!X_(+_CYruU^5 zaf6SfJVcZ2qRBqu*hLF@1&dlg5T`sQ1ren@FN!N{b$=IZkz;BaQmMlBt6LOKIcElA zyjT*~oE4r6$tCTn1_fEnh8*H(7fVZSd8Kors##}r)bPIQ?n@J?dksFPP3W)s>3uOd z3JngWCv%y%RBgomYM$-x{>fuxE}&X>Vqp_=&FOxmR;FN{y%m_JT4gq+cJ?!hOBGp^evqG z$}zLW4fOu$a`WZB=t`PCD<@DmJ})%KePp~KMgnf~70(4`v277e3Gk1otw<; zl;yLZ7{Bt5?>{#4+%|WFM;H71q?W6sn;cjWJ*o%4YWB#q==NPhXAlPx3tJS*s_*1< zWCC0SbXr`(NONN9f8&x~40B7Qux;|xq(TC=>z`^`4JG`u4UGKbWR{#W*?D2xq54ll z=^j&Q*~d9QchLV(MI}d{;_w_v=tL`J45@!F%sb5kza9C z**njr848)#4!NXhKSj7|lm1$pMLsZ#9!_`fk~Y;{UZPu4C51)U$M#Yx2HqVY z|0`c|eAV06-pD_YTkV@H*v*2)LN*CMEUU&5oRzp4yqR{@!U$7Mdk1zZm#SlEDQv@&+4ha0tCD@@7I@k+=wpTDO}nU z&CNa)A288wT_jGiU_AP&?j{Mz+qsY~nyq|ZG*aoSr2WYJi*0gOew!C~(P!@kj&IW9 zQqD>0v?7!5(-2IMh%Ku5OB~j3#N`fgakW@3BxvkwW_0bJqhv?G1qsL^Cq=V6lOwl} zwC0vh;aH^wGGCRQTq^HPvqp9|W9LL|^8QC3lVP8+=d3O-gkN^ zCGo={6+dUM2}{>va^E3L`rqmdFj-_7r2AOs?Os;T@~F>XS-lM^$2dgZ_EZoR;4>Uj zN{#xK-W-~8sE@29?PiiCYW*%jK34gdf!8TWcHXQ^UCGt3w!oGsQcfC ztE9TnMup0LkW^y(B3w`}r9k*P$xYy&AL!rESEkz79KW))ASPt$^_{fP+QoGIuM%~X z!rvGM)g?h02Ty#ds~|Czhh*Ex*pBK&@sHm(&(-ji4n~7s0|Dzno#*qs-PjIQwCSJH zkTxaEbA49LR&KfjDaMMj8ztS+Xnn1S6{N=Mndhu!24Noj;sUL;J%^EipBM99)D>uq zXBi)4)up-^NZNB5ZZ04K$nR%wZ#)kfF>{a0i61ZY?C0&zGROgod*>T`2X8H4VkQca z%*RDab?u)NYC0wL0ZLkZ$GEWIu)df#%93PWB29j*g_*$Y*v!H zx`*;`hYIlkD(K6$nT`SH`7JUMaGykHP=L^s;P{CO{XTV>N52jIXv)R9dG%uO$VA(< zX6dJ`7^gO@JN~nUm;mM;a_6wfh7s_R3`rW+uBE-Y=Zu;?7nh;2GHyAng3~kjJ=7!) zKN+@k-gOHBAXmQXf4@t0#PKJ6%UwrNmS!Ib9=&REyp0u>*FJkLR>4Z*d+&NO?ygx> z*UT~#kd`>CO{KrfcaG#4o`?;RT_zC)K(c%VLJF161t$wg^>|LeL~M*78){7o8}zqm z&43@t)-Yz9XN!70o?hx=c5O7JT+Wl%{F5=R&V)CAoQAD|xS0i7x-h;bv(_IZ0kyv9 zRE@gIXM9P>?vjFA|1{C5`{;KcUs^R2|GKP9kSXIj=aSQ2;rorr_!`?Fj_cgl65`?-a&s%CMw(g=@Ay zodpbs+bomDwk4NDV#%;iFz@a|_3phTvrgN-Pa88H9lew4_ykEkD3eO%2>5QQD`afg z#~myt5BL1BNul6f#=$#Sev$E%1RTLDr{8g~sH_X1-mIr|+jV=DcCEzJ-+MyIft$V>&IUavDJ&%-O5PedO{}E z5}GT;VYf{I^L$mfT@!Fi!RuqpQIq4_JuzdAMzJ=UR?A)Y>AkiXEeT6lFQe{61RO-D zuj@oYrieKjfb7swgIQ2IBWyY@lEEFvDy4#i0k#~S1uQddU$Uh^-*dNSBK166i&+6Y zbhcS*Rz#dAg|#NZyVzk9_CgQhnDGDdx%(UZha$sX^pUbY;E@i{32 ze{#G*v{P-1kZKe+pii?MlM?QyT#gc|%FU^>&6s#RV3Z@F*UJ}UT{F95S019(*a$s=viU={? zvYZ@$`}yZLRp|_^E*bgC8Ub3h-X2ZL_(!&bg&_w_uveYl63&$UN^ z**u}K_y0ZCq5k9^9#RABFOd$IV;bEieD>aNKoC=PwCV+Hg!0$@^(i}St(?-YH$jqjy7DRQ9o>UaNeAx{WWoVV^$G~F zH<-xhL+;nRQZkW!I`!mcr;EWwJ&y?d`k=M}_i4}m>B~tH(1BSE`Mp-r$scbJVyxPp z$|}V_T6qL7j;+ot4sxB`?zCp@QrgW5v%TtC;_UZWu-Vw1)z=YOubX%U2zQx~Sr-K~ zghlg`J)c;}i#ZFB!`IwAO?pRK`ut$wRA`_nu)`9TqZ^VtrM2kB(eQw01Tja(uQTkdV=K(=^3;W-}R)lraUT6ezSeeFU z-CRui)41PPe?ew_A1*9IitnKEnL+LN7>h_de;WZUjeyU&vcsDZbGp=y)l_Mnq{8aHMitJpzRg3O_7Jx68$ss!`3uqRMU4zk zvGZJlWaH#fJ>k@IOIBxYlZ!Lfpn`E|OOv*1qsg1SJrA6vsfKAl5 zXsWFOF=RL(_t9ECg3|Zz;Z`w<%es)Yr+Rg@D!|$#KW(0gc)tX-wBpU}cLMs4l3~ki zm0{$p$zu49wJ=R;kC%zY<+P>@QOcU)*3B%pN)|9a7P3B_^#*dgd|eZwsxoGn_DIZqBxv@^d% zZ!b-V-Ga(KqJotlrwV2ux6sv;=%G*bD*Gn>Y5RChE8jV!yy#ob;OR8JNNvr-GD?@Z z!HgklO-fjKeu71MPzmqu5GRf;e1f*3$CqFPVLl&L zNNSg=CjxlI;CgfWqe@2|$5uz9_MXK}%>9iRSCQ-6IrH%Ii!bvVj(;o;wn|$#mOx0% zFVI%m05{5_{Fc7{G&C^LN6_SS-e%sTBrNb_x~$jcOZ4HGLW?d6`MH@@I*oe2-r$GC zNw9Su-cZ}IKonf3r>ra@mx;az-Ak7(l4ik3YvmpeA8m+fBaZBb_M{~=|AB}-KkYqG z${qRP;*hwtA7|bySUNvSP;liM&z8w&Y-td zql|#VyUh2Wd0=!Y`oP7~r#|ufYp2fJ8ZR*{APnzeb(>l*>$b5ggkah?D^oUl_ zZFq69%ZpT(PTvTclF$5gJS?+gBvec1a(fFd`1+P`&iLvTnsqcuP@s7`ib7%E5*q=UKmt) zUJZ1&4801+`R;iR`tyw0rO#V&UwPms2ZIdWyq2h8#lM!f^eEf=SHqX~7EiW=CIKUZ zVovUq_>CWh{^RMEhs!X@ubgLW9w#XK_+g zQ!l+}-Rw>*Q=L?+o?iLvb)*v1i9PF$U$f@ZBE73Z%GL?mr@+DCO_odAgRWx-up{X# zJ@QXR`VgKd3T-jo=CwiQnTlNu%u9q5Wa{a;>;OD71xyBrPN);Fdcms1ivzZmh zyS$nd{V8n4v*V4JxRh+ObL-(a_WBV(aoV8FZV7=$#q0DN?vO}1uiMh6g{sk*J6C!N z$IA%%f7^dqdux+Av^dsA^C>KT{b*aWLbRhU?gi!rRt$ZULC>UImZlgmj|?fwd>9;S z(sKgZ3ubT4{RjGOA3N~-ZWFqgrK!a_<&Htsr9PVaJ#$v7`b{I#;)*KiB0oo443~8V~JZ;;~atJ?l%3 z8l|6fK2b*v84?i>oz@@c2o8~NMrUWwIQ?M740NX}qTtdWNFmV z&!pD1moSO=sw2*#o+2lLsqMD*MehE;j@<8@er|6Xr~>*cH!8OAB4`LIS$VAc>flJh zFC}aLYPeG#nkL6~F1F1SCx}W|5F z+V2tpLQtsdlkT>;+wyzu6l)u35@5j2s^}Jg_w#Nand(8QAEq)%&6r%DJxc4}-5n-k z+^c&DvCse;aE={+!(L}I?NYyvjr2=+!up!Si;IQ4VWVTD(aHG(X73+Ms`+a=MVh*Bi@POFuqac?Z;2gzw|bTGeKqnOF%cH4h zq2;})?@o-ufLng0*~DQZIL+7F7CDbe!2u8pI^$TF)V{C+dlwaKlfaS}R6emOVsgPg z7zD5u6dM!_2E?)$gj_y6DI57llya@^=@;&{N8T7#*zT#M1FEk;6-rp=Yfd@?gXT)2NnAKK?yO2~uTr7n@&?H7V*FZo94SnJ6n%tTbi@f7gPe`K=zcJuf$vI}&Kx zG7!<3Z7GcuR2}M+ic9Vcgs3A`Of0gF0l9s{in1Cpu2QXKo??GQ=BzPc6XOhd(O}vF z-L&7D#-mPAs#ijM7|DrbEx(E?+sy8?tVJ&}Fn6V4cfnRj=FSD!ud53qBWptK8-e4q zm809R`%X(5%NP1Op9CE;rFDcVPqC04+yP9GLIo#|U1XhG;@Gf8@JnA1F$c)c@sC4L z`AMsyZ+xlH1=#~65t8AlUC%)C}OCl zFY@TYUp!`lDN#+@Ct>Qhl*uthZo%~PvEoQ`>o(8(Q?0-QU+WL>0itNHXuX#G+rNhO z#(Da(T4&M_#Zb?0MfA{D7bLfhMcs^bC+4VcV%~^XoCs`myR>FM5hC@nJ5;E-EvCo$PYZ?wJ>AcH= zRcZyqSHsphx{rVB8(pEjawckbUJojf9YPci=Jwoer9Tfs|~79~1Sfo}fgCKdZ)JEpk% z*ilNM4>jyjWpYe;N2^VRccISJfgLuk7DGj^mpAoQoZDJFSMsU{oPDQ`>RmWV#L>lw zrq9%aYOZOz+yg{GOeJiwHRk@|f`>sPM1n8sa^Na7uxZOT^)o5s&+r9Xkr)0$uL>YB z>;{JdX`A{4uj%7m(1owFSl)#Z6Hd(le42?rRj4kf?bjKb5m0_|-H`M*%*f!i0GyH6 zDrZ^3In=^N+R($Rw|UPi@>`SsYG|}^N%&S^F-rk49jt%2zBF9%aci=@1Ug@7A0~Qq z{T)v5JX$1&J|+VrFMc}lSl`kA(el;idf7?n@(PW1Po46)Ixm|&?)rrMvRzIV3S-!)b~i|Piy6$J&0kz`g*rtRM*)!{4iU~JU^1E zP}pumizn?Y>N+&4!xT&4=O3dATxUzy0oGsaRTAwF$C-%OKF0YZPtl(m2ch_pSGT8~ zUV3$dN@n&2;U^!1Pz78{e{n|1;Q`c_u(_2vo>u+e^>xghEaJJzO*J)gX@4ExT0e`9 zmoRlb-`10Ih!PSfx577ePG}9BbXd<8m#h}rtv2*QkuR?n39U$Q>ihQ3K*GrzIfm=Mbd0H zJJO)Ow!K5)cL!O}Oq&x!->Zi$sr=#tQ3C0PKrf#=6l1dEb|t85VwRf$Mr78RkQZ}? z94{xhTSCY%mMN~*>*mWs#Z;<0#l3s;baeq*q*`5wrzOUx(6WR{ni#d zV<}b1RSg{2HDglfo@nVQJ3nfgW!{1SH7?|1ghHrL8K=i^F29}_rqvtTz=>bMbcZ2JA zi?Ss5GQ!ScY$n+8k8r`Ht~s!CCMT?ATTr#(0ArN1aXPh;AVYwzG$EP+2@cWGrrsO@ z2YvxljkvS<8gr9A=Kd41mSenn%Jdc7wO{UYrIPZ&iTvi;3KW)O(&6Cv_armBy=qC6 z9+h*_qhWtHU0UgCyI3AKEQ(`A6NC-yX!-J??lvP$ryh+wj z9O+hHr}K*|lr3!gXxs(Ri337J8S$C3MF4I(s@kT-Ye%&YuIj z(HUHA;28Tw_STk(R9gS9k0zto%LOT!F(P|A>L@>N&-upjYGWKV*(y&IzS+6<@c~bx zQN!Jv9S7#((~U{BOMlw-v9`t?=iQsxg}9aW+b~PAwJfF3wWN#WVw)?;p+|4OaT~hW zHN5^X_P}DiX3lQ=qFkcA3rAT@Zou)>t`DoA4)>Im4Y>C&cWz7AJ~D_ax8FP`bBlg@ zH2L^%4Q=jTtQU&Qa^$E=NXj2tW#KWLbslfXz{ZIk4I@rbir+PM{G_4>@ySyh)OP*3 zR{_zOxL1rJA@e)VGnC|cI>keg=iTg{Xy!2c@X5bvceg+PD1yRlIj=Vut z+D@SUd=TL7_Tuv?yVXvk9x`0)o~@4kYt0v85y}yI|DQtxO=mMXvve9JAyD<17o&EH z@uA9}309Y`-n)%-M`^}zLb!$Rir(e$AzUtWw<3C)EfGHC`YB?Ml30GW#GrZ4FWuD0 z;dFWfgHJirK?DPMo1)1DRVUchM?Kj61^cL6uKlsAbM8M5;n1~Vy-;e{G>J!vnq9!w z=nlL%;2HQOBDO^kv?8cpszM#QdVks189OguDI?)xP-4{|v7#GB6fc)P&>l#hWJf2M z8kM})zGVjv1n|;xlKI}!-(0kCrFMZBa;RjJHhDa}O5qbDgerA8jw3s_mJ>6tU;-2{ zp5|IQuZR9E*yhL<{DfG&bD_b^FU;s?ZQ`aDp(rqUmqyLm4>`0lJVRZ+mYdVTu;tj{ zHpPS1o);+Il|6D9^Z5qm%Pp~_kyi)9YV`xc+Ue{e1usnrdtA-OGS=z%jn>Gz9pZ?P z4HJ3f{KhR3@HzOo%yG^dY1II(gR0<9=Q*jQ!{%FBE2?HzVTJW2Tm(^yTuFof%6vnA zL}h5-^)+7Vw|bC3Q)TJo`L`03H+Riry^w1|;^j(jXB4Z|X4N-Bh?}_OrtoDw1eH)S zd(!CZ@OV{F`nztMfy7XB_Vi<_!|J_1-mc4b9QE7;%ZPQka@Kokcu(&!I4Zg>(}QL* zng%v#cuy_sz^fpj8+M=a7m`960x6LS&6{5AXz*$nNZ7e7~K7 z62D7GZ0Nf>yT34&< zbb5r_sU4y`^Zhn*s>X|gd+N^4ve0|6wyT3zjOM{4GP99+FU(>)GoO0(=i^DpaDOs|BUPZsv^ zP@9TX?w(Ea1?)+bV0biSY|ecW*#4vJS4CxCqto0mryJ*!ts6;GRu0xS#vzqJ6ZU^( zVBLk<47+>1#o1oVg0v>EOtkArtB1s z%9xw}dT{_%tl`y5ly^$;)VDs8g0rhXeO`^Qrp? z(tJ^$2d12!Eq+8_96}$B4bNPqZFh^bO9+uNz=HtC6346w7#Sa-+{_4X6n@n;p$N!T z5Fbrv_4a~#!XDZ3!J4!9hXR(rZQ#Z$!92Cc+WB5D^Y{8&j5MTJ(mIBy-GbDq0q{wx zNbC{Kg+1?N3O<3HFFN+9w12h_xc=KoaqG7FvXB*O)w>OLUqdmnYd$soSR59v1W(HFqLCHE|`dNoYPzk!l*iP+5SvEX)2{DeRk zdF!Lm=1+`E!9fH!bSnWh)-d#%&dEihPp`|aE+=>0$N_cXit2(R{o>&VKxw%VQrKv0 z9j}X}odSZm!ea94Fo~EG3QKkyt8mcFPcThc4^jKiUo}r3?ICTW<(ycS2bw}RATZ+A zlwWhhF57v%nuDwQNUtIpYCwg?h1`1-^#u&#^B%}@ULc5=+x#i|Fj<4Vsx`Hp-f2R$|^ z=EOvcfq9x?1_%JTOp*GQUpMmum|HJTcioIj=r}cJ7`$1*lr%UbEd8O?!ju z4462uqY#?zU~c~P-A9*RU8;qgbx+r?0{YLII?eNuf1+s!Z~W>4GnlS26R^&Ggwt_( zHVA^y0hFuQ)9NSB8wz6PC8$xQ0qfiRN7u&4@|qR^Vlicx($R$)20`JpL)57}ghcn2 zVl~{^qs;lc5rmdj8}=(5Rd&Ni9FShSe{z*RwOC)z$us&#j6&!MU25a+V?WQt$aQIA z25{Eh7s;X}M@)6weA)Dh95~`mkH1!(J{^;sO1#Cx6HI)B6S@3W<;B^X7Ml8#xnG8} zTxRSUS1T|S=iq5jk{c(RzI%%bMnH2Xr2N)mh|OqSrt24=WLI@wD;|B$(nvpapgDh1 z3^nbqZzKJ`>L8j?;r#yWhk}PuEaf|}40C<}6y;nxp(UTYF!Ex~xP}Gi(Ld9nI+8s? zl=Co{*k)Pcr2bf7aJJ&6MQ(pjGVIk%*=nB4e}kZ$h@q)DzKD)q7^-MWqXS<5ILAlt zUD@T5Qou6YhMc-J3#^B88&HnT9$$dQzByD}$y+h%<{N8b>qB~_tYYt5K9}oCknwN@ z6K_O_+utS5^B`}A(u(DMd@V4Tas&PIImg1t&G;5+Jilbd z3EXx=+m zCv=|T?#%U7wX>6eOCKpw8_!go;r5trV@FFaF}wTNVV__ceJ4_Y{#Tz5ks`si>1s)P zx0O$nZ)SGSFSwDpf^4e*0kzGIMG$+yb@lbKFZ9X)={Qp5L{1GGr*#D+tcxxT9GAaA z+zZYsNIu!nM_vAiAIb8v6T% z3t^Q^HKd)bp;`BFVp}7AcGyO*$CGCc8MuS+c7pe!RLjHsLSMpzP_{XB(;|EOE$s>3 z5KD)6zhNE(*M4Kbi>=S z-;3YOjx)--ol$@I5I{`ChW$H4X|hB$d$vbC7|kBsWlG-?ZO2KNWQgZV_v0Nebz_)< zQ8@ONJ;4KO8*eb-`D*By35e|(^yA#gS#umPYJu-bhjl$7wO9<`gS58r? z=JV`t;JvG&YZBFhhTg*{5m;yjPirzyYu#{&2FFN8a(K8|D$A*~J1V?JwmH|Zi=Gu5H%vHY64GbosesUo^5#Z|aFJ(ds0i@SO^g~-z(^#A zg9aq{6z>Tnwpgh@GWjU(bQ`OYqyjn(h;7@*F)@o-Vg>?fNhfQ~ZhDyN5yXYw)I@Be zOhW(UH$v4fKA*~&V)xi8QkfLT>4CJCDzlM*HvuO%O+~(u0CLevXR&~TjmCd8l^Wze zx|!b;ZBI}OC9nnJY!gb!Q|Ej_>t^4}S_|GoZydcfl1hLjnQTb)@Q%I!q= PAIG~_ke9_T%!2+8g)e^} diff --git a/monster_ecomail/monster_ecomail.php b/monster_ecomail/monster_ecomail.php deleted file mode 100644 index b99ed6a..0000000 --- a/monster_ecomail/monster_ecomail.php +++ /dev/null @@ -1,640 +0,0 @@ -name = 'monster_ecomail'; - $this->tab = 'emailing'; - $this->version = '1.9.702'; - $this->author = 'MONSTER MEDIA, s.r.o.'; - $this->need_instance = 0; - $this->ps_versions_compliancy = array('min' => '1.5.1', 'max' => '1.7.999'); - $this->bootstrap = true; - - parent::__construct(); - - $this->displayName = $this->l('Ecomail'); - $this->description = $this->l('Napojení e-shopu na Ecomail.'); - - $this->confirmUninstall = $this->l('Opravdu si přejete odinstalovat napojení na Ecomail?'); - } - - public function install() - { - return parent::install() && - $this->setValues() && - $this->setTab() && - $this->setDatabase() && - $this->setHooks() && - unlink(_PS_CACHE_DIR_.'/class_index.php'); - } - - public function uninstall() - { - return parent::uninstall() && - $this->unsetValues() && - $this->unsetTab() && - $this->unsetDatabase(); - } - - //hodnoty v configu - public function setValues(){ - return Configuration::updateValue('MONSTER_ECOMAIL_SKIP_CONFIRM', 1); - } - - public function unsetValues(){ - return - Configuration::deleteByName('MONSTER_ECOMAIL_API_KEY') && - Configuration::deleteByName('MONSTER_ECOMAIL_APP_ID') && - Configuration::deleteByName('MONSTER_ECOMAIL_LIST_ID'); - - } - - //taby v adminu - public function setTab(){ - return true; - } - - public function unsetTab(){ - return true; - } - - //tabulky v DB - public function setDatabase(){ - return true; - } - - public function unsetDatabase(){ - return true; - } - - //hooky - public function setHooks(){ - - return - $this->registerHook( 'actionCustomerAccountAdd' ) && - $this->registerHook( 'actionValidateOrder' ) && - $this->registerHook( 'displayFooter' ) && - $this->registerHook( 'actionCustomerNewsletterSubscribed' ) && - $this->registerHook( 'actionCartSave'); - } - - public function getContent() - { - $output = null; - - if (Tools::isSubmit('submit'.$this->name)) - { - Configuration::updateValue('MONSTER_ECOMAIL_API_KEY', Tools::getValue('api_key')); - Configuration::updateValue('MONSTER_ECOMAIL_APP_ID', Tools::getValue('app_id')); - Configuration::updateValue('MONSTER_ECOMAIL_LIST_ID', Tools::getValue('list_id')); - - Configuration::updateValue('MONSTER_ECOMAIL_LOAD_ORDER_DATA', Tools::getValue('load_order_data')); - - Configuration::updateValue('MONSTER_ECOMAIL_LOAD_NAME', Tools::getValue('load_name')); - Configuration::updateValue('MONSTER_ECOMAIL_LOAD_ADDRESS', Tools::getValue('load_address')); - Configuration::updateValue('MONSTER_ECOMAIL_LOAD_BIRTHDAY', Tools::getValue('load_birthday')); - Configuration::updateValue('MONSTER_ECOMAIL_LOAD_CART', Tools::getValue('load_cart')); - Configuration::updateValue('MONSTER_ECOMAIL_SKIP_CONFIRM', Tools::getValue('skip_confirmation')); - - } - - if(Configuration::get( 'MONSTER_ECOMAIL_API_KEY' ) && !$this->getAPI()->getListsCollection()){ - $output .= $this->displayError("Nepodařilo se spojit se službou Ecomail. Zkontrolujte prosím svůj API klíč."); - } - - if(Configuration::get( 'MONSTER_ECOMAIL_API_KEY' ) && $this->getAPI()->getListsCollection()){ - $output .= $this->displayConfirmation($this->l('Spojení se službou Ecomail je aktivní.')); - $output .= $this->displayConfirmation($this->l('Webhook pro zpětnou aktualizaci kontaktů je na adrese ')."".(isset($_SERVER['HTTPS']) ? "https" : "http") . "://".$_SERVER['HTTP_HOST']."/modules/monster_ecomail/webhook.php"); - } - - if(_PS_VERSION_ < 1.6){ - $output .= $this->displayError("Návod k aktivaci odesílání subscribů z modulu 'Blok Odběr novinek [Newsletter block]' do systému Ecomail pro vaší verzi PrestaShopu najdete zde."); - } - - return $output.$this->displayForm(); - } - - public function displayForm() - { - // Get default language - $default_lang = (int)Configuration::get('PS_LANG_DEFAULT'); - - if(Configuration::get( 'MONSTER_ECOMAIL_API_KEY' ) && $this->getAPI()->getListsCollection()){ - - $options = array(); - if( Configuration::get( 'MONSTER_ECOMAIL_API_KEY' ) ) { - $listsCollection = $this->getAPI() - ->getListsCollection(); - foreach( $listsCollection as $list ) { - $options[] = array( - 'id_option' => $list->id, - 'name' => $list->name - ); - } - } - - // Init Fields form array - $fields_form[0]['form'] = array( - 'legend' => array( - 'title' => $this->l('Konfigurace Ecomail'), - ), - 'input' => array( - array( - 'type' => 'text', - 'label' => $this->l( 'Vložte Váš API klíč' ), - 'name' => 'api_key', - 'rows' => 20, - 'required' => true - ), - array( - 'type' => 'select', - 'label' => $this->l( 'Vyberte seznam kontaktů:' ), - 'desc' => $this->l( - 'Vyberte list do kterého budou zapsáni noví zákazníci. Pokud jste jej vytvořili teprve nyní, může trvat až 30 minut, než bude možné se na něj napojit.' - ), - 'name' => 'list_id', - 'required' => true, - 'options' => array( - 'query' => $options, - 'id' => 'id_option', - 'name' => 'name' - ) - ), - array( - 'type' => (_PS_VERSION_ > 1.5) ? 'switch' : 'radio', - 'class' => 't', - 'label' => $this->l('Aktualizovat údaje na základě dat z objednávek'), - 'name' => 'load_order_data', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - 'label' => $this->l('Yes') - ), - array( - 'id' => 'active_off', - 'value' => 0, - 'label' => $this->l('No') - ) - ), - ), - array( - 'type' => (_PS_VERSION_ > 1.5) ? 'switch' : 'radio', - 'class' => 't', - 'label' => $this->l('Odesílat jména zákazníků'), - 'name' => 'load_name', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - 'label' => $this->l('Yes') - ), - array( - 'id' => 'active_off', - 'value' => 0, - 'label' => $this->l('No') - ) - ), - ), - array( - 'type' => (_PS_VERSION_ > 1.5) ? 'switch' : 'radio', - 'class' => 't', - 'label' => $this->l('Odesílat adresy zákazníků'), - 'name' => 'load_address', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - 'label' => $this->l('Yes') - ), - array( - 'id' => 'active_off', - 'value' => 0, - 'label' => $this->l('No') - ) - ), - ), - array( - 'type' => (_PS_VERSION_ > 1.5) ? 'switch' : 'radio', - 'class' => 't', - 'label' => $this->l('Odesílat data narození zákazníků'), - 'name' => 'load_birthday', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - 'label' => $this->l('Yes') - ), - array( - 'id' => 'active_off', - 'value' => 0, - 'label' => $this->l('No') - ) - ), - ), - array( - 'type' => (_PS_VERSION_ > 1.5) ? 'switch' : 'radio', - 'class' => 't', - 'label' => $this->l('Odesílat produkty v košíku'), - 'name' => 'load_cart', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - 'label' => $this->l('Yes') - ), - array( - 'id' => 'active_off', - 'value' => 0, - 'label' => $this->l('No') - ) - ), - ), - array( - 'type' => (_PS_VERSION_ > 1.5) ? 'switch' : 'radio', - 'class' => 't', - 'label' => $this->l('Přeskočit double opt-in'), - 'name' => 'skip_confirmation', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - 'label' => $this->l('Yes') - ), - array( - 'id' => 'active_off', - 'value' => 0, - 'label' => $this->l('No') - ) - ), - ), - ), - 'submit' => array( - 'title' => $this->l('Save'), - 'class' => 'btn btn-default pull-right' - ) - ); - - $fields_form[1]['form'] = array( - 'legend' => array( - 'title' => $this->l('Marketer+'), - ), - 'input' => array( - array( - 'type' => 'text', - 'label' => $this->l( 'Vložte Vaše appId' ), - 'desc' => $this->l( - 'Tento údaj slouží pro aktivaci trackovacího kódu a sledování transakcí - pouze pro tarif Marketer+' - ), - 'name' => 'app_id', - 'rows' => 20 - ) - ), - 'submit' => array( - 'title' => $this->l('Save'), - 'class' => 'btn btn-default pull-right' - ) - ); - - }else{ - $fields_form[0]['form'] = array( - 'legend' => array( - 'title' => $this->l('Konfigurace Ecomail'), - ), - 'input' => array( - array( - 'type' => 'text', - 'label' => $this->l( 'Vložte Váš API klíč' ), - 'name' => 'api_key', - 'rows' => 20, - 'required' => true, - 'desc' => $this->l('Po správném načtení vašeho API klíče si zvolíte seznam kontaktů pro váš e-shop.') - ) - ), - 'submit' => array( - 'title' => $this->l('Save'), - 'class' => 'btn btn-default pull-right' - ) - ); - } - - $helper = new HelperForm(); - - // Module, token and currentIndex - $helper->module = $this; - $helper->name_controller = $this->name; - $helper->token = Tools::getAdminTokenLite('AdminModules'); - $helper->currentIndex = AdminController::$currentIndex.'&configure='.$this->name; - - // Language - $helper->default_form_language = $default_lang; - $helper->allow_employee_form_lang = $default_lang; - - // Title and toolbar - $helper->title = $this->displayName; - $helper->show_toolbar = true; - $helper->toolbar_scroll = true; - $helper->submit_action = 'submit'.$this->name; - $helper->toolbar_btn = array( - 'save' => - array( - 'desc' => $this->l('Save'), - 'href' => AdminController::$currentIndex.'&configure='.$this->name.'&save'.$this->name. - '&token='.Tools::getAdminTokenLite('AdminModules'), - ), - 'back' => array( - 'href' => AdminController::$currentIndex.'&token='.Tools::getAdminTokenLite('AdminModules'), - 'desc' => $this->l('Back to list') - ) - ); - - // Load current value - $helper->fields_value['api_key'] = Configuration::get('MONSTER_ECOMAIL_API_KEY'); - $helper->fields_value['app_id'] = Configuration::get('MONSTER_ECOMAIL_APP_ID'); - $helper->fields_value['list_id'] = Configuration::get('MONSTER_ECOMAIL_LIST_ID'); - $helper->fields_value['load_order_data'] = Configuration::get('MONSTER_ECOMAIL_LOAD_ORDER_DATA'); - - $helper->fields_value['load_name'] = Configuration::get('MONSTER_ECOMAIL_LOAD_NAME'); - $helper->fields_value['load_address'] = Configuration::get('MONSTER_ECOMAIL_LOAD_ADDRESS'); - $helper->fields_value['load_birthday'] = Configuration::get('MONSTER_ECOMAIL_LOAD_BIRTHDAY'); - $helper->fields_value['load_cart'] = Configuration::get('MONSTER_ECOMAIL_LOAD_CART'); - $helper->fields_value['skip_confirmation'] = Configuration::get('MONSTER_ECOMAIL_SKIP_CONFIRM'); - - return $helper->generateForm($fields_form); - } - - protected function getAPI() { - require_once __DIR__ . '/lib/api.php'; - $obj = new EcomailAPI(); - $obj->setAPIKey( Configuration::get('MONSTER_ECOMAIL_API_KEY') ); - return $obj; - } - - //registrace zákazníka, registrace v košíku, objednávka bez registrace - public function hookActionCustomerAccountAdd( $params ) { - - if(_PS_VERSION_ < 1.7){ - $newsletter = $params['_POST']['newsletter']; - $email = $params['_POST']['email']; - }else{ - $newsletter = $params['newCustomer']->newsletter; - $email = $params['newCustomer']->email; - } - - if( $newsletter ) { - - if( Configuration::get('MONSTER_ECOMAIL_API_KEY') ) { - - $nameData = array(); - $birthdayData = array(); - $addressData = array(); - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_NAME')){ - - $firstname = (_PS_VERSION_ < 1.7) ? $params['_POST']['customer_firstname'] : $params['newCustomer']->firstname; - $lastname = (_PS_VERSION_ < 1.7) ? $params['_POST']['customer_lastname'] : $params['newCustomer']->lastname; - - $nameData = array( - 'name' => $firstname, - 'surname' => $lastname - ); - } - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_BIRTHDAY')){ - - if(_PS_VERSION_ < 1.7){ - $birthday = (empty($params['_POST']['years']) ? '' : (int)$params['_POST']['years'].'-'.(int)$params['_POST']['months'].'-'.(int)$params['_POST']['days']); - if (!Validate::isBirthDate($birthday)) { - $birthday = ""; - } - }else{ - $birthday = $params['newCustomer']->birthday; - } - - $birthdayData = array( - 'birthday' => $birthday - ); - } - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_ADDRESS')) { - - //pokud probíhá nákup bez registrace nebo registrace v košíku - if(_PS_VERSION_ < 1.7) { - if ($params['_POST']['id_country']) { - $country = new Country($params['_POST']['id_country']); - - $addressData = array( - "company" => $params['_POST']['company'], - "city" => $params['_POST']['city'], - "street" => $params['_POST']['address1'], - "zip" => $params['_POST']['postcode'], - "country" => $country->iso_code - ); - } - }else{ - - } - } - - $this->getAPI() - ->subscribeToList( - Configuration::get('MONSTER_ECOMAIL_LIST_ID'), - array_merge( - array('email' => $email),$nameData,$birthdayData,$addressData) - ); - } - } - } - - //subscribe zákazníka v modulu blocknewsletter - public function hookActionCustomerNewsletterSubscribed( $params ) { - - $monsterLogWS = new FileLogger(0); - $monsterLogWS->setFilename(_PS_ROOT_DIR_ . "/log/ecomail.log"); - $monsterLogWS->logDebug("executing hook"); - - if( Configuration::get('MONSTER_ECOMAIL_API_KEY') ) { - - $monsterLogWS->logDebug("api ok"); - - $customer = Customer::getCustomersByEmail( $params['email'] ); - - $monsterLogWS->logDebug("email = ".$params['email'] ); - - //uživatel existuje v eshopu - if($customer){ - - $monsterLogWS->logDebug("customer existuje v eshopu"); - - $customer = end($customer); //po registraci už není možné vytvářet další účty, takže bude mít nejvíc dat - - $nameData = array(); - $birthdayData = array(); - $addressData = array(); - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_NAME')){ - $nameData = array( - 'name' => $customer['firstname'], - 'surname' => $customer['lastname'] - //'gender' => male/female - ecomail si dopočítává automaticky podle jmen - ); - } - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_BIRTHDAY')){ - $birthdayData = array( - 'birthday' => $customer['birthday'] - ); - } - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_ADDRESS')){ - if(isset($params['order'])){ - $address = new Address($params['order']->id_address_invoice); - $country = new Country($address->id_country); - - $addressData = array( - 'company' => $customer['company'] - ); - } - } - - $monsterLogWS->logDebug("subscribeToList"); - - $this->getAPI() - ->subscribeToList( - Configuration::get('MONSTER_ECOMAIL_LIST_ID'), - array_merge(array('email' => $customer['email']),$nameData,$birthdayData,$addressData) - - ); - }else{//uživatel neexistuje v eshopu - je to visitor - - $monsterLogWS->logDebug("uživatel neexistuje v eshopu"); - $this->getAPI() - ->subscribeToList( - Configuration::get('MONSTER_ECOMAIL_LIST_ID'), - array('email' => $params['email']) - ); - - } - } - } - - //dokončení objednávky - public function hookActionValidateOrder( $params ) { - - //aktualizace stávajících údajů + subscribe uživatele, který se registroval dříve - if(Configuration::get('MONSTER_ECOMAIL_LOAD_ORDER_DATA')){ - $customer = new Customer($params['order']->id_customer); - - //pokud zákazník nesouhlasil s newsletterem, neřešíme ho ani zde - if($customer->newsletter){ - $nameData = array(); - $birthdayData = array(); - $addressData = array(); - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_NAME')){ - $nameData = array( - 'name' => $customer->firstname, - 'surname' => $customer->lastname - - ); - } - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_BIRTHDAY')){ - $birthdayData = array( - 'birthday' => $customer->birthday - - ); - } - - if(Configuration::get('MONSTER_ECOMAIL_LOAD_ADDRESS')){ - $address = new Address($params['order']->id_address_invoice); - $country = new Country($address->id_country); - - $addressData = array( - "city" => $address->city, - "street" => $address->address1, - "zip" => $address->postcode, - "country" => $country->iso_code, - "company" => $address->company - ); - } - - $this->getAPI() - ->subscribeToList( - Configuration::get('MONSTER_ECOMAIL_LIST_ID'), - array_merge(array('email' => $customer->email),$nameData,$birthdayData,$addressData) - ); - } - } - - //přenos transakce pro tarif Marketer+ - $this->getAPI() - ->createTransaction( $params['order'] ); - } - - public function hookActionCartSave($params) - { - if(Configuration::get('MONSTER_ECOMAIL_LOAD_CART')){ - if (!isset($this->context->cart)) - return; - - $cart_products = $this->context->cart->getProducts(); - - $products = array(); - foreach($cart_products as $p){ - $productCat = new Category($p["id_category_default"]); - $products[] = array( - "productId" => $p["id_product"], - "img_url" => $this->context->link->getImageLink($p['link_rewrite'], $p["id_image"]), - "url" => $this->context->link->getProductLink((int)$p["id_product"], $p['link_rewrite'], $productCat->link_rewrite[$this->context->language->id]), - "name" => $p["name"], - "price" => $p["price_wt"], - "description" => $p["description_short"] - ); - } - $result = $this->getAPI()->sendBasket($this->context->customer->email, $products); - if (isset($result->errors)) { - PrestaShopLogger::addLog('Ecomail failed: '. json_encode($result->errors), 1, null, 'Cart', (int)$this->context->cart->id, true); - } - } else { - return; - } - } - - public function hookDisplayFooter($params) { - - $output = ' - - -'; - - return $output; - } - - -} diff --git a/monster_ecomail/override/modules/blocknewsletter/blocknewsletter.php b/monster_ecomail/override/modules/blocknewsletter/blocknewsletter.php deleted file mode 100644 index 628aa25..0000000 --- a/monster_ecomail/override/modules/blocknewsletter/blocknewsletter.php +++ /dev/null @@ -1,21 +0,0 @@ - $email ) - ); - - if ($register_status == self::GUEST_NOT_REGISTERED) - return $this->registerGuest($email); - - if ($register_status == self::CUSTOMER_NOT_REGISTERED) - return $this->registerUser($email); - - return false; - } -} \ No newline at end of file diff --git a/monster_ecomail/override/modules/ps_emailsubscription/ps_emailsubscription.php b/monster_ecomail/override/modules/ps_emailsubscription/ps_emailsubscription.php deleted file mode 100644 index 345adb5..0000000 --- a/monster_ecomail/override/modules/ps_emailsubscription/ps_emailsubscription.php +++ /dev/null @@ -1,53 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -if (!defined('_PS_VERSION_')) { - exit; -} - -class Ps_EmailsubscriptionOverride extends Ps_Emailsubscription -{ - - protected function register($email, $register_status) - { - - Hook::exec( - 'actionCustomerNewsletterSubscribed', - array( 'email' => $email ) - ); - - if ($register_status == self::GUEST_NOT_REGISTERED) { - return $this->registerGuest($email); - } - - if ($register_status == self::CUSTOMER_NOT_REGISTERED) { - return $this->registerUser($email); - } - - return false; - } - -} diff --git a/monster_ecomail/readme_1.5.html b/monster_ecomail/readme_1.5.html deleted file mode 100644 index 0e5b347..0000000 --- a/monster_ecomail/readme_1.5.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - -
-

Odesílání subscribů z modulu
"Blok Odběr novinek [Newsletter block]" do systému Ecomail

- - -

PrestaShop s verzí nižší, než 1.6.0.11 neumí úpravu modulu jiným modulem. -Proto je potřeba tuto drobnou změnu provézt ručně. Postup je následující:

- -
    -
  1. V souboru "modules/blocknewsletter/blocknewsletter.php"
    2. -
  2. Najděte řádek s funkcí "register".
    - Pravděpodobně bude vypadat takto: "protected function register($email, $register_status)"
    3. -
  3. Přepište funkci touto verzí:
    4. -
- -

-    protected function register($email, $register_status)
-    {
-        Hook::exec(
-        'actionCustomerNewsletterSubscribed',
-        array( 'email' => $email )
-        );
-
-        if ($register_status == self::GUEST_NOT_REGISTERED)
-        return $this->registerGuest($email);
-
-        if ($register_status == self::CUSTOMER_NOT_REGISTERED)
-        return $this->registerUser($email);
-
-        return false;
-    }
-    
-
-
- - MM logo - -
-
- - - - - diff --git a/monster_ecomail/webhook.php b/monster_ecomail/webhook.php deleted file mode 100644 index ef907e1..0000000 --- a/monster_ecomail/webhook.php +++ /dev/null @@ -1,27 +0,0 @@ -payload->email; - - $customer = new Customer(); - - $customers = $customer->getCustomersByEmail($email); - - if($request->payload->status === 'SUBSCRIBED'){ - $newsletterStatus = '1'; - } else { - $newsletterStatus = '0'; - } - - foreach ($customers as $customer) { - $customerObject = new Customer($customer['id_customer']); - $customerObject->newsletter = $newsletterStatus; - $customerObject->save(); - } -} \ No newline at end of file