Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 6318) +++ /controller/wpsg_ProduktController.class.php (revision 6319) @@ -759,10 +759,10 @@ } - $data['preis'] = wpsg_tf($_REQUEST['preis']); - $data['oldprice'] = wpsg_tf($_REQUEST['oldprice']); + $data['preis'] = wpsg_tf(wpsg_getStr($_REQUEST['preis'])); + $data['oldprice'] = wpsg_tf(wpsg_getStr($_REQUEST['oldprice'])); $this->shop->callMods('produkt_save_before', array(&$data)); - if ($_REQUEST['edit_id'] > 0) + if (wpsg_getInt($_REQUEST['edit_id']) > 0) { Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 6318) +++ /mods/wpsg_mod_deliverytime.class.php (revision 6319) @@ -68,6 +68,8 @@ } - $this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'] = $product_data['wpsg_mod_deliverytime_deliverytime']; - $this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'] = $product_data['wpsg_mod_deliverytime_storeproduct']; + if (isset($this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'])) + $this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'] = $product_data['wpsg_mod_deliverytime_deliverytime']; + if (isset($this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'])) + $this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'] = $product_data['wpsg_mod_deliverytime_storeproduct']; $product_content['general']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverytime/produkt_addedit_allgemein.phtml', false); @@ -113,5 +115,5 @@ $produkt_data['wpsg_mod_deliverytime_deliverytime'] = wpsg_q($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime']); - $produkt_data['wpsg_mod_deliverytime_storeproduct'] = wpsg_q($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']); + $produkt_data['wpsg_mod_deliverytime_storeproduct'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'])); } // public function produkt_save_before(&$produkt_data) Index: /mods/wpsg_mod_discount.class.php =================================================================== --- /mods/wpsg_mod_discount.class.php (revision 6318) +++ /mods/wpsg_mod_discount.class.php (revision 6319) @@ -165,5 +165,6 @@ );*/ - $product_content['price']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_discount/produkt_addedit_sidebar.phtml', false); + if (isset($product_content['price']['content'])) + $product_content['price']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_discount/produkt_addedit_sidebar.phtml', false); @@ -334,8 +335,9 @@ * Ich speichere die Rabatteinstellungen in einem Feld innerhalb des Produktes das Trennzeichen ist "_" */ - $rabatt_str = $_REQUEST['wpsg_mod_discount']['discount_aktiv']."_".$_REQUEST['wpsg_mod_discount']['discount_from']."_".$_REQUEST['wpsg_mod_discount']['discount_to']."_".wpsg_tf($_REQUEST['wpsg_mod_discount']['discount_value'], true); + if (isset($_REQUEST['wpsg_mod_discount'])) + $rabatt_str = $_REQUEST['wpsg_mod_discount']['discount_aktiv']."_".$_REQUEST['wpsg_mod_discount']['discount_from']."_".$_REQUEST['wpsg_mod_discount']['discount_to']."_".wpsg_tf($_REQUEST['wpsg_mod_discount']['discount_value'], true); $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, array( - 'rabatt' => wpsg_q($rabatt_str) + 'rabatt' => wpsg_q(wpsg_getStr($rabatt_str)) ), "`id` = '".wpsg_q($produkt_id)."'"); Index: /mods/wpsg_mod_ordercondition.class.php =================================================================== --- /mods/wpsg_mod_ordercondition.class.php (revision 6318) +++ /mods/wpsg_mod_ordercondition.class.php (revision 6319) @@ -235,9 +235,14 @@ $arSave = array(); - foreach ((array)$_REQUEST['wpsg_mod_ordercondition'] as $oc_id => $oc_value) - { - - if ($oc_value === '1') $arSave[] = $oc_id; - + if (isset($_REQUEST['wpsg_pv'])) + { + + foreach ((array)$_REQUEST['wpsg_mod_ordercondition'] as $oc_id => $oc_value) + { + + if ($oc_value === '1') $arSave[] = $oc_id; + + } + } Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 6318) +++ /mods/wpsg_mod_productvariants.class.php (revision 6319) @@ -1592,4 +1592,79 @@ /** + * Gibt die Möglichken Bilder einer Variantenkombination zurÌck + */ + public function getKombiVariImages($var_key, $var_id = false) + { + + if (!$this->shop->hasMod('wpsg_mod_produktbilder')) return false; + + $arVarSelected = $this->getSetVariArray($var_key); + $product_id = $this->shop->getProduktID($var_key); + //$arVari = $this->loadVarianten($product_id); + $arVari = $this->getVariants($product_id, true, true, true); + $this->unserializeVariant($arVari); + + $arTemp = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_id)); + + if (!$this->isVariantsProductKey($var_key)) return $arTemp; + + $arBilder = array(); + foreach ($arTemp as $bild) { + $arBilder[] = $bild['basenameori']; + } + + /* + // Schauen ob ein Bild nach dem Dateinamen dabei ist + foreach ($arBilder as $bild) + { + $image = false; + $filename = preg_replace("/\.([^\.]*)/", "", $bild); + if ($filename == "vp_".str_replace(":", "-", $var_key)) $image = $bild; + + if ($image !== false) return array($image); + } + */ + foreach ($arVari as $var_key => $var) + { + if (array_key_exists($var_key, $arVarSelected)) + { + if ($var_id === $var_key) continue; + if ($var['typ'] == "checkbox") + { + if ($arVarSelected[$var_key] == "1") + { + $arBilder = array_intersect($arBilder, explode(",", $var['pic'])); + } + else + { + $arBilder = array_diff($arBilder, explode(",", $var['pic'])); + } + } + else + { + $pics = wpsg_getStr($var['arVariation'][$arVarSelected[$var_key]]['pic']); + $arBilder = array_intersect($arBilder, explode(",", wpsg_getStr($var['arVariation'][$arVarSelected[$var_key]]['pic']))); + } + } + } + //$arBilder = $this->checkPics($arBilder, $product_id); + + if (wpsg_isSizedArray($arBilder)) + { + $arBilder = array_values($arBilder); + foreach ($arTemp as $k => $bild) { + if ($arBilder[0] != $bild['basenameori']) unset($arTemp[$k]); + } + //return $arBilder; + $arTemp = array_values($arTemp); + return $arTemp; + } + else + { + return array(); + } + } + + /** * Gibt einen Array zurÌck, bei denen die SchlÌssel die Varianten sind und die Werte die gewÀhlten Variationen */ Index: /mods/wpsg_mod_productvars.class.php =================================================================== --- /mods/wpsg_mod_productvars.class.php (revision 6318) +++ /mods/wpsg_mod_productvars.class.php (revision 6319) @@ -169,7 +169,10 @@ public function produkt_save(&$produkt_id) { - foreach ((array)$_REQUEST['wpsg_pv'] as $k => $v) { if ($v != '1') unset($_REQUEST['wpsg_pv'][$k]); } - - $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, array('produktvars' => implode(",", array_keys((array)$_REQUEST['wpsg_pv']))), "`id` = '".wpsg_q($produkt_id)."'"); + if (isset($_REQUEST['wpsg_pv'])) + { + foreach ((array)$_REQUEST['wpsg_pv'] as $k => $v) { if ($v != '1') unset($_REQUEST['wpsg_pv'][$k]); } + + $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, array('produktvars' => implode(",", array_keys((array)$_REQUEST['wpsg_pv']))), "`id` = '".wpsg_q($produkt_id)."'"); + } } // public function produkt_save(&$produkt_id) Index: /mods/wpsg_mod_produktbilder.class.php =================================================================== --- /mods/wpsg_mod_produktbilder.class.php (revision 6318) +++ /mods/wpsg_mod_produktbilder.class.php (revision 6319) @@ -598,5 +598,6 @@ $ar4 = pathinfo($af); $af = $ar4['filename']; - + $af2 = substr($af, 0, strlen($af) - 2); + //var_dump($af2); $sql = "SELECT P.`ID`, P.`post_title`, P.`guid`, PM.`post_id`, PM.`meta_key`, PM.`meta_value` @@ -610,4 +611,17 @@ $arr = $this->db->fetchAssoc($sql); + if (!wpsg_isSizedArray($arr)) { + $sql = "SELECT + P.`ID`, P.`post_title`, P.`guid`, PM.`post_id`, PM.`meta_key`, PM.`meta_value` + FROM `".$wpdb->prefix."posts` AS P + LEFT JOIN `".$wpdb->prefix."postmeta` AS PM ON (P.`ID` = PM.`post_id`) + WHERE + PM.`meta_key` = 'wpsg_produkt_id' AND + PM.`meta_value` = '".wpsg_q($product_id)."' AND + P.`post_title` = '".$af2."' + "; + $arr = $this->db->fetchAssoc($sql); + } + $p = wp_get_attachment_image_src($arr[0]['ID'], 'thumbnail'); @@ -674,5 +688,5 @@ $arPostids = explode(',', $postids); - $ud = wp_upload_dir(); + $ud = wp_upload_dir(); $i = 0; Index: /mods/wpsg_mod_statistics.class.php =================================================================== --- /mods/wpsg_mod_statistics.class.php (revision 6318) +++ /mods/wpsg_mod_statistics.class.php (revision 6319) @@ -856,5 +856,5 @@ LEFT JOIN `".WPSG_TBL_ADRESS."` AS OA ON (O.`adress_id` = OA.`id`)"; - $pid = $_REQUEST['edit_id']; + $pid = wpsg_getInt($_REQUEST['edit_id']); $sql .= " WHERE (`OP`.`p_id`='".$pid."')"; Index: /mods/wpsg_mod_voucherproduct.class.php =================================================================== --- /mods/wpsg_mod_voucherproduct.class.php (revision 6318) +++ /mods/wpsg_mod_voucherproduct.class.php (revision 6319) @@ -153,7 +153,7 @@ { - $produkt_data['wpsg_mod_voucherproduct_gs'] = wpsg_q($_REQUEST['wpsg_mod_voucherproduct_gs']); - $produkt_data['wpsg_mod_voucherproduct_gslaenge'] = intval($_REQUEST['wpsg_mod_voucherproduct_gslaenge']); - $produkt_data['wpsg_mod_voucherproduct_available'] = intval($_REQUEST['wpsg_mod_voucherproduct_available']); + $produkt_data['wpsg_mod_voucherproduct_gs'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_voucherproduct_gs'])); + $produkt_data['wpsg_mod_voucherproduct_gslaenge'] = intval(wpsg_getStr($_REQUEST['wpsg_mod_voucherproduct_gslaenge'])); + $produkt_data['wpsg_mod_voucherproduct_available'] = intval(wpsg_getStr($_REQUEST['wpsg_mod_voucherproduct_available'])); } // public function produkt_save_before(&$produkt_data) Index: /views/admin/loadsavesettings.phtml =================================================================== --- /views/admin/loadsavesettings.phtml (revision 6318) +++ /views/admin/loadsavesettings.phtml (revision 6319) @@ -22,5 +22,5 @@
-

