From 990c8b80689c81a06acd4b4d174c5618ad8fd525 Mon Sep 17 00:00:00 2001 From: karl Date: Fri, 28 Jul 2023 14:19:34 +0000 Subject: - Feature: Modul Vorkasse: QR-Code von QR-Rechnung (Schweiz) kann nun auf der Bestellabschlussseite/Bestellmail angezeigt werden. git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8336 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/shopdata.phtml | 78 +++++++++++++++------------ views/mailtemplates/html/customer.phtml | 20 ++++++- views/mods/mod_prepayment/order_done.phtml | 58 ++++++++++++++++---- views/mods/mod_prepayment/settings_edit.phtml | 42 +++++++++++++-- 4 files changed, 149 insertions(+), 49 deletions(-) diff --git a/views/admin/shopdata.phtml b/views/admin/shopdata.phtml index 6531a79..c5e3d83 100644 --- a/views/admin/shopdata.phtml +++ b/views/admin/shopdata.phtml @@ -21,6 +21,12 @@
+ + getId()] = $oCountry->getName(); + ?>
@@ -29,6 +35,7 @@
get_option('wpsg_shopdata_name'), array('help' => 'wpsg_shopdata_name')); ?> get_option('wpsg_shopdata_owner'), array('help' => 'wpsg_shopdata_owner')); ?> +
get_option('wpsg_shopdata_tel'), array('help' => 'wpsg_shopdata_tel')); ?> get_option('wpsg_shopdata_fax'), array('help' => 'wpsg_shopdata_fax')); ?> get_option('wpsg_shopdata_email'), array('help' => 'wpsg_shopdata_email')); ?> @@ -42,16 +49,10 @@

- get_option('wpsg_shopdata_street'), array('help' => 'wpsg_shopdata_street')); ?> get_option('wpsg_shopdata_zip'), array('help' => 'wpsg_shopdata_zip')); ?> - get_option('wpsg_shopdata_city'), array('help' => 'wpsg_shopdata_city')); ?> - __('in Deutschland', 'wpsg'), - wpsg_AdminController::SHOPDATA_EU_EU => __('innerhalb der EU', 'wpsg'), - wpsg_AdminController::SHOPDATA_EU_WORLD => __('im europäischen Ausland', 'wpsg') - ), $this->get_option('wpsg_shopdata_eu'), array('help' => 'wpsg_shopdata_eu')); ?> - + get_option('wpsg_shopdata_city'), array('help' => 'wpsg_shopdata_city')); ?> + get_option('wpsg_shopdata_country'), array('help' => 'wpsg_shopdata_country')); ?>
@@ -60,16 +61,17 @@

- get_option('wpsg_shopdata_2')); ?> - + get_option('wpsg_shopdata_2'), array('help' => 'wpsg_shopdata_2')); ?> +
@@ -78,32 +80,32 @@

- get_option('wpsg_shopdata_bank_name'), array('help' => 'wpsg_shopdata_bank_name')); ?> get_option('wpsg_shopdata_bank_owner'), array('help' => 'wpsg_shopdata_bank_owner')); ?> get_option('wpsg_shopdata_bank_iban'), array('help' => 'wpsg_shopdata_bank_iban')); ?> + get_option('wpsg_shopdata_bank_qriban'), array('help' => 'wpsg_shopdata_bank_qriban')); ?> get_option('wpsg_shopdata_bank_bic'), array('help' => 'wpsg_shopdata_bank_bic')); ?> - + get_option('wpsg_shopdata_bank_besr'), array('help' => 'wpsg_shopdata_bank_besr')); ?>
- -
-
-
-

-
-
- get_option('wpsg_shopdata_eu_name'), array('help' => 'wpsg_shopdata_eu_name')); ?> +
+
+

