From b15012b9849f23e04f5213c529efd9d2191d70ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 17 May 2021 13:28:33 +0200
Subject: [PATCH] Drop the logic for the ordering items

---
 app/Services/PdfMaker/PdfMakerUtilities.php | 27 +---------
 tests/Feature/PdfMaker/PdfMakerTest.php     | 59 ---------------------
 2 files changed, 2 insertions(+), 84 deletions(-)

diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
index d98f3577a5e0..df84bddaab17 100644
--- a/app/Services/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -62,32 +62,11 @@ trait PdfMakerUtilities
             }
 
             if (isset($element['elements'])) {
-                $sorted = $this->processChildrenOrder($element['elements']);
-
-                $this->createElementContent($node, $sorted);
+                $this->createElementContent($node, $element['elements']);
             }
         }
     }
 
-    public function processChildrenOrder(array $children)
-    {
-        $processed = [];
-
-        foreach ($children as $child) {
-            if (!isset($child['order'])) {
-                $child['order'] = 0;
-            }
-
-            $processed[] = $child;
-        }
-
-        usort($processed, function ($a, $b) {
-            return $a['order'] <=> $b['order'];
-        });
-
-        return $processed;
-    }
-
     public function updateElementProperty($element, string $attribute, ?string $value)
     {
         // We have exception for "hidden" property.
@@ -154,9 +133,7 @@ trait PdfMakerUtilities
             }
 
             if (isset($child['elements'])) {
-                $sorted = $this->processChildrenOrder($child['elements']);
-
-                $this->createElementContent($_child, $sorted);
+                $this->createElementContent($_child, $child['elements']);
             }
         }
     }
diff --git a/tests/Feature/PdfMaker/PdfMakerTest.php b/tests/Feature/PdfMaker/PdfMakerTest.php
index 4c5f3c8f1dcb..8c843860b462 100644
--- a/tests/Feature/PdfMaker/PdfMakerTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerTest.php
@@ -209,65 +209,6 @@ class PdfMakerTest extends TestCase
         $this->assertNotSame($output1, $output2);
     }
 
-    public function testOrderingElements()
-    {
-        $design = new Design('example', ['custom_path' => base_path('tests/Feature/PdfMaker/')]);
-
-        $maker = new PdfMaker([
-            'template' => [
-                'header' => [
-                    'id' => 'header',
-                    'properties' => [],
-                    'elements' => [
-                        ['element' => 'h1', 'content' => 'h1-element'],
-                        ['element' => 'span', 'content' => 'span-element'],
-                    ],
-                ],
-            ],
-        ]);
-
-        $maker
-            ->design($design)
-            ->build();
-
-        $node = $maker->getSectionNode('header');
-
-        $before = [];
-
-        foreach ($node->childNodes as $child) {
-            $before[] = $child->nodeName;
-        }
-
-        $this->assertEquals('h1', $before[1]);
-
-        $maker = new PdfMaker([
-            'template' => [
-                'header' => [
-                    'id' => 'header',
-                    'properties' => [],
-                    'elements' => [
-                        ['element' => 'h1', 'content' => 'h1-element', 'order' => 1],
-                        ['element' => 'span', 'content' => 'span-element', 'order' => 0],
-                    ],
-                ],
-            ],
-        ]);
-
-        $maker
-            ->design($design)
-            ->build();
-
-        $node = $maker->getSectionNode('header');
-
-        $after = [];
-
-        foreach ($node->childNodes as $child) {
-            $after[] = $child->nodeName;
-        }
-
-        $this->assertEquals('span', $after[1]);
-    }
-
     public function testGeneratingPdf()
     {
         $state = [