From 2cc114fad0f0ba3c9361298f6f7095912a2c997f Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 24 Mar 2017 15:24:40 +0000
Subject: OnePageCheckout mit Warenkorb

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6149 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/warenkorb/basket.phtml   | 43 ++++++++++++++++++++++++++++++++----------
 views/warenkorb/overview.phtml | 19 +++++++++++++++----
 2 files changed, 48 insertions(+), 14 deletions(-)

(limited to 'views/warenkorb')

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 6e3b685..5f43120 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -11,15 +11,23 @@
 ?>	
 <div class="wpsg wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">
 	
+	<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
+	<?php } else {?>
 	<?php echo $this->writeFrontendMessage(); ?>
+	<?php } ?>
 	
 	<?php $this->callMods('basket_top'); ?>
 	
 	<?php if (sizeof($this->view['basket']['produkte']) > 0) { ?>
 
-	<?php $GLOBALS['step'] = 1; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
-		
+	<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
+	<?php } else {?> 
+		<?php $GLOBALS['step'] = 1; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+	<?php } ?> 
+
+	<?php if (!isset($this->view['noFormTag'])) { ?>	
 	<form id="wpsg_basket_form" name="wpsg_basket_form"  method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>">
+	<?php } ?>
 	
 		<h2><?php echo __('Bestellte Produkte', 'wpsg'); ?></h2>
 		
@@ -157,7 +165,7 @@
 					<span><?php echo $this->arShipping[$this->view['basket']['checkout']['shipping']]['name']; ?></span>
 					<?php } ?>
 					<?php if ($this->get_option('wpsg_hideBasketCountrySelect') != '1') { ?>
-					<select name="set_land" class="wpsg_form_submit set_land">
+					<select name="set_land" id="set_land" class="wpsg_form_submit set_land">
 						<?php foreach ($this->view['arLander'] as $l_id => $l) { ?>
 						<option <?php echo (($l_id == $this->getFrontendCountry(true))?'selected="selected"':''); ?> value="<?php echo $l_id; ?>"><?php echo wpsg_hspc(__($l, 'wpsg')); ?></option>
 						<?php } ?>
@@ -283,17 +291,21 @@
 		<input type="hidden" name="wpsg_basket_submit" value="1" />
 		
 		<input type="submit" class="wpsg_button wpsg_refreshbutton" value="<?php echo __('aktualisieren', 'wpsg'); ?>" name="wpsg_basket_refresh" />
-		<input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />
-		
-		<br /><br />
-		
-		<a href="<?php echo WPSG_URL_WP;?>" class="wpsg_basket_weiter_shoppen"><?php echo __('weiter shoppen', 'wpsg'); ?></a>  	
-					
+		<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
+		<?php } else { ?>
+			<input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />
+			
+			<br /><br />
+			
+			<a href="<?php echo WPSG_URL_WP;?>" class="wpsg_basket_weiter_shoppen"><?php echo __('weiter shoppen', 'wpsg'); ?></a>
+		<?php } ?>	
 		<div class="wpsg_clear"></div>
 			
 		<?php $this->ClearSessionErrors(); ?>
-			
+		
+	<?php if (!isset($this->view['noFormTag'])) { ?>	
 	</form>
+	<?php } ?>
 	
 	<?php $this->callMods('basket_after', array(&$this->view)); ?>
 	 	
@@ -326,6 +338,17 @@
 		
 		} );
 
+		jQuery('#set_land').bind('change', function() {
+			  
+			land = jQuery('#set_land').val();
+			jQuery('#wpsg_land').val(land);
+		
+		} );
+
+		// Land der Rechnungsadresse setzen
+		land = jQuery('#set_land').val();
+		jQuery('#wpsg_land').val(land);
+		
 	} );
 
 	<?php if (isset($_REQUEST['wpsg_basket_ajax'])) { ?> 
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 0b92464..5c9dc60 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -12,7 +12,10 @@
 
 	<?php echo $this->writeFrontendMessage(); ?>
 
-	<?php $GLOBALS['step'] = 4; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+	<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
+	<?php } else {?>
+		<?php $GLOBALS['step'] = 4; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+	<?php } ?>
 
 	<form method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
 
@@ -42,6 +45,10 @@
 			<div class="shipping"><?php echo wpsg_hspc($this->arShipping[$this->view['basket']['checkout']['shipping']]['name']); ?></div>
 		</div>
 		
+		<?php
+			$arAnrede = explode('|', $this->get_option('wpsg_admin_pflicht')['anrede_auswahl']);
+		?>
+		
 		<?php if (wpsg_getStr($this->view['basket']['checkout']['diff_shippingadress']) == '1') { ?>
 		<div class="anschrift">
 			<div class="subtitle"><?php echo __('Rechnungsanschrift', 'wpsg'); ?>&nbsp;
@@ -50,7 +57,7 @@
 			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>			
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
 			<?php } ?>
-			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$this->view['basket']['checkout']['title']:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
+			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
 			<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
@@ -66,7 +73,7 @@
 			<?php if (trim($this->view['basket']['checkout']['shipping_firma']) != '') { ?>			
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_firma']); ?><br />
 			<?php } ?>
-			<?php echo (($this->view['basket']['checkout']['shipping_title'] != '' && $this->view['basket']['checkout']['shipping_title'] != '-1')?$this->view['basket']['checkout']['shipping_title']:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_name']); ?><br />
+			<?php echo (($this->view['basket']['checkout']['shipping_title'] != '' && $this->view['basket']['checkout']['shipping_title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['shipping_title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_name']); ?><br />
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse']); ?><br />
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_ort']); ?><br />
 			<?php if (wpsg_isSizedArray($this->view['basket']['shipping_land'])) { ?>
@@ -79,12 +86,16 @@
 					
 		<div class="anschrift">
 			<div class="subtitle"><?php echo __('Liefer- und Rechnungsanschrift', 'wpsg'); ?>&nbsp;
+				<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
+				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
+				<?php } else { ?>
 				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
+				<?php } ?>
 			</div>
 			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>			
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
 			<?php } ?>
-			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$this->view['basket']['checkout']['title']:''); ?> <?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?><br />
+			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?><br />
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
 			<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
 			<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
-- 
cgit v1.2.3