diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2019-03-06 13:48:23 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2019-03-06 13:48:23 +0000 |
| commit | 2cdf9b2793ff9f70f432409a4367ad27de563775 (patch) | |
| tree | 0863c9be8d9dde17ed6f347c01a41b8cceda3221 | |
| parent | 3fd450811d809f9557d7290dbb6d477486223742 (diff) | |
- Notices / Warnungen
- PayPal Payment ID eindeutig speichern
- Rechnung erst nach Zahlungseingang schreiben
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7343 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rw-r--r-- | views/mailtemplates/html/status.phtml | 6 | ||||
| -rw-r--r-- | views/mailtemplates/status.phtml | 7 | ||||
| -rw-r--r-- | views/mods/mod_paypalapi/order_view_afterpayment.phtml | 9 |
3 files changed, 13 insertions, 9 deletions
diff --git a/views/mailtemplates/html/status.phtml b/views/mailtemplates/html/status.phtml index f6c412c..7d82730 100644 --- a/views/mailtemplates/html/status.phtml +++ b/views/mailtemplates/html/status.phtml @@ -6,11 +6,13 @@ /* Wichtig, da die Module sonst kein HTML zurückgeben */
$this->htmlMail = true;
-
+
+ $oCustomer = wpsg_customer::getInstance($this->view['kunde']['id']);
+
include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');
?>
-<p><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $this->view['kunde']['vname'], $this->view['kunde']['name']); ?></p>
+<p><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $oCustomer->getTitle(), $oCustomer->getFirstname(), $oCustomer->getName()); ?></p>
<p><?php echo wpsg_translate(
__('Der Status Ihrer Bestellung mit der Bestellnummer #1# hat sich von "#2#" auf "#3#" geändert.', 'wpsg'),
diff --git a/views/mailtemplates/status.phtml b/views/mailtemplates/status.phtml index 9b04e91..5016b61 100644 --- a/views/mailtemplates/status.phtml +++ b/views/mailtemplates/status.phtml @@ -6,10 +6,9 @@ $this->htmlMail = false;
- $arPflicht = $this->loadPflichtFeldDaten();
- $arTitle = explode('|', $arPflicht['anrede_auswahl']);
-
-?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), @$arTitle[$this->view['basket']['checkout']['title']], $this->view['basket']['checkout']['vname'], $this->view['basket']['checkout']['name']); ?>
+ $oCustomer = wpsg_customer::getInstance($this->view['kunde']['id']);
+
+?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), $oCustomer->getTitle(), $oCustomer->getFirstname(), $oCustomer->getName()); ?>
<?php echo wpsg_translate(
__('Der Status Ihrer Bestellung mit der Bestellnummer #1# hat sich von "#2#" auf "#3#" geändert.', 'wpsg'),
diff --git a/views/mods/mod_paypalapi/order_view_afterpayment.phtml b/views/mods/mod_paypalapi/order_view_afterpayment.phtml index 80e402a..29a13f5 100644 --- a/views/mods/mod_paypalapi/order_view_afterpayment.phtml +++ b/views/mods/mod_paypalapi/order_view_afterpayment.phtml @@ -3,10 +3,13 @@ /**
* Template für die Integration der PayPal Zahlungsart in die Bestellverwaltung
*/
-
+
+ $wpsg_mod_paypalapi_paymentid = $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid');
+ $wpsg_mod_paypalapi_saleid = $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid')
+
?>
-<?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'))) { ?>
+<?php if (wpsg_isSizedString($wpsg_mod_paypalapi_paymentid)) { ?>
<?php echo wpsg_drawForm_Text(
wpsg_translate(
@@ -18,7 +21,7 @@ <?php } ?>
-<?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'))) { ?>
+<?php if (wpsg_isSizedString($wpsg_mod_paypalapi_saleid)) { ?>
<?php echo wpsg_drawForm_Text(__('SaleID', 'wpsg'), wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_salestate'))); ?>
|