Merge pull request PrestaShop#21617 from NeOMakinG/issue-21562

Show gift package and message on every details tabs of order view
lfymcc · Nov 4, 2020 · c020552 · c020552
2 parents fd65530 + 8106838
commit c020552
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Order/Order/Blocks/View/details.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Order/Order/Blocks/View/details.html.twig
@@ -108,6 +108,14 @@
         {% endblock %}
       {% endembed %}
     </div>
+
+    {% if orderForViewing.shipping.recycledPackaging %}
+      <span class="badge badge-success">{{ 'Recycled packaging'|trans({}, 'Admin.Orderscustomers.Feature') }}</span>
+    {% endif %}
+
+    {% if orderForViewing.shipping.giftWrapping %}
+      <span class="badge badge-success">{{ 'Gift wrapping'|trans({}, 'Admin.Orderscustomers.Feature') }}</span>
+    {% endif %}
   </div>
 </div>
 

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Order/Order/Blocks/View/shipping.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Order/Order/Blocks/View/shipping.html.twig
@@ -86,14 +86,6 @@
   {% if orderForViewing.shipping.carrierModuleInfo %}
     {{ orderForViewing.shipping.carrierModuleInfo|raw }}
   {% endif %}
-
-  {% if orderForViewing.shipping.recycledPackaging %}
-    <span class="badge badge-success">{{ 'Recycled packaging'|trans({}, 'Admin.Orderscustomers.Feature') }}</span>
-  {% endif %}
-
-  {% if orderForViewing.shipping.giftWrapping %}
-    <span class="badge badge-success">{{ 'Gift wrapping'|trans({}, 'Admin.Orderscustomers.Feature') }}</span>
-  {% endif %}
 {% else %}
   <p class="text-center mb-0">
     {{ 'Shipping does not apply to virtual orders'|trans({}, 'Admin.Orderscustomers.Feature') }}