Skip to content

diffToFree.tpl expanded #1

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

Open
Josef-A-Puckl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

diffToFree.tpl expanded #1

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
62b8da7
diffToFree.tpl expanded
Jun 28, 2013
1d06421
B2B-Mode (net prices are shown) added
Jun 28, 2013
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: 4 additions & 0 deletions modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ class marm_diff_oxbasket extends marm_diff_oxbasket_parent
public function getPriceUntilFreeShipping()
{
if ( $this->_oProductsPriceList ) {
if ( !$this->isCalculationModeNetto() ){
$productsPrice = $this->_oProductsPriceList->getBruttoSum();
} else {
$productsPrice = $this->_oProductsPriceList->getNettoSum();
}
$oDB = oxDb::getDb();
$sQ = 'select OXPARAM from oxdelivery where OXADDSUM = 0';
$freeShippingPrice = oxDb::getDb()->GetOne($sQ);
Expand Down
10 changes: 8 additions & 2 deletions modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
[{$smarty.block.parent}]
[{if $oxcmp_basket->getPriceUntilFreeShipping() > 0 }]
<p class="totals">
Nur noch <strong>[{$oxcmp_basket->getPriceUntilFreeShipping()}]
[{ $currency->sign}]</strong>
und wir schicken Ihnen Ihre Bestellung kostenlos.
</p>
und wir liefern Ihnen Ihre Bestellung kostenlos.
</p>
[{else}]
<p class="totals">
Versandkostenfreie Lieferung!
</p>
[{/if}]