Merge pull request #2 from koala-framework/fix-shop-errors

Fix shop errors
koala-framework · Feb 13, 2018 · 766eb05 · 766eb05
2 parents 160aab1 + 27c42e1
commit 766eb05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/KwcShop/Kwc/Shop/Cart/Checkout/Payment/Abstract/Confirm/Paragraphs/Products/Component.twig b/KwcShop/Kwc/Shop/Cart/Checkout/Payment/Abstract/Confirm/Paragraphs/Products/Component.twig
@@ -1,5 +1,5 @@
 <div class="{{ rootElementClass }}">
-    {% if not items|empty %}
+    {% if items %}
         <span class="{{ 'title'|bemClass }}">
             {{ data.trlKwf('You ordered the following product', 'You ordered the following products', items|length) }}
         </span>
@@ -28,7 +28,7 @@
                 </li>
             {% endif %}
         </ul>
-    {% elseif %}
+    {% else %}
         <span>{{ data.trlKwf('Productlist') }}</span>
     {% endif %}
 </div>
diff --git a/KwcShop/Kwc/Shop/Cart/Checkout/Payment/Wirecard/Success/Component.php b/KwcShop/Kwc/Shop/Cart/Checkout/Payment/Wirecard/Success/Component.php
@@ -13,8 +13,11 @@ public static function getSettings($param = null)
 
     public function getNameForEdit()
     {
-        return trlKwf('Shop Confirmation Text') . ' (' .$this->getData()->getSubroot()->id . ') '
-            . Kwf_Trl::getInstance()->trlStaticExecute(Kwc_Abstract::getSetting($this->getData()->parent->componentClass, 'componentName'));
+        $ret = trlKwf('Shop Confirmation Text');
+        $subroot = $this->getData()->getSubroot();
+        if ($subroot && isset($subroot->id)) $ret .= ' (' .$this->getData()->getSubroot()->id . ')';
+        $ret .= ' ' . Kwf_Trl::getInstance()->trlStaticExecute(Kwc_Abstract::getSetting($this->getData()->parent->componentClass, 'componentName'));
+        return $ret;
     }
 
     protected function _getOrder()