Merge pull request #253 from PrestaSafe/fix-order-paste-blocks

Fix order paste blocks

Author: PrestaSafe

_dev/yarn.lock

@@ -12,10 +12,10 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz"
   integrity sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==
 
-"@esbuild/darwin-arm64@0.21.5":
+"@esbuild/linux-x64@0.21.5":
   version "0.21.5"
-  resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz"
-  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
 
 "@headlessui/vue@^1.7.19":
   version "1.7.22"
@@ -107,10 +107,15 @@
   resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@rollup/rollup-darwin-arm64@4.19.0":
+"@rollup/rollup-linux-x64-gnu@4.19.0":
   version "4.19.0"
-  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.0.tgz"
-  integrity sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.0.tgz"
+  integrity sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==
+
+"@rollup/rollup-linux-x64-musl@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.0.tgz"
+  integrity sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==
 
 "@swc/helpers@^0.2.13":
   version "0.2.14"
@@ -698,11 +703,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@~2.3.2, fsevents@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"

classes/PrettyBlocksModel.php

@@ -970,8 +970,10 @@ public static function copyZone($zone_name, $zone_name_to_paste, $id_lang, $id_s
         $query->where('zone_name = \'' . $zone_name . '\'');
         $query->where('id_lang = ' . (int) $id_lang);
         $query->where('id_shop = ' . (int) $id_shop);
+        $query->orderBy('position ASC');
         $results = $db->executeS($query);
         $result = true;
+        $lastPosition = self::getLastPosition($zone_name, $id_lang, $id_shop);
 
         foreach ($results as $row) {
             $model = new PrettyBlocksModel(null, $id_lang, $id_shop);
@@ -985,6 +987,8 @@ public static function copyZone($zone_name, $zone_name_to_paste, $id_lang, $id_s
             $model->instance_id = $row['instance_id'];
             $model->id_shop = (int) $id_shop;
             $model->id_lang = (int) $id_lang;
+            $model->position = $row['position'] + $lastPosition;
+            ++$lastPosition;
             if (!$model->save()) {
                 $errors[] = $model;
             }
@@ -993,6 +997,19 @@ public static function copyZone($zone_name, $zone_name_to_paste, $id_lang, $id_s
         return $errors;
     }
 
+    public static function getLastPosition($zone_name, $id_lang, $id_shop)
+    {
+        $db = Db::getInstance();
+        $query = new DbQuery();
+        $query->select('MAX(position)')
+            ->from('prettyblocks')
+            ->where('zone_name = \'' . $zone_name . '\'')
+            ->where('id_lang = ' . (int) $id_lang)
+            ->where('id_shop = ' . (int) $id_shop);
+
+        return (int) $db->getValue($query);
+    }
+
     /**
      * deleteBlocksFromZone
      * delete all blocks from a zone