From cd5d72e272f8ae12b7f543520fc11510e96923c6 Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Fri, 13 Feb 2026 05:42:54 +0100
Subject: [PATCH] fix: make drag-and-drop on category tree persist correctly

Two issues prevented the shelf tree reordering from working:

- The JS used ``onDragStop`` (only fires for drags outside the
  tree) instead of the ``tree.move`` event to send the AJAX
  request. Moved the POST into the ``tree.move`` handler.
- The ``inside`` case used ``appendNode`` (last child), but
  jqTree sends ``inside`` when dropping before the first child.
  Switched to ``prependNode`` so the node lands first.
- Added missing ``before`` case with ``insertBeforeNode``.
---
 app/Repositories/Core/Categories.php          | 12 ++---
 .../Shop/Categories/partials/tree.blade.php   | 51 +++++--------------
 2 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/app/Repositories/Core/Categories.php b/app/Repositories/Core/Categories.php
index 5b654413..e508ae2c 100644
--- a/app/Repositories/Core/Categories.php
+++ b/app/Repositories/Core/Categories.php
@@ -67,17 +67,15 @@ class Categories
         $category_target = self::getNode($target_id);
 
         switch ($type) {
+            case 'before':
+                return $category->insertBeforeNode($category_target);
             case 'after':
-                $category->afterNode($category_target);
-                break;
+                return $category->insertAfterNode($category_target);
             case 'inside':
-                $category_target->appendNode($category);
-                break;
+                return $category_target->prependNode($category);
             default:
-                $category->afterNode($category_target);
+                return $category->insertAfterNode($category_target);
         }
-
-        return $category->save();
     }
 
     public static function create($data)
diff --git a/resources/views/Admin/Shop/Categories/partials/tree.blade.php b/resources/views/Admin/Shop/Categories/partials/tree.blade.php
index 915c69f7..a68d4757 100644
--- a/resources/views/Admin/Shop/Categories/partials/tree.blade.php
+++ b/resources/views/Admin/Shop/Categories/partials/tree.blade.php
@@ -14,57 +14,30 @@
 
 @push('js')
 	<script>
-		var position = '';
-		var target_node = '';
-
 		$(function() {
 
 		    var $tree = $('#tree1').tree({
 			  	dragAndDrop: true,
-			  	onDragStop: handleMove,
 			  	autoOpen: 0
 			});
 
-
 			$tree.on('tree.move', function(e) {
-			    // e.preventDefault();
+			    var position = e.move_info.position;
+			    var target_node = e.move_info.target_node;
+			    var moved_node = e.move_info.moved_node;
 
-			    position = e.move_info.position;
-			    target_node = e.move_info.target_node;
-
-			    function getNewParentNode() {
-			        if (position == 'inside') {
-			            return target_node;
-			        }
-			        else {
-			            // before or after
-			            return target_node.parent;
-			        }
-			    }
-
-			    var parent_node = getNewParentNode();
-			    console.log("Parent node", parent_node);
+			    $.ajax({
+  				    method: "POST",
+  				    url: "{{ route('Admin.Shop.Categories.moveTree') }}",
+  				    data: {
+  				        node_id: moved_node.id,
+  				        type: position,
+  				        target_id: target_node.id
+  				    }
+			    });
 			});
 
 		});
-
-		function handleMove(node, e) {
-    		console.log(node);
-    		node_id = node.id;
-    		console.log(node_id);
-    		console.log(position);
-    		console.log(target_node);
-    		target_node_id = target_node.id;
-
-    		$.ajax({
-  				method: "POST",
-  				url: "{{ route('Admin.Shop.Categories.moveTree') }}",
-  				data: { node_id: node.id, type: position, target_id: target_node.id }
-			});
-    		// console.log(e);
-    		// console.log($('#tree1').tree('getTree'));
-		}
-
 	</script>
 @endpush