Index: includes/classes/product.php
===================================================================
--- includes/classes/product.php (revision 11106)
+++ includes/classes/product.php (working copy)
@@ -401,10 +401,15 @@
$quantity = GRADUATED_PRICE_MAX_VALUE.' '.$staffel[$i]['stk'];
}
$vpe = '';
+ $vpe_unit = '';
+ $vpe_value = '';
if (isset($this->data) && $this->data['products_vpe_status'] == 1 && $this->data['products_vpe_value'] != 0.0 && $staffel[$i]['price'] > 0) {
$vpe = $staffel[$i]['price'] - $staffel[$i]['price'] / 100 * $discount;
$vpe = $vpe * (1 / $this->data['products_vpe_value']);
$vpe = $xtPrice->xtcFormatCurrency($xtPrice->xtcFormat($vpe, false, $this->data['products_tax_class_id']), 0, false).TXT_PER.xtc_get_vpe_name($this->data['products_vpe']);
+ $vpe_unit = xtc_get_vpe_name($this->data['products_vpe']);
+ $vpe_value = $this->data['products_vpe_value'];
+ $vpe_value = number_format($vpe_value, 2, ',', '.');
}
$Pprice = $xtPrice->xtcFormat($staffel[$i]['price'] - $staffel[$i]['price'] / 100 * $discount, false, $this->data['products_tax_class_id']);
@@ -422,6 +427,8 @@
'FROM_QUANTITY' => GRADUATED_PRICE_MAX_VALUE,
'TO_QUANTITY' => $to_quantity,
'VPE' => $vpe,
+ 'VPE_UNIT' => $vpe_unit,
+ 'VPE_VALUE' => $vpe_value,
'PRICE' => $xtPrice->xtcFormat($Pprice, true),
'PLAIN_PRICE' => $Pprice,
'PRICE_NETTO' => $Nprice,
Index: includes/classes/xtcPrice.php
===================================================================
--- includes/classes/xtcPrice.php (revision 11106)
+++ includes/classes/xtcPrice.php (working copy)
@@ -802,6 +802,21 @@
$special_price = '';
$from = '';
$uvp = '';
+ //
+ $vpe_query="SELECT pv.products_vpe_name,
+ p.products_vpe_value
+ FROM " . TABLE_PRODUCTS_VPE . " pv
+ JOIN " . TABLE_PRODUCTS . " p
+ ON pv.products_vpe_id = p.products_vpe
+ WHERE pv.language_id='".(int)$_SESSION['languages_id']."'
+ AND p.products_id='".(int)$pID."'";
+ $vpe_query = xtDBquery($vpe_query);
+ $vpe = xtc_db_fetch_array($vpe_query,true);
+ $vpe_unit = $vpe['products_vpe_name'];
+ $vpe_value = $vpe['products_vpe_value'];
+ $vpe_value = number_format($vpe_value, 2, ',', '.');
+ $unit_price = sprintf(UNIT_PRICE, $vpe_value, $vpe_unit);
+ //
if (($this->cStatus['customers_status_graduated_prices'] == '1') && ($sQuery['qty'] > 1)) {
$bestPrice = $this->xtcGetGraduatedPrice($pID, $sQuery['qty']);
if ($discount) {
@@ -849,7 +864,10 @@
'uvp' => $uvp,
'flag' => 'SpecialGraduated',
'netto' => $Nprice,
- 'brutto' => $Bprice
+ 'brutto' => $Bprice,
+ //'vpe_unit' => $vpe_unit,
+ //'vpe_value' => $vpe_value,
+ 'unit_price' => $unit_price
);
}
} else {
Index: lang/english/english.php
===================================================================
--- lang/english/english.php (revision 11106)
+++ lang/english/english.php (working copy)
@@ -467,7 +467,8 @@
define('ENTRY_VAT_ERROR', 'The chosen VAT Reg No is not valid or cannot be verified at the moment! Please enter a valid VAT Reg No or leave this field empty.');
define('MSRP','MSRP');
define('YOUR_PRICE','your price ');
-define('UNIT_PRICE','unit price ');
+//define('UNIT_PRICE','unit price ');
+define('UNIT_PRICE','Price for %s x %s: ');
define('ONLY',' Now only ');
define('FROM','from ');
define('YOU_SAVE','you save ');
Index: lang/german/german.php
===================================================================
--- lang/german/german.php (revision 11106)
+++ lang/german/german.php (working copy)
@@ -467,7 +467,8 @@
define('ENTRY_VAT_ERROR', 'Die eingegebene USt-IdNr. ist ungültig oder kann derzeit nicht überprüft werden! Bitte geben Sie eine gültige ID ein oder lassen Sie das Feld zunächst leer.');
define('MSRP','UVP');
define('YOUR_PRICE','Ihr Preis ');
-define('UNIT_PRICE','Stückpreis ');
+//define('UNIT_PRICE','Stückpreis ');
+define('UNIT_PRICE','Preis für %s x %s: ');
define('ONLY',' Jetzt nur ');// DokuMan - Werbung mit durchgestrichenen Statt-Preisen ist zulässig
define('FROM','ab ');
define('YOU_SAVE','Sie sparen ');
Index: templates/tpl_modified/module/graduated_price.html
===================================================================
--- templates/tpl_modified/module/graduated_price.html (revision 11106)
+++ templates/tpl_modified/module/graduated_price.html (working copy)
@@ -5,7 +5,7 @@
{#heading_text#}
{foreach name=aussen item=module_data from=$module_content}
- {$module_data.FROM_QUANTITY} {$module_data.PLAIN_QUANTITY} {#unit#}
+ {$module_data.FROM_QUANTITY} {$module_data.PLAIN_QUANTITY} {*#unit#*}x {$module_data.VPE_VALUE} x {$module_data.VPE_UNIT}
{#pieces#} {$module_data.PRICE}
{if $module_data.VPE != ''}{$module_data.VPE}{/if}
Index: templates/tpl_modified/module/includes/price_box.html
===================================================================
--- templates/tpl_modified/module/includes/price_box.html (revision 11106)
+++ templates/tpl_modified/module/includes/price_box.html (working copy)
@@ -16,7 +16,7 @@
{$smarty.const.FROM} {$price_data.PRODUCTS_PRICE_OLD_PRICE}
- {$smarty.const.UNIT_PRICE} {$price_data.PRODUCTS_PRICE_SPECIAL_PRICE}
+ {*$smarty.const.UNIT_PRICE*}{$price_data.PRODUCTS_PRICE_UNIT_PRICE} {$price_data.PRODUCTS_PRICE_SPECIAL_PRICE}
{* ENDE Produkt Staffelpreis mit Ausgabe ab Preis, Stückpreis *}
{/if}
{elseif $price_data.PRODUCTS_PRICE_FLAG == 'NotAllowed'}
Index: templates/tpl_modified/module/includes/price_info.html
===================================================================
--- templates/tpl_modified/module/includes/price_info.html (revision 11106)
+++ templates/tpl_modified/module/includes/price_info.html (working copy)
@@ -31,7 +31,7 @@
{if isset($price_data.PRODUCTS_PRICE_FROM)}{$smarty.const.FROM} {/if}{$price_data.PRODUCTS_PRICE_OLD_PRICE}
- {$smarty.const.UNIT_PRICE} {$price_data.PRODUCTS_PRICE_SPECIAL_PRICE}
+ {*$smarty.const.UNIT_PRICE*}{$price_data.PRODUCTS_PRICE_UNIT_PRICE} {$price_data.PRODUCTS_PRICE_SPECIAL_PRICE}
{* ENDE Produkt Staffelpreis mit Ausgabe ab Preis, Stückpreis *}
{/if}
Index: templates/tpl_modified/module/includes/price_listing.html
===================================================================
--- templates/tpl_modified/module/includes/price_listing.html (revision 11106)
+++ templates/tpl_modified/module/includes/price_listing.html (working copy)
@@ -24,7 +24,7 @@
{$smarty.const.FROM} {$price_data.PRODUCTS_PRICE_OLD_PRICE}
- {$smarty.const.UNIT_PRICE} {$price_data.PRODUCTS_PRICE_SPECIAL_PRICE}
+ {*$smarty.const.UNIT_PRICE*}{$price_data.PRODUCTS_PRICE_UNIT_PRICE} {$price_data.PRODUCTS_PRICE_SPECIAL_PRICE}
{* ENDE Produkt Staffelpreis mit Ausgabe ab Preis, Stückpreis *}
{/if}
{elseif $price_data.PRODUCTS_PRICE_FLAG == 'NotAllowed'}