fix update errors

PrestaSafe · Aug 8, 2023 · 9dfda03 · 9dfda03
1 parent 632bd66
commit 9dfda03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/classes/PrettyBlocksMigrate.php b/classes/PrettyBlocksMigrate.php
@@ -77,6 +77,15 @@ public static function columnExists($tableName, $columnName)
         $sql = "SHOW COLUMNS FROM `$tableName` LIKE '$columnName'";
         $result = Db::getInstance()->executeS($sql);
 
+        return !empty($result);
+    }
+
+    public static function tableExists($tableName)
+    {
+        $tableName = _DB_PREFIX_ . $tableName;
+        $sql = "SHOW TABLES LIKE '$tableName'";
+        $result = Db::getInstance()->executeS($sql);
+
         // Retourne true si le tableau de résultat n'est pas vide, sinon false.
         return !empty($result);
     }
@@ -87,6 +96,9 @@ public static function columnExists($tableName, $columnName)
      */
     public static function migrateLangTable()
     {
+        if (!self::tableExists('prettyblocks_lang')) {
+            return true;
+        }
         if (!self::columnExists('prettyblocks', 'id_shop')
             && !self::columnExists('prettyblocks', 'id_lang')
             && !self::columnExists('prettyblocks', 'state')) {
@@ -176,7 +188,7 @@ public static function migrateSettings()
 
             $model = $settingModel->getFirst();
             if (!$model) {
-                $model = new PrettyBlocksSettingsModel();
+                $model = new \PrettyBlocksSettingsModel();
             }
             $model->theme_name = $theme_name;
             $model->settings = json_encode($res, true);

diff --git a/classes/PrettyBlocksModel.php b/classes/PrettyBlocksModel.php
@@ -480,7 +480,7 @@ public static function updateThemeSettings($stateRequest)
         // dump($stateRequest);
         // die();
         $context = Context::getContext();
-        $profile = PrettyBlocksSettingsModel::getProfileByTheme($context->shop->theme_name, $context->shop->id);
+        $profile = \PrettyBlocksSettingsModel::getProfileByTheme($context->shop->theme_name, $context->shop->id);
         $res = [];
         foreach ($stateRequest as $tabs) {
             foreach ($tabs as $name => $field) {
@@ -807,7 +807,7 @@ public static function getThemeSettings($with_tabs = true, $context = 'front')
     {
         $theme_settings = \HelperBuilder::hookToArray('ActionRegisterThemeSettings');
         $context = Context::getContext();
-        $settingsDB = PrettyBlocksSettingsModel::getSettings($context->shop->theme_name, $context->shop->id);
+        $settingsDB = \PrettyBlocksSettingsModel::getSettings($context->shop->theme_name, $context->shop->id);
         $res = [];
         $no_tabs = [];
         foreach ($theme_settings as $key => $settings) {

diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
       "php-cs-fixer fix --no-interaction --dry-run --diff"
     ],
     "fix": [
-      "php-cs-fixer fix --dry-run --diff"
+      "php-cs-fixer fix --diff"
     ],
     "autoindex": [
       "vendor/bin/autoindex prestashop:add:index ./"