diff options
| author | karl <noreply@maennchen1.de> | 2023-04-19 09:13:20 +0000 |
|---|---|---|
| committer | karl <noreply@maennchen1.de> | 2023-04-19 09:13:20 +0000 |
| commit | 2758ac53815597cdc0013647b3643ac701f0fabb (patch) | |
| tree | c55be0174084578a369e52a58fa3e708d7119898 | |
| parent | dac3af0cc638758a328fa358d1afef8aa957a697 (diff) | |
- wpsg_debug entfernt
- Produktfeatures Eingabefeld in Produkten hinzugefuegt -> bisher noch nicht mit im Template implementiert
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8274 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rw-r--r-- | views/mods/mod_rechnungen/invoice_pdf.phtml | 11 | ||||
| -rw-r--r-- | views/order/backendEdit/editPayShipping.phtml | 2 | ||||
| -rw-r--r-- | views/produkt/addedit_texte.phtml | 13 |
3 files changed, 20 insertions, 6 deletions
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index d11e6d6..6434ade 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -199,13 +199,13 @@ if ($bNoTax) {
- $discount_value = $this->view['basket']['arCalculation']['sum']['discount_netto'];
+ $discount_value = abs($this->view['basket']['arCalculation']['sum']['discount_netto']);
$shipping_cost = $this->view['basket']['arCalculation']['sum']['shipping_netto'];
$payment_cost = $this->view['basket']['arCalculation']['sum']['payment_netto'];
} else {
- $discount_value = $this->view['basket']['arCalculation']['sum']['discount_brutto'];
+ $discount_value = abs($this->view['basket']['arCalculation']['sum']['discount_brutto']);
$shipping_cost = $this->view['basket']['arCalculation']['sum']['shipping_brutto'];
$payment_cost = $this->view['basket']['arCalculation']['sum']['payment_brutto'];
@@ -451,7 +451,8 @@ } // produkte
- if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) {
+ if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher']))
+ {
foreach ($this->view['basket']['arCalculation']['voucher'] as $v) {
@@ -491,7 +492,7 @@ }
// Versandkosten
- if ( ($shipping_cost != '') && ($shipping_cost != 0) )
+ if ( ($shipping_cost != '') && ($shipping_cost != 0) )
{
$pdf->SetFont('Arial', '', 9);
@@ -742,7 +743,7 @@ // Rabatt
if ($discount_value > 0)
{
-
+
$offset += 5;
$pdf->Text($prod_left + 80, $prod_top + $offset, __("Rabatt", "wpsg"));
$pdf->setXY($prod_left + 140, $prod_top + $offset - 5);
diff --git a/views/order/backendEdit/editPayShipping.phtml b/views/order/backendEdit/editPayShipping.phtml index 06dafc5..584f4b8 100644 --- a/views/order/backendEdit/editPayShipping.phtml +++ b/views/order/backendEdit/editPayShipping.phtml @@ -51,7 +51,7 @@ ?>
<div id="editPayShipping">
- <?php wpsg_debug($price_shipping); ?>
+
<?php echo wpsg_drawForm_Select('edit_shipping_type', __('Versandart', 'wpsg'), $arShippingSelect,$this->view['data']['type_shipping']); ?>
<?php echo wpsg_drawForm_Input('edit_shipping_price', __('Kosten', 'wpsg').$price_suffix, $price_shipping); ?>
diff --git a/views/produkt/addedit_texte.phtml b/views/produkt/addedit_texte.phtml index aa3b450..eff5984 100644 --- a/views/produkt/addedit_texte.phtml +++ b/views/produkt/addedit_texte.phtml @@ -55,6 +55,19 @@ ?>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Produktfeatures', 'wpsg')); ?>
+<?php
+
+ // Damit die qTranslate Interne Editor Übersetzung nicht aufgerufen wird
+ //remove_filter('the_editor', 'qtrans_modifyRichEditor');
+
+ add_filter('tiny_mce_before_init', 'wpsg_formatTinyMCE');
+ add_filter('admin_head', 'wpsg_ShowTinyMCE');
+ wp_editor(@$this->view['data']['productfeatures'], 'productfeatures');
+
+?>
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
<?php echo wpsg_drawForm_AdminboxStart(__('Zusätzliche Informationen', 'wpsg')); ?>
<?php
|