Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 5382) +++ /controller/wpsg_ProduktController.class.php (revision 5385) @@ -681,5 +681,8 @@ $this->shop->view['templates'] = $this->shop->loadProduktTemplates(); - $this->shop->view['data'] = array(); + $this->shop->view['data'] = array( + 'id' => false + ); + $this->shop->callMods('produkt_add', array(&$this->shop->view['data'])); Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5382) +++ /controller/wpsg_ShopController.class.php (revision 5385) @@ -2444,5 +2444,5 @@ $this->callMod($_REQUEST['wpsg_mod'], $_REQUEST['wpsg_action'].'Redirect'); return; - + } Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 5382) +++ /lib/functions.inc.php (revision 5385) @@ -971,10 +971,22 @@ /** + * Gibt die Numerische Entsprechung einer Variable zurÃŒck oder $default + */ + function wpsg_getInt(&$value, $default = false) + { + + if (!isset($value) || !is_numeric($value)) return $default; + + return intval($value); + + } + + /** * Gibt einen String zurÃŒck und verhindert Fehler wenn eine Wert nicht definiert wurde */ - function wpsg_getStr(&$value) - { - - if (!isset($value) || !is_string($value)) return ''; + function wpsg_getStr(&$value, $default = '') + { + + if (!isset($value) || !is_string($value)) return $default; return $value; Index: /lib/helper_functions.inc.php =================================================================== --- /lib/helper_functions.inc.php (revision 5382) +++ /lib/helper_functions.inc.php (revision 5385) @@ -618,4 +618,15 @@ } + function wpsg_drawForm_SubmitButton($field_label) + { + + $TC = new wpsg_ShopController(); + + $TC->view['field_label'] = $field_label; + + return $TC->render(WPSG_PATH_VIEW.'admin/form/input_submit.phtml', false); + + } + function wpsg_drawForm_Input($field_name, $field_label, $field_value, $conf = array()) { Index: /model/wpsg_model.class.php =================================================================== --- /model/wpsg_model.class.php (revision 5382) +++ /model/wpsg_model.class.php (revision 5385) @@ -79,17 +79,38 @@ $class_name = get_called_class(); - if (!array_key_exists($class_name.'_'.$id, self::$_objCache) || $noCache === true) + if (wpsg_isSizedArray($id)) { - $oObject = new $class_name(); - $bLoad = $oObject->load($id); - - if (!$bLoad) return false; - - self::$_objCache[$class_name.'_'.$id] = $oObject; - + $arReturn = []; + + foreach ($id as $_id) + { + + $arReturn[$_id] = self::getInstance($_id); + + } + + return $arReturn; + } + else if (is_array($id)) return array(); + else + { + + if (!array_key_exists($class_name.'_'.$id, self::$_objCache) || $noCache === true) + { + + $oObject = new $class_name(); + $bLoad = $oObject->load($id); + + if (!$bLoad) return false; + + self::$_objCache[$class_name.'_'.$id] = $oObject; + + } + + return self::$_objCache[$class_name.'_'.$id]; - return self::$_objCache[$class_name.'_'.$id]; + } } // public abstract static function getInstance($id) Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5382) +++ /model/wpsg_product.class.php (revision 5385) @@ -128,6 +128,8 @@ if ($url === false) { - - if (wpsg_isSizedInt($this->partikel)) + + $partikel = $this->partikel; + + if (wpsg_isSizedInt($partikel)) { @@ -166,4 +168,25 @@ } // public function getProductURL() + + public function getOldPrice() + { + + return 2100; + + } + + public function getMinPrice() + { + + return $this->getPrice(); + + } + + public function getPrice() + { + + return 15; + + } /** @@ -244,4 +267,59 @@ } // public function getAllowedShipping() + /* Statische Funktionen */ + + public static function find($arFilter = array(), $load = true) + { + + list($strQueryWHERE, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strQuery = " + SELECT + P.`id` + FROM + `".WPSG_TBL_PRODUCTS."` AS P + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + ORDER BY + ".$strQueryORDER." + "; + + $arID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); + $arReturn = array(); + + foreach ($arID as $id) + { + + if ($load === true) $arReturn[$id] = self::getInstance($id); + else $arReturn[$id] = $id; + + } + + return $arReturn; + + } // public function find($arQuery = array()) + + public static function getQueryParts($arFilter = array()) + { + + $strQueryWHERE = ""; + $strQueryHAVING = ""; + $strQueryORDER = " P.`cdate` ASC "; + + if (wpsg_isSizedArray($arFilter['product_ids'])) + { + + $strQueryWHERE .= " AND P.`id` IN (".implode(',', $arFilter['product_ids']).") "; + + } + + return array($strQueryWHERE, $strQueryHAVING, $strQueryORDER); + + } // public function getQueryParts($arFilter = array()) + } // class wpsg_product extends wpsg_model Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 5382) +++ /mods/wpsg_mod_productgroups.class.php (revision 5385) @@ -200,5 +200,5 @@ { - $this->shop->view['productgroups'] = $this->db->fetchAssoc(" + $this->shop->view['productgroups'] = $this->db->fetchAssoc(" SELECT (SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`pgruppe` = PG.`id` AND P.`deleted` != '1' ".$GLOBALS['wpsg_produkt_index_query_where'].") AS countProdukte, @@ -211,6 +211,10 @@ countProdukte > 0 "); - + $this->shop->view['countProducts'] = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`deleted` != '1' AND P.`lang_parent` = 0 ".$GLOBALS['wpsg_produkt_index_query_where']); + + $this->shop->view['arSelect'] = []; + foreach ($this->shop->view['productgroups'] as $pg) { $this->shop->view['arSelect'][$pg['id']] = $pg['name'].' ('.$pg['countProdukte'].')'; } + $this->shop->view['arSelect'][0] = __('Alle', 'wpsg').' ('.$this->shop->view['countProducts'].')'; $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/produkt_index_filter.phtml'); Index: /mods/wpsg_mod_productview.class.php =================================================================== --- /mods/wpsg_mod_productview.class.php (revision 5382) +++ /mods/wpsg_mod_productview.class.php (revision 5385) @@ -24,9 +24,96 @@ public function init() { - + + add_shortcode('wpsg_productview', array($this, 'wpsg_sc_productview')); } // public function init() + public function wpsg_enqueue_scripts() + { + + if (!is_admin()) + { + + wp_enqueue_script('wpsg_mod_productview_js', $this->shop->getRessourceURL('mods/mod_productview/productview.js')); + + wp_localize_script('wpsg_mod_productview_js', 'wpsg_mod_productview', array( + + )); + } + + } // public function wpsg_enqueue_scripts() + + /* Modulfunktionen */ + + public function refreshRedirect() + { + + $atts = @unserialize($_REQUEST['atts']); + + if (wpsg_isSizedInt($_REQUEST['page'])) $atts['page'] = $_REQUEST['page']; + + die($this->wpsg_sc_productview($atts)); + + } // public function refreshRedirect() + + /** + * Shortcode fÃŒr die Anzeige der Produkte + */ + public function wpsg_sc_productview($atts) + { + + $arProductviewArray = $this->getSelectedProductArray($atts); + + $this->shop->view['wpsg_mod_productview'] = $arProductviewArray; + $this->shop->view['wpsg_mod_productview']['index'] = wpsg_getInt($GLOBALS['wpsg_mod_productview_index'], 1); + $this->shop->view['wpsg_mod_productview']['atts'] = $atts; + + $GLOBALS['wpsg_mod_productview_index'] = $this->shop->view['wpsg_mod_productview']['index'] + 1; + + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productview/productview.phtml', false); + + } // public function wpsg_sc_productview($atts) + + /** + * Gibt die ProduktIDs fÃŒr die Anzeige anhand der Shortcode Einstellungen zurÃŒck + */ + private function getSelectedProductArray($atts) + { + + $arFilter = []; + $arReturn = []; + + if (wpsg_isSizedString($atts['product_ids'])) + { + + $arReturn = array_merge($arReturn, explode(',', $atts['product_ids'])); + $arReturn = wpsg_trim(array_unique($arReturn)); + + $arFilter = array( + 'product_ids' => $arReturn + ); + + } + + $arReturn = wpsg_product::find($arFilter, false); + $nCount = sizeof($arReturn); + + $nPage = wpsg_getInt($atts['page'], 1); + $nPerPage = wpsg_getInt($atts['per_page'], 8); + $nPages = ceil($nCount / $nPerPage); + + $arReturn = wpsg_product::getInstance(array_slice($arReturn, ($nPage - 1) * $nPerPage, $nPerPage, true)); + + return array( + 'page' => $nPage, + 'per_page' => $nPerPage, + 'pages' => $nPages, + 'count' => $nCount, + 'products' => $arReturn, + 'title' => wpsg_getStr($atts['title']) + ); + + } // private function getSelectedProductArray($atts) } // class wpsg_mod_productview extends wpsg_mod_basic Index: /mods/wpsg_mod_produktbilder.class.php =================================================================== --- /mods/wpsg_mod_produktbilder.class.php (revision 5382) +++ /mods/wpsg_mod_produktbilder.class.php (revision 5385) @@ -325,4 +325,27 @@ } // public function getImageModes() + + /** + * Gibt false oder die URL zu einem Bild des Produktes zurÃŒck + */ + public function getProductImage($product_key, $setW, $setH, $mode) + { + + $product_id = $this->shop->getProduktID($product_key); + + $arBilder = $this->getProduktBilder($product_id); + + if (!wpsg_isSizedArray($arBilder)) + { + + return $this->shop->getRessourceURL('mods/mod_produktbilder/dummy.png'); + + } + + $img_url = $this->makeTn($product_id, $arBilder[0], $setW, $setH, $mode); + + return $img_url; + + } // public function getProductImage($product_key) /** @@ -544,8 +567,8 @@ imagefill($dstImage, 0, 0, $color); imagesavealpha($dstImage, true); - - if ($width < $setW) $dst_x = ($setW - $width) / 2; - if ($height < $setH) $dst_x = ($setW - $width) / 2; - + + $dst_x = 0; if ($width < $setW) $dst_x = ($setW - $width) / 2; + $dst_y = 0; if ($height < $setH) $dst_y = ($setH - $height) / 2; + imagecopyresampled($dstImage, $srcImage, $dst_x, $dst_y, 0, 0, $width, $height, $W, $H); Index: /views/admin/form/input_submit.phtml =================================================================== --- /views/admin/form/input_submit.phtml (revision 5385) +++ /views/admin/form/input_submit.phtml (revision 5385) @@ -0,0 +1,9 @@ +
+ + + +
+ +
+ +
Index: /views/admin/index.phtml =================================================================== --- /views/admin/index.phtml (revision 5382) +++ /views/admin/index.phtml (revision 5385) @@ -15,5 +15,5 @@ - + Index: /views/admin/module.phtml =================================================================== --- /views/admin/module.phtml (revision 5382) +++ /views/admin/module.phtml (revision 5385) @@ -18,5 +18,5 @@ view['groups'] as $group_name => $g) { ?> -
+ + + view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?> + view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?> LÀnderverwaltung
@@ -300,5 +300,5 @@
- +
@@ -340,5 +340,5 @@
- +
@@ -350,5 +350,5 @@
- +
@@ -361,5 +361,5 @@
- +
@@ -375,5 +375,5 @@ @@ -387,9 +387,9 @@
- +
- +    - +
@@ -432,5 +432,5 @@ '1' => __('Mehrfach mit beliebiger Menge', 'wpsg'), '2' => __('Mehrfach mit Menge 1', 'wpsg') - ), $this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?> + ), @$this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?> @@ -492,5 +492,5 @@ add_filter('tiny_mce_before_init', 'wpsg_formatTinyMCE'); add_filter('admin_head','wpsg_ShowTinyMCE'); - wp_editor($this->view['data']['beschreibung'], 'beschreibung'); + wp_editor(@$this->view['data']['beschreibung'], 'beschreibung'); ?> Index: /views/produkt/index.phtml =================================================================== --- /views/produkt/index.phtml (revision 5382) +++ /views/produkt/index.phtml (revision 5385) @@ -52,302 +52,244 @@ -
-

