From fc08dfd0ebc1240ec7a31f9201bac9a0a4c79407 Mon Sep 17 00:00:00 2001 From: Marion Muszynski Date: Mon, 23 Oct 2017 10:10:05 +0200 Subject: [PATCH 1/2] fix delay in admin privatesale --- modules/privatesales/AdminPrivateSalesSales.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/privatesales/AdminPrivateSalesSales.php b/modules/privatesales/AdminPrivateSalesSales.php index a348265b..98f580c4 100755 --- a/modules/privatesales/AdminPrivateSalesSales.php +++ b/modules/privatesales/AdminPrivateSalesSales.php @@ -567,7 +567,7 @@ class AdminPrivateSalesSales extends AdminTab { array( 'label' => $this->l('Livraison spécifique'), 'value' => 9, - 'selected' => ($this->cursale!==NULL && $this->cursale->delivery_delay== 8?true:false) + 'selected' => ($this->cursale!==NULL && $this->cursale->delivery_delay== 9?true:false) ), ); // Delivery delay From ef97bdfc53fd67fe1ac9a43150f1704a39700f1a Mon Sep 17 00:00:00 2001 From: Marion Muszynski Date: Tue, 24 Oct 2017 10:27:38 +0200 Subject: [PATCH 2/2] fix required paths --- modules/ant_resetbopassword/ant_resetbopassword.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/ant_resetbopassword/ant_resetbopassword.php b/modules/ant_resetbopassword/ant_resetbopassword.php index 60c4a7a7..4a8d4189 100644 --- a/modules/ant_resetbopassword/ant_resetbopassword.php +++ b/modules/ant_resetbopassword/ant_resetbopassword.php @@ -2,7 +2,12 @@ if (!defined('_PS_VERSION_')) exit; -require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php'); +if (defined('PS_ADMIN_DIR')) +{ + require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php'); +} else { + require_once(realpath(dirname(__FILE__) .'/../../').'/adm/helpers/HelperFormBootstrap.php'); +} class Ant_Resetbopassword extends Module {