diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/admin/kundendaten_tab1.phtml | 1 | ||||
| -rw-r--r-- | views/mods/mod_kundenverwaltung/edit.phtml | 12 | ||||
| -rw-r--r-- | views/order/view_customerdata.phtml | 8 | ||||
| -rw-r--r-- | views/warenkorb/checkout.phtml | 14 | ||||
| -rw-r--r-- | views/warenkorb/done.phtml | 10 |
5 files changed, 35 insertions, 10 deletions
diff --git a/views/admin/kundendaten_tab1.phtml b/views/admin/kundendaten_tab1.phtml index 9a6d791..81900b2 100644 --- a/views/admin/kundendaten_tab1.phtml +++ b/views/admin/kundendaten_tab1.phtml @@ -21,6 +21,7 @@ <?php echo wpsg_drawForm_Select('pflicht[email]', __('E-Mail Adresse', 'wpsg'), $arSelect, $this->view['pflicht']['email'])?>
<?php echo wpsg_drawForm_Checkbox('pflicht[emailconfirm]', __('E-Mail Adresse (Wiederholung)', 'wpsg'), $this->view['pflicht']['emailconfirm']); ?>
<?php echo wpsg_drawForm_Checkbox('pflicht[eInvoice]', __('E-Mail Adresse für eRechnung abfragen (optional)', 'wpsg'), $this->view['pflicht']['eInvoice']??0); ?>
+<?php echo wpsg_drawForm_Checkbox('pflicht[leitweg]', __('Leitweg-ID für eRechnung abfragen (optional)', 'wpsg'), $this->view['pflicht']['leitweg']??0); ?>
<?php echo wpsg_drawForm_Select('pflicht[tel]', __('Telefon', 'wpsg'), $arSelect, $this->view['pflicht']['tel'])?>
<?php echo wpsg_drawForm_Select('pflicht[fax]', __('Fax', 'wpsg'), $arSelect, $this->view['pflicht']['fax'])?>
<?php echo wpsg_drawForm_Select('pflicht[strasse]', __('Straße', 'wpsg'), $arSelect, $this->view['pflicht']['strasse'])?>
diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml index 86fdde0..648dd35 100644 --- a/views/mods/mod_kundenverwaltung/edit.phtml +++ b/views/mods/mod_kundenverwaltung/edit.phtml @@ -64,11 +64,15 @@ <?php if ($this->view['pflicht']['email'] != '2') { ?>
<?php echo wpsg_drawForm_Input('email', __('E-Mail', 'wpsg'), @$this->view['data']['email']); ?>
<?php } ?>
-
- <?php if ($oCustomer->getEMailEInvoice() !== null) { ?>
- <?php echo wpsg_drawForm_Input('email_einvoice', __('E-Mail für eRechnung', 'wpsg'), $oCustomer->getEMailEInvoice()); ?>
+
+ <?php if ($this->view['pflicht']['eInvoice'] != '0') { ?>
+ <?php echo wpsg_drawForm_Input('email_einvoice', __('E-Mail für eRechnung', 'wpsg'), $this->view['data']['email_einvoice']??''); ?>
<?php } ?>
-
+
+ <?php if (($this->view['pflicht']['leitweg']??'') != '0') { ?>
+ <?php echo wpsg_drawForm_Input('leitweg_id', __('Leitweg-ID', 'wpsg'), @$this->view['data']['leitweg_id']??''); ?>
+ <?php } ?>
+
<?php if ($this->view['pflicht']['firma'] != '2') { ?>
<?php echo wpsg_drawForm_Input('firma', __('Firma', 'wpsg'), @$this->view['data']['firma']); ?>
<?php } ?>
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml index 3393da1..974b508 100644 --- a/views/order/view_customerdata.phtml +++ b/views/order/view_customerdata.phtml @@ -55,9 +55,11 @@ '">'.$this->view['data']['email'].'</a>'); ?>
<?php } ?>
<?php } ?>
-
- <?php echo wpsg_drawForm_Input('email_einvoice', __('E-Mail für eInvoice', 'wpsg'), $this->view['data']['email_einvoice']); ?>
-
+
+ <?php echo wpsg_drawForm_Input('email_einvoice', __('E-Mail für eRechnung', 'wpsg'), $this->view['data']['email_einvoice']); ?>
+
+ <?php echo wpsg_drawForm_Input('leitweg_id', __('Leitweg-ID für eRechnung', 'wpsg'), $this->view['data']['leitweg_id']); ?>
+
<br />
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml index 9a038cb..ba8ddb9 100644 --- a/views/warenkorb/checkout.phtml +++ b/views/warenkorb/checkout.phtml @@ -218,6 +218,20 @@ />
</div>
<?php } ?>
+
+ <?php if (intval($this->view['pflicht']['leitweg']??0) === 1) { ?>
+ <div class="wpsg_checkoutblock" id="wpsg_leitweg_id">
+ <label for="wpsg_leitweg_id_input" class="wpsg_checkout"><?php echo __("Leitweg-ID (für eRechnung, optional)", "wpsg"); ?></label>
+ <input
+ class="wpsg_input_text wpsg_checkout <?php echo ((in_array("leitweg_id", (array)$this->view['error']))?'wpsg_error':''); ?>"
+ type="text"
+ id="wpsg_email_leitweg_id_input"
+ name="wpsg[checkout][leitweg_id]"
+ value="<?php echo htmlspecialchars($this->view['basket']['checkout']['leitweg_id']??''); ?>"
+ autocomplete="off"
+ />
+ </div>
+ <?php } ?>
<?php if ($this->view['pflicht']['geb'] != '2') { ?>
<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">
diff --git a/views/warenkorb/done.phtml b/views/warenkorb/done.phtml index 8193feb..2ef286c 100644 --- a/views/warenkorb/done.phtml +++ b/views/warenkorb/done.phtml @@ -1,6 +1,6 @@ -<?php
+<?php
- /**
+/**
* Template, welches nach erfolgreicher Bestellung angezeigt wird
*/
@@ -32,8 +32,12 @@ Bestellnummer: <?php echo $this->view['order']['onr']; ?>
Zahlungsart: <?php echo $this->arShipping[$this->view['basket']['checkout']['payment']]['name']; ?>
Versandart: <?php echo $this->arShipping[$this->view['basket']['checkout']['shipping']]['name']; ?>
+ Berechnungs-Array: <?php var_dump(wpsg_calculation::getOrderCalculation($this->view['o_id'])->getCalculationArray()['sum']); ?>
*/
-
+
+namespace wpsg;
+use wpsg_order;
+
?>
<div class="wpsg wpsg_done">
|