From 24a29c6eceac73735d2c5724b28e0146f01e43d7 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 18 Nov 2016 06:55:29 +0000 Subject: - WPML Arbeiten / Modulanpassungen git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5921 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_deliverynote/deliverynote_pdf.phtml | 2 +- views/mods/mod_rechnungen/rechnung_pdf.phtml | 2 +- views/produkt/addedit_general.phtml | 12 ++-- views/produkt/index.phtml | 10 ++-- views/produkttemplates/standard.phtml | 68 +++++++--------------- 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 @@ isMultiLingual()) { ?> getStoreLanguages() as $a) { ?> - - + getDefaultLanguageCode())) { ?> + getDefaultLanguageCode()) { ?> @@ -36,7 +36,7 @@ view['templates'], wpsg_getStr($this->view['data']['ptemplate_file']), array('noKeys' => true)); ?> - hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?> + hasMod('wpsg_mod_produktartikel')) { ?> view['partikel_select'], wpsg_getStr($this->view['data']['partikel']), array('optgroup' => true)); ?> @@ -53,8 +53,10 @@ - view['data']['rating'])); ?> - + + view['data']['rating'])); ?> + + callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> 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 @@ - " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=" class="row-title"> -
- " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id="> + isMultiLingual()) { ?> getStoreLanguages() as $l) { ?> getDefaultLanguageLocale()) { ?> - + <?php echo wpsg_translate(__('Produkt für Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?> + " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=" class="row-title"> + +
+ " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id="> | ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Produkt&action=del&edit_id=&noheader=1"> | 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 @@ hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - - view['data']['wpsg_mod_deliverytime_storeproduct'] >= '1') {?> + + callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> get_option('wpsg_mod_deliverytime_storetext')); ?> get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> @@ -141,35 +141,16 @@
- get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?> - - view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?> - view['data']['wpsg_mod_deliverytime_deliverytime']; ?> - get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?> - get_option('wpsg_mod_deliverytime_mode_days_default')); ?> - - - - - - - view['data']['wpsg_mod_deliverytime_deliverytime'])) { ?> - view['data']['wpsg_mod_deliverytime_deliverytime']); ?> - - get_option('wpsg_mod_deliverytime_mode_select_values')); ?> - - - + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> +
- - - get_option('wpsg_mod_deliverytime_delay') == '1') { ?> -
- get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> -
- + callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + +
+ + @@ -244,25 +225,18 @@
- - view['data']['wpsg_mod_deliverytime_storeproduct'])) {?> - - get_option('wpsg_mod_deliverytime_storetext')); ?>
- - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - - - - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> - - - - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - - + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + callMods('productForSale', array($this->view['data']['product_key']))) { ?> + + + + + + + + hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> +
-- cgit v1.2.3