+
+
+ get_option('wpsg_shopdata_3'), array('help' => 'wpsg_shopdata_3')); ?> +
@@ -121,6 +123,12 @@ } ).change(); + jQuery('#wpsg_shopdata_3').bind('change', function() { + + if (jQuery(this).is(':checked')) jQuery('.wpsg_shopdata_3_activ').show(); + else jQuery('.wpsg_shopdata_3_activ').hide(); + + } ).change(); } ); diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml index b3a2e7d..4441268 100644 --- a/views/mailtemplates/html/customer.phtml +++ b/views/mailtemplates/html/customer.phtml @@ -169,11 +169,27 @@ require_once WPSG_PATH_LIB.'phpgirocode.class.php'; - if (isset($this->view['mod_prepayment']['subject'])) { + if (isset($this->view['mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true)) { if (in_array('kundenmail.phtml', $this->arTemplateStack)) { + - echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE)); + if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '0') { + + $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_FILE, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket'])); + + foreach ($qrcodes as $qr) echo $qr; + + } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { + + echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket'])); + + } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') { + + echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket'])); + + } } diff --git a/views/mods/mod_prepayment/order_done.phtml b/views/mods/mod_prepayment/order_done.phtml index d1505d4..dfd6c4b 100644 --- a/views/mods/mod_prepayment/order_done.phtml +++ b/views/mods/mod_prepayment/order_done.phtml @@ -21,15 +21,55 @@

- - callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 8, PhpGirocode::OUTPUT_BASE64)); - - echo ''; + + + + get_option('wpsg_mod_prepayment_qrcode_country') == '0') { ?> - ?> + + + 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'])); + + echo '
'; + foreach ($img as $i) { + + echo '
'; + echo '

'.$i['title'].':'.'

'; + echo '
'; + echo '

'; + + } + echo '
' + + ?> + + get_option('wpsg_mod_prepayment_qrcode_country') == '1') { ?> + + + + 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'))); + + echo ''; + + ?> + + get_option('wpsg_mod_prepayment_qrcode_country') == '2') { ?> + + + + 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'])); + + echo ''; + + ?> + + \ No newline at end of file diff --git a/views/mods/mod_prepayment/settings_edit.phtml b/views/mods/mod_prepayment/settings_edit.phtml index 7d07c93..0f46150 100644 --- a/views/mods/mod_prepayment/settings_edit.phtml +++ b/views/mods/mod_prepayment/settings_edit.phtml @@ -8,8 +8,14 @@ get_option('wpsg_mod_prepayment_bezeichnung'), array('help' => 'wpsg_mod_prepayment_bezeichnung')); ?> get_option('wpsg_mod_prepayment_aktiv'), array('help' => 'wpsg_mod_prepayment_aktiv')); ?> -get_option('wpsg_mod_prepayment_qrcode'), array('help' => 'wpsg_mod_prepayment_qrcode')); ?> - +get_option('wpsg_mod_prepayment_qrcode'), array('help' => 'wpsg_mod_prepayment_qrcode')); ?> + get_option('wpsg_mod_prepayment_hint'), array('help' => 'wpsg_mod_prepayment_hint')); ?> get_option('wpsg_mod_prepayment_subject'), array('help' => 'mod_prepayment_subject')); ?> @@ -23,4 +29,34 @@ get_option('wpsg_mod_prepayment_kinhaber'), array('help' => 'wpsg_mod_prepayment_kinhaber')); ?> get_option('wpsg_mod_prepayment_bank'), array('help' => 'wpsg_mod_prepayment_bank')); ?> get_option('wpsg_mod_prepayment_iban'), array('help' => 'wpsg_mod_prepayment_iban')); ?> -get_option('wpsg_mod_prepayment_swift'), array('help' => 'wpsg_mod_prepayment_swift')); ?> \ No newline at end of file +get_option('wpsg_mod_prepayment_qriban'), array('help' => 'wpsg_mod_prepayment_qriban')); ?> +get_option('wpsg_mod_prepayment_swift'), array('help' => 'wpsg_mod_prepayment_swift')); ?> +get_option('wpsg_mod_prepayment_besr'), array('help' => 'wpsg_mod_prepayment_besr')); ?> + + -- cgit v1.2.3