Merge pull request #35 from Joukz/gdpr_compliance

Add compliance to gdpr law (psgdpr module)

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>mailalerts</name>
 	<displayName><![CDATA[Mail alerts]]></displayName>
-	<version><![CDATA[3.6.1]]></version>
+	<version><![CDATA[3.7.0]]></version>
 	<description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[administration]]></tab>

mailalerts.php

@@ -48,7 +48,7 @@ public function __construct()
 	{
 		$this->name = 'mailalerts';
 		$this->tab = 'administration';
-		$this->version = '3.6.1';
+		$this->version = '3.7.0';
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
@@ -91,6 +91,9 @@ public function install($delete_params = true)
 			!$this->registerHook('actionProductCoverage') ||
 			!$this->registerHook('actionOrderReturn') ||
 			!$this->registerHook('actionOrderEdited') ||
+			!$this->registerHook('registerGDPRConsent') ||
+			!$this->registerHook('actionDeleteGDPRCustomer') ||
+			!$this->registerHook('actionExportGDPRData') ||
 			!$this->registerHook('displayHeader'))
 			return false;
 
@@ -478,7 +481,8 @@ public function hookActionProductOutOfStock($params)
 		$this->context->smarty->assign(
 			array(
 				'id_product' => $id_product,
-				'id_product_attribute' => $id_product_attribute
+				'id_product_attribute' => $id_product_attribute,
+				'id_module' => $this->id
 			)
 		);
 
@@ -866,6 +870,27 @@ public function hookActionOrderEdited($params)
 			null, null, null, null, _PS_MAIL_DIR_, true, (int)$order->id_shop);
 	}
 
+	public function hookActionDeleteGDPRCustomer($customer)
+	{
+		if (!empty($customer['email']) && Validate::isEmail($customer['email'])) {
+			$sql = "DELETE FROM "._DB_PREFIX_."mailalert_customer_oos WHERE customer_email = '".pSQL($customer['email'])."'";
+			if (Db::getInstance()->execute($sql)) {
+				return json_encode(true);
+			}
+			return json_encode($this->l('Mail alert: Unable to delete customer using email.'));
+		}
+	}
+	public function hookActionExportGDPRData($customer)
+	{
+		if (!Tools::isEmpty($customer['email']) && Validate::isEmail($customer['email'])) {
+			$sql = "SELECT * FROM "._DB_PREFIX_."mailalert_customer_oos WHERE customer_email = '".pSQL($customer['email'])."'";
+			if ($res = Db::getInstance()->ExecuteS($sql)) {
+				return json_encode($res);
+			}
+			return json_encode($this->l('Mail alert: Unable to export customer using email.'));
+		}
+	}
+
 	public function renderForm()
 	{
 		$fields_form_1 = array(

upgrade/install-3.7.0.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2016 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * 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 [email protected] 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 http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <[email protected]>
+ * @copyright 2007-2016 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;
+
+function upgrade_module_3_7_0($object)
+{
+	return ($object->registerHook('registerGDPRConsent') &&
+		$object->registerHook('actionDeleteGDPRCustomer') &&
+		$object->registerHook('actionExportGDPRData'));
+}

views/templates/hook/product.tpl

@@ -41,10 +41,12 @@ function oosHookJsCodeMailAlert() {
 			if ($.trim(msg) == '0') {
 				$('#mailalert_link').show();
 				$('#oos_customer_email').show();
+				$('#oosHook').find('#gdpr_consent').show();
 			}
 			else {
 				$('#mailalert_link').hide();
 				$('#oos_customer_email').hide();
+				$('#oosHook').find('#gdpr_consent').hide();
 			}
 		}
 	});
@@ -59,6 +61,7 @@ function  addNotification() {
 			if ($.trim(msg) == '1') {
 				$('#mailalert_link').hide();
 				$('#oos_customer_email').hide();
+				$('#oosHook').find('#gdpr_consent').hide();
 				$('#oos_customer_email_result').html("{/literal}{l s='Request notification registered' mod='mailalerts'}{literal}");
 				$('#oos_customer_email_result').css('color', 'green').show();
 			}
@@ -89,9 +92,15 @@ $(document).ready(function() {
 </script>
 
 <!-- MODULE MailAlerts -->
+<form>
 	{if isset($email) AND $email}
 		<input type="text" id="oos_customer_email" name="customer_email" size="20" value="{l s='[email protected]' mod='mailalerts'}" class="mailalerts_oos_email" onclick="clearText();" /><br />
 	{/if}
-	<a href="#" title="{l s='Notify me when available' mod='mailalerts'}" onclick="return addNotification();" id="mailalert_link" rel="nofollow">{l s='Notify me when available' mod='mailalerts'}</a>
+
+	{if isset($id_module)}
+			{hook h='displayGDPRConsent' id_module=$id_module}
+	{/if}
+	<button type="submit" class="btn btn-default" title="{l s='Notify me when available' mod='mailalerts'}" onclick="return addNotification();" id="mailalert_link" rel="nofollow">{l s='Notify me when available' mod='mailalerts'}</button>
 	<span id="oos_customer_email_result" style="display:none;"></span>
+</form>
 <!-- END : MODULE MailAlerts -->