- Übernahme neuer Funktionen aus dem alten Zweig / Pfad / Einstellungen / Hilfe Icons / Berechnung

- Neuer Modulfilter im neuen Backend

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5382 0d5edaf7-2b12-4e95-93f4-047927463d4b

5 files changed, 183 insertions, 64 deletions

diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml
index 1f5d5cc..cad27f5 100644
--- a/views/warenkorb/ajaxDialog.phtml
+++ b/views/warenkorb/ajaxDialog.phtml
@@ -9,29 +9,117 @@
 	// $this->view['amount_add'] // So oft wurde das Produkt hinzugefügt

 	// $this->view['amount_basket'] // So oft befindet sich das hinzugefügte Produkt im Warenkorb

 	// $this->view['product_data'] // Array mit Produktdaten

-	

+	// $this->view['product_index'] // Index des Produktes im Warenkorb	 	

+

 ?><div id="wpsg_basket_ajax_message">

  	

  	<div class="wpsg_basket_ajax_message_content">

+ 	 

+ 		<?php if ($this->view['error'] === true) { ?>

+

+			<h3><?php echo __('Es sind folgende Fehler aufgetreten:', 'wpsg'); ?></h3>

+

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

+ 		 		 

+ 			<div class="wpsg_button_wrap">

+	 			<button class="wpsg_button wpsg_button_continue_shopping" onclick="return wpsg_basket_ajax_message_close();"><?php echo __('Weiter Einkaufen', 'wpsg'); ?></button>	 		

+	 		</div>

+	 	

+	 		<div class="wpsg_clear"></div>

  		

- 		<?php if ($this->view['error'] === true) { echo $this->writeFrontendMessage(); } else { ?>

- 		 

- 		 	<span class="wpsg_basket_ajax_message_content_success">

- 			<?php echo wpsg_translate(

- 				__('Es wurde #1#x "#2#" in den Warenkorb gelegt.', 'wpsg'),

- 				$this->view['amount_add'],

- 				$this->getProductName($this->view['product_data']['id'], true)); ?>

- 			</span>

- 				

- 		<?php } ?> 

- 		

- 		<div class="wpsg_button_wrap">

- 			<button class="wpsg_button wpsg_button_continue_shopping" onclick="return wpsg_basket_ajax_message_close();"><?php echo __('Weiter Einkaufen', 'wpsg'); ?></button>

- 			<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>"><button class="wpsg_button wpsg_button_basket"><?php echo __('Zum Warenkorb', 'wpsg'); ?></button></a>

- 			<div class="wpsg_clear"></div>

- 		</div>

- 		

- 		<?php $this->clearFrontendMessage(); ?>

+ 		<?php } else { ?>

+ 	

+	 		<div class="wpsg_basket_ajax_message_content_left">

+	 		<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?> 

+	 			<?php $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktId($this->view['product_data']['id']))); ?>

+	  			<?php if (wpsg_isSizedArray($arBilder)) { ?> 

+	  				<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktId($this->view['product_data']['id']), $arBilder[0], 150, 150, 's')); ?>" alt="" />

+	  			<?php } ?>

+	 		<?php } ?>

+	 		</div>

+	 		

+	 		<div class="wpsg_basket_ajax_message_content_right">

+	 		<?php if ($this->view['error'] === true) { echo $this->writeFrontendMessage(); } else { ?>

+	 		 

+	 		 	<span class="wpsg_basket_ajax_message_content_success">

+	 			<?php echo wpsg_translate(

+	 				__('Es wurde #1#x "#2#" in den Warenkorb gelegt.', 'wpsg'),

+	 				$this->view['amount_add'],

+	 				$this->getProductName($this->view['product_data']['id'], true)); ?>

+	 			</span>

+	 			<?php } ?>

+				<div class="wpsg_clear"></div>

+	 			

+	 			<?php /* Preisanzeige Start */ ?>

+	 			<div class=wpsg_ajaxdialog_form>

+	 				<?php echo __('Der Preis für das Produkt beträgt:','wpsg')?>

+	 				<?php echo wpsg_ff($this->view['product_data']['preis'], $this->get_option('wpsg_currency')); ?>

+	 			</div>

+	 			<div class="wpsg_clear"></div>

