diff options
| author | karl <noreply@maennchen1.de> | 2023-08-03 07:03:04 +0000 |
|---|---|---|
| committer | karl <noreply@maennchen1.de> | 2023-08-03 07:03:04 +0000 |
| commit | 92029720fda5af4735582b79fb3fd916ecd5629d (patch) | |
| tree | 43643a460d97b6932ebd232a9a3699783a744a16 | |
| parent | 13878f8dbd63460e272a15bb8765e52f322282c4 (diff) | |
- Feature: Modul Vorkasse: QR-Rechnung ist nun an Bestellbestätigung (E-Mail) anhängbar
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8344 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rw-r--r-- | views/mods/mod_prepayment/mail_html.phtml | 8 | ||||
| -rw-r--r-- | views/mods/mod_prepayment/order_done.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_prepayment/settings_edit.phtml | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/views/mods/mod_prepayment/mail_html.phtml b/views/mods/mod_prepayment/mail_html.phtml index 370704c..272041f 100644 --- a/views/mods/mod_prepayment/mail_html.phtml +++ b/views/mods/mod_prepayment/mail_html.phtml @@ -31,7 +31,7 @@ <td style="text-align:right;"><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
</tr>
<?php
-
+
if (isset($this->view['mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true)) {
require_once WPSG_PATH_LIB.'phpgirocode.class.php';
@@ -42,9 +42,9 @@ $qrcodes = array();
$qrcodes = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
+
foreach ($qrcodes as $qr) {
- // Base64 QR-Image
if ($qr['title'] == 'QR-Rechnung') echo '<tr style="margin-top:25px;" >';
else echo '<tr>';
echo '<td>'.__($qr['title'], 'wpsg').'</td>';
@@ -60,7 +60,7 @@ echo '
<tr>
<td>'.__($qrcode['title'], 'wpsg').':</td>
- <td style="float:right;">'.$qrcode['hash'].'</td>
+ <td style="float:right;" alt="qrcode">'.$qrcode['hash'].'</td>
</tr>
';
@@ -71,7 +71,7 @@ echo '
<tr>
<td>'.__($qrcode['title'], 'wpsg').':</td>
- <td style="float:right;">'.$qrcode['hash'].'</td>
+ <td style="float:right;" alt="qrcode">'.$qrcode['hash'].'</td>
</tr>
';
diff --git a/views/mods/mod_prepayment/order_done.phtml b/views/mods/mod_prepayment/order_done.phtml index 87a298f..6850634 100644 --- a/views/mods/mod_prepayment/order_done.phtml +++ b/views/mods/mod_prepayment/order_done.phtml @@ -30,7 +30,7 @@ $img = array();
$img = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 10, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-
+
?>
<div style="display: flex; justify-content: center; flex-direction: column; gap: 20px;">
diff --git a/views/mods/mod_prepayment/settings_edit.phtml b/views/mods/mod_prepayment/settings_edit.phtml index 238b14f..80dee13 100644 --- a/views/mods/mod_prepayment/settings_edit.phtml +++ b/views/mods/mod_prepayment/settings_edit.phtml @@ -9,12 +9,13 @@ <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_prepayment_bezeichnung'), array('help' => 'wpsg_mod_prepayment_bezeichnung')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_prepayment_aktiv'), array('help' => 'wpsg_mod_prepayment_aktiv')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_qrcode', __('QR-Code anzeigen', 'wpsg'), $this->get_option('wpsg_mod_prepayment_qrcode'), array('help' => 'wpsg_mod_prepayment_qrcode')); ?>
-<div id="wpsg_mod_prepayment_qrcode_country_layer" style="display: none;">
+<div id="wpsg_mod_prepayment_qrcode_options_layer" style="display: none;">
<?php echo wpsg_drawForm_Select('wpsg_mod_prepayment_qrcode_country', __('QR-Code für', 'wpsg'), Array(
wpsg_mod_prepayment::QRCODE_BOTH => __('Beide', 'wpsg'),
wpsg_mod_prepayment::QRCODE_EPC => __('Girocode', 'wpsg'),
wpsg_mod_prepayment::QRCODE_SWISS => __('QR-Rechnung', 'wpsg')
), $this->get_option('wpsg_mod_prepayment_qrcode_country'), array('help' => 'wpsg_mod_prepayment_qrcode_country')); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_mailattachment', __('QR-Rechnung an Bestellbestätigung anhängen', 'wpsg'), $this->get_option('wpsg_mod_prepayment_mailattachment'), array('help' => 'wpsg_mod_prepayment_mailattachment')); ?>
</div>
<?php echo wpsg_drawForm_Textarea('wpsg_mod_prepayment_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_prepayment_hint'), array('help' => 'wpsg_mod_prepayment_hint')); ?>
@@ -38,7 +39,7 @@ document.addEventListener("DOMContentLoaded", function() {
var qrcodeAktiveCheckbox = document.getElementById('wpsg_mod_prepayment_qrcode');
- var qrcodeSelectDiv = document.getElementById('wpsg_mod_prepayment_qrcode_country_layer');
+ var qrcodeSelectDiv = document.getElementById('wpsg_mod_prepayment_qrcode_options_layer');
function toggleDivVisibility(checkbox, div)
|