- WPML Arbeiten / Modulanpassungen

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

5 files changed, 36 insertions, 58 deletions

diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index 4905c8a..a627888 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -198,7 +198,7 @@
 		if ($this->isOtherLang())

 		{

 				

-			$trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['productkey']))."' AND `lang_locale` = '".wpsg_q(get_locale())."'");

+			$trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['productkey']))."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'");

 				

 			if (is_array($trans_db) && sizeof($trans_db) > 0)

 			{

diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml
index cc9197f..31fe336 100644
--- a/views/mods/mod_rechnungen/rechnung_pdf.phtml
+++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml
@@ -220,7 +220,7 @@
 		if ($this->isOtherLang())

 		{ 

 			

-			$trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['id']))."' AND `lang_locale` = '".wpsg_q(get_locale())."'");

+			$trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['id']))."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'");

 			

 			if (is_array($trans_db) && sizeof($trans_db) > 0)

 			{

diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml
index 33ddf66..d3f7219 100644
--- a/views/produkt/addedit_general.phtml
+++ b/views/produkt/addedit_general.phtml
@@ -11,8 +11,8 @@
 	<?php if ($this->isMultiLingual()) { ?>

 	<?php echo wpsg_drawForm_TextStart(); ?>

 		<?php foreach ($this->getStoreLanguages() as $a) { ?>

-			<?php if ((isset($_REQUEST['wpsg_lang']) && $_REQUEST['wpsg_lang'] != $a['locale']) || (!isset($_REQUEST['wpsg_lang']) && $a['lang'] != $GLOBALS['q_config']['default_language'])) { ?>

-			<?php if (isset($_REQUEST['wpsg_lang']) && $a['lang'] == $GLOBALS['q_config']['default_language']) { ?>

+			<?php if ((isset($_REQUEST['wpsg_lang']) && $_REQUEST['wpsg_lang'] != $a['lang']) || (!isset($_REQUEST['wpsg_lang']) && $a['lang'] != $this->getDefaultLanguageCode())) { ?>

+			<?php if (isset($_REQUEST['wpsg_lang']) && $a['lang'] == $this->getDefaultLanguageCode()) { ?>

 			<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">

 			<?php } else { ?>

 			<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&wpsg_lang=<?php echo $a['locale']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">

@@ -36,7 +36,7 @@
 			<?php echo wpsg_drawForm_Select('ptemplate_file', __('Produkttemplate', 'wpsg'), $this->view['templates'], wpsg_getStr($this->view['data']['ptemplate_file']), array('noKeys' => true)); ?>

 		<?php } ?>				

 	<?php } ?>

-	<?php if (!$this->hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?>

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

 	<?php echo wpsg_drawForm_Select('partikel', __('Zugeordneter Wordpress Artikel', 'wpsg'), $this->view['partikel_select'], wpsg_getStr($this->view['data']['partikel']), array('optgroup' => true)); ?>

 	<?php } ?>	 

 	<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>

@@ -53,8 +53,10 @@
 		<?php echo wpsg_drawForm_TextEnd(__('URL', 'wpsg')); ?>		

 	<?php } ?>

 

-	<?php echo wpsg_drawForm_Select('rating', __('Bewertungspunkte', 'wpsg'), array('0', '1', '2', '3', '4', '5'), wpsg_getInt($this->view['data']['rating'])); ?>

-

+	<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>

+		<?php echo wpsg_drawForm_Select('rating', __('Bewertungspunkte', 'wpsg'), array('0', '1', '2', '3', '4', '5'), wpsg_getInt($this->view['data']['rating'])); ?>

+	<?php } ?>

+				

 	<?php $this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>	

 	

 <?php echo wpsg_drawForm_AdminboxEnd(); ?>

diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml
index 1d2b5fa..c791e60 100644
--- a/views/produkt/index.phtml
+++ b/views/produkt/index.phtml
@@ -129,18 +129,20 @@
                         </td>

                         <?php } ?>

                         <td class="post-title column-title">

-                            <strong><a title="<?php echo __("Dieses Produkt bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=edit&amp;edit_id=<?php echo $d['id']; ?>" class="row-title"><?php echo (($d['name'] == "")?__("---- ", "wpsg"):$d['name']); ?></a></strong>

-                            <div class="row-actions">

-                                <span class="edit"><a title="<?php echo __("Dieses Produkt bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=edit&amp;edit_id=<?php echo $d['id']; ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>

+                            <strong>                                

                                 <?php if ($this->isMultiLingual()) { ?>

                                 <?php foreach ($this->getStoreLanguages() as $l) { ?>

                                     <?php if ($l['locale'] != $this->getDefaultLanguageLocale()) { ?>

-                                    <a href="<?php echo $this->url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&amp;action=edit&amp;edit_id='.$d['id'].'&amp;wpsg_lang='.$l['locale']); ?>" title="<?php echo wpsg_translate(__('Produkt für Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?>">

+                                    <a href="<?php echo $this->url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&amp;action=edit&amp;edit_id='.$d['id'].'&amp;wpsg_lang='.$l['lang']); ?>" title="<?php echo wpsg_translate(__('Produkt für Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?>">

                                         <img src="<?php echo $this->getFlagURL().$l['flag']; ?>" alt="<?php echo wpsg_translate(__('Produkt für Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?>" />

                                     </a>

                                     <?php } ?>

                                 <?php } ?>

                                 <?php } ?>

+                                <a title="<?php echo __("Dieses Produkt bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=edit&amp;edit_id=<?php echo $d['id']; ?>" class="row-title"><?php echo (($d['name'] == "")?__("---- ", "wpsg"):$d['name']); ?></a>

+                            </strong>

+                            <div class="row-actions">

+                                <span class="edit"><a title="<?php echo __("Dieses Produkt bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=edit&amp;edit_id=<?php echo $d['id']; ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>                                

                                 |

                                 <span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie das Produkt löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Dieses Produkt löschen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=del&amp;edit_id=<?php echo $d['id']; ?>&amp;noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>

                                 |

diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index fa51444..ff68461 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -130,8 +130,8 @@
 			<?php /* Lieferzeit Anzeige START */ ?>

 			<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>

 				

-				<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>

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

+				<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>				

+				<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key'])))  {?>

 					

 					<span class="wpsg_product_only_store"><?php echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span>

                     <?php if (wpsg_isSizedInt($this->get_option('wpsg_page_mod_deliverytime_storelink'))) { ?>

@@ -141,35 +141,16 @@
 				

 				<?php } else {?>

 					<div class="wpsg_mod_deliverytime">

-						<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>

-						

-							<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>

-								<?php echo $this->view['data']['wpsg_mod_deliverytime_deliverytime']; ?>

-							<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>

-							 	<?php echo wpsg_translate(__('Lieferzeit: #1# Tage(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>

-							<?php } else { /* Sonst sofort lieferbar */ ?>

-								<?php echo wpsg_translate(__('Das Produkt ist sofort lieferbar (Lieferzeit: 0 Tage)', 'wpsg')); ?>

-							<?php } ?>

-						

-						<?php } else {?>						

-						

-							<?php if (wpsg_isSizedString($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { ?>

-								<?php echo wpsg_translate(__('Lieferzeit: #1#', 'wpsg'), $this->view['data']['wpsg_mod_deliverytime_deliverytime']); ?>

-							<?php } else { ?>

-								<?php echo wpsg_translate(__('Lieferzeit: #1#', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_select_values')); ?>

-							<?php } ?>	

-						

-						<?php } ?>

 						

+						<?php echo $this->callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?>

+												

 					</div>

 					

-					<?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>

-

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

-						<div class="wpsg_mod_deliverytime_delay">

-							<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verz�gerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>

-						</div>

-					<?php } ?>

+					<?php $strDelayNote = $this->callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?>

+					<?php if (wpsg_isSizedString($strDelayNote)) { ?>

+					<div class="wpsg_mod_deliverytime_delay"><?php echo wpsg_hspc($strDelayNote); ?></div>

+					<?php } ?> 

+					

 				<?php } ?>

 			<?php } ?>

 			<?php /* Lieferzeit Anzeige ENDE */ ?>

@@ -244,25 +225,18 @@
 			</div>

 			<?php } ?>

 			

-			<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>

-				<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_storeproduct'])) {?>

-					

-					<span class="wpsg_product_only_store"><?php  echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span><br />

-				

-				<?php } else {?>

-					<?php /*Abfrage Warenkorbanzeige 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->callMods('productForSale', array($this->view['data']['product_key']))) { ?>

-							<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />

-						<?php } ?>		

-					<?php }else{?>

-						<a class="wpsg_blind_basket_button" href="#"><?php echo wpsg_translate(__('Die Produktpreise werden nur eingeloggten Benutzern angezeigt. Loggen Sie sich <a href="'.$this->getURL(wpsg_ShopController::URL_PROFIL).'">hier</a> bitte ein, um zu bestellen.')); ?></a>

-					<?php } ?>

-					<?php /* Abfrage Warenkorbanzeige nur für eingeloggte Benutzer ENDE */?>

-				

-					<?php if ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> 

-					<input class="wpsg_button wpsg_add_requestlist" id="wpsg_add_requestlist_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('Auf die Anfrageliste', 'wpsg'); ?>" name="wpsg[submit_request]" />

-					<?php } ?>

+			<?php /* Abfrage Warenkorbanzeige 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->callMods('productForSale', array($this->view['data']['product_key']))) { ?>

+					<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />

+				<?php } ?>		

+			<?php }else{?>

+				<a class="wpsg_blind_basket_button" href="#"><?php echo wpsg_translate(__('Loggen Sie sich bitte ein, um zu bestellen', 'wpsg')); ?></a>

+			<?php } ?>

+			<?php /* Abfrage Warenkorbanzeige nur für eingeloggte Benutzer ENDE */ ?>

+			

+			<?php if ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> 

+				<input class="wpsg_button wpsg_add_requestlist" id="wpsg_add_requestlist_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('Auf die Anfrageliste', 'wpsg'); ?>" name="wpsg[submit_request]" />

 			<?php } ?>

 			

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