-

- - - view['data'])) { ?> - +
+ + + + view['pages'] > 1) { ?> + + + + writeBackendMessage(); ?> + +
+ view['data']) && sizeof($this->view['data']) > 0) { ?> + + + + hasMod('wpsg_mod_produktbilder')) { ?> + + + + + hasMod('wpsg_mod_productgroups')) { ?> + + + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> + + + + + + + + view['data'] as $d) { ?> + + hasMod('wpsg_mod_produktbilder')) { ?> + + + + + hasMod('wpsg_mod_productgroups')) { ?> + + + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> + + + + + + + + + + hasMod('wpsg_mod_produktbilder')) { ?> + + + + + hasMod('wpsg_mod_productgroups')) { ?> + + + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($d['id'])); + + if (wpsg_isSizedArray($arBilder)) + { + + echo ''; + echo ''; + echo ''; + + } + + ?> + + " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=" class="row-title"> +
+ " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id="> + isMultiLingual()) { ?> + getStoreLanguages() as $l) { ?> + getDefaultLanguageLocale()) { ?> + + <?php echo wpsg_translate(__('Produkt fÃŒr Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?> + + + + + | + ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Produkt&action=del&edit_id=&noheader=1"> + | + ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Produkt&action=copy&edit_id=&noheader=1"> + | + " href="getProduktLink(array('id' => $d['id'])); ?>"> + callMods('produkt_index_editmenu', array(&$d)); ?> +
+ 		+ + + + + + +
+ hasMod('wpsg_mod_varianten') && wpsg_isSizedArray($this->callMod('wpsg_mod_varianten', 'loadVarianten', array($d['id'])))) { ?> +
+ +
+ + 		+ getDefaultCountry()->kuerzel.')'; ?> + + get_option('wpsg_preisangaben') == WPSG_NETTO) { ?> + get_option('wpsg_currency')); ?> + + get_option('wpsg_currency')); ?> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +

- -

- - writeBackendMessage(); ?> - -
- - callMod('wpsg_mod_productgroups', 'produkt_index_filter'); ?> - -

- - - - */ ?> -

- - view['data'] > 0)) { ?> -
- -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
-
- -
- - - - - - - -
-
-
-

-
- -

-
-
-
-
*/ ?> - - - - view['data']) && sizeof($this->view['data']) > 0) { ?> - - - - hasMod('wpsg_mod_produktbilder')) { ?> - - - - - hasMod('wpsg_mod_productgroups')) { ?> - - - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> - - - - - - - - view['data'] as $d) { ?> - - hasMod('wpsg_mod_produktbilder')) { ?> - - - - - hasMod('wpsg_mod_productgroups')) { ?> - - - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> - - - - - - - - - - hasMod('wpsg_mod_produktbilder')) { ?> - - - - - hasMod('wpsg_mod_productgroups')) { ?> - - - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($d['id'])); - - if (wpsg_isSizedArray($arBilder)) - { - - echo ''; - echo ''; - echo ''; - - } - - ?> - - " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=" class="row-title"> -
- " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id="> - isMultiLingual()) { ?> - getStoreLanguages() as $l) { ?> - getDefaultLanguageLocale()) { ?> - - <?php echo wpsg_translate(__('Produkt fÃŒr Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?> - - - - - | - ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Produkt&action=del&edit_id=&noheader=1"> - | - ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Produkt&action=copy&edit_id=&noheader=1"> - | - " href="getProduktLink(array('id' => $d['id'])); ?>"> - callMods('produkt_index_editmenu', array(&$d)); ?> -
- 		- - - - - - -
- hasMod('wpsg_mod_varianten') && wpsg_isSizedArray($this->callMod('wpsg_mod_varianten', 'loadVarianten', array($d['id'])))) { ?> -
- -
- - 		- getDefaultCountry()->kuerzel.')'; ?> - - get_option('wpsg_preisangaben') == WPSG_NETTO) { ?> - get_option('wpsg_currency')); ?> - - get_option('wpsg_currency')); ?> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
-
- -
- - -

- + +