From 23438e6a4830ed41bd1d62bb19f9ad19aa249f5d Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Mon, 20 Mar 2017 12:53:13 +0000
Subject: Onepage-Checkout angepasst

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6142 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_creditcard/paymenthint.phtml  |   2 +-
 views/mods/mod_onepagecheckout/onepage.phtml |  10 +-
 views/mods/mod_productvariants/produkt.phtml | 211 +++++++++++++++++++++++++++
 views/order/index.phtml                      |   2 +-
 4 files changed, 218 insertions(+), 7 deletions(-)
 create mode 100644 views/mods/mod_productvariants/produkt.phtml

(limited to 'views')

diff --git a/views/mods/mod_creditcard/paymenthint.phtml b/views/mods/mod_creditcard/paymenthint.phtml
index d9cbbf2..c5882bc 100644
--- a/views/mods/mod_creditcard/paymenthint.phtml
+++ b/views/mods/mod_creditcard/paymenthint.phtml
@@ -53,7 +53,7 @@
 	<div class="wpsg_mod_creditcard_knr wpsg_mod_creditcard_field">
 		<label>
 			<?php echo __('Gültigkeit', 'wpsg'); ?><span class="wpsg_required">*</span>:
-			<!-- <input class="<?php echo ((in_array("mod_creditcard_gueltig", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" name="wpsg_mod_creditcard[gueltig]" value="<?php echo wpsg_hspc($this->view['wpsg_mod_creditcard']['gueltig']); ?>" /> -->
+			<!-- <input class="<?php echo ((in_array("mod_creditcard_gueltig", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" name="wpsg_mod_creditcard[gueltig]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['wpsg_mod_creditcard']['gueltig'])); ?>" /> -->
 			
 			<select name="wpsg_mod_creditcard[gueltigm]" id="wpsg_mod_creditcard_gueltigm" 
 			class="<?php echo ((in_array('mod_creditcard_gueltigm', (array)$this->view['error']))?'wpsg_error':''); ?>" >
diff --git a/views/mods/mod_onepagecheckout/onepage.phtml b/views/mods/mod_onepagecheckout/onepage.phtml
index f45a339..c5b7701 100644
--- a/views/mods/mod_onepagecheckout/onepage.phtml
+++ b/views/mods/mod_onepagecheckout/onepage.phtml
@@ -73,10 +73,10 @@
 							<img class="wpsg_payship_logo" src="<?php echo $p['logo']; ?>" alt="<?php echo $p['name']; ?>" />
 							<?php } ?>
 							 
