Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 6112) +++ /mods/wpsg_mod_produktartikel.class.php (revision 6113) @@ -383,6 +383,9 @@ { - $arBilder = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($produkt_id)); - + $arTemp = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($produkt_id)); + + foreach($arTemp as $k => $v) { + $arBilder[] = $v['guid']; + } if (sizeof($arBilder) > 0) $this->shop->view['data']['bilder'] = $arBilder; Index: /views/mailtemplates/html/order.phtml =================================================================== --- /views/mailtemplates/html/order.phtml (revision 6112) +++ /views/mailtemplates/html/order.phtml (revision 6113) @@ -19,11 +19,12 @@ - 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']))); ?> + + + Index: /views/mods/mod_produktartikel/header_facebook.phtml =================================================================== --- /views/mods/mod_produktartikel/header_facebook.phtml (revision 6112) +++ /views/mods/mod_produktartikel/header_facebook.phtml (revision 6113) @@ -10,11 +10,5 @@ hasMod('wpsg_mod_produktbilder') && isset($this->view['data']['bilder'][0])) { ?> - + Index: /views/mods/mod_produktartikel/header_google.phtml =================================================================== --- /views/mods/mod_produktartikel/header_google.phtml (revision 6112) +++ /views/mods/mod_produktartikel/header_google.phtml (revision 6113) @@ -10,10 +10,4 @@ - + Index: /views/mods/mod_produktartikel/schemaorg.phtml =================================================================== --- /views/mods/mod_produktartikel/schemaorg.phtml (revision 6112) +++ /views/mods/mod_produktartikel/schemaorg.phtml (revision 6113) @@ -9,11 +9,5 @@
view['data']['name']); ?> - +
view['data']['beschreibung']; ?>
Index: /views/mods/mod_request/requestpage.phtml =================================================================== --- /views/mods/mod_request/requestpage.phtml (revision 6112) +++ /views/mods/mod_request/requestpage.phtml (revision 6113) @@ -104,10 +104,12 @@ 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'])); ?>
Index: /views/produkttemplates/ausverkauft.phtml =================================================================== --- /views/produkttemplates/ausverkauft.phtml (revision 6112) +++ /views/produkttemplates/ausverkauft.phtml (revision 6113) @@ -19,22 +19,36 @@ 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']) { ?> +
+ + + +
+ + + + + +
Index: /views/produkttemplates/standard.phtml =================================================================== --- /views/produkttemplates/standard.phtml (revision 6112) +++ /views/produkttemplates/standard.phtml (revision 6113) @@ -31,16 +31,30 @@ 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']) { ?> +
+ +
Index: /views/produkttemplates/standard_alt.phtml =================================================================== --- /views/produkttemplates/standard_alt.phtml (revision 6113) +++ /views/produkttemplates/standard_alt.phtml (revision 6113) @@ -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())); ?> + +
+ +
Index: /views/warenkorb/ajaxDialog.phtml =================================================================== --- /views/warenkorb/ajaxDialog.phtml (revision 6112) +++ /views/warenkorb/ajaxDialog.phtml (revision 6113) @@ -32,7 +32,9 @@
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']))); ?> - + + + Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 6112) +++ /views/warenkorb/basket.phtml (revision 6113) @@ -60,10 +60,12 @@ 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'])); ?>
Index: /views/warenkorb/overview.phtml =================================================================== --- /views/warenkorb/overview.phtml (revision 6112) +++ /views/warenkorb/overview.phtml (revision 6113) @@ -131,9 +131,13 @@ 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'])); ?>