+	 			<?php /* Preisanzeige ENDE */ ?>

+	

+	 			<?php /* Füllmengenanzeige START */ ?>

+				<?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog') === '1') { ?>

+					<div class="wpsg_ajaxdialog_form">

+					<?php echo wpsg_translate(__('Füllmenge: #1# #2#', 'wpsg'),'<span class="wpsg_fmenge">'.wpsg_ff($this->view['product_data']['fmenge']).'</span>', $this->view['product_data']['feinheit']); ?> 

+					</div>	

+				<?php } ?>	

+				<div class="wpsg_clear"></div>	

+				<?php /* Füllmengenanzeige ENDE */ ?>

+	 			

+	 			<?php /* Gewichtsanzeige Start */ ?>

+	 			<?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showAjaxDialog') === '1') { ?>

+					<div class="wpsg_ajaxdialog_form">

+						<?php echo wpsg_translate(__('Gewicht: #1# #2#', 'wpsg'), '<span class="wpsg_weight"">'.wpsg_ff($this->view['product_data']['weight']).'</span>', $this->view['product_data']['weight_unit']); ?>

+					</div>

+				<?php } ?>

+				<div class="wpsg_clear"></div>

+				<?php /* Gewichtsanzeige ENDE */ ?>

+				

+			</div>

+			

+			<div class="wpsg_clear"></div>

+	 		

+	 		<?php /* Zubehörprodukte START */?>

+	 		<?php if ($this->hasMod('wpsg_mod_relatedproducts') && $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog') === '1') { ?>

+	 			<?php $arRelatedProducts = $this->callMod('wpsg_mod_relatedproducts', 'getRelatedProducts', array($this->getProduktID($this->view['product_key']))); ?>

+	 			<?php if (wpsg_isSizedArray($arRelatedProducts)) { ?> 			 

+	 				<div class="wpsg_ajaxdialog_relatedproducts">

+	 				 	<h3><?php echo __('Das könnte Ihnen auch gefallen:', 'wpsg'); ?></h3>

+	 	

+	 					<div class="wpsg_clear"></div>

+	 					

+	 					<?php foreach ($arRelatedProducts as $rp_data) { $product_data = $this->loadProduktArray($rp_data['product_id']); ?>

+	 					

+	 					<div class="wpsg_ajaxdialog_productrow">

+	 						<h4><?php echo $this->getProductName($rp_data['product_id']); ?></h4>

+	 						<a href="<?php echo $this->getProduktLink($rp_data['product_id']); ?>">

+	 							<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?> 

+	 								<?php $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($rp_data['product_id'])); ?>

+	  								<?php if (wpsg_isSizedArray($arBilder)) { ?> 

+	  									<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($rp_data['product_id'], $arBilder[0], 150, 150, 's')); ?>" alt="" />

+	  								<?php } ?>

+	 							<?php } ?>

+	 						</a>

+	 					</div>

+	 					

+						<?php } ?>

+					</div>

+	 			<?php }?>	

+	 		<?php } ?>	

+	 		

+	 		<div class="wpsg_clear"></div>

+	 		<?php /* Zubehörprodukte ENDE*/?>

+	 		

+	 		<div class="wpsg_button_wrap">

+	 			<button class="wpsg_button wpsg_button_continue_shopping" onclick="return wpsg_basket_ajax_message_close();"><?php echo __('Weiter Einkaufen', 'wpsg'); ?></button>

+	 			<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>"><button class="wpsg_button wpsg_button_basket"><?php echo __('Zum Warenkorb', 'wpsg'); ?></button></a>

+	 			<div class="wpsg_clear"></div>

+	 		</div>

+	 			 		

+	 	<?php } ?>

+	 	

+	 	<?php $this->clearFrontendMessage(); ?>

  		

  	</div>

 

diff --git a/views/warenkorb/done.phtml b/views/warenkorb/done.phtml
index 78b0f55..6e7fccc 100644
--- a/views/warenkorb/done.phtml
+++ b/views/warenkorb/done.phtml
@@ -3,7 +3,7 @@
 	/**

 	 * Template, welches nach erfolgreicher Bestellung angezeigt wird

 	 */

-

