Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix shop errors #2

Merged
merged 2 commits into from
Feb 13, 2018
Merged

Fix shop errors #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e4be48
Fix error when subroot is root and doesn't have id
lllHuber Feb 9, 2018
27c42e1
Fix twig error
lllHuber Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions KwcShop/Kwc/Shop/Cart/Checkout/Payment/Abstract/Confirm/Paragraphs/Products/Component.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -28,7 +28,7 @@
</li>
{% endif %}
</ul>
{% elseif %}
{% else %}
<span>{{ data.trlKwf('Productlist') }}</span>
{% endif %}
</div>
7 changes: 5 additions & 2 deletions KwcShop/Kwc/Shop/Cart/Checkout/Payment/Wirecard/Success/Component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down