-		 					<?php if ((isset($p['hint']) && trim($p['hint']) != '') || $p['price'] > 0) { ?>					
+		 					<?php if ((isset($p['hint']) && trim($p['hint']) != '') || $p['preis'] > 0) { ?>					
 							<div id="payment_<?php echo $p['id']; ?>_hint" class="shippay_hint">
-								<?php if ($p['price'] > 0) { ?>
-								<?php echo __('Gebühr', 'wpsg'); ?>: <?php echo wpsg_ff($p['price'], $this->get_option('wpsg_currency')); ?><br />
+								<?php if ($p['preis'] > 0) { ?>
+								<?php echo __('Gebühr', 'wpsg'); ?>: <?php echo wpsg_ff($p['preis'], $this->get_option('wpsg_currency')); ?><br />
 								<?php } ?>
 								<?php echo $this->replaceUniversalPlatzhalter(__($p['hint'], 'wpsg')); ?>
 							</div>
@@ -134,7 +134,7 @@
 				
 				<div class="wpsg_checkoutblock">
 					<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?>
-					<?php if ($this->data['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[checkout][name]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['name']); ?>" />
 				</div>
@@ -213,7 +213,7 @@
 					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
-					<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[checkout][ustidnr]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['ustidnr']); ?>" />
+					<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[checkout][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ustidnr'])); ?>" />
 				</div>
 				
 				<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
diff --git a/views/mods/mod_productvariants/produkt.phtml b/views/mods/mod_productvariants/produkt.phtml
new file mode 100644
index 0000000..32b4c5c
--- /dev/null
+++ b/views/mods/mod_productvariants/produkt.phtml
@@ -0,0 +1,211 @@
+<?php
+
+	/**
+	 * Template für die Varianten wird vom Produkttemplate z.B. standard.phtml geladen
+	 */
+ 
+?>
+ 
+<script type="text/javascript">/* <![CDATA[ */
+ 
+	wpsg_vp_vari[<?php echo $this->getProduktId($this->view['data']['id']); ?>] = new Array();
+	 
+/* ]]> */</script>
+
+<?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) { 
+		
+		if ($var['active'] == "0") { 
+
+			$vAktiv = true; ?>
+		
+			<div class="wpsg_vp_field wpsg_vp_field_<?php echo $this->getProduktId($this->view['data']['id']); ?>">
+				
+				<script type="text/javascript">/* <![CDATA[ */
+		
+					wpsg_vp_vari[<?php echo $this->getProduktId($this->view['data']['id']); ?>][<?php echo $k; ?>] = "<?php echo $var['type']; ?>";			
+								
+				/* ]]> */</script>
+				
+				<?php if ($var['typ0'] != 0) { ?>
+					<label class="wpsg_vp_field_label" for="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>">
+						<?php echo $var['name']; ?>
+					</label>
+				<?php } else { ?>
+					<span class="wpsg_vp_field"><?php echo $var['name']; ?></span>
+				<?php } ?>
+				
+				<div class="wpsg_vp_field_typ_<?php echo $var['typ']; ?>">
+				
+					<?php /* SELECT-Box START */ ?>
+					<?php if ($var['type'] == "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 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_varianten']['set'][$k] == $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_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+														(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
+													<?php } ?>
+												<?php }else{?>
+													<?php echo wpsg_translate(__('(Preise nur für eingeloggte Benutzer)', 'wpsg')); ?>
+												<?php } ?>
+												<?php /* Abfrage ENDE */ ?>
+											</option>
+											
+										<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswählbar */ ?>
+										<?php } else { ?>
+											<option disabled="disabled" value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
+												<?php echo $vari['name']; ?>
+												<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+													(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
+												<?php } ?>
+											</option>
+										<?php } /* Lagerbestandsabfrage ENDE */ ?>
+											
+									<?php } ?>
+								<?php } ?>
+							<?php } ?>	
+							</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'])) { ?>
+											<span class="wpsg_vp_image wpsg_vp_image_<?php echo $kv; ?>" style="display:<?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'block':'none'); ?>;">
+												
+												<?php 
+													
+												$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
+													$this->getProduktId($this->view['data']['id']), 
+													$vari['showpic'],
+													$this->get_option("wpsg_vp_showpic_width"),
+													$this->get_option("wpsg_vp_showpic_height"), 
+													's'
+												));
+													
+												?><img src="<?php echo $img_src; ?>" alt="" />
+																		
+											</span>
+										<?php } ?>
+									<?php } ?>
+								</span>
+							<?php } ?>		
+						</label>
+					<?php } /* SELECT-Box ENDE */ ?>
+					
+					<?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_varianten']['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_varianten', '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_varianten']['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'))); ?>" />
+										</a>
+									<?php } ?>
+								<?php } ?>
+							<?php } ?>	
+						</div>
+					<?php } /* IMAGE ENDE */ ?>
+					
+					<?php /* Radio-Buttons START */ ?>
+					<?php if ($var['typ'] == "radio") { ?>			
+						<?php $j = 0; foreach ($var['vari'] as $kv => $vari) { if ($vari['aktiv'] == "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_varianten']['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']; ?>
+									<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswählbar */ ?>
+									<?php } else { ?>
+										<input disabled="disabled" <?php echo (($this->view['wpsg_mod_varianten']['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']; ?>
+									<?php } ?>
+									
+									<?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_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+											<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)</span>
+										<?php } ?>
+										
+									<?php }else{?>
+											<?php echo wpsg_translate(__('(Preise nur für eingeloggte Benutzer)', 'wpsg')); ?>
+									<?php } ?>
+									<?php /* Abfrage ENDE */ ?>
+										
+										<?php if ($this->get_option("wpsg_vp_showpic") == "1" && isset($vari['showpic']) && $vari['showpic'] != false) { ?>
+										<span class="wpsg_vp_field_image">
+										
+											<?php 
+													
+											$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
+												$this->getProduktId($this->view['data']['id']), 
+												$vari['showpic'],
+												$this->get_option("wpsg_vp_showpic_width"),
+												$this->get_option("wpsg_vp_showpic_height"), 
+												's'
+											));
+									
+											?><img src="<?php echo $img_src; ?>" alt="" />
+								
+										</span>
+										<?php } /* if image */ ?>		
+								</label>
+							<?php } /* If aktiv && stock */ ?>
+						<?php } } /* Foreach/Aktiv Radio ENDE */ ?>
+                    <?php } /* Radio ENDE */ ?>
+
+					<?php /* Checkboxen START */ ?>
+					<?php if ($var['typ'] == "checkbox" && $var['aktiv'] == 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_varianten']['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_varianten', 'showVariPrice', array($var['preis']))) { ?>
+								<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($var['preis'], $this->get_option('wpsg_currency')); ?>)</span>
+							<?php } ?>
+						<?php } else {?>
+							<?php echo wpsg_translate(__('(Preise nur für eingeloggte Benutzer)', 'wpsg')); ?>
+						<?php } ?>
+						<?php /* Abfrage ENDE */ ?>
+
+						<?php if ($this->get_option("wpsg_vp_showpic") == "1" && $var['showpic'] != false) { ?>
+						<span class="wpsg_vp_field_image">
+
+							<?php
+
+							$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
+								$this->getProduktId($this->view['data']['id']),
+								$var['showpic'],
+								$this->get_option("wpsg_vp_showpic_width"),
+								$this->get_option("wpsg_vp_showpic_height"),
+								's'
+							));
+
+							?><img src="<?php echo $img_src; ?>" alt="" />
+						</span>
+						<?php } ?>
+					</label>
+					<?php } /* Checkboxen ENDE */ ?>
+
+				    <div style="clear:both;"></div>
+
+                </div>
+            </div>
+
+		<?php } /* $var['aktiv'] == "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/order/index.phtml b/views/order/index.phtml
index add65fc..5bb3d1d 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -38,7 +38,7 @@
 		<div class="wpsg-filter wpsg-order-tab wpsg-order-tab-0 container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
 			<div class="row">
 				<div class="col-lg-4">
-					<form method="post" id="filter_form">
+					<form method="post" id="filter_form" >
 
 						<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo @$this->view['arFilter']['page']; ?>" class="current-page" />
 						<input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo @$this->view['arFilter']['order']; ?>" />
-- 
cgit v1.2.3