Merge remote-tracking branch 'origin/main'

5 files changed, 52 insertions, 42 deletions

diff --git a/views/mods/mod_customerbudget/produkt_edit_sidebar.phtml b/views/mods/mod_customerbudget/produkt_edit_sidebar.phtml
new file mode 100644
index 0000000..32851c8
--- /dev/null
+++ b/views/mods/mod_customerbudget/produkt_edit_sidebar.phtml
@@ -0,0 +1,26 @@
+<?php

+

+	/**

+	 * Template für die Kennzeichnung eines Produkts als Aufladeprodukt innerhalb

+	 * der Produktverwaltung

+	 */

+

+?>

+<div id="wpsg_customerbudget" class="panel panel-default">

+	<div class="panel-heading clearfix">

+		<h3 class="panel-title">

+			<?php echo __('Kundenbudget', 'wpsg'); ?>

+		</h3>

+	</div>

+	<div class="panel-body">

+

+		<input type="hidden" name="wpsg_mod_customerbudget_form" value="1" />

+

+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_customerbudget_topup', __('Produkt lädt das Kundenbudget auf', 'wpsg'), wpsg_getStr($this->view['data']['wpsg_mod_customerbudget_topup'])); ?>

+

+		<p class="description">

+			<?php echo __('Sobald eine Bestellung mit diesem Produkt den Status "Zahlung akzeptiert" erhält, wird der Bruttopreis dem Guthaben des Kunden gutgeschrieben. Das Produkt sollte auf dem Steuerschlüssel "Nullsatz" stehen, damit nicht die Aufladung und der spätere Kauf besteuert werden.', 'wpsg'); ?>

+		</p>

+

+	</div>

+</div>

diff --git a/views/mods/mod_customerbudget/profil_budget.phtml b/views/mods/mod_customerbudget/profil_budget.phtml
new file mode 100644
index 0000000..6439c1d
--- /dev/null
+++ b/views/mods/mod_customerbudget/profil_budget.phtml
@@ -0,0 +1,18 @@
+<?php

+

+	/**

+	 * Template für die Anzeige des Kundenbudgets im Kundenkonto

+	 */

+

+	$budget = $this->view['mod_customerbudget']['budget_formatted'];

+

+?>

+<div class="wpsg wpsg_customerbudget">

+

+	<h2><?php echo wpsg_hspc($this->get_option('wpsg_mod_customerbudget_name')); ?></h2>

+

+	<div class="wpsg_customerbudget_amount">

+		<?php echo wpsg_translate(__('Ihr aktuelles Guthaben: #1#', 'wpsg'), '<strong>'.wpsg_hspc($budget).'</strong>'); ?>

+	</div>

+

+</div>

diff --git a/views/mods/mod_customerbudget/settings_edit.phtml b/views/mods/mod_customerbudget/settings_edit.phtml
index 966faac..952fd1c 100644
--- a/views/mods/mod_customerbudget/settings_edit.phtml
+++ b/views/mods/mod_customerbudget/settings_edit.phtml
@@ -6,4 +6,7 @@
 

 ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_customerbudget_name', __('Bezeichnung der Zahlungsart', 'wpsg'), $this->get_option('wpsg_mod_customerbudget_name'), array('help' => 'wpsg_mod_customerbudget_name')); ?>

-<?php echo wpsg_drawForm_Textarea('wpsg_mod_customerbudget_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_customerbudget_hint'), array('help' => 'wpsg_mod_customerbudget_hint')); ?>
\ No newline at end of file
+<?php echo wpsg_drawForm_Textarea('wpsg_mod_customerbudget_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_customerbudget_hint'), array('help' => 'wpsg_mod_customerbudget_hint')); ?>

+<?php echo wpsg_drawForm_Select('wpsg_mod_customerbudget_status', __('Status nach Kauf', 'wpsg'), $this->view['mod_customerbudget']['arStatus'], $this->view['mod_customerbudget']['status'], array('hint' => __('Bestellstatus, der gesetzt wird, sobald eine Bestellung mit dem Kundenbudget bezahlt wurde. Die Zahlung ist mit der Abbuchung abgeschlossen, ohne diesen Statuswechsel lösen weder die Downloadmodule noch die Kampagnen aus.', 'wpsg'))); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_customerbudget_inform', __('Kunden über den Statuswechsel informieren', 'wpsg'), $this->view['mod_customerbudget']['inform'], array('hint' => __('Muss aktiv sein, damit das Modul "Downloadprodukte" die Dateien freigibt. Der Kunde erhält dadurch zusätzlich zur Bestellbestätigung eine Statusmail.', 'wpsg'))); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_customerbudget_storno', __('Guthaben bei Stornierung zurückbuchen', 'wpsg'), $this->view['mod_customerbudget']['storno'], array('hint' => __('Bucht bei einer Stornierung sowohl eine Zahlung mit dem Kundenbudget als auch eine Aufladung wieder zurück.', 'wpsg'))); ?>

diff --git a/views/mods/mod_kundenverwaltung/profil.phtml b/views/mods/mod_kundenverwaltung/profil.phtml
index d17615e..b974e4f 100644
--- a/views/mods/mod_kundenverwaltung/profil.phtml
+++ b/views/mods/mod_kundenverwaltung/profil.phtml
@@ -131,6 +131,8 @@
 

 	<?php echo $this->writeFrontendMessage(); ?>

 	

+	<?php $this->callMods('customer_profil_inner', [&$this->view['data']]); ?>

+	

 	<form method="post" id="form-profil" action="<?php echo $this->callMod('wpsg_mod_kundenverwaltung', 'getProfilURL'); ?>">

 		

 		<h2><?php echo __('Kundendaten', 'wpsg'); ?></h2>

diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 4bffb91..d04f35c 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -316,7 +316,7 @@
 		<?php if ($oProduct->isGARAN()) { ?>

 		

 			<div class="wpsg_product_garan_wrap">

-				<a href="#" class="wpsg_product_garan">

+				<a href="https://europa.eu/youreurope/commercial-guarantee-durability/" target="_blank" class="wpsg_product_garan">

 					<span class="years"><?php echo $oProduct->getGARANYears(); ?></span>

 					<span class="title">GARAN</span>

 					<span class="tooltip">

@@ -372,46 +372,7 @@
 						</span>

 					</span>

 				</a>

-			</div>

-			<style lang="css">

-				

-				.wpsg_product_garan_wrap { padding:5px 0; margin-bottom:1rem; font-family:'Inter', system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif;

-					.wpsg_product_garan { border:1px solid black; display:inline-block; padding:5px 50px 5px 5px; position:relative; height:30px; white-space:nowrap; cursor:pointer; text-decoration:none; 

-						& > .years { font-size:30px; height:30px; line-height:30px; font-weight:bold; padding-right:35px; position:relative; border-right:1px solid black;

-							&:after { position:absolute; right:10px; bottom:8px; content:' '; width:16px; height:16px; background-image:url('/wp-content/plugins/wpshopgermany-free/views/gfx/garan/garan_year.svg'); background-size:contain; background-repeat:no-repeat; }

-						}

-						& > .title { padding-left:5px; font-size:22px; font-weight:bold; padding-right:20px; position:relative;

-							&:after { position:absolute; right:0; bottom:2px; content:' '; width:16px; height:16px; background-image:url('/wp-content/plugins/wpshopgermany-free/views/gfx/garan/garan_checkmark.svg'); background-size:contain; background-repeat:no-repeat; }

-						}

-						&:after { position:absolute; right:5px; top:0; content:' '; width:28px; height:40px; background-image:url('/wp-content/plugins/wpshopgermany-free/views/gfx/garan/garan_eu.svg'); background-size:contain; background-repeat:no-repeat; }

-						& > .tooltip { position:absolute; opacity:0; pointer-events:none; top:40px; left:-1px; padding:5px 5px 5px 0; transition:all 0.5s;

-							& > .inner { width:300px; min-height:300px; display:flex; flex-direction:column; gap:5px; background-color:white; padding:5px; border:1px solid black;

-							  	& > .border { border:1px solid black; display:flex; flex-direction:column; padding:5px;

-									.top { width:100%; border-bottom:2px solid black; padding-bottom:5px; position:relative;

-										& > .title { font-size:50px; font-weight:bold; padding-right:40px; position:relative; display:inline-block; line-height:50px; letter-spacing:1px;

-											&:after { position:absolute; right:0; bottom:5px; content:' '; width:32px; height:32px; background-image:url('/wp-content/plugins/wpshopgermany-free/views/gfx/garan/garan_checkmark.svg'); background-size:contain; background-position:right bottom; background-repeat:no-repeat; }

-										}

-										&:after { position:absolute; right:0; top:-11px; content:' '; width:36px; height:51px; background-image:url('/wp-content/plugins/wpshopgermany-free/views/gfx/garan/garan_eu.svg'); background-size:contain; background-repeat:no-repeat; }

-									}

-									& > .flexline { display:flex; justify-content:space-between; gap:5px; align-items:flex-start; padding:5px 0; font-size:16px; }

-									& > .line { display:flex; justify-content:space-between; gap:5px; align-items:flex-end; padding:5px 0;

-										& > .years { font-size:85px; height:85px; line-height:85px; font-weight:bold; padding-right:60px; position:relative;

-											&:after { position:absolute; right:10px; bottom:8px; content:' '; width:35px; height:35px; background-image:url('/wp-content/plugins/wpshopgermany-free/views/gfx/garan/garan_year.svg'); background-size:contain; background-repeat:no-repeat; }

-										}

-									  & > img { transform:translateY(-8px); }

-									}

-									& > .trans_wrap { display:block; white-space:normal; text-align:justify; hyphens:auto; font-size:8px; line-height:1.4;

-										& > span + span:before { content:'|'; padding-right:1px; }

-										strong { font-weight:bold; }

-									}

-								}

-							}

-						}

-					  &:hover > .tooltip { opacity:1; pointer-events:all; z-index:1; }

-					}

-				}

-				

-			</style>

+			</div> 

 		

 		<?php } ?>