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/mods/mod_onepagecheckout/onepage.phtml       | 35 +++++++--
 views/mods/mod_onepagecheckout/settings_edit.phtml |  3 +-
 views/mods/mod_productvariants/admin_edit.phtml    | 28 +++++--
 views/mods/mod_productvariants/produkt.phtml       | 91 +++++++++++++---------
 views/mods/mod_productvariants/stock2.phtml        | 59 ++++++++++++++
 .../mods/mod_productvariants/stockVarianten.phtml  | 59 ++++++++++++++
 views/order/index.phtml                            |  2 +-
 views/produkt/index.phtml                          |  4 +-
 views/warenkorb/basket.phtml                       | 43 +++++++---
 views/warenkorb/overview.phtml                     | 19 ++++-
 10 files changed, 276 insertions(+), 67 deletions(-)
 create mode 100644 views/mods/mod_productvariants/stock2.phtml
 create mode 100644 views/mods/mod_productvariants/stockVarianten.phtml

(limited to 'views')

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);
 		 	
 		} );
 			
diff --git a/views/mods/mod_onepagecheckout/settings_edit.phtml b/views/mods/mod_onepagecheckout/settings_edit.phtml
index 8979df3..e225915 100644
--- a/views/mods/mod_onepagecheckout/settings_edit.phtml
+++ b/views/mods/mod_onepagecheckout/settings_edit.phtml
@@ -5,4 +5,5 @@
 	 */
 
 ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_onepagecheckout_page', __('Seite für den "EinSeitenCheckout"', 'wpsg'), $this->view['arPages'], $this->get_option('wpsg_mod_onepagecheckout_page'), array('help' => 'wpsg_mod_onepagecheckout_page')); ?>
\ No newline at end of file
+<?php echo wpsg_drawForm_Select('wpsg_mod_onepagecheckout_page', __('Seite für den "EinSeitenCheckout"', 'wpsg'), $this->view['arPages'], $this->get_option('wpsg_mod_onepagecheckout_page'), array('help' => 'wpsg_mod_onepagecheckout_page')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_onepagecheckout_basket', __('Warenkorb in EinSeitenCheckout integrieren', 'wpsg'), $this->get_option('wpsg_mod_onepagecheckout_basket'), array('help' => 'wpsg_mod_onepagecheckout_basket')); ?>
\ No newline at end of file
diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml
index edd0a59..d0434d1 100644
--- a/views/mods/mod_productvariants/admin_edit.phtml
+++ b/views/mods/mod_productvariants/admin_edit.phtml
@@ -109,7 +109,10 @@
 		
 					/* ]]> */</script>	
     			</td>
-    			<td class="col1"><span class="wpsg_editable" id="productvariation_name_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['name']); ?></span></td>
+    			<td class="col1"><span class="wpsg_editable" id="productvariation_name_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['name']); ?></span>
+    			<?php if (!isset($vari['iid'])) $vari['iid'] = $vari['id'];  ?>
+    			<input type="hidden" id="productvariation_iid_<?php echo $vari['id']; ?>" value="<?php echo wpsg_getStr($vari['iid']); ?>" />
+    			</td>
     			<td class="col_shortname"><span class="wpsg_editable" id="productvariation_shortname_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['shortname']); ?></span></td>
     			
     			<?php if (wpsg_isSizedInt($this->view['product_id'])) { ?>
@@ -134,7 +137,7 @@
 				$pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['product_id']));
 				$k = $this->view['variant']['id'];
 				$kv = $vari['id'];
