diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2021-06-02 05:35:45 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2021-06-02 05:35:45 +0000 |
| commit | ec8777e2484f5d8f70d9674d012873f82f8dfc60 (patch) | |
| tree | 3f8d7e77f676dffa326230e7a9893e1a4d661631 | |
| parent | 84c020827ecf96c2a57e04f56b0f7e68ae974d7d (diff) | |
- Bugfix: Weitere Kundendaten werden in Admin- und Kundenmail und Bestellverwaltung angezeigt
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7900 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rw-r--r-- | views/admin/kundendaten_tab2.phtml | 13 | ||||
| -rw-r--r-- | views/mailtemplates/html/order.phtml | 29 | ||||
| -rw-r--r-- | views/mailtemplates/order.phtml | 18 | ||||
| -rw-r--r-- | views/order/view_customerdata.phtml | 19 |
4 files changed, 69 insertions, 10 deletions
diff --git a/views/admin/kundendaten_tab2.phtml b/views/admin/kundendaten_tab2.phtml index 6473f6d..0f9cdba 100644 --- a/views/admin/kundendaten_tab2.phtml +++ b/views/admin/kundendaten_tab2.phtml @@ -90,14 +90,17 @@ indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
callback: function(el) {
- if (el == '<?php echo __('Auswahl', 'wpsg'); ?>')
- {
+
+ if (el == '1') {
+
jQuery('#row_auswahl_<?php echo $c_id; ?>').show();
- }
- else
- {
+
+ } else {
+
jQuery('#row_auswahl_<?php echo $c_id; ?>').hide();
+
}
+
}
});
diff --git a/views/mailtemplates/html/order.phtml b/views/mailtemplates/html/order.phtml index cb0f2de..b024ec8 100644 --- a/views/mailtemplates/html/order.phtml +++ b/views/mailtemplates/html/order.phtml @@ -1,5 +1,8 @@ <?php
-
+
+ /** @var wpsg_order $oOrder */
+ $oOrder = $this->view['oOrder'];
+
if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
else $display_brutto_netto = 'netto';
@@ -201,6 +204,30 @@ </tr>
<?php $this->callMods('mail_order_end', [&$this->view['basket']['arCalculation'], true]); ?>
</table>
+
+ <?php
+
+ $arCV = $oOrder->getCustomer()->getCustomerVariables();
+
+ if (wpsg_isSizedArray($arCV)) { ?>
+
+ <strong><?php echo __('Weitere Kundendaten', 'wpsg'); ?>:</strong><br />
+
+ <table>
+
+ <?php foreach ($arCV as $cv) { ?>
+ <tr>
+ <th><?php echo $cv['label']; ?></th>
+ <td><?php echo $cv['value']; ?></td>
+ </tr>
+ <?php } ?>
+
+ </table>
+
+ <?php }
+
+ ?>
+
</div>
<br />
\ No newline at end of file diff --git a/views/mailtemplates/order.phtml b/views/mailtemplates/order.phtml index ae91725..40f5803 100644 --- a/views/mailtemplates/order.phtml +++ b/views/mailtemplates/order.phtml @@ -1,5 +1,8 @@ <?php
-
+
+ /** @var wpsg_order $oOrder */
+ $oOrder = $this->view['oOrder'];
+
if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
else $display_brutto_netto = 'netto';
@@ -121,4 +124,15 @@ <?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')), 34); ?>
<?php $this->callMods('mail_order_end', [&$this->view['basket']['arCalculation'], false]); ?>
-<?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>
\ No newline at end of file +<?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>
+<?php
+
+ $arCV = $oOrder->getCustomer()->getCustomerVariables();
+
+ if (wpsg_isSizedArray($arCV)) { ?>
+<?php echo __('Weitere Kundendaten', 'wpsg'); ?>:
+
+<?php foreach ($arCV as $cv) { ?>
+<?php echo $cv['label']; ?>: <?php echo $cv['value']."\r\n"; ?>
+<?php } ?>
+<?php } ?>
\ No newline at end of file diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml index 66d7d76..c76ec1a 100644 --- a/views/order/view_customerdata.phtml +++ b/views/order/view_customerdata.phtml @@ -6,6 +6,9 @@ * Time: 10:40
*/
+ /** @var wpsg_customer $Customer */
+ $Customer = $this->view['oCustomer'];
+
?>
<div class="modal fade" tabindex="-1" role="dialog" id="wpsg_customer_edit">
@@ -169,7 +172,7 @@ <?php } ?>
<?php echo wpsg_drawForm_TextEnd(__('E-Mail', 'wpsg')); ?>
- <script type="text/javascript">/* <![CDATA[ */
+ <script>
function wpsg_saveInvoiceAdress()
{
@@ -204,6 +207,18 @@ } );
- /* ]]> */</script>
+ </script>
+
+ <?php $arCV = $Customer->getCustomerVariables(); ?>
+ <?php if (wpsg_isSizedArray($arCV)) { ?>
+
+ <br />
+ <?php foreach ($Customer->getCustomerVariables() as $cv) { ?>
+
+ <?php echo wpsg_drawForm_Text($cv['label'], $cv['value']); ?>
+
+ <?php } ?>
+
+ <?php } ?>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
|