';
+
debug_print_backtrace();
die();
- }
+ }*/
$sellerName = $sellerXpath->item(0)->nodeValue;
Index: /mods/mod_rechnungen/wpsg_fpdf.class.php
===================================================================
--- /mods/mod_rechnungen/wpsg_fpdf.class.php (revision 8476)
+++ /mods/mod_rechnungen/wpsg_fpdf.class.php (revision 8477)
@@ -14,5 +14,20 @@
}
-
+
+ public function addBase64Image($base64Image, $x, $y, $w = 0, $h = 0) {
+
+ list($type, $data) = explode(';', $base64Image);
+ list(, $data) = explode(',', $data);
+ $data = base64_decode($data);
+
+ $tempFile = tempnam(sys_get_temp_dir(), 'fpdf') . '.png';
+ file_put_contents($tempFile, $data);
+
+ $this->Image($tempFile, $x, $y, $w, $h);
+
+ unlink($tempFile);
+
+ }
+
public function Cell($w, $h, $text, $border, $ln, $align, $fill = 0)
{
Index: /mods/wpsg_mod_prepayment.class.php
===================================================================
--- /mods/wpsg_mod_prepayment.class.php (revision 8476)
+++ /mods/wpsg_mod_prepayment.class.php (revision 8477)
@@ -48,8 +48,7 @@
} // public function settings_edit()
- public function settings_save()
- {
-
- $this->shop->update_option('wpsg_mod_prepayment_bezeichnung', $_REQUEST['wpsg_mod_prepayment_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD);
+ public function settings_save() {
+
+ $this->shop->update_option('wpsg_mod_prepayment_bezeichnung', $_REQUEST['wpsg_mod_prepayment_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD);
$this->shop->update_option('wpsg_mod_prepayment_aktiv', $_REQUEST['wpsg_mod_prepayment_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX);
$this->shop->update_option('wpsg_mod_prepayment_hint', $_REQUEST['wpsg_mod_prepayment_hint'], false, false, WPSG_SANITIZE_TEXTFIELD);
@@ -62,4 +61,7 @@
$this->shop->update_option('wpsg_mod_prepayment_swift', $_REQUEST['wpsg_mod_prepayment_swift'], false, false, WPSG_SANITIZE_TEXTFIELD);
$this->shop->update_option('wpsg_mod_prepayment_subject', $_REQUEST['wpsg_mod_prepayment_subject'], false, false, WPSG_SANITIZE_TEXTFIELD);
+ $this->shop->update_option('wpsg_mod_prepayment_qrcode', $_REQUEST['wpsg_mod_prepayment_qrcode'], false, false, WPSG_SANITIZE_CHECKBOX);
+ $this->shop->update_option('wpsg_mod_prepayment_qrcode_invoice', $_REQUEST['wpsg_mod_prepayment_qrcode_invoice'], false, false, WPSG_SANITIZE_CHECKBOX);
+ $this->shop->update_option('wpsg_mod_prepayment_qrcode_mail', $_REQUEST['wpsg_mod_prepayment_qrcode_mail'], false, false, WPSG_SANITIZE_CHECKBOX);
$this->shop->addTranslationString('wpsg_mod_prepayment_bezeichnung', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_prepayment_bezeichnung']));
@@ -67,4 +69,53 @@
} // public function settings_save()
+
+ public function wpsg_mod_rechnungen_pdf(&$pdf, &$order_id, &$bPreview, &$bInvoice) {
+
+ if ($this->shop->get_option('wpsg_mod_prepayment_qrcode_invoice') == '1') {
+
+ require_once WPSG_PATH_LIB.'phpgirocode.class.php';
+
+ $formatIBAN = function($iban) {
+
+ $iban = preg_replace('/\040/', '', $iban);
+ $iban_formated = '';
+
+ for ($i = 0; $i < ceil(strlen($iban) / 4); $i ++) $iban_formated .= substr($iban, $i * 4, 4).' ';
+
+ return trim($iban_formated);
+
+ };
+
+ $img = 'data:image/png;base64,'.$this->genQRCode(
+ $order_id,
+ $this->get_subject($order_id),
+ $this->shop->view['basket']['sum']['preis_gesamt_brutto'],
+ 10,
+ PhpGirocode::OUTPUT_BASE64
+ );
+
+ if ($pdf->getY() > 200) {
+
+ $pdf->AddPage();
+ $y = $pdf->getY();
+
+ } else $y = $pdf->getY() + 15;
+
+ $pdf->setX(24); $pdf->setXY(24, $y);
+ $pdf->MultiCell(0, 4, __('Wenn Ihre Banking-App Girocode unterstÌtzt, können Sie den folgenden QRCode scannen, um die Zahlung durchzufÌhren.', 'wpsg'));
+
+ $pdf->setY($pdf->getY() + 5);
+
+ $pdf->addBase64Image($img, 22, $pdf->getY(), 50, 50);
+
+ $pdf->setXY(80, $pdf->getY() + 3);
+ $pdf->MultiCell(0, 4, "IBAN: ".$formatIBAN($this->shop->replaceUniversalPlatzhalter($this->shop->get_option('wpsg_mod_prepayment_iban')))."
+Kontoinhaber: ".$this->shop->replaceUniversalPlatzhalter($this->shop->get_option('wpsg_mod_prepayment_kinhaber'))."
+
+Betreff: ".$this->get_subject($order_id));
+
+ }
+
+ }
public function checkGeneralBackendError()
@@ -126,23 +177,29 @@
} // public function order_done(&$order_id)
- public function mail_payment()
- {
-
+ public function mail_payment() {
+
if ($this->shop->view['basket']['checkout']['payment'] != $this->id) return;
$this->shop->view['mod_prepayment']['subject'] = $this->get_subject($this->shop->view['o_id']);
- if ($this->shop->htmlMail === true)
- {
+ if ($this->shop->htmlMail === true) {
echo $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_prepayment/mail_html.phtml');
- }
- else
- {
+ } else {
echo $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_prepayment/mail.phtml');
}
+
+ }
+
+ public function mail_payment_after() {
+
+ if ($this->shop->view['basket']['checkout']['payment'] != $this->id || $this->shop->htmlMail !== true) return;
+
+ $this->shop->view['mod_prepayment']['subject'] = $this->get_subject($this->shop->view['o_id']);
+
+ echo $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_prepayment/mail_html_payment_after.phtml');
} // public function mail_payment()
Index: /views/css/frontend.css
===================================================================
--- /views/css/frontend.css (revision 8476)
+++ /views/css/frontend.css (revision 8477)
@@ -255,5 +255,5 @@
.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_only_store { margin-top:0.75em; margin-bottom:0.75em; }
.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap { margin-top:0.75em; margin-bottom:0.75em; }
-.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap select { width:100%; box-sizing:border-box; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap select { width:100%; box-sizing:border-box; padding:0.75em; line-height:1.5em; }
.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_informationarea { margin-top:1.5em; margin-bottom:1.5em; }
.wpsg_productform .wpsg_produkt_wrapper label { font-weight:bold; }
@@ -576,5 +576,5 @@
.wpsg_mod_prepayment_info_left_amount { display:flex; flex-direction:column; }
-.wpsg_mod_prepayment_girocode { display: flex; gap: 20px; border: 1px solid #000000; padding: 20px;}
+.wpsg_mod_prepayment_girocode { display: flex; gap: 20px; border: 1px solid #000000; padding: 20px; font-size:16px; }
.wpsg_mod_prepayment_girocode h4{ margin: 0; }
.wpsg_mod_prepayment_girocode_left { display: flex; flex-direction: column; }
Index: /views/mailtemplates/html/customer.phtml
===================================================================
--- /views/mailtemplates/html/customer.phtml (revision 8476)
+++ /views/mailtemplates/html/customer.phtml (revision 8477)
@@ -182,36 +182,5 @@
:
-
-view['mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true)) {
-
- if (in_array('kundenmail.phtml', $this->arTemplateStack)) {
-
-
- 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']));
-
- }
-
- }
-
- }
-
-?>
+
@@ -222,3 +191,4 @@
+ callMods('mail_payment_after'); ?>
Index: /views/mods/mod_prepayment/mail_html.phtml
===================================================================
--- /views/mods/mod_prepayment/mail_html.phtml (revision 8476)
+++ /views/mods/mod_prepayment/mail_html.phtml (revision 8477)
@@ -10,74 +10,2 @@
-| : | -replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?> | -
| : | -replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?> | -
| : | -replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank')); ?> | -
| : | -replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift')); ?> | -
| : | -view['mod_prepayment']['subject']); ?> | -
| '.__('Zahlen via QR Code', 'wpsg').': | |
| '.__($qr['title'], 'wpsg').' | '; - echo ' | ';
- echo '
| '.__($qrcode['title'], 'wpsg').': | -'.$qrcode['hash'].' | -
| '.__($qrcode['title'], 'wpsg').': | -'.$qrcode['hash'].' | -
+
+ | : | +replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?> | +
| : | +replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?> | +
| : | +replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank')); ?> | +
| : | +replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift')); ?> | +
| : | +view['mod_prepayment']['subject']); ?> | +
+ +
+ + __('Girocode', 'wpsg'), + 'invoiceAmount' => $this->view['basket']['sum']['preis_gesamt_brutto'], + 'referenceNumber' => $this->view['wpsg_mod_prepayment']['subject'], + 'hash' => $this->callMod('wpsg_mod_prepayment', 'genQRCode', [ + $this->view['o_id'], + $this->view['wpsg_mod_prepayment']['subject'], + $this->view['basket']['sum']['preis_gesamt_brutto'], + 10, + PhpGirocode::OUTPUT_BASE64 + ]) + ]; - + ?> - 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'])); - - ?> - -- -
- - 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'])); - - ?> - -