From 45b99119eb3c039a12f7e74f0ece4b0f5e707f46 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 28 Apr 2017 14:57:02 +0000 Subject: - Vordefiniertes Bild aus Variantenauswahl für erstes Vorschaubild - Aufräumen Varianten erster Schritt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6242 0d5edaf7-2b12-4e95-93f4-047927463d4b --- .../mods/mod_productvariants/productTemplate.phtml | 4 +- views/mods/mod_productvariants/produkt.phtml | 333 ++++++++++----------- 2 files changed, 165 insertions(+), 172 deletions(-) (limited to 'views/mods') diff --git a/views/mods/mod_productvariants/productTemplate.phtml b/views/mods/mod_productvariants/productTemplate.phtml index 0f472f5..fdba0ec 100644 --- a/views/mods/mod_productvariants/productTemplate.phtml +++ b/views/mods/mod_productvariants/productTemplate.phtml @@ -3,7 +3,9 @@ /** * Integration der Variantenauswahl in die Produktverwaltung */ - + + die("VERALTETES TEMPLATE"); + ?>
diff --git a/views/mods/mod_productvariants/produkt.phtml b/views/mods/mod_productvariants/produkt.phtml index 9dadc9d..e449e9c 100644 --- a/views/mods/mod_productvariants/produkt.phtml +++ b/views/mods/mod_productvariants/produkt.phtml @@ -3,97 +3,152 @@ /** * Template für die Varianten wird vom Produkttemplate z.B. standard.phtml geladen */ - -<<<<<<< .mine - //die("Veraltet"); - -||||||| .r6234 -======= - die("Veraltet"); - ->>>>>>> .r6240 + ?> - - - -view['data']['vp_data']) && sizeof($this->view['data']['vp_data']) > 0) { ?> - view['data']['vp_data'] as $k => $var) { - - $kk++; - //if ($var['active'] == "1") - { - - $vAktiv = true; ?> - -
- - - - - - - - - -
- - - - + + + + hasMod('wpsg_mod_produktbilder')) { ?> +
+ + $vari) { $kkv++; + if ($vari['active'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?> + + get_option('wpsg_vp_imageselect_width'); + $pbh = $this->get_option('wpsg_vp_imageselect_height'); + ?> + + + + + + +
+ + + + + $vari) { if ($vari['active'] == "1") { $j ++; ?> + hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?> + - - - - hasMod('wpsg_mod_produktbilder')) { ?> -
- - $vari) { $kkv++; - if ($vari['active'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?> - - get_option('wpsg_vp_imageselect_width'); - $pbh = $this->get_option('wpsg_vp_imageselect_height'); - ?> - - - - - - -
- + + + + + + +
+ +
+
+ + + view['data']['vp_data'] as $k => $var) */ ?> + + + +
\ No newline at end of file -- cgit v1.2.3