Index: /changelog =================================================================== --- /changelog (revision 7840) +++ /changelog (revision 7841) @@ -425,4 +425,5 @@ - Feature: Template je Variante fÌr Downloadplus anpassbar - Feature: parallele Erstellung eines Dokumentes ohne Vorlage (Briefbogenfunktion) +- Feature: Globale Bilder in globalen Variationen - Bugfix: Anzeige von Name/Titel in den Passwort Vergessen Mails - Bugfix: KundenzusammenfÌgen funktioniert wieder Index: /lib/wpsg_imagehandler.class.php =================================================================== --- /lib/wpsg_imagehandler.class.php (revision 7840) +++ /lib/wpsg_imagehandler.class.php (revision 7841) @@ -34,10 +34,9 @@ $arAttachmentIDs = $this->getAttachmentIDs($product_key, $vari_id, $all); - + if (wpsg_isSizedArray($arAttachmentIDs)) { - // return array_values($arAttachmentIDs)[0]; - $arValues = array_values($arAttachmentIDs); + return $arValues[0]; @@ -119,6 +118,5 @@ * @throws \wpsg\Exception */ - public function getAttachmentIDs($product_key, $vari_id = false, $all = false) - { + public function getAttachmentIDs($product_key, $vari_id = false, $all = false) { $product_id = $this->shop->getProduktID($product_key); @@ -142,6 +140,5 @@ $postids = $this->db->fetchOne("SELECT `postids` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($product_id)."' "); - if (strpos($postids, ',') !== false) - { + if (strpos($postids, ',') !== false) { $arPostIDsOrder = explode(',', $postids); @@ -156,17 +153,14 @@ } - + // Jetzt sind in $arAttachmentIDs alle Bilder dieses Produktes - if ($this->shop->hasMod('wpsg_mod_productvariants') && $this->shop->callMod('wpsg_mod_productvariants', 'isVariantsProductKey', array($product_key))) - { - + if ($this->shop->hasMod('wpsg_mod_productvariants') && $this->shop->callMod('wpsg_mod_productvariants', 'isVariantsProductKey', array($product_key))) { + // Bei einem Variantenprodukt muss ich jetzt noch filtern ... $arVariInfo = $this->shop->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($product_key)); - + return array_values($arVariInfo['images']); - } - else if ($this->shop->hasMod('wpsg_mod_productvariants') && wpsg_isSizedInt($vari_id)) - { + } else if ($this->shop->hasMod('wpsg_mod_productvariants') && wpsg_isSizedInt($vari_id)) { // Daten der Produktvariation laden @@ -185,5 +179,11 @@ $arAttachmentIDsProductVari = explode(',', $images); - + + // Globale Bilder hinzufÌgen + $vari_images = $this->shop->get_option('wpsg_mod_productvariants_global_images'); + if (!is_array($vari_images)) $vari_images = []; + + if (isset($vari_images[intval($vari_id)])) $arAttachmentIDs = array_merge($arAttachmentIDs, $vari_images[intval($vari_id)]); + // Die Elemente, in der Reihenfolge aus $arAttachmentIDs. die auch in $arAttachmentIDsProductVari enthalten sind $arAttachmentIDsIntersect = array_intersect($arAttachmentIDsProductVari, $arAttachmentIDs); @@ -193,12 +193,9 @@ $arAttachmentIDs = $arAttachmentIDsIntersect + $arDiff; - if ($all === true) - { + if ($all === true) { return array_values($arAttachmentIDs); - } - else - { + } else { // Jetzt noch aus der Reihenfolge die gesetzten filtern @@ -217,6 +214,25 @@ } + } else if ($this->shop->hasMod('wpsg_mod_productvariants') && $this->shop->callMod('wpsg_mod_productvariants', 'isVariantsProduct', array($product_key))) { + + // Globale Bilder hinzufÌgen + $vari_data = $this->shop->callMod('wpsg_mod_productvariants', 'getVariants', [$this->shop->getProduktID($product_key), true, true, true]); + + foreach ($vari_data as $variant_id => $variant_data) { + + foreach ($variant_data['arVariation'] as $variation_id => $variation_data) { + + $arAttachmentIDs = wpsg_trim(array_unique(array_merge( + $arAttachmentIDs, explode(',', $variation_data['images_set']) + ))); + + } + + } + } - + + $arAttachmentIDs = array_filter($arAttachmentIDs, function($attachment_id) { return get_post_status($attachment_id) === 'publish'; }); + return array_values($arAttachmentIDs); Index: /mods/wpsg_mod_downloadplus.class.php =================================================================== --- /mods/wpsg_mod_downloadplus.class.php (revision 7840) +++ /mods/wpsg_mod_downloadplus.class.php (revision 7841) @@ -738,10 +738,9 @@ FROM `".WPSG_TBL_PDFINDIV."` - WHERE - `file` = '".wpsg_q($v[1])."' AND + WHERE `p_key` = '".wpsg_q($v[0])."' AND `o_id` = '".wpsg_q($order_id)."' AND `product_index` = '".wpsg_q($v[2])."' - "); + "); // `file` = '".wpsg_q($v[1])."' AND if (!wpsg_isSizedInt($db_indiv['id'])) { Index: /mods/wpsg_mod_orderupload.class.php =================================================================== --- /mods/wpsg_mod_orderupload.class.php (revision 7840) +++ /mods/wpsg_mod_orderupload.class.php (revision 7841) @@ -266,12 +266,9 @@ } // public function order_ajax() - public function basket_save_done(&$o_id, &$k_id, &$oBasket) - { - - if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_orderupload'])) - { - - foreach ($_SESSION['wpsg']['wpsg_mod_orderupload'] as $k => $ou) - { + public function basket_save_done(&$o_id, &$k_id, &$oBasket) { + + if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_orderupload'])) { + + foreach ($_SESSION['wpsg']['wpsg_mod_orderupload'] as $k => $ou) { $path_target = $this->getSavePath($o_id); @@ -293,10 +290,11 @@ } // public function basket_save_done($o_id, $k_id) - public function order_view_sidebar(&$order_id) - { - - $arFiles = scandir($this->getSavePath($order_id)); - - foreach ($arFiles as $k => $v) { if (in_array($v, array('.', '..', '.htaccess', '.htpasswd'))) { unset($arFiles[$k]); } } + public function order_view_sidebar(&$order_id) { + + $path = $this->getSavePath($order_id); + + $arFiles = scandir($path); + + foreach ($arFiles as $k => $v) { if (in_array($v, array('.', '..', '.htaccess', '.htpasswd')) || is_dir($path.$v)) { unset($arFiles[$k]); } } if (sizeof($arFiles) <= 0) return; @@ -358,6 +356,6 @@ $arFilesUploaded = $this->getProductUploads($_REQUEST['order_id'], $_REQUEST['product_index']); if (sizeof($arFilesUploaded) >= $oProduct->wpsg_mod_orderupload_set) { $this->shop->addFrontendError(wpsg_translate(__('Sie haben die maximale Anzahl an Dateien (#1#) fÌr dieses Produkt erreicht.', 'wpsg'), $oProduct->wpsg_mod_orderupload_set)); break; } - - move_uploaded_file($f, $path.$_FILES['file']['name'][$k]); + + move_uploaded_file($f, $path.$_FILES['file']['name'][$k]); } @@ -421,5 +419,5 @@ $arUploadedFiles = $this->getProductUploads($order_id, $product_index); - + if (wpsg_isSizedArray($arUploadedFiles)) { @@ -449,5 +447,5 @@ $this->shop->view['wpsg_mod_orderupload']['product_id'] = $product_id; $this->shop->view['wpsg_mod_orderupload']['arFiles'] = $this->getProductUploads($order_id, $product_index); - + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/basket_row_upload_target.phtml', false); @@ -513,5 +511,5 @@ $path = $this->getProductStoragePath($order_id, $product_index); - + foreach (scandir($path) as $file) { Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 7840) +++ /mods/wpsg_mod_productvariants.class.php (revision 7841) @@ -128,6 +128,5 @@ } // public function settings_save() - public function be_ajax() - { + public function be_ajax() { $action = $_REQUEST['subaction'].'Action'; @@ -1163,5 +1162,5 @@ $vp_data = $this->getVariants($product_id, true, true, true); - + $this->shop->view['vp_data'] = $vp_data; $this->shop->view['vp_info'] = $this->getVariantenInfoArray($product_key); @@ -1278,15 +1277,12 @@ } // private function admin_addAction() - private function admin_editAction() - { - - $_REQUEST['product_id'] = wpsg_sinput("key", $_REQUEST['product_id']); - $_REQUEST['variant_id'] = wpsg_sinput("key", $_REQUEST['variant_id']); + private function admin_editAction() { + + $_REQUEST['product_id'] = intval($_REQUEST['product_id']); + $_REQUEST['variant_id'] = intval($_REQUEST['variant_id']); $this->shop->view['product_id'] = wpsg_getStr($_REQUEST['product_id'], '0'); $this->shop->view['variant'] = $this->getVariant($_REQUEST['variant_id']); $this->shop->view['arVariation'] = $this->getVariationOfVariant($_REQUEST['variant_id'], $_REQUEST['product_id']); - - //die(wpsg_debug($this->shop->view['arVariation'])); die($this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/admin_edit.phtml')); @@ -1522,4 +1518,52 @@ } // private function admin_inlineEditAction() + private function admin_removeImageAction() { + + $vari_images = $this->shop->get_option('wpsg_mod_productvariants_global_images'); + if (!is_array($vari_images)) $vari_images = []; + + $vari_id = intval($_REQUEST['vari_id']); + + if (!isset($vari_images[$vari_id]) || !is_array($vari_images[$vari_id])) $vari_images[$vari_id] = []; + + $vari_images[$vari_id] = array_filter($vari_images[$vari_id], function($e) { + + return intval($e) !== intval($_REQUEST['attachment_id']); + + }); + + $this->shop->update_option('wpsg_mod_productvariants_global_images', $vari_images); + + exit; + + } + + private function admin_uploadAction() { + + $vari_images = $this->shop->get_option('wpsg_mod_productvariants_global_images'); + if (!is_array($vari_images)) $vari_images = []; + + $vari_id = intval($_REQUEST['vari_id']); + + if (!wpsg_isSizedInt($vari_id)) exit; + + if (!is_array($vari_images[$vari_id])) $vari_images[$vari_id] = []; + + foreach ($_REQUEST['arAtt'] as $a) { + + $post_id = intval($a); + + if ($post_id > 0) $vari_images[$vari_id][] = $post_id; + + } + + $vari_images[$vari_id] = array_unique($vari_images[$vari_id]); + + $this->shop->update_option('wpsg_mod_productvariants_global_images', $vari_images); + + $this->admin_editAction(); + + } + /** * Gibt einen Array zurÌck, bei denen die SchlÌssel die Varianten sind und die Werte die gewÀhlten Variationen @@ -1553,6 +1597,5 @@ * @param Integer $variant_id ID der Variante */ - public function getVariationOfVariant($variant_id, $product_id = false, $arProductFilter = array()) - { + public function getVariationOfVariant($variant_id, $product_id = false, $arProductFilter = array()) { $strQuerySELECT = ""; @@ -1561,6 +1604,5 @@ $strQueryHAVING = ""; - if (wpsg_isSizedArray($arProductFilter)) - { + if (wpsg_isSizedArray($arProductFilter)) { //return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER); @@ -1941,10 +1983,11 @@ ", "id"); - foreach ($arData as $k => $v) - { + $vari_images = $this->shop->get_option('wpsg_mod_productvariants_global_images'); + if (!is_array($vari_images)) $vari_images = []; + + foreach ($arData as $k => $v) { if ($onlyActive === true && !wpsg_isSizedInt($v['count_active'])) unset($arData[$k]); - else - { + else { $arData[$k]['type_label'] = self::$arTypeLabel[$arData[$k]['type']]; @@ -1972,5 +2015,25 @@ VI.`pos` ASC ", "variation_id"); - + + array_walk($arData[$k]['arVariation'], function(&$e) use ($vari_images) { + + if (isset($vari_images[intval($e['variation_id'])])) { + + $images = explode(',', $e['images']); + $images_set = explode(',', $e['images_set']); + + $images = array_merge($images, $vari_images[intval($e['variation_id'])]); + $images_set = array_merge($images_set, $vari_images[intval($e['variation_id'])]); + + $images = array_unique($images); + $images_set = array_unique($images_set); + + $e['images'] = implode(',', $images); + $e['images_set'] = implode(',', $images_set); + + } + + }); + } } @@ -2068,6 +2131,5 @@ * Liest die Informationen anhand eines VariantenschlÌssels aus */ - public function getVariantenInfoArray($product_key) - { + public function getVariantenInfoArray($product_key) { $produkt_id = $this->shop->getProduktID($product_key); @@ -2087,7 +2149,9 @@ // kein Produkt-Key dann keine Weiterarbeit nötig if (is_numeric($product_key)) { + $arReturn['key'] = ''; $arReturn['akey'] = ''; $arReturn['images'] = array(); + return $arReturn; @@ -2100,7 +2164,22 @@ $arImagesProduct = $this->shop->imagehandler->getAttachmentIDs($produkt_id); $arImages = $arImagesProduct; - - foreach ($arVari as $var_key) - { + + /** Globale Varianten könnten auch erlaubte Bilder haben */ + $vari_images = $this->shop->get_option('wpsg_mod_productvariants_global_images'); + if (!is_array($vari_images)) $vari_images = []; + + foreach ($arVari as $k => $var_key) { + + $var_value = intval(preg_replace('/(.*)\:/', '', $var_key)); + + if (isset($vari_images[$var_value])) { + + $arImages = array_unique(array_merge($arImages, $vari_images[$var_value])); + + } + + } + + foreach ($arVari as $var_key) { $var_id = preg_replace('/\:(.*)/', '', $var_key); @@ -2111,8 +2190,8 @@ /* Bilder dieser Variation */ $arImagesVariation = explode(',', @$vp_data[$var_id]['arVariation'][$var_value]['images_set']); - + /* Schnittmenge */ $arImages = array_intersect($arImages, $arImagesVariation); - + $r = array( 'vari_id' => $var_value, @@ -2124,6 +2203,5 @@ ); - if ($this->shop->hasMod('wpsg_mod_weight') && wpsg_isSizedInt($vp_data[$var_id]['arVariation'][$var_value]['weight'])) - { + if ($this->shop->hasMod('wpsg_mod_weight') && wpsg_isSizedInt($vp_data[$var_id]['arVariation'][$var_value]['weight'])) { $r['weight'] = $vp_data[$var_id]['arVariation'][$var_value]['weight']; @@ -2132,6 +2210,5 @@ } - if ($this->shop->hasMod('wpsg_mod_fuellmenge') && wpsg_isSizedInt($vp_data[$var_id]['arVariation'][$var_value]['fmenge'])) - { + if ($this->shop->hasMod('wpsg_mod_fuellmenge') && wpsg_isSizedInt($vp_data[$var_id]['arVariation'][$var_value]['fmenge'])) { $r['fmenge'] = $vp_data[$var_id]['arVariation'][$var_value]['fmenge']; Index: /mods/wpsg_mod_productvars.class.php =================================================================== --- /mods/wpsg_mod_productvars.class.php (revision 7840) +++ /mods/wpsg_mod_productvars.class.php (revision 7841) @@ -406,5 +406,5 @@ public function basket_row(&$p, $i) { - if ($this->shop->get_option('wpsg_mod_productvars_showBasket') != '1') + if ($this->shop->get_option('wpsg_mod_productvars_showBasket') === '1') { $produkt_id = $this->shop->basket->getProduktDBID($p['id']); Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 7840) +++ /views/css/admin.css (revision 7841) @@ -67,4 +67,5 @@ #wpsg-bs .wpsg_msg_wrap { margin-right:20px; } #wpsg-bs .d-flex { display:flex; } +#wpsg-bs .justify-content-between { justify-content:space-between; } #wpsg-bs .w-100 { width:100%; } #wpsg-bs .justify-content_center { justify-content:center; } @@ -386,4 +387,8 @@ .wpsg_mod_productvariants_table_variants .col_id { width:50px; } .wpsg_mod_productvariants_table_variation .col_action { text-align:right; width:75px; } +.wpsg_mod_productvariants_table_variation .wpsg_mod_productvariants_remove_global_vari_image { position:relative; text-decoration:none; display:inline-block; } +.wpsg_mod_productvariants_table_variation .wpsg_mod_productvariants_remove_global_vari_image > span { color:#FFFFFF; background-color:rgba(0, 0, 0, 0.5); position:absolute; left:0; top:0; width:100%; height:100%; display:none; justify-content:center; align-items:center; } +.wpsg_mod_productvariants_table_variation .wpsg_mod_productvariants_remove_global_vari_image:hover > span { display:flex; } +.wpsg_mod_productvariants_table_variation .wpsg_mod_productvariants_remove_global_vari_image img { max-width:25px; max-height:25px; } .wpsg_mod_productvariants_table_variation tbody:nth-child(even) td { background-color:#F9F9F9; } .wpsg_mod_productvariants_table_variation .col_id { width:50px; } Index: /views/mods/mod_downloadplus/settings_edit_templates.phtml =================================================================== --- /views/mods/mod_downloadplus/settings_edit_templates.phtml (revision 7840) +++ /views/mods/mod_downloadplus/settings_edit_templates.phtml (revision 7841) @@ -47,5 +47,8 @@
- +
@@ -180,4 +183,6 @@ #wpsg_dp_templates_app .file_wrap .file { display:flex; gap:1rem; justify-content:flex-end; align-items:center; } #wpsg_dp_templates_app .file_wrap .file .wpsg-glyphicon { margin-right:8px; } + #wpsg_dp_templates_app .label-copy { display:flex; justify-content:space-between; } + #wpsg_dp_templates_app .label-copy .glyphicon { font-size:14px; } @@ -221,4 +226,17 @@ }, + copyTemplate: function() { + + if (!confirm('')) return false; + + let new_template = JSON.parse(JSON.stringify(this.template)); + + new_template.name += ' (Kopie)'; + + this.arTemplates.push(new_template); + this.template = new_template; + + }, + removeTemplate: function() { Index: /views/mods/mod_productgroups/list.phtml =================================================================== --- /views/mods/mod_productgroups/list.phtml (revision 7840) +++ /views/mods/mod_productgroups/list.phtml (revision 7841) @@ -22,14 +22,30 @@
- - = 0 && is_int($image)) { ?> -
- - - - - -
- + + callMod('wpsg_mod_stock', 'getBestand', [$g['produkte'][$i]['id']]); + + ?> + + + + Ausverkauft ... + + + + + = 0 && is_int($image)) { ?> +
+ + + + + +
+ + + +
Index: /views/mods/mod_productindex/layouts/list.phtml =================================================================== --- /views/mods/mod_productindex/layouts/list.phtml (revision 7840) +++ /views/mods/mod_productindex/layouts/list.phtml (revision 7841) @@ -102,5 +102,5 @@
- hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge') == '1') { ?> + hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge') == '1') { ?> '0') { ?> Index: /views/mods/mod_productvariants/admin_edit.phtml =================================================================== --- /views/mods/mod_productvariants/admin_edit.phtml (revision 7840) +++ /views/mods/mod_productvariants/admin_edit.phtml (revision 7841) @@ -6,7 +6,19 @@ ?> - + + + view['arVariation'])) { ?> @@ -50,5 +62,9 @@ - view['arVariation'] as $vari) { $i ++; ?> + view['arVariation'] as $vari) { $i ++; + + $vari_id = intval($vari['id']); + + ?> @@ -181,29 +197,120 @@ - - view['product_id'])) { ?> +   imagehandler->getAttachmentIDs($this->view['product_id'], $vari['id'], true); + + if (wpsg_isSizedInt($this->view['product_id'])) { + + $arAttachmentIDs = $this->imagehandler->getAttachmentIDs($this->view['product_id'], $vari['id'], true); + + } else { + + $vari_images = $this->get_option('wpsg_mod_productvariants_global_images'); + if (!is_array($vari_images)) $vari_images = []; + + $arAttachmentIDs = ((isset($vari_images[$vari_id]))?$vari_images[$vari_id]:[]); + + } ?> - - + +
+ + + + view['product_id'])) { ?> +
+ + + +
+ + +
- pic" id="" onclick="return wpsg_vp_vari_setPic(this, view['variant']['id']; ?>, , '', view['product_id']; ?>);"> - - - - - - - - + + jQuery('.wpsg_mod_productvariants_remove_global_vari_image').on('click', function() { + + let el = jQuery(this); + + event.preventDefault(); + + if (!confirm('')) return; + + el.remove(); + + jQuery.ajax({ + url: 'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_removeImage&noheader=1', + async: true, + data: { + product_id: 0, + variant_id: el.data('variant_id'), + vari_id: el.data('variation_id'), + attachment_id: el.data('attachment_id') + }, + success: function(data) { } + }); + + }); + + view['product_id'])) { ?> @@ -346,5 +477,5 @@ - + + Index: /views/mods/mod_productvariants/admin_html.phtml =================================================================== --- /views/mods/mod_productvariants/admin_html.phtml (revision 7840) +++ /views/mods/mod_productvariants/admin_html.phtml (revision 7841) @@ -41,5 +41,5 @@
- + Index: /views/mods/mod_productvariants/admin_show.phtml =================================================================== --- /views/mods/mod_productvariants/admin_show.phtml (revision 7840) +++ /views/mods/mod_productvariants/admin_show.phtml (revision 7841) @@ -48,5 +48,5 @@ - + @@ -86,5 +86,5 @@

- + Index: /views/produkttemplates/standard.phtml =================================================================== --- /views/produkttemplates/standard.phtml (revision 7840) +++ /views/produkttemplates/standard.phtml (revision 7841) @@ -44,5 +44,5 @@ /* Array mit allen AttachmentIDs der Produktbilder */ $arAttachmentIDsAll = $this->imagehandler->getAttachmentIDs($this->view['data']['product_id']); - + ?>