OnePageCheckout mit Warenkorb

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

1 files changed, 29 insertions, 6 deletions

diff --git a/views/mods/mod_onepagecheckout/onepage.phtml b/views/mods/mod_onepagecheckout/onepage.phtml
index c5b7701..29fbc9f 100644
--- a/views/mods/mod_onepagecheckout/onepage.phtml
+++ b/views/mods/mod_onepagecheckout/onepage.phtml
@@ -3,25 +3,31 @@
 	/**

 	 * Template für den Bestellablauf auf einer Seite

 	 */

-

+ 

 ?>

 <div class="wpsg wpsg_onepagecheckout wpsg_checkout wpsg_checkout2 <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">

 

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

 	 

-	<?php $GLOBALS['step'] = 2; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>

-	 

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

+		<?php $GLOBALS['step'] = 2; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>

+	<?php } ?> 

 	<form id="wpsg_basket_form" name="wpsg_basket_form"  method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" enctype="multipart/form-data">

+		

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

+			<?php $this->view['noFormTag'] = true; $this->render(WPSG_PATH_VIEW.'/warenkorb/basket.phtml'); ?>

+		<?php } ?> 

 				    

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

 		 

-		<?php /* Einbindung des Logins im Checokut */ ?>	

+		<?php /* Einbindung des Logins im Checkout */ ?>	

 		<?php $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_login'); ?>

 		 

 		 <div class="wpsg_box" id="wpsg_box_payship">

 		 		 

 		 	<div class="wpsg_inner">

 		 	

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

 		 		<div class="wpsg_shipping">

 		 		

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

@@ -53,10 +59,12 @@
 		 			</div>

 		 			

 				</div>

+				<?php } ?>

 				

 				<?php if ($this->callMods('checkout_handlePayment') === true) { ?>

 				

 					<?php if (!$this->hasMod('wpsg_mod_crefopay')) { ?>

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

 					<div class="wpsg_payment">

 					

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

@@ -86,10 +94,11 @@
 							

 		 				</div>

 		 				<?php } ?>

-		 			</div>

+		 				</div>

 					

 					</div>

 					<?php } ?>

+					<?php } ?>

 					

 				<?php } ?>

 			 	

@@ -197,7 +206,14 @@
 					<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[checkout][ort]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['ort']); ?>" />

 				</div>

 				

-				<div class="wpsg_checkoutblock">

+				<?php

+					$lhidden = '';

+					if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1 )) { 

+						$lhidden = 'hidden="hidden"';

+					}

+				?>

+				

+				<div class="wpsg_checkoutblock" <?php echo $lhidden;?>>

 					<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?> 

 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

 					</label>					

@@ -274,7 +290,9 @@
 			

 		<br /> 

 		

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

 		<input type="submit" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>'; return false;" class="wpsg_button wpsg_basketbutton" value="<?php echo __('Zurück zum Warenkorb', 'wpsg'); ?>" name="wpsg_redirect_basket" />

+		<?php } ?>

 		<input type="submit" id="wpsg_checkout2button" class="wpsg_button wpsg_checkout2button" value="<?php echo __('Weiter', 'wpsg'); ?>" name="wpsg_checkout" />

 			

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

@@ -396,6 +414,11 @@
 			} );

 			 			

 			<?php } ?>			

+

+			// Land der Rechnungsadresse setzen

+			land = jQuery('#set_land').val();

+			jQuery('#wpsg_land').val(land);

+			//alert('land: ' + land);

 		 	

 		} );