From bbb5c3ade57daab468b23bb68bb6a73b48258aee Mon Sep 17 00:00:00 2001
From: Anton Fedurtsya <anton@fedurtsya.com>
Date: Mon, 27 Aug 2018 13:37:10 +0300
Subject: [PATCH] PR-129 Revert listitem oxprice plugin usage

#Related #129
---
 tpl/widget/product/listitem_grid.tpl     | 19 +++++------
 tpl/widget/product/listitem_infogrid.tpl | 41 ++++++++++++------------
 tpl/widget/product/listitem_line.tpl     | 20 +++++++-----
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/tpl/widget/product/listitem_grid.tpl b/tpl/widget/product/listitem_grid.tpl
index 8051edb7..1527b42d 100644
--- a/tpl/widget/product/listitem_grid.tpl
+++ b/tpl/widget/product/listitem_grid.tpl
@@ -70,10 +70,13 @@
                 <div class="content">
                     [{block name="widget_product_listitem_grid_price"}]
                         [{oxhasrights ident="SHOWARTICLEPRICE"}]
+                            [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
+                            [{assign var="tprice"     value=$product->getTPrice()}]
+                            [{assign var="price"      value=$product->getPrice()}]
 
-                            [{if $product->getTPrice()}]
+                            [{if $tprice && $tprice->getBruttoPrice() > $price->getBruttoPrice()}]
                                 <span class="oldPrice text-muted">
-                                    <del>[{oxprice price=$product->getTPrice() currency=$oView->getActCurrency()}]</del>
+                                    <del>[{$product->getFTPrice()}] [{$currency->sign}]</del>
                                 </span>
                             [{/if}]
 
@@ -83,26 +86,24 @@
                                         [{if $product->isRangePrice()}]
                                             [{oxmultilang ident="PRICE_FROM"}]
                                             [{if !$product->isParentNotBuyable()}]
-                                                [{assign var="oPrice" value=$product->getMinPrice()}]
+                                                [{$product->getFMinPrice()}]
                                             [{else}]
-                                                [{assign var="oPrice" value=$product->getVarMinPrice()}]
+                                                [{$product->getFVarMinPrice()}]
                                             [{/if}]
                                         [{else}]
                                             [{if !$product->isParentNotBuyable()}]
-                                                [{assign var="oPrice" value=$product->getPrice()}]
+                                                [{$product->getFPrice()}]
                                             [{else}]
-                                                [{assign var="oPrice" value=$product->getVarMinPrice()}]
+                                                [{$product->getFVarMinPrice()}]
                                             [{/if}]
                                         [{/if}]
-                                        [{oxprice price=$oPrice currency=$oView->getActCurrency()}]
+                                        [{$currency->sign}]
                                         [{if $oView->isVatIncluded()}]
                                              [{if !($product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants())}]*[{/if}]
                                         [{/if}]
                                     </span>
                                 [{/if}]
                             [{/block}]
-
-                            [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
                             [{if $oUnitPrice}]
                                 <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit">
                                     [{$product->oxarticles__oxunitquantity->value}] [{$product->getUnitName()}] | [{oxprice price=$oUnitPrice currency=$currency}]/[{$product->getUnitName()}]
diff --git a/tpl/widget/product/listitem_infogrid.tpl b/tpl/widget/product/listitem_infogrid.tpl
index 7ff74a5f..34fda360 100644
--- a/tpl/widget/product/listitem_infogrid.tpl
+++ b/tpl/widget/product/listitem_infogrid.tpl
@@ -98,39 +98,40 @@
                         <div class="content">
                             [{block name="widget_product_listitem_infogrid_price"}]
                                 [{oxhasrights ident="SHOWARTICLEPRICE"}]
+                                    [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
+                                    [{assign var="tprice"     value=$product->getTPrice()}]
+                                    [{assign var="price"      value=$product->getPrice()}]
 
-                                    [{if $product->getTPrice()}]
+                                    [{if $tprice && $tprice->getBruttoPrice() > $price->getBruttoPrice()}]
                                         <span class="oldPrice text-muted">
-                                            <del>[{oxprice price=$product->getTPrice() currency=$oView->getActCurrency()}]</del>
+                                            <del>[{$product->getFTPrice()}] [{$currency->sign}]</del>
                                         </span>
                                     [{/if}]
 
                                     [{block name="widget_product_listitem_infogrid_price_value"}]
                                         [{if $product->getFPrice()}]
                                             <span class="lead text-nowrap">
-                                                [{if $product->isRangePrice()}]
-                                                    [{oxmultilang ident="PRICE_FROM"}]
-                                                    [{if !$product->isParentNotBuyable()}]
-                                                        [{assign var="oPrice" value=$product->getMinPrice()}]
-                                                    [{else}]
-                                                        [{assign var="oPrice" value=$product->getVarMinPrice()}]
-                                                    [{/if}]
+                                            [{if $product->isRangePrice()}]
+                                                [{oxmultilang ident="PRICE_FROM"}]
+                                                [{if !$product->isParentNotBuyable()}]
+                                                    [{$product->getFMinPrice()}]
                                                 [{else}]
-                                                    [{if !$product->isParentNotBuyable()}]
-                                                        [{assign var="oPrice" value=$product->getPrice()}]
-                                                    [{else}]
-                                                        [{assign var="oPrice" value=$product->getVarMinPrice()}]
-                                                    [{/if}]
+                                                    [{$product->getFVarMinPrice()}]
                                                 [{/if}]
-                                                [{oxprice price=$oPrice currency=$oView->getActCurrency()}]
-                                                [{if $oView->isVatIncluded()}]
-                                                    [{if !($product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants())}]*[{/if}]
+                                            [{else}]
+                                                [{if !$product->isParentNotBuyable()}]
+                                                    [{$product->getFPrice()}]
+                                                [{else}]
+                                                    [{$product->getFVarMinPrice()}]
                                                 [{/if}]
-                                            </span>
+                                            [{/if}]
+                                            [{$currency->sign}]
+                                            [{if $oView->isVatIncluded()}]
+                                                [{if !($product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants())}]*[{/if}]
+                                            [{/if}]
+                                        </span>
                                         [{/if}]
                                     [{/block}]
-
-                                    [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
                                     [{if $oUnitPrice}]
                                         <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit">
                                             [{$product->oxarticles__oxunitquantity->value}] [{$product->getUnitName()}] | [{oxprice price=$oUnitPrice currency=$currency}]/[{$product->getUnitName()}]
diff --git a/tpl/widget/product/listitem_line.tpl b/tpl/widget/product/listitem_line.tpl
index 034c9df2..fbf21faf 100644
--- a/tpl/widget/product/listitem_line.tpl
+++ b/tpl/widget/product/listitem_line.tpl
@@ -103,10 +103,15 @@
                 <div class="functions text-right">
                     [{block name="widget_product_listitem_line_price"}]
                         [{oxhasrights ident="SHOWARTICLEPRICE"}]
-                        [{if $product->getTPrice()}]
+                        [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
+                        [{assign var="tprice"     value=$product->getTPrice()}]
+                        [{assign var="price"      value=$product->getPrice()}]
+
+                        [{if $tprice && $tprice->getBruttoPrice() > $price->getBruttoPrice()}]
                             <span class="oldPrice text-muted">
-                                <del>[{oxprice price=$product->getTPrice() currency=$oView->getActCurrency()}]</del>
+                                <del>[{$product->getFTPrice()}] [{$currency->sign}]</del>
                             </span>
+                            <br/>
                         [{/if}]
 
                         [{block name="widget_product_listitem_line_price_value"}]
@@ -114,25 +119,24 @@
                                 [{if $product->isRangePrice()}]
                                     [{oxmultilang ident="PRICE_FROM"}]
                                     [{if !$product->isParentNotBuyable()}]
-                                        [{assign var="oPrice" value=$product->getMinPrice()}]
+                                        [{$product->getFMinPrice()}]
                                     [{else}]
-                                        [{assign var="oPrice" value=$product->getVarMinPrice()}]
+                                        [{$product->getFVarMinPrice()}]
                                     [{/if}]
                                 [{else}]
                                     [{if !$product->isParentNotBuyable()}]
-                                        [{assign var="oPrice" value=$product->getPrice()}]
+                                        [{$product->getFPrice()}]
                                     [{else}]
-                                        [{assign var="oPrice" value=$product->getVarMinPrice()}]
+                                        [{$product->getFVarMinPrice()}]
                                     [{/if}]
                                 [{/if}]
-                                [{oxprice price=$oPrice currency=$oView->getActCurrency()}]
+                                [{$currency->sign}]
                                 [{if $oView->isVatIncluded()}]
                                     [{if !($product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants())}]*[{/if}]
                                 [{/if}]
                             </span><br/>
                         [{/block}]
 
-                        [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
                         [{if $oUnitPrice}]
                             <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit text-nowrap">[{$product->oxarticles__oxunitquantity->value}] [{$product->getUnitName()}] | [{oxprice price=$oUnitPrice currency=$currency}]/[{$product->getUnitName()}]</span>
                         [{elseif $product->oxarticles__oxweight->value }]