+

Index: /views/admin/presentation.phtml =================================================================== --- /views/admin/presentation.phtml (revision 6318) +++ /views/admin/presentation.phtml (revision 6319) @@ -22,5 +22,5 @@
-

+

Index: /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml =================================================================== --- /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml (revision 6318) +++ /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml (revision 6319) @@ -15,5 +15,6 @@ get_option('wpsg_mod_deliverytime_store'))) {?> - view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?> + view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'])) + echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?> Index: /views/mods/mod_productvariants/frontend.js =================================================================== --- /views/mods/mod_productvariants/frontend.js (revision 6318) +++ /views/mods/mod_productvariants/frontend.js (revision 6319) @@ -4,5 +4,5 @@ var template_index = jQuery(event.target).closest('.wpsg_mod_productvariants_product_wrap').attr('wpsg-productindex'); - + wpsg_blockProductTemplate(template_index); Index: /views/mods/mod_productvariants/produkt.phtml =================================================================== --- /views/mods/mod_productvariants/produkt.phtml (revision 6318) +++ /views/mods/mod_productvariants/produkt.phtml (revision 6319) @@ -102,5 +102,6 @@ hasMod('wpsg_mod_produktbilder')) { ?>
- + + $vari) { $kkv++; if ($vari['active'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?> @@ -110,10 +111,11 @@ $pbh = $this->get_option('wpsg_vp_imageselect_height'); ?> - + - + +
@@ -187,5 +189,12 @@ jQuery('.wpsg_vp_update').off('change').on('change', wpsg_mod_productvariants_reload); - + + jQuery('.wpsg_vp_update_image').on('click', function(event) { + + jQuery(this).closest('span').find('input').val(jQuery(this).data('wpsg-id')); + wpsg_mod_productvariants_reload(event); + + } ); + } ); Index: /views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml (revision 6318) +++ /views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml (revision 6319) @@ -13,7 +13,10 @@
- view['data']['wpsg_mod_voucherproduct_gs']); ?> - view['data']['wpsg_mod_voucherproduct_gslaenge'] > 0)?$this->view['data']['wpsg_mod_voucherproduct_gslaenge']:10)); ?> - view['data']['wpsg_mod_voucherproduct_available']); ?> + view['data']['wpsg_mod_voucherproduct_gs'])) + echo wpsg_drawForm_Checkbox('wpsg_mod_voucherproduct_gs', __('Gutschein generieren', 'wpsg'), $this->view['data']['wpsg_mod_voucherproduct_gs']); ?> + view['data']['wpsg_mod_voucherproduct_gslaenge'])) + echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_gslaenge', __('LÀnge des Gutscheincodes', 'wpsg'), (($this->view['data']['wpsg_mod_voucherproduct_gslaenge'] > 0)?$this->view['data']['wpsg_mod_voucherproduct_gslaenge']:10)); ?> + view['data']['wpsg_mod_voucherproduct_available'])) + echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_available', __('GÌltigkeit (Tage)', 'wpsg'), $this->view['data']['wpsg_mod_voucherproduct_available']); ?>

