Merge branch 'pull_requests'

OXID-eSales · Nov 19, 2018 · 9ec6181 · 9ec6181
2 parents ab024cc + b09fc7d
commit 9ec6181
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 120 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Add active class to cms content pages in mainnavbar [PR-126](https://github.com/OXID-eSales/flow_theme/pull/126)
 - Add active class to cms content pages in submenus [PR-133](https://github.com/OXID-eSales/flow_theme/pull/133)
 - Introduce new feature - reset category filter [0002046](https://bugs.oxid-esales.com/view.php?id=2046)
+- New blocks:
+  - `page/checkout/inc/basketcontents_table.tpl`
+    - checkout_basketcontents_basketitem_title [PR-134](https://github.com/OXID-eSales/flow_theme/pull/134)
+    - checkout_basketcontents_basketitem_artnum [PR-134](https://github.com/OXID-eSales/flow_theme/pull/134)
+    - checkout_basketcontents_basketitem_attributes [PR-134](https://github.com/OXID-eSales/flow_theme/pull/134)
+    - checkout_basketcontents_basketitem_selectlists
+    - checkout_basketcontents_basketitem_persparams [PR-134](https://github.com/OXID-eSales/flow_theme/pull/134)
+  - `page/checkout/inc/basketcontents_list.tpl`
+    - checkout_basketcontents_basketitem_title [PR-135](https://github.com/OXID-eSales/flow_theme/pull/135)
+    - checkout_basketcontents_basketitem_artnum [PR-135](https://github.com/OXID-eSales/flow_theme/pull/135)
+    - checkout_basketcontents_basketitem_attributes [PR-135](https://github.com/OXID-eSales/flow_theme/pull/135)
+    - checkout_basketcontents_basketitem_selectlists
+    - checkout_basketcontents_basketitem_persparams [PR-135](https://github.com/OXID-eSales/flow_theme/pull/135)
 
 ### Fixed
 - Fix mouseover on cart in lists flickering [PR-127](https://github.com/OXID-eSales/flow_theme/pull/127)

diff --git a/tpl/page/checkout/inc/basketcontents_list.tpl b/tpl/page/checkout/inc/basketcontents_list.tpl
@@ -20,74 +20,84 @@
                     </div>
                     <div class="col-md-6 col-xs-8">
                         [{block name="checkout_basketcontents_basketitem_titlenumber"}]
-                            [{if $editable}]<a rel="nofllow" href="[{$basketitem->getLink()}]">[{/if}]
-                            <b>[{$basketitem->getTitle()}]</b>
-                            [{if $editable}]</a>[{/if}]
-                            [{if $basketitem->isSkipDiscount()}] <sup><a href="#SkipDiscounts_link" >**</a></sup>[{/if}]
+                            [{block name="checkout_basketcontents_basketitem_title"}]
+                                [{if $editable}]<a rel="nofllow" href="[{$basketitem->getLink()}]">[{/if}]
+                                <b>[{$basketitem->getTitle()}]</b>
+                                [{if $editable}]</a>[{/if}]
+                                [{if $basketitem->isSkipDiscount()}] <sup><a href="#SkipDiscounts_link" >**</a></sup>[{/if}]
+                            [{/block}]
 
-                            <div class="small">
-                                [{oxmultilang ident="PRODUCT_NO"}] [{$basketproduct->oxarticles__oxartnum->value}]
-                            </div>
+                            [{block name="checkout_basketcontents_basketitem_artnum"}]
+                                <div class="small">
+                                    [{oxmultilang ident="PRODUCT_NO"}] [{$basketproduct->oxarticles__oxartnum->value}]
+                                </div>
+                            [{/block}]
 
-                            <div class="small">
-                                [{assign var=sep value=", "}]
-                                [{assign var=result value=""}]
-                                [{foreach key="oArtAttributes" from=$oAttributes->getArray() item="oAttr" name="attributeContents"}]
-                                    [{assign var=temp value=$oAttr->oxattribute__oxvalue->value}]
-                                    [{assign var=result value=$result|cat:$temp|cat:$sep}]
-                                [{/foreach}]
-                                <small>[{$result|trim:$sep}]</small>
-                            </div>
+                            [{block name="checkout_basketcontents_basketitem_attributes"}]
+                                <div class="small">
+                                    [{assign var=sep value=", "}]
+                                    [{assign var=result value=""}]
+                                    [{foreach key="oArtAttributes" from=$oAttributes->getArray() item="oAttr" name="attributeContents"}]
+                                        [{assign var=temp value=$oAttr->oxattribute__oxvalue->value}]
+                                        [{assign var=result value=$result|cat:$temp|cat:$sep}]
+                                    [{/foreach}]
+                                    <small>[{$result|trim:$sep}]</small>
+                                </div>
+                            [{/block}]
 
-                            [{if !$basketitem->isBundle() || !$basketitem->isDiscountArticle()}]
-                                [{assign var="oSelections" value=$basketproduct->getSelections(null,$basketitem->getSelList())}]
-                                [{if $oSelections}]
-                                    <div class="selectorsBox clear" id="cartItemSelections_[{$smarty.foreach.basketContents.iteration}]">
-                                        [{foreach from=$oSelections item=oList name=selections}]
-                                            [{if $oViewConf->showSelectListsInList()}]
-                                                [{include file="widget/product/selectbox.tpl" oSelectionList=$oList sFieldName="aproducts[`$basketindex`][sel]" iKey=$smarty.foreach.selections.index blHideDefault=true sSelType="seldrop"}]
-                                            [{else}]
-                                                [{assign var="oActiveSelection" value=$oList->getActiveSelection()}]
-                                                [{if $oActiveSelection}]
-                                                    <input type="hidden" name="aproducts[[{$basketindex}]][sel][[{$smarty.foreach.selections.index}]]" value="[{$oActiveSelection->getValue()}]">
-                                                    <div>[{$oList->getLabel()}]: [{$oActiveSelection->getName()}]</div>
+                            [{block name="checkout_basketcontents_basketitem_selectlists"}]
+                                [{if !$basketitem->isBundle() || !$basketitem->isDiscountArticle()}]
+                                    [{assign var="oSelections" value=$basketproduct->getSelections(null,$basketitem->getSelList())}]
+                                    [{if $oSelections}]
+                                        <div class="selectorsBox clear" id="cartItemSelections_[{$smarty.foreach.basketContents.iteration}]">
+                                            [{foreach from=$oSelections item=oList name=selections}]
+                                                [{if $oViewConf->showSelectListsInList()}]
+                                                    [{include file="widget/product/selectbox.tpl" oSelectionList=$oList sFieldName="aproducts[`$basketindex`][sel]" iKey=$smarty.foreach.selections.index blHideDefault=true sSelType="seldrop"}]
+                                                [{else}]
+                                                    [{assign var="oActiveSelection" value=$oList->getActiveSelection()}]
+                                                    [{if $oActiveSelection}]
+                                                        <input type="hidden" name="aproducts[[{$basketindex}]][sel][[{$smarty.foreach.selections.index}]]" value="[{$oActiveSelection->getValue()}]">
+                                                        <div>[{$oList->getLabel()}]: [{$oActiveSelection->getName()}]</div>
+                                                    [{/if}]
                                                 [{/if}]
-                                            [{/if}]
-                                        [{/foreach}]
-                                    </div>
+                                            [{/foreach}]
+                                        </div>
+                                    [{/if}]
                                 [{/if}]
-                            [{/if}]
+                            [{/block}]
 
-                            [{if !$editable}]
-                                <p class="persparamBox">
-                                    <small>
-                                        [{foreach key=sVar from=$basketitem->getPersParams() item=aParam name=persparams}]
-                                            [{if !$smarty.foreach.persparams.first}]<br />[{/if}]
-                                            [{if $smarty.foreach.persparams.first && $smarty.foreach.persparams.last}]
-                                                [{oxmultilang ident="LABEL"}]
-                                            [{else}]
-                                                [{$sVar}] :
-                                            [{/if}]
-                                            [{$aParam}]
-                                        [{/foreach}]
-                                    </small>
-                                </p>
-                            [{else}]
-                                [{if $basketproduct->oxarticles__oxisconfigurable->value}]
-                                    [{if $basketitem->getPersParams()}]
-                                        <br />
-                                        [{foreach key=sVar from=$basketitem->getPersParams() item=aParam name=persparams}]
+                            [{block name="checkout_basketcontents_basketitem_persparams"}]
+                                [{if !$editable}]
+                                    <p class="persparamBox">
+                                        <small>
+                                            [{foreach key=sVar from=$basketitem->getPersParams() item=aParam name=persparams}]
+                                                [{if !$smarty.foreach.persparams.first}]<br />[{/if}]
+                                                [{if $smarty.foreach.persparams.first && $smarty.foreach.persparams.last}]
+                                                    [{oxmultilang ident="LABEL"}]
+                                                [{else}]
+                                                    [{$sVar}] :
+                                                [{/if}]
+                                                [{$aParam}]
+                                            [{/foreach}]
+                                        </small>
+                                    </p>
+                                [{else}]
+                                    [{if $basketproduct->oxarticles__oxisconfigurable->value}]
+                                        [{if $basketitem->getPersParams()}]
+                                            <br />
+                                            [{foreach key=sVar from=$basketitem->getPersParams() item=aParam name=persparams}]
+                                                <p>
+                                                    <input class="textbox persParam form-control" type="text" name="aproducts[[{$basketindex}]][persparam][[{$sVar}]]" value="[{$aParam}]" placeholder="[{if $smarty.foreach.persparams.first && $smarty.foreach.persparams.last}][{oxmultilang ident="LABEL"}][{else}][{$sVar}][{/if}]">
+                                                </p>
+                                            [{/foreach}]
+                                        [{else}]
                                             <p>
-                                                <input class="textbox persParam form-control" type="text" name="aproducts[[{$basketindex}]][persparam][[{$sVar}]]" value="[{$aParam}]" placeholder="[{if $smarty.foreach.persparams.first && $smarty.foreach.persparams.last}][{oxmultilang ident="LABEL"}][{else}][{$sVar}][{/if}]">
+                                                <input class="textbox persParam form-control" type="text" name="aproducts[[{$basketindex}]][persparam][details]" value="" placeholder="[{oxmultilang ident="LABEL"}]">
                                             </p>
-                                        [{/foreach}]
-                                    [{else}]
-                                        <p>
-                                            <input class="textbox persParam form-control" type="text" name="aproducts[[{$basketindex}]][persparam][details]" value="" placeholder="[{oxmultilang ident="LABEL"}]">
-                                        </p>
+                                        [{/if}]
                                     [{/if}]
                                 [{/if}]
-                            [{/if}]
+                            [{/block}]
                         [{/block}]
 
                         [{block name="checkout_basketcontents_basketitem_wrapping"}]
@@ -267,4 +277,4 @@
     [{/block}]
 
     [{block name="checkout_basketcontents_basketfunctions"}][{/block}]
-</ul>
+</ul>