Skip to content
This repository was archived by the owner on Mar 17, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SendinBlue module for PrestaShop
SendinBlue module for PrestaShop
Copyright (C) 2014 https://www.sendinblue.com

You can freely use this module in your PrestaShop e-commerce website. For updates, please visit:
Expand Down
2 changes: 1 addition & 1 deletion ajaxsubscribeconfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
$resp = $sendin->defaultNlStatus();

if ($resp == 1) {
$manage_subs_val = Tools::getValue('managesubscribe');
$manage_subs_val = Tools::getValue('managesubscribe');
Configuration::updateValue('Sendin_Subscribe_Setting', $manage_subs_val, '', $id_shop_group, $id_shop);
echo 'done';
} else {
Expand Down
2 changes: 1 addition & 1 deletion mails/fr/sendinsms_notify.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cet email est envoyé pour vous informer que vous n'avez plus assez de crédits pour envoyer des SMS à partir de votre site PrestaShop
Cet email est envoyé pour vous informer que vous n'avez plus assez de crédits pour envoyer des SMS à partir de votre site PrestaShop
Actuellement, vous avez {present_credit} crédits SMS.
Cordialement,
L'équipe de SendinBlue
4 changes: 2 additions & 2 deletions mails/fr/sendinsmtp_conf.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Cet e-mail a été envoyé via sendinBlue SMTP.
Cet e-mail a été envoyé via sendinBlue SMTP.
Félicitation, votre module SendinBlue SMTP est bien configuré.
L'équipe de SendinBlue
L'équipe de SendinBlue
2 changes: 1 addition & 1 deletion mails/it/sendinsms_notify.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Quest'email inviata per informarti che non hai abbastanza crediti per inviare SMS dal tuo sito web PrestaShop {site_name}.
Quest'email è inviata per informarti che non hai abbastanza crediti per inviare SMS dal tuo sito web PrestaShop {site_name}.
Adesso hai {present_credit} crediti sms.
Cordialmente, il Team SendinBlue
4 changes: 2 additions & 2 deletions mails/it/sendinsmtp_conf.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Quest'email stata inviata usando l'SMTP di SendinBlue.
Congratulazioni, il tuo modulo SMTP di SendinBlue stato installato correttamente.
Quest'email ?stata inviata usando l'SMTP di SendinBlue.
Congratulazioni, il tuo modulo SMTP di SendinBlue ?stato installato correttamente.
Il Team SendinBlue
4 changes: 2 additions & 2 deletions mails/pt/sendinsms_notify.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Enviamos este e-mail para inform�-lo de que voc� n�o tem cr�ditos suficientes para enviar SMS a partir do seu website PrestaShop {site_name}.
Atualmente, voc� tem {present_credit} cr�ditos sms.
Enviamos este e-mail para informá-lo de que você não tem créditos suficientes para enviar SMS a partir do seu website PrestaShop {site_name}.
Atualmente, você tem {present_credit} créditos sms.
Atenciosamente, Equipe SendinBlue
2 changes: 1 addition & 1 deletion mails/pt/sendinsmtp_conf.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Este e-mail foi enviado usando o SMTP SendinBlue.
Parab�ns, seu m�dulo SMTP da SendinBlue foi configurado corretamente.
Parabéns, seu módulo SMTP da SendinBlue foi configurado corretamente.
A Equipe SendinBlue
8 changes: 2 additions & 6 deletions sendinblue.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ class Sendinblue extends Module
public function __construct()
{
$this->name = 'sendinblue';
if (version_compare(_PS_VERSION_, '1.5', '>')) {
$this->tab = 'emailing';
} else {
$this->tab = 'advertising_marketing';
}
$this->tab = 'advertising_marketing';
$this->author = 'SendinBlue';
$this->version = '2.5.5';

Expand Down Expand Up @@ -267,7 +263,7 @@ public function callhookRegister()
$this->sendWsTemplateMail($this->email);
}
}
} elseif(isset($newsletter_status) && $newsletter_status == 0 && Tools::isSubmit('submitIdentity')) {
} elseif (isset($newsletter_status) && $newsletter_status == 0 && Tools::isSubmit('submitIdentity')) {
$this->unsubscribeByruntime($this->email);
}
}
Expand Down
73 changes: 33 additions & 40 deletions ajaxhookPosition.php → upgrade/index.php
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,40 +1,33 @@
<?php
/**
* 2007-2014 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-2014 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/

include(dirname(__FILE__).'/../../config/config.inc.php');
include(dirname(__FILE__).'/sendinblue.php');

if (Tools::getValue('token') != Tools::encrypt(Configuration::get('PS_SHOP_NAME')))
die('Error: Invalid Token');

$sendin = new Sendinblue();
$blockname_value = Tools::getValue('blockname');
$blockvalue_value = Tools::getValue('blockvalue');

if (!empty($blockname_value) && !empty($blockvalue_value))
$sendin->hooksPosition($blockname_value, $blockvalue_value, Tools::getValue('id_shop_group'), Tools::getValue('id_shop'));
else
echo 'blank_value';
<?php
/**
* 2007-2014 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-2014 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/

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;
4 changes: 2 additions & 2 deletions views/js/sendinblue.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* 2007-2015 PrestaShop
* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <[email protected]>
* @copyright 2007-2015 PrestaShop SA
* @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
*/
Expand Down
6 changes: 3 additions & 3 deletions views/js/sendinblue.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions views/templates/admin/ajaxuserlist.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{*
* 2007-2015 PrestaShop
* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <[email protected]>
* @copyright 2007-2015 PrestaShop SA
* @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
*}
Expand Down
4 changes: 2 additions & 2 deletions views/templates/admin/sendinsyncronizeblock.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{*
* 2007-2015 PrestaShop
* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <[email protected]>
* @copyright 2007-2015 PrestaShop SA
* @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
*}
Expand Down
4 changes: 2 additions & 2 deletions views/templates/admin/smssetting.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{*
* 2007-2015 PrestaShop
* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <[email protected]>
* @copyright 2007-2015 PrestaShop SA
* @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
*}
Expand Down
4 changes: 2 additions & 2 deletions views/templates/admin/userlist.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{*
* 2007-2015 PrestaShop
* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <[email protected]>
* @copyright 2007-2015 PrestaShop SA
* @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
*}
Expand Down