Merge branch 'test' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / webpages / shop_part / categories.html

diff --git a/templates/webpages/shop_part/categories.html b/templates/webpages/shop_part/categories.html
index 43b7388..55e6628 100644 (file)
--- a/templates/webpages/shop_part/categories.html
+++ b/templates/webpages/shop_part/categories.html
@@ -3,46 +3,33 @@
 [%- USE L -%]
 [%- USE P -%]
 [%- USE LxERP -%]
+[%- USE Dumper -%]
 
 [%  LxERP.t8("Part") %]: [% HTML.escape(SELF.shop_part.part.displayable_name) %]<br>
 [%  LxERP.t8("Shop") %]: [% HTML.escape(SELF.shop_part.shop.description) %]<br>
 
 <form action="controller.pl" method="post">
   [% BLOCK recurse %]
-    [% # path = '' %]<!-- TODO: Pfad wg neuer Kategorie im Shop anlegen -->
-    [% FOREACH obj = data %]
-      <ul>
-        <li>
-        [% checked = '' %]
-        [% # path = path _ obj.name %]
-        [% # test = path.split('\|') %]
-        [% IF SELF.shop_part.shop_category.1.grep(obj.name).size %]
-          [% checked = 'checked' %]
-        [% ELSE %]
+      [% FOREACH categorie = categories_array %]
+        <ul>
+          <li>
+          [% checked = '' %]
           [% FOREACH cat_row = SELF.shop_part.shop_category %]
-            [% IF cat_row.1.grep(obj.name).size %]
+            [% IF (cat_row.0 == categorie.id) || (SELF.shop_part.shop.connector == 'shopware6' && cat_row == categorie.id) %]
               [% checked = 'checked' %]
             [% END %]
           [% END %]
-        [% END %]
-          [% L.checkbox_tag('categories[]',value=obj.id, checked=checked) %][% HTML.escape(obj.name) %][% L.hidden_tag("cat_id_" _ obj.id, obj.name) %]</li>
-        [% IF obj.childrenCount >= 1 %]
-          [% # path = path _ '|' %]
-          [% INCLUDE recurse data=obj.children %]
-        [% END %]
-      </ul>
+            [% L.checkbox_tag('categories[]',value=categorie.id, checked=checked) %][% HTML.escape(categorie.name) %][% L.hidden_tag("cat_id_" _ categorie.id, categorie.name) %]
+          </li>
+          [% IF categorie.children.size %]
+            [% INCLUDE recurse categories_array=categorie.children %]
+          [% END %]
+        </ul>
     [% END %]
   [% END %]
   <div><h2>[% LxERP.t8("Shopcategories") %]</h2>
-      [% FOREACH row = CATEGORIES %]
-<!-- TODO: Is still hardcoded 'Root' is shopware specified -->
-        [% IF row.name == 'Root' %]
-          [% IF row.childrenCount >= 1 %]
-            [% path = '' %]
-            [% INCLUDE recurse data=row.children path=path %]
-          [% END %]
-        [% END %]
-      [% END %]
+    [% # Dumper.dump_html( CATEGORIES ) %]
+    [% INCLUDE recurse categories_array=CATEGORIES %]
   </div>
     [% L.button_tag("kivi.ShopPart.save_categories(" _ SELF.shop_part.id _", " _ SELF.shop_part.shop.id _")", LxERP.t8("Save"))  %]</td>
 </form>