Index: /views/mods/mod_weight/settings_edit.phtml =================================================================== --- /views/mods/mod_weight/settings_edit.phtml (revision 6318) +++ /views/mods/mod_weight/settings_edit.phtml (revision 6319) @@ -13,5 +13,6 @@ get_option('wpsg_mod_weight_showOverview'), array('help' => 'wpsg_mod_weight_showOverview')); ?> get_option('wpsg_mod_weight_showOverviewProduct'), array('help' => 'wpsg_mod_weight_showOverviewProduct')); ?> -hasMod('wpsg_mod_productindex')) { ?> + +hasMod('wpsg_mod_productindex')) { ?> get_option('wpsg_mod_weight_showProductindex'), array('help' => 'wpsg_mod_weight_showProductindex')); ?> Index: /views/produkttemplates/standard.phtml =================================================================== --- /views/produkttemplates/standard.phtml (revision 6318) +++ /views/produkttemplates/standard.phtml (revision 6319) @@ -11,6 +11,8 @@ //$this->noReleatedProducts = true; - $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['product_id'])); - if (!wpsg_isSizedArray($arImages)) $arImages = array(); + $arImages = $this->callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($this->view['data']['product_key'])); + if (!wpsg_isSizedArray($arImages)) + $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['product_key'])); + //$arImages = array(); ?> Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 6318) +++ /views/warenkorb/basket.phtml (revision 6319) @@ -128,5 +128,8 @@ callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium')); + //$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium')); + $arr = $this->callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($p['product_key'])); + $ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail'); + $url = $ais[0]; } else { $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['productkey'], 'medium'));