From aac6af5189d650d3a17b8a45d3eeae9ed6c1b168 Mon Sep 17 00:00:00 2001 From: hartmut Date: Fri, 10 Mar 2017 09:06:20 +0000 Subject: Mediathek-Unterstützung MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6113 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mailtemplates/html/order.phtml | 7 +- .../mods/mod_produktartikel/header_facebook.phtml | 8 +- views/mods/mod_produktartikel/header_google.phtml | 8 +- views/mods/mod_produktartikel/schemaorg.phtml | 8 +- views/mods/mod_request/requestpage.phtml | 6 +- views/produkttemplates/ausverkauft.phtml | 50 ++-- views/produkttemplates/standard.phtml | 30 +- views/produkttemplates/standard_alt.phtml | 327 +++++++++++++++++++++ views/warenkorb/ajaxDialog.phtml | 6 +- views/warenkorb/basket.phtml | 8 +- views/warenkorb/overview.phtml | 8 +- 11 files changed, 407 insertions(+), 59 deletions(-) create mode 100644 views/produkttemplates/standard_alt.phtml (limited to 'views') diff --git a/views/mailtemplates/html/order.phtml b/views/mailtemplates/html/order.phtml index 39706c9..45ae41c 100644 --- a/views/mailtemplates/html/order.phtml +++ b/views/mailtemplates/html/order.phtml @@ -18,13 +18,14 @@
- hasMod('wpsg_mod_produktbilder') && wpsg_isSizedInt($this->get_option('wpsg_mod_produktbilder_overviewimage'))) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktId($p['id']))); ?> + hasMod('wpsg_mod_produktbilder') && wpsg_isSizedInt($this->get_option('wpsg_mod_produktbilder_overviewimage'))) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($p['id']))); ?> - - <?php echo wpsg_hspc(((wpsg_isSizedString($p['detailname'])?$p['detailname']:$p['name']))); ?> + + + diff --git a/views/mods/mod_produktartikel/header_facebook.phtml b/views/mods/mod_produktartikel/header_facebook.phtml index 670923d..f8a8045 100644 --- a/views/mods/mod_produktartikel/header_facebook.phtml +++ b/views/mods/mod_produktartikel/header_facebook.phtml @@ -9,13 +9,7 @@ hasMod('wpsg_mod_produktbilder') && isset($this->view['data']['bilder'][0])) { ?> - + diff --git a/views/mods/mod_produktartikel/header_google.phtml b/views/mods/mod_produktartikel/header_google.phtml index c49420c..9d21a7a 100644 --- a/views/mods/mod_produktartikel/header_google.phtml +++ b/views/mods/mod_produktartikel/header_google.phtml @@ -9,11 +9,5 @@ - + \ No newline at end of file diff --git a/views/mods/mod_produktartikel/schemaorg.phtml b/views/mods/mod_produktartikel/schemaorg.phtml index 20cfd1e..daa8294 100644 --- a/views/mods/mod_produktartikel/schemaorg.phtml +++ b/views/mods/mod_produktartikel/schemaorg.phtml @@ -8,13 +8,7 @@ ?>
view['data']['name']); ?> - +
view['data']['beschreibung']; ?>
\ No newline at end of file diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml index 96aff04..47a4a89 100644 --- a/views/mods/mod_request/requestpage.phtml +++ b/views/mods/mod_request/requestpage.phtml @@ -103,12 +103,14 @@ hasMod('wpsg_mod_produktbilder') && $this->get_option('wpsg_mod_request_requestpageimage') == '1') { if (wpsg_isSizedString($request_product['product_data']['varianten_image'])) $arBilder = array($request_product['product_data']['varianten_image']); - else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($request_product['product_id'])); + else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($request_product['product_id'])); ?>
- <?php echo wpsg_hspc((($request_product['product_data']['detailname'] != '')?$request_product['product_data']['detailname']:$request_product['product_data']['name'])); ?> + + + <?php echo wpsg_hspc((($request_product['product_data']['detailname'] != '')?$request_product['product_data']['detailname']:$request_product['product_data']['name'])); ?>
diff --git a/views/produkttemplates/ausverkauft.phtml b/views/produkttemplates/ausverkauft.phtml index aa4262b..21a711e 100644 --- a/views/produkttemplates/ausverkauft.phtml +++ b/views/produkttemplates/ausverkauft.phtml @@ -18,24 +18,38 @@ hasMod('wpsg_mod_produktbilder')) { ?>
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?> -
- - <?php echo wpsg_hspc($this->view['data']['name']); ?> - -
- - - - - -
+ get_option('wpsg_mod_produktbilder_width'); + $pbh = $this->get_option('wpsg_mod_produktbilder_height'); + $pbm = $this->get_option('wpsg_mod_produktbilder_mode'); + $pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id'])); + ?> + + + view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?> +
+ + + +
+ + + + + +
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index af3c3e3..09e3ffe 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -30,18 +30,32 @@ if (!function_exists('is_plugin_active')) hasMod('wpsg_mod_produktbilder')) { ?>
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?> -
- - <?php echo wpsg_hspc($this->view['data']['name']); ?> + get_option('wpsg_mod_produktbilder_width'); + $pbh = $this->get_option('wpsg_mod_produktbilder_height'); + $pbm = $this->get_option('wpsg_mod_produktbilder_mode'); + $pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id'])); + ?> + + + view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?> +
+ +
diff --git a/views/produkttemplates/standard_alt.phtml b/views/produkttemplates/standard_alt.phtml new file mode 100644 index 0000000..3f419a5 --- /dev/null +++ b/views/produkttemplates/standard_alt.phtml @@ -0,0 +1,327 @@ +view['data']); + + // Damit keine Zubehörprodukte ausgegeben werden + //$this->noReleatedProducts = true; + + //wpsg_debug($_SESSION); + +if (!function_exists('is_plugin_active')) + require_once(ABSPATH.'/wp-admin/includes/plugin.php'); +?> +
+ +
+ + + + callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+ +
+
+ + hasMod('wpsg_mod_produktbilder')) { ?> +
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> + callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> + view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?> +
+ + <?php echo wpsg_hspc($this->view['data']['name']); ?> + +
+ + + + + +
+
+ + +
+
+ +
+ +
+

getProductName($this->view['data']['id']); ?>

+ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> +
+
+ get_option('wpsg_showArticelnumber') == '1') { ?> +
+ : view['data']['anr']); ?>
+ get_option('wpsg_mod_produktartikel_ean'))) {?> + :view['data']['ean']); ?>
+ + get_option('wpsg_mod_produktartikel_gtin'))) {?> + :view['data']['gtin']); ?>
+
+ + + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + +
+ + + + view['data']['preis'], $this->get_option('wpsg_currency')); ?> + view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> + + hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> +
+ : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> +
+ +
+ + get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> + +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ + + +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + +
+ + + + + getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> + + + + + +
+

