Skip to content

Commit

Permalink
Merge pull request #5180 in SW/shopware from sw-19191/5.2/add-smarty-…
Browse files Browse the repository at this point in the history
…block-in-confirm.tpl to 5.2

* commit '98d0ae020b023479acdceec019039c3733399aaf':
  SW-19191 - Add smarty block around the table in confirm.tpl fixes shopware/shopware#1154
  • Loading branch information
Phil23 committed Jul 3, 2017
2 parents c8860e1 + 98d0ae0 commit 74fe5b4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 21 deletions.
1 change: 1 addition & 0 deletions UPGRADE-5.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ This changelog references changes done in Shopware 5.2 patch versions.
* Added support for uploading media with ftps in Rest-API
* Added `{$smarty.block.parent}` to `themes/Frontend/Bare/frontend/checkout/confirm_item.tpl`.
* Added new block `frontend_checkout_cart_item_details_essential_features` to `themes/Frontend/Bare/frontend/checkout/confirm_item.tpl`.
* Added new block `frontend_checkout_confirm_product_table_content` around table in `themes/Frontend/Bare/frontend/checkout/confirm.tpl`.

# 5.2.26

Expand Down
44 changes: 23 additions & 21 deletions themes/Frontend/Bare/frontend/checkout/confirm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -648,33 +648,35 @@

{block name='frontend_checkout_confirm_product_table'}
<div class="product--table">
<div class="panel has--border">
<div class="panel--body is--rounded">
{block name="frontend_checkout_confirm_product_table_content"}
<div class="panel has--border">
<div class="panel--body is--rounded">

{* Product table header *}
{block name='frontend_checkout_confirm_confirm_head'}
{include file="frontend/checkout/confirm_header.tpl"}
{/block}
{* Product table header *}
{block name='frontend_checkout_confirm_confirm_head'}
{include file="frontend/checkout/confirm_header.tpl"}
{/block}

{block name='frontend_checkout_confirm_item_before'}{/block}
{block name='frontend_checkout_confirm_item_before'}{/block}

{* Basket items *}
{block name='frontend_checkout_confirm_item_outer'}
{foreach $sBasket.content as $sBasketItem}
{block name='frontend_checkout_confirm_item'}
{include file='frontend/checkout/confirm_item.tpl' isLast=$sBasketItem@last}
{/block}
{/foreach}
{/block}
{* Basket items *}
{block name='frontend_checkout_confirm_item_outer'}
{foreach $sBasket.content as $sBasketItem}
{block name='frontend_checkout_confirm_item'}
{include file='frontend/checkout/confirm_item.tpl' isLast=$sBasketItem@last}
{/block}
{/foreach}
{/block}

{block name='frontend_checkout_confirm_item_after'}{/block}
{block name='frontend_checkout_confirm_item_after'}{/block}

{* Table footer *}
{block name='frontend_checkout_confirm_confirm_footer'}
{include file="frontend/checkout/confirm_footer.tpl"}
{/block}
{* Table footer *}
{block name='frontend_checkout_confirm_confirm_footer'}
{include file="frontend/checkout/confirm_footer.tpl"}
{/block}
</div>
</div>
</div>
{/block}

{* Table actions *}
{block name='frontend_checkout_confirm_confirm_table_actions'}
Expand Down

0 comments on commit 74fe5b4

Please sign in to comment.