From ae9a3c67e5e143a4227266951b1ef7429f5fe7e9 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 21 Dec 2023 10:08:58 +0100
Subject: [PATCH] Move returns templates to proper location

---
 .../Admin/Sell/CustomerService/MerchandiseReturnController.php  | 2 +-
 .../CustomerService/MerchandiseReturn}/Blocks/form.html.twig    | 0
 .../Sell/CustomerService/MerchandiseReturn}/edit.html.twig      | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {templates/bundles/PrestaShopBundle/Admin/Sell/CustomerService/OrderReturn => src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/MerchandiseReturn}/Blocks/form.html.twig (100%)
 rename {templates/bundles/PrestaShopBundle/Admin/Sell/CustomerService/OrderReturn => src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/MerchandiseReturn}/edit.html.twig (93%)

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/CustomerService/MerchandiseReturnController.php b/src/PrestaShopBundle/Controller/Admin/Sell/CustomerService/MerchandiseReturnController.php
index f094a29282110..883b0a290a1cc 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/CustomerService/MerchandiseReturnController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/CustomerService/MerchandiseReturnController.php
@@ -120,7 +120,7 @@ public function editAction(int $orderReturnId, Request $request): Response
             return $this->redirectToRoute('admin_merchandise_returns_index');
         }
 
-        return $this->render('@PrestaShop/Admin/Sell/CustomerService/OrderReturn/edit.html.twig', [
+        return $this->render('@PrestaShop/Admin/Sell/CustomerService/MerchandiseReturn/edit.html.twig', [
             'orderReturnForm' => $form->createView(),
             'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
             'enableSidebar' => true,
diff --git a/templates/bundles/PrestaShopBundle/Admin/Sell/CustomerService/OrderReturn/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/MerchandiseReturn/Blocks/form.html.twig
similarity index 100%
rename from templates/bundles/PrestaShopBundle/Admin/Sell/CustomerService/OrderReturn/Blocks/form.html.twig
rename to src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/MerchandiseReturn/Blocks/form.html.twig
diff --git a/templates/bundles/PrestaShopBundle/Admin/Sell/CustomerService/OrderReturn/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/MerchandiseReturn/edit.html.twig
similarity index 93%
rename from templates/bundles/PrestaShopBundle/Admin/Sell/CustomerService/OrderReturn/edit.html.twig
rename to src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/MerchandiseReturn/edit.html.twig
index 851dd29f7ee6d..265bcb8008685 100644
--- a/templates/bundles/PrestaShopBundle/Admin/Sell/CustomerService/OrderReturn/edit.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/MerchandiseReturn/edit.html.twig
@@ -27,7 +27,7 @@
 {% block content %}
   <div class="row justify-content-center">
     <div class="col">
-      {% include '@PrestaShop/Admin/Sell/CustomerService/OrderReturn/Blocks/form.html.twig' %}
+      {% include '@PrestaShop/Admin/Sell/CustomerService/MerchandiseReturn/Blocks/form.html.twig' %}
     </div>
   </div>
 {% endblock %}