-				$temp = $this->callMod('wpsg_mod_productvariants', 'getVariImages', array($this->view['product_id'], $k, $kv));
+				$temp = $this->callMod('wpsg_mod_productvariants', 'getVariImages', array($this->view['product_id'], $k, $vari['iid']));
 				?>
     			<td class="ui-sortable" colspan="<?php echo $colspan; ?>"  id="wpsg_mod_productvariants_productimage_<?php echo $k; ?>_<?php echo $kv; ?>" >
 					<?php $j = 0; foreach ($temp as $b) { $j ++; ?>
@@ -161,6 +164,9 @@
 									wpsg_vp_ajaxloading_show();
 									
 									var wpsg_reorder = jQuery(this).sortable('toArray');
+									var iid = jQuery('#productvariation_iid_' + <?php echo $kv; ?>).val();
+									//alert('iid: ' + iid);
+														
 
 									jQuery.ajax( {			
 										url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_productvariants&cmd=wpsg_var_setImageOrder&noheader=1&edit_id=<?php echo $this->view['product_id']; ?>',
@@ -168,6 +174,7 @@
 										data: {				
 											'var_id': <?php echo $k; ?>,
 											'vari_id': <?php echo $kv; ?>,
+											'iid': iid,
 											'wpsg_reorder': wpsg_reorder
 										},
 										success: function(data) { 
@@ -203,6 +210,8 @@
 		<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
 
 		wpsg_vp_ajaxloading_show();
+		iid = jQuery('#productvariation_iid_' + vari_id).val();
+		//alert('iid:' + iid);
 		
 		jQuery.ajax( {
 			url: "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_productvariants&cmd=wpsg_vp_vari_setPic&noheader=1&edit_id=<?php echo $this->view['product_id']; ?>",
@@ -210,6 +219,7 @@
 			data: {				
 				var_id: var_id,
 				vari_id: vari_id,
+				iid: iid,
 				pic: pic
 			},
 			success: function(data) { 
@@ -266,11 +276,15 @@
 	} 
 
 
-		<?php 
-		$p1 = wpsg_getInt($this->view['product_id']);
-		$p2 = ($this->view['variant']['product_id']);
+		<?php
+			$b1 = wpsg_isSizedInt($this->view['product_id']);
+			$b2 = wpsg_isSizedInt($this->view['variant']['product_id']);
+			if (!wpsg_isSizedInt($this->view['product_id']) || wpsg_isSizedInt($this->view['variant']['product_id'])) { 
 		?>
-		<?php if (!wpsg_isSizedInt($this->view['product_id']) || wpsg_isSizedInt($this->view['variant']['product_id'])) { ?>
+			<?php 
+				$p1 = wpsg_getInt($this->view['product_id']);
+				$p2 = ($this->view['variant']['product_id']);
+			?>
 
 		jQuery('.wpsg_mod_productvariants_table_variation').sortable( {
 			items: 'tbody',
@@ -279,7 +293,7 @@
  
 				var wpsg_reorder = jQuery(this).sortable('toArray');
 				var product_id = jQuery('#wpsg_mod_productvariants_product_id').val();
-	
+				
 				jQuery.ajax( {
 					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1',
 					data: {
diff --git a/views/mods/mod_productvariants/produkt.phtml b/views/mods/mod_productvariants/produkt.phtml
index 8c17fc7..7225c8b 100644
--- a/views/mods/mod_productvariants/produkt.phtml
+++ b/views/mods/mod_productvariants/produkt.phtml
@@ -14,9 +14,11 @@
 
 <?php $vAktiv = false; if (is_array($this->view['data']['vp_data']) && sizeof($this->view['data']['vp_data']) > 0) { ?>
 
-	<?php foreach ($this->view['data']['vp_data'] as $k => $var) { 
+	<?php $kk = -1; 
+		foreach ($this->view['data']['vp_data'] as $k => $var) { 
 		
-		if ($var['aktiv'] == "1") { 
+		$kk++;
+		if ($var['active'] == "1") { 
 
 			$vAktiv = true; ?>
 		
@@ -42,20 +44,20 @@
 					<?php if ($var['typ'] == "select") { ?>
 						<label>			 			
 							<select onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" name="wpsg_vp[<?php echo $k; ?>]" id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>">
-							<?php /*foreach ($var['vari'] as $kv => $vari)*/ { 
-								if ($vari['aktiv'] == "1") { $j ++; ?>
+							<?php foreach ($var['arVariation'] as $kv => $vari) { $j = -1;
+								if ($vari['active'] == "1") { $j++; ?>
 									<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?>
 											
 										<?php /* Lagerbestand > 0 */ ?>
 										<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
 										
-											<option value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
+											<option value="<?php echo $kv; ?>" <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$j]) == $kv)?'selected="selected"':''); ?>>						
 											<?php echo $vari['name']; ?>
 												
 												<?php /* Abfrage Preisanzeige nur für eingeloggte Benutzer START */?>
 												<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>			
-													<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['preis']))) { ?>
-														(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
+													<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['price']))) { ?>
+														(<?php echo wpsg_ff($vari['price'], $this->get_option('wpsg_currency')); ?>)
 													<?php } ?>
 												<?php }else{?>
 													<?php echo wpsg_translate(__('(Preise nur für eingeloggte Benutzer)', 'wpsg')); ?>
@@ -67,8 +69,8 @@
 										<?php } else { ?>
 											<option disabled="disabled" value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
 												<?php echo $vari['name']; ?>
-												<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['preis']))) { ?>
-													(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
+												<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['price']))) { ?>
+													(<?php echo wpsg_ff($vari['price'], $this->get_option('wpsg_currency')); ?>)
 												<?php } ?>
 											</option>
 										<?php } /* Lagerbestandsabfrage ENDE */ ?>
@@ -79,12 +81,12 @@
 							</select> 
 							<?php if ($this->get_option("wpsg_vp_showpic") == "1" && $this->hasMod('wpsg_mod_produktbilder')) { ?>
 								<span class="wpsg_vp_field_image">				
-									<?php foreach ($var['vari'] as $kv => $vari) { 
-										if ($vari['aktiv'] == "1" && isset($vari['showpic'])) { ?>
+									<?php foreach ($var['arVariation'] as $kv => $vari) { 
+										if ($vari['active'] == "1" && isset($vari['showpic'])) { ?>
 											<span class="wpsg_vp_image wpsg_vp_image_<?php echo $kv; ?>" style="display:<?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'block':'none'); ?>;">
 												
 												<?php 
-													
+												/*
 												$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
 													$this->getProduktId($this->view['data']['id']), 
 													$vari['showpic'],
@@ -92,8 +94,11 @@
 													$this->get_option("wpsg_vp_showpic_height"), 
 													's'
 												));
-													
-												?><img src="<?php echo $img_src; ?>" alt="" />
+												*/
+												$pbw = $this->get_option("wpsg_vp_showpic_width");
+												$pbh = $this->get_option("wpsg_vp_showpic_height");
+												$img_src = $vari['guid'];
+												?><img src="<?php echo $img_src; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>" alt="" />
 																		
 											</span>
 										<?php } ?>
@@ -106,13 +111,16 @@
 					<?php /* IMAGE START */ ?>
 					<?php if ($var['typ'] == 'image' && $this->hasMod('wpsg_mod_produktbilder')) { ?>
 						<div class="wpsg_mod_varianten_imageselect wpsg_mod_varianten_imageselect_<?php echo $k; ?>">
-						<input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $this->view['wpsg_mod_productvariants']['set'][$k]; ?>" />
-							<?php foreach ($var['vari'] as $kv => $vari) { 
-								if ($vari['aktiv'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?>
-									<?php $img = $this->callMod('wpsg_mod_productvariants', 'getImageSelectImage', array($this->getProduktId($this->view['data']['id']), $k, $kv, $this->view['data']['product_key'])); ?>								
-									<?php if (wpsg_isSizedString($img)) { ?>
-										<a data-wpsg-id="<?php echo $kv; ?>" class="image <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'akt':''); ?>" onclick="jQuery(this).parent().find('a').removeClass('akt'); jQuery(this).addClass('akt'); wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>); return false;" href="#">
-											<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktId($this->view['data']['id']), $img, $this->get_option('wpsg_vp_imageselect_width'), $this->get_option('wpsg_vp_imageselect_height'), $this->get_option('wpsg_vp_imageselect_mode'))); ?>" />
+						<input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]); ?>" />
+							<?php $kkv = -1; foreach ($var['arVariation'] as $kv => $vari) { $kkv++;
+								if ($vari['active'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?>
+									<?php $img = $vari['guid']; ?>								
+									<?php if (wpsg_isSizedString($img)) { 
+										$pbw = $this->get_option('wpsg_vp_imageselect_width');
+										$pbh = $this->get_option('wpsg_vp_imageselect_height');
+									?>
+										<a data-wpsg-id="<?php echo $kv; ?>" class="image <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]) == $kv)?'akt':''); ?>" onclick="jQuery(this).parent().find('a').removeClass('akt'); jQuery(this).addClass('akt'); wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>); return false;" href="#">
+											<img src="<?php echo $img; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>"/>
 										</a>
 									<?php } ?>
 								<?php } ?>
@@ -122,12 +130,15 @@
 					
 					<?php /* Radio-Buttons START */ ?>
 					<?php if ($var['typ'] == "radio") { ?>			
-						<?php $j = 0; foreach ($var['vari'] as $kv => $vari) { if ($vari['aktiv'] == "1") { $j ++; ?>
+						<?php $j = 0; foreach ($var['arVariation'] as $kv => $vari) { if ($vari['active'] == "1") { $j ++; ?>
 							<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?>					
 								<label>
 								
 									<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
-										<input <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
+										<input <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$kk]) == $kv)?'checked="checked"':''); ?> 
+										id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" 
+										onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" 
+										type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
 									<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswählbar */ ?>
 									<?php } else { ?>
 										<input disabled="disabled" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
@@ -136,8 +147,8 @@
 									<?php /* Abfrage Preisanzeige nur für eingeloggte Benutzer START */?>
 									<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>			
 							
-										<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['preis']))) { ?>
-											<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)</span>
+										<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['price']))) { ?>
+											<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($vari['price'], $this->get_option('wpsg_currency')); ?>)</span>
 										<?php } ?>
 										
 									<?php }else{?>
@@ -149,7 +160,7 @@
 										<span class="wpsg_vp_field_image">
 										
 											<?php 
-													
+											/*
 											$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
 												$this->getProduktId($this->view['data']['id']), 
 												$vari['showpic'],
@@ -157,9 +168,13 @@
 												$this->get_option("wpsg_vp_showpic_height"), 
 												's'
 											));
-									
-											?><img src="<?php echo $img_src; ?>" alt="" />
-								
+											*/
+											
+											$pbw = $this->get_option("wpsg_vp_showpic_width");
+											$pbh = $this->get_option("wpsg_vp_showpic_height");
+											$img_src = $vari['guid'];
+											?><img src="<?php echo $img_src; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>" alt="" />
+											
 										</span>
 										<?php } /* if image */ ?>		
 								</label>
@@ -168,14 +183,14 @@
                     <?php } /* Radio ENDE */ ?>
 
 					<?php /* Checkboxen START */ ?>
-					<?php if ($var['typ'] == "checkbox" && $var['aktiv'] == 1) { ?>
+					<?php if ($var['typ'] == "checkbox" && $var['active'] == 1) { ?>
 					<label>
 						<input onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="hidden" value="0" name="wpsg_vp[<?php echo $k; ?>]" />
 						<input <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == '1')?'checked="checked"':''); ?> onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="checkbox" value="1" name="wpsg_vp[<?php echo $k; ?>]" />
 						<?php /* Abfrage Preisanzeige nur für eingeloggte Benutzer START */?>
 						<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
-							<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($var['preis']))) { ?>
-								<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($var['preis'], $this->get_option('wpsg_currency')); ?>)</span>
+							<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($var['price']))) { ?>
+								<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($var['price'], $this->get_option('wpsg_currency')); ?>)</span>
 							<?php } ?>
 						<?php } else {?>
 							<?php echo wpsg_translate(__('(Preise nur für eingeloggte Benutzer)', 'wpsg')); ?>
@@ -186,7 +201,7 @@
 						<span class="wpsg_vp_field_image">
 
 							<?php
-
+							/*
 							$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
 								$this->getProduktId($this->view['data']['id']),
 								$var['showpic'],
@@ -194,8 +209,12 @@
 								$this->get_option("wpsg_vp_showpic_height"),
 								's'
 							));
-
-							?><img src="<?php echo $img_src; ?>" alt="" />
+							*/
+							$pbw = $this->get_option("wpsg_vp_showpic_width");
+							$pbh = $this->get_option("wpsg_vp_showpic_height");
+							$img_src = $vari['guid'];
+							?><img src="<?php echo $img_src; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>" alt="" />
+														
 						</span>
 						<?php } ?>
 					</label>
@@ -206,6 +225,6 @@
                 </div>
             </div>
 
-		<?php } /* $var['aktiv'] == "1" */ ?>
+		<?php } /* $var['active'] == "1" */ ?>
 	<?php } /* foreach ($this->view['data']['vp_data'] as $k => $var) */ ?>
 <?php } /* $vAktiv = false; ENDE */ ?>