+ view['data']['shortdesc']; ?> +
+ +
+ + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> +
+ + +
+ + + + + hasMod('wpsg_mod_fuellmenge')) { ?> + +
+ + '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], + ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', + wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) + ); ?> +
+ + + +
+ +
+ + hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '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'))) { ?> +   + +
+ + +
+ + + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> + +
+ + callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + +
+ +
+
+ + + + + + + + hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> +
+ + view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> +
+ + + + +
+ callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?> +
+ +
+ +
+ +
+
+ callMods('productForSale', array($this->view['data']['product_key'])) || ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id'])))) { ?> +
+ + + + view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> + /> + + get_option('wpsg_afterinsert'), array('2', '3'))) { ?> + + + +
+ +
+ +
+ + +
+ 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']))) { ?> + + + +
+ +
+ +
+ + +
+ + view['data']['longdescription'])) > 0) { ?> +
+
+
+

+ view['data']['longdescription']; ?> +
+
+
+ + +
+
+

+
+
+ +
+
+

+
+
+ + +
+ +
+ + +
+ + + +
+ + callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+ +
\ No newline at end of file diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml index cad27f5..ae2ac19 100644 --- a/views/warenkorb/ajaxDialog.phtml +++ b/views/warenkorb/ajaxDialog.phtml @@ -31,9 +31,11 @@
hasMod('wpsg_mod_produktbilder')) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktId($this->view['product_data']['id']))); ?> + callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($this->view['product_data']['id']))); ?> - + + +
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index ea9a4cb..6e3b685 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -59,12 +59,14 @@ get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']); - else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktID($p['id']))); + else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($p['id']))); ?>
- - <?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?> + + + + <?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 4599ab3..0b92464 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -130,11 +130,15 @@ get_option('wpsg_mod_produktbilder_overviewimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']); - else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktID($p['id']))); + else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($p['id']))); ?>
- <?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?> + + + + + <?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>
getProduktLink($p)) { ?> -- cgit v1.2.3