+ 

 	/*

 	BestellID: <?php echo $this->view['o_id']; ?>

 	Menge aller Produkte: <?php echo $this->view['menge']; ?>

diff --git a/views/warenkorb/index.phtml b/views/warenkorb/index.phtml
index b03d426..d02ff16 100644
--- a/views/warenkorb/index.phtml
+++ b/views/warenkorb/index.phtml
@@ -94,6 +94,9 @@
 	<?php } ?>

 	

 	<ul>

+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_requestpage'] == 1) { ?>

+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_REQUEST); ?>"><?php echo get_the_title($this->get_option('wpsg_page_request')); ?></a></li>

+		<?php } ?>

 		<?php if ($this->view['wpsg_widgetsettings']['wpsg_agbpage'] == 1) { ?>

 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_AGB); ?>"><?php echo get_the_title($this->get_option('wpsg_page_agb')); ?></a></li>

 		<?php } ?>

diff --git a/views/warenkorb/messageDialog.phtml b/views/warenkorb/messageDialog.phtml
new file mode 100644
index 0000000..96ca5c1
--- /dev/null
+++ b/views/warenkorb/messageDialog.phtml
@@ -0,0 +1,33 @@
+<?php

+

+	/**

+	 * Template wird verwendet wenn Meldungen vom Shop nicht ausgegeben werden konnte.

+	 * Beispielsweise wenn Produktvariable auf einem Produkttemplate abgefragt und Pflichtfeld ist 

+	 */

+

+?>

+

+<div id="wpsg_basket_ajax_message_wrap">

+	<div id="wpsg_basket_ajax_message">

+		<div class="wpsg_basket_ajax_message_content">

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

+			<br />

+			<input type="button" id="wpsg_basket_messageDialog_closeButton" value="<?php echo __('Schließen', 'wpsg'); ?>" />			

+		</div>

+	</div>

+	<div id="wpsg_basket_ajax_layer"></div></div>

+				

+<script type="text/javascript">/* <![CDATA[ */

+

+	jQuery(document).ready(function() {

+

+		jQuery('#wpsg_basket_messageDialog_closeButton, #wpsg_basket_ajax_layer').bind('click', function() {

+			

+			jQuery('#wpsg_basket_ajax_message').remove(); 

+			jQuery('#wpsg_basket_ajax_layer').remove();

+			

+		} );

+		

+	} );

+                                            

+/* ]]> */</script>
\ No newline at end of file
diff --git a/views/warenkorb/progress.phtml b/views/warenkorb/progress.phtml
index 786527c..acd7bbe 100644
--- a/views/warenkorb/progress.phtml
+++ b/views/warenkorb/progress.phtml
@@ -1,60 +1,55 @@
+<?php 

 

-<div class="wpsg_progress">

-		

-	<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>">		

+	/**

+	 * Fortschrittsbalken

+	 */

+

+?>

+

+<div class="wpsg_progress <?php echo (($this->get_option('wpsg_mod_onepagecheckout') == '')?'':'only3steps'); ?>">

+      

+	<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>">      

 		<span class="step step1 <?php echo (($GLOBALS['step'] === 1)?'current':'done'); ?>" title="<?php echo __('Hier gelangen Sie zum Warenkorb', 'wpsg'); ?>"><span class="dot"></span><span class="text"><?php echo __('Warenkorb', 'wpsg'); ?></span></span>

 	</a>

-	

-	<?php if ($GLOBALS['step'] > 1) { ?>

-	<a href=""><?php } ?>

+        

+	<?php if ($this->get_option('wpsg_mod_onepagecheckout') == '') { ?>

+           

+	<?php if ($GLOBALS['step'] > 1) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>"><?php } ?>

 	<span class="step step2 <?php echo (($GLOBALS['step'] ===2)?'current':''); ?> <?php echo (($GLOBALS['step'] > 2)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten', 'wpsg'); ?>">

 		<span class="dot"></span><span class="text"><?php echo __('Kundendaten', 'wpsg'); ?></span>

-	</span>

-	<?php if ($GLOBALS['step'] > 1) { ?>

-	</a><?php } ?>

+	</span>            

+	<?php if ($GLOBALS['step'] > 1) { ?></a><?php } ?>

 	

-	<?php if ($GLOBALS['step'] > 2) { ?>

-	<a href=""><?php } ?>

+	<?php if ($GLOBALS['step'] > 2) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT2); ?>"><?php } ?>

 	<span class="step step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?> <?php echo (($GLOBALS['step'] > 3)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zur Auswahl der Bezahlmethode und der Versandart', 'wpsg'); ?>">

 		<span class="dot"></span><span class="text"><?php echo __('Zahlung / Versand', 'wpsg'); ?></span>

