Merge pull request PrestaShop#34894 from Hlavtox/remove-templates

Move returns templates to proper location
PululuK · Dec 22, 2023 · 32cc543 · 32cc543
2 parents 9ac3a85 + ae9a3c6
commit 32cc543
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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/...Service/OrderReturn/Blocks/form.html.twig → ...e/MerchandiseReturn/Blocks/form.html.twig b/...Service/OrderReturn/Blocks/form.html.twig → ...e/MerchandiseReturn/Blocks/form.html.twig
diff --git a/...ustomerService/OrderReturn/edit.html.twig → ...rService/MerchandiseReturn/edit.html.twig b/...ustomerService/OrderReturn/edit.html.twig → ...rService/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 %}