\ No newline at end of file
diff --git a/views/mods/mod_productvariants/stock2.phtml b/views/mods/mod_productvariants/stock2.phtml
new file mode 100644
index 0000000..5130d87
--- /dev/null
+++ b/views/mods/mod_productvariants/stock2.phtml
@@ -0,0 +1,59 @@
+<?php
+
+	/**
+	 * HTML Teil für die Produktvariablenverwaltung
+	 * (GLOBAL und Produktbezogen)
+	 */
+
+?>
+
+<div id="wpsg_mod_productvariants_dialog_modal" class="modal fade" tabindex="-1" role="dialog">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<h4 class="modal-title"><?php echo __('Produktvariation bearbeiten', 'wpsg'); ?></h4>
+			</div>
+			<div class="modal-body">
+
+			</div>
+			<div class="modal-footer">
+
+				<button type="button" class="btn-sm wpsg_mod_productvariants_variation_add_button btn btn-default" id="wpsg_mod_productvariants_variation_add_button" style="display:none;" onclick="return wpsg_mod_productvariants_variation_add();"><span class="glyphicon glyphicon-plus"></span>&nbsp;<?php echo __('Neue Variation', 'wpsg'); ?></button>
+				<button type="button" class="btn-sm wpsg_mod_productvariants_variants_close wpsg_mod_productvariants_variants_vari btn btn-default" style="display:none;" onclick="return wpsg_mod_productvariants_back();"><span class="glyphicon glyphicon-remove"></span>&nbsp;<?php echo __('Schließen', 'wpsg'); ?></button>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	function wpsg_mod_productvariants_show(product_id)
+	{
+
+		jQuery('#wpsg_mod_productvariants_dialog button').prop('disabled', true);
+		jQuery('#wpsg_mod_productvariants_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		 
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&noheader=1',
+			data: {  
+				'subaction': 'admin_show',
+				'product_id': product_id
+			},
+			success: function(data) { 
+
+				jQuery('.wpsg_mod_productvariants_variants').show();
+				jQuery('.wpsg_mod_productvariants_variants_vari').hide();
+				
+				jQuery('#wpsg_mod_productvariants_dialog .modal-body').html(data);
+				jQuery('#wpsg_mod_productvariants_dialog button').prop('disabled', false); 
+
+			}
+    	} ); 
+		 
+		return false;
+		
+	} // function wpsg_mod_productvariants_show()
+
+/* ]]> */</script>
\ No newline at end of file
diff --git a/views/mods/mod_productvariants/stockVarianten.phtml b/views/mods/mod_productvariants/stockVarianten.phtml
new file mode 100644
index 0000000..737ea27
--- /dev/null
+++ b/views/mods/mod_productvariants/stockVarianten.phtml
@@ -0,0 +1,59 @@
+<?php
+
+	/**
+	 * Template um eine Variante zu bearbeiten
+	 */
+
+?>
+
+<?php if (wpsg_isSizedArray($this->view['arVariant'])) { ?>
+
+	<table class="table wpsg_mod_productvariants_table_variation">
+    	<tbody >
+
+    	<?php foreach ($this->view['arVariant'] as $var) { ?>
+    		<tr>    		
+    		
+    			<td class="col_shortname" colspan="3"><?php echo wpsg_hspc($var['name']); ?></td>
+
+    			
+    		</tr>
+    		<?php foreach ($var['arVariation'] as $vari) {  ?>
+	    		<tr>    		
+    			<td class="col_active">
+    			</td>
+    			<?php 
+    			$txt = wpsg_hspc($vari['name']).' : '.wpsg_hspc($vari['stock']);
+    			 
+    			?>
+    			<td class="col_shortname"><?php echo $txt; ?></td>
+    			<td class="col_1">
+    			</td>
+
+				</tr>
+			<?php } ?>
+    	<?php } ?>    	
+
+    	</tbody>
+    </table>
+
+	<script type="text/javascript">/* <![CDATA[ */
+
+		
+	function wpsg_vp_ajaxloading_show()
+	{
+
+		jQuery('.wpsg_mod_productvariants_ajaxloading').show();
+		
+	}
+
+	function wpsg_vp_ajaxloading_hide()
+	{
+
+		jQuery('.wpsg_mod_productvariants_ajaxloading').hide();
+		
+	} 
+
+	/* ]]> */</script> 
+    
+<?php } ?>
\ No newline at end of file
diff --git a/views/order/index.phtml b/views/order/index.phtml
index 902347f..ce71b26 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -229,7 +229,7 @@
 
                             <?php if ($oOrder->hasShippingAdress()) { ?>
                                 <br />
-                                <?php echo $oOrder->getShippingTitle(); ?><?php echo $oOrder->getShippingFirstName(); ?> <?php echo $oOrder->getShippingName(); ?><br />
+                                <?php echo $oOrder->getShippingTitle(); ?> <?php echo $oOrder->getShippingFirstName(); ?> <?php echo $oOrder->getShippingName(); ?><br />
                                 <span class="wpsg_grey">
                                     <?php echo $oOrder->getShippingStreet(); ?>
                                     <?php echo $oOrder->getShippingZip(); ?> <?php echo $oOrder->getShippingCity(); ?> <?php echo $oOrder->getShippingCountryKuerzel(); ?><br />
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml
index 3b1aaee..40e1b2e 100644
--- a/views/produkt/index.phtml
+++ b/views/produkt/index.phtml
@@ -171,9 +171,9 @@
                            			<div class="wpsg_productview_backend-available"><?php echo __('Vorrätig', 'wpsg');?></div><div>(<?php echo $d['stock']; ?>)</div>
                            		<?php }?>
                             </div>                            
-                            <?php if ($this->hasMod('wpsg_mod_varianten')) $arVarianten = $this->callMod('wpsg_mod_varianten', 'loadVarianten', array($d['id'])); if (wpsg_isSizedArray($arVarianten)) { ?>
+                            <?php if ($this->hasMod('wpsg_mod_productvariants')) $arVarianten = $this->callMod('wpsg_mod_productvariants', 'getVariants', array($d['id'], true, true, true)); if (wpsg_isSizedArray($arVarianten)) { ?>
                             <div style="line-height:inherit; padding:2px 0px 0px;">
-                                <a class="clueTip" href="#" rel="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_stock&edit_id=<?php echo $d['id']; ?>&noheader=1&wpsg_cmd=getVariInfo"><?php echo __('Variantenbestand', 'wpsg'); ?></a>
+                                <a class="clueTip" rel="#" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_stock&edit_id=<?php echo $d['id']; ?>&noheader=1&wpsg_cmd=getVariInfo"><?php echo __('Variantenbestand', 'wpsg'); ?></a>
                             </div>
                             <?php } ?>
                         </td>
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