-	</span>

-	<?php if ($GLOBALS['step'] > 2) { ?>

-	</a><?php } ?>

-	

-	<?php if ($GLOBALS['step'] > 3) { ?>

-	<a href=""><?php } ?>

+	</span>            

+	<?php if ($GLOBALS['step'] > 2) { ?></a><?php } ?>

+            

+	<?php if ($GLOBALS['step'] > 3) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_OVERVIEW); ?>"><?php } ?>

 	<span class="step step4 <?php echo (($GLOBALS['step'] === 4)?'current':''); ?> <?php echo (($GLOBALS['step'] > 4)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>">

 		<span class="dot"></span><span class="text"><?php echo __('Abschluß', 'wpsg'); ?></span>

 	</span>

-	<?php if ($GLOBALS['step'] > 3) { ?>

-	</a><?php } ?>

-

-</div>

-

-<div class="wpsg_clear"></div>

-

-<?php /* ?>

-<div class="steps">

-	

-	<a class="step1 <?php echo (($GLOBALS['step'] === 1)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" title="<?php echo __('Hier gelangen Sie zum Warenkorb', 'wpsg'); ?>"><span><?php echo __('Warenkorb', 'wpsg'); ?></span></a>

-	

-	<?php if ($GLOBALS['step'] > 1) { ?>

-	<a class="step2 <?php echo (($GLOBALS['step'] === 2)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten', 'wpsg'); ?>"><span><?php echo __('Kundendaten', 'wpsg'); ?></span></a>

+	<?php if ($GLOBALS['step'] > 3) { ?></a><?php } ?>

+   

 	<?php } else { ?>

-	<p class="step2"><span><?php echo __('Kundendaten','wpsg')?></span></p>		

-	<?php } ?>

-	

-	<?php if ($GLOBALS['step'] > 2) { ?>

-	<a class="step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT2); ?>" title="<?php echo __('Hier gelangen Sie zur Auswahl der Bezahlmethode und der Versandart', 'wpsg'); ?>"><span><?php echo __('Bezahlung', 'wpsg'); ?></span></a>

-	<?php } else { ?>	

-	<p class="step3"><span><?php echo __('Bezahlung','wpsg')?></span></p>		

-	<?php } ?>

+        	

+		<?php /* Onepagecheckout */ ?>

+		<?php if ($GLOBALS['step'] > 1) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>"><?php } ?>

+		<span class="step step2 <?php echo (($GLOBALS['step'] ===2)?'current':''); ?> <?php echo (($GLOBALS['step'] > 2)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten, Bezahlmethode und der Versandart', 'wpsg'); ?>">

+			<span class="dot"></span><span class="text"><?php echo __('Kundendaten / Zahlung  / Versand', 'wpsg'); ?></span>

+		</span>

+		<?php if ($GLOBALS['step'] > 1) { ?></a><?php } ?>

 	

-	<?php if ($GLOBALS['step'] > 3) { ?>

-	<a class="step4 <?php echo (($GLOBALS['step'] === 4)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_OVERVIEW); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>"><span><?php echo __('Abschluss', 'wpsg'); ?></span></a>

-	<?php } else { ?>

-	<p class="step4"><span><?php echo __('Abschluss','wpsg')?></span></p>

+		<?php if ($GLOBALS['step'] > 2) { ?><a href=""><?php } ?>

+		<span class="step step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?> <?php echo (($GLOBALS['step'] > 3)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>">

+			<span class="dot"></span><span class="text"><?php echo __('Abschluß', 'wpsg'); ?></span>

+		</span>

+		<?php if ($GLOBALS['step'] > 2) { ?></a><?php } ?>

+   

 	<?php } ?>

 

-</div> */ ?>

+</div>

+

+<div class="wpsg_clear"></div>

 	
\ No newline at end of file