Index: /mods/wpsg_mod_basketteaser.class.php =================================================================== --- /mods/wpsg_mod_basketteaser.class.php (revision 5458) +++ /mods/wpsg_mod_basketteaser.class.php (revision 5461) @@ -97,13 +97,18 @@ } // public function basket_row_afterproducts(&$p, $i) - public function produkt_edit_sidebar(&$produkt_data) + public function product_addedit_content(&$product_content, &$product_data) { - + if (isset($_REQUEST['wpsg_lang'])) return; - $this->shop->view['data'] = $produkt_data; - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_basketteaser/produkt_edit_sidebar.phtml'); - - } // public function produkt_edit_sidebar(&$produkt_data) + $this->shop->view['data'] = $product_data; + $this->shop->view['wpsg_mod_basketteaser']['data'] = $product_data; + + $product_content['wpsg_mod_basketteaser'] = array( + 'title' => __('Warenkorbteaser', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_basketteaser/produkt_addedit_sidebar.phtml', false) + ); + + } //public function product_addedit_content(&$product_content, &$product_data) public function produkt_save_before(&$produkt_data) { Index: /mods/wpsg_mod_discount.class.php =================================================================== --- /mods/wpsg_mod_discount.class.php (revision 5458) +++ /mods/wpsg_mod_discount.class.php (revision 5461) @@ -142,14 +142,23 @@ } // public function settings_save() - public function produkt_edit_sidebar(&$produkt_data) - { - - if (isset($_REQUEST['wpsg_lang'])) return; - - $this->shop->view['wpsg_mod_discount']['data'] = explode("_", $produkt_data['rabatt']); - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_discount/produkt_edit_sidebar.phtml'); - - } // public function produkt_edit_sidebar(&$produkt_data) - + public function product_addedit_content(&$product_content, &$product_data) + { + + if (wpsg_isSizedInt($product_data['id'])) + { + + if (isset($_REQUEST['wpsg_lang'])) return; + + $this->shop->view['wpsg_mod_discount']['data'] = explode("_", $produkt_data['rabatt']); + + } + + $product_content['wpsg_mod_discount'] = array( + 'title' => __('Rabatte', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_discount/produkt_addedit_sidebar.phtml', false) + ); + + } // public function produkt_edit_sidebar(&$product_content, &$produkt_data) + /** * Soll den Rabattierten Preis zurÌckgeben Index: /mods/wpsg_mod_downloadprodukte.class.php =================================================================== --- /mods/wpsg_mod_downloadprodukte.class.php (revision 5458) +++ /mods/wpsg_mod_downloadprodukte.class.php (revision 5461) @@ -74,9 +74,25 @@ } // public function settings_save() - /** - * - * zeigt ein upload- Formular im rechten Bereich des Produkt-bearbeiten Dialog an + /* + * zeigt ein Upload-Formular im linken Bereich des Produktbackend an * @param &array $produkt_data */ + public function product_addedit_content(&$product_content, &$product_data) + { + + if (isset($_REQUEST['wpsg_lang']) || !wpsg_isSizedInt($produkt_data['id'])) return; + + $this->shop->view['data'] = $produkt_data; + $this->shop->view['prodFiles'] = $this->getProdFileListe($produkt_data['id']); + $this->shop->view['wpsg_mod_downloadprodukte']['path'] = str_replace('\\', '\\\\', $this->getFilePath($produkt_data['id'])); + + $product_content['wpsg_mod_downloadprodukte'] = array( + 'title' => __('Upload fÌr Downloadprodukte', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_downloadprodukte/produkt_edit_sidebar.phtml', false) + ); + + } // public function produkt_edit_sidebar(&$product_content, &$produkt_data) + + /* public function produkt_edit_sidebar(&$produkt_data) { @@ -91,5 +107,5 @@ } // public function produkt_edit_sidebar(&$produkt_data) - + */ public function order_view_row(&$p, $i) { Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 5458) +++ /mods/wpsg_mod_productgroups.class.php (revision 5461) @@ -291,35 +291,43 @@ } // public function produkt_copy(&$produkt_id, &$copy_id) - public function produkt_edit_sidebar(&$produkt_data) - { - - if (isset($_REQUEST['wpsg_lang'])) return; - - $this->shop->view['wpsg_mod_productgroups']['produkt_data'] = $produkt_data; - $this->shop->view['wpsg_mod_productgroups']['data'] = array(); - $this->shop->view['wpsg_mod_productgroups']['data'][0] = __('Nicht zugewiesen.', 'wpsg'); - - // Kein Array Merge ! Da indexe gelöscht werden - $groups_db = $this->db->fetchAssocField(" - SELECT - PG.`id`, PG.`name` - FROM - `".WPSG_TBL_PRODUCTS_GROUP."` AS PG - WHERE - PG.`deleted` != '1' - ORDER BY - `id` ASC - ", "id", "name"); - $this->shop->view['wpsg_mod_productgroups']['data'] = array_diff_key($this->shop->view['wpsg_mod_productgroups']['data'], $groups_db) + $groups_db; - - $sticky_data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS_STICKY."` WHERE `produkt_id` = '".wpsg_q($produkt_data['id'])."'"); - - if ($sticky_data['von'] > 0) $this->shop->view['wpsg_mod_productgroups']['sticky_von'] = date('d.m.Y', $sticky_data['von']); - if ($sticky_data['bis'] > 0) $this->shop->view['wpsg_mod_productgroups']['sticky_bis'] = date('d.m.Y', $sticky_data['bis']); - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/produkt_edit_sidebar.phtml'); - - } // public function produkt_edit_sidebar(&$produkt_data) - + public function product_addedit_content(&$product_content, &$product_data) + { + + if (wpsg_isSizedInt($product_data['id'])) + { + + if (isset($_REQUEST['wpsg_lang'])) return; + + $this->shop->view['wpsg_mod_productgroups']['produkt_data'] = $produkt_data; + $this->shop->view['wpsg_mod_productgroups']['data'] = array(); + $this->shop->view['wpsg_mod_productgroups']['data'][0] = __('Nicht zugewiesen.', 'wpsg'); + + // Kein Array Merge ! Da indexe gelöscht werden + $groups_db = $this->db->fetchAssocField(" + SELECT + PG.`id`, PG.`name` + FROM + `".WPSG_TBL_PRODUCTS_GROUP."` AS PG + WHERE + PG.`deleted` != '1' + ORDER BY + `id` ASC + ", "id", "name"); + $this->shop->view['wpsg_mod_productgroups']['data'] = array_diff_key($this->shop->view['wpsg_mod_productgroups']['data'], $groups_db) + $groups_db; + + $sticky_data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS_STICKY."` WHERE `produkt_id` = '".wpsg_q($produkt_data['id'])."'"); + + if ($sticky_data['von'] > 0) $this->shop->view['wpsg_mod_productgroups']['sticky_von'] = date('d.m.Y', $sticky_data['von']); + if ($sticky_data['bis'] > 0) $this->shop->view['wpsg_mod_productgroups']['sticky_bis'] = date('d.m.Y', $sticky_data['bis']);; + + } + + $product_content['wpsg_mod_productgroups'] = array( + 'title' => __('Produktgruppen', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/produkt_addedit_sidebar.phtml', false) + ); + + } // public function produkt_edit_sidebar(&$product_content, &$produkt_data) + public function content_filter(&$content) { Index: /mods/wpsg_mod_productvars.class.php =================================================================== --- /mods/wpsg_mod_productvars.class.php (revision 5458) +++ /mods/wpsg_mod_productvars.class.php (revision 5461) @@ -149,16 +149,21 @@ } // public function be_ajax() - - public function produkt_edit_sidebar(&$produkt_data) - { - + + public function product_addedit_content(&$product_content, &$product_data) + { + if (isset($_REQUEST['wpsg_lang'])) return; - - $this->shop->view['wpsg_mod_productvars']['productvars_set'] = explode(",", $produkt_data['produktvars']); + + $this->shop->view['wpsg_mod_productvars']['productvars_set'] = explode(",", $produkt_data['productvars']); $this->shop->view['wpsg_mod_productvars']['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_PRODUCTS_VARS."` ORDER BY `pos` ASC, `id` ASC"); - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvars/produkt_edit_sidebar.phtml'); - - } // public function produkt_edit_sidebar(&$produkt_data) + $this->shop->view['wpsg_mod_productvars']['data'] = $produkt_data; + + $product_content['wpsg_mod_productvars'] = array( + 'title' => __('Produktvariable', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvars/produkt_addedit_sidebar.phtml', false) + ); + + } //public function product_addedit_content(&$product_content, &$product_data) public function produkt_save(&$produkt_id) { Index: /mods/wpsg_mod_produktattribute.class.php =================================================================== --- /mods/wpsg_mod_produktattribute.class.php (revision 5458) +++ /mods/wpsg_mod_produktattribute.class.php (revision 5461) @@ -254,17 +254,22 @@ } // public function produkt_copy(&$produkt_id, &$copy_id) - public function produkt_edit_content(&$produkt_data) - { + public function product_addedit_content(&$product_content, &$product_data) + { + + // Nur fÌr angelegte Produkte + if ($product_data['id'] <= 0) return false; - // Nur fÌr angelegte Produkte - if ($produkt_data['id'] <= 0) return false; - - $this->shop->view['data'] = $produkt_data; - $this->shop->view['data']['pa'] = $this->shop->callMod('wpsg_mod_produktattribute', 'getProductAttributeByProductId', array($this->shop->getProduktID($produkt_data['id']))); - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktattribute/produkt_edit_content.phtml'); - - } // public function produkt_edit_content(&$produkt_data) - + $this->shop->view['data'] = $product_data; + $this->shop->view['data']['pa'] = $this->shop->callMod('wpsg_mod_produktattribute', 'getProductAttributeByProductId', array($this->shop->getProduktID($product_data['id']))); + + $this->shop->view['wpsg_mod_produktattribute']['data'] = $product_data; + + $product_content['wpsg_mod_produktattribute'] = array( + 'title' => __('Produktattribute', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktattribute/produkt_addedit_content.phtml', false) + ); + + } //public function product_addedit_content(&$product_content, &$product_data) + public function product_bottom(&$produkt_id, $template_index) { Index: /mods/wpsg_mod_stock.class.php =================================================================== --- /mods/wpsg_mod_stock.class.php (revision 5458) +++ /mods/wpsg_mod_stock.class.php (revision 5461) @@ -116,6 +116,6 @@ } - } // public function produkt_ajax() - + } // public function produkt_ajax() + public function produkt_edit(&$data) { @@ -141,4 +141,15 @@ } // public function produkt_save(&$produkt_id) + + + public function produkt_edit_allgemein(&$produkt_data) + { + + if (isset($_REQUEST['wpsg_lang'])) return; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_stock/produkt_edit_sidebar.phtml'); + + } // public function produkt_edit_allgemein(&$produkt_data) + public function produkt_edit_sidebar(&$produkt_data) Index: /mods/wpsg_mod_topseller.class.php =================================================================== --- /mods/wpsg_mod_topseller.class.php (revision 5458) +++ /mods/wpsg_mod_topseller.class.php (revision 5461) @@ -62,15 +62,20 @@ } // public function settings_save() - - public function produkt_edit_allgemein(&$produkt_data) - { - + + public function product_addedit_content(&$product_content, &$product_data) + { + if (isset($_REQUEST['wpsg_lang'])) return; - $this->shop->view['wpsg_mod_topseller']['status'] = wpsg_getStr($produkt_data['wpsg_mod_topseller']); + $this->shop->view['wpsg_mod_topseller']['status'] = wpsg_getStr($product_data['wpsg_mod_topseller']); - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_topseller/produkt_edit_allgemein.phtml'); - - } // public function produkt_edit_sidebar(&$produkt_data) + $this->shop->view['wpsg_mod_topseller']['data'] = $product_data; + + $product_content['wpsg_mod_topseller'] = array( + 'title' => __('Topseller', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_topseller/produkt_addedit_allgemein.phtml', false) + ); + + } //public function product_addedit_content(&$product_content, &$product_data) public function produkt_save_before(&$produkt_data) Index: /mods/wpsg_mod_varianten.class.php =================================================================== --- /mods/wpsg_mod_varianten.class.php (revision 5458) +++ /mods/wpsg_mod_varianten.class.php (revision 5461) @@ -719,5 +719,22 @@ } // public function settings_edit() - + + public function product_addedit_content(&$product_content, &$product_data) + { + + // FÌr die Varianten brauche ich immer das original Array ... + $produkt_data['id'] = $this->db->fetchOne("SELECT `lang_parent` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_data['id'])."'"); + + + $this->shop->view['wpsg_mod_varianten']['data'] = $produkt_data; + + $product_content['wpsg_mod_varianten'] = array( + 'title' => __('Varianten', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_varianten/produkt_addedit_content.phtml', false) + ); + + } + + /* public function produkt_edit_content(&$produkt_data) { @@ -736,4 +753,6 @@ } // public function produkt_edit_content(&$produkt_data) + + */ public function produkt_edit_afterForm(&$product_id) { } Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5458) +++ /views/css/admin.css (revision 5461) @@ -125,2 +125,6 @@ .wpsg_mod_produktattribute_table .auswahlrow2 td { border-top:0px; } .wpsg_mod_produktattribute_table > tbody + tbody { border-top:0px; } +.wpsg_produkt_pa_label { margin-left:10px; } +#wpsg_produktattribute .wpsg_form_field { padding:10px 0; } + +#beschreibung_ifr { height:500px; } Index: /views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml (revision 5461) +++ /views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml (revision 5461) @@ -0,0 +1,18 @@ + +
+

+
+ +

+
+ view['data']['mod_basketteaser_from']), array('datepicker' => true)); ?> + view['data']['mod_basketteaser_to']), array('datepicker' => true)); ?> +
+
Index: ews/mods/mod_basketteaser/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_basketteaser/produkt_edit_sidebar.phtml (revision 5458) +++ (revision ) @@ -1,18 +1,0 @@ - -
-

-
- -

-
- view['data']['mod_basketteaser_from']), array('datepicker' => true)); ?> - view['data']['mod_basketteaser_to']), array('datepicker' => true)); ?> -
-
Index: /views/mods/mod_discount/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_discount/produkt_addedit_sidebar.phtml (revision 5461) +++ /views/mods/mod_discount/produkt_addedit_sidebar.phtml (revision 5461) @@ -0,0 +1,19 @@ + +
+

+
+ +

+
+ view['wpsg_mod_discount']['data'][0]); ?> + view['wpsg_mod_discount']['data'][1])); ?> + view['wpsg_mod_discount']['data'][2])); ?> + view['wpsg_mod_discount']['data'][3])); ?> +
+
Index: ews/mods/mod_discount/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_discount/produkt_edit_sidebar.phtml (revision 5458) +++ (revision ) @@ -1,19 +1,0 @@ - -
-

-
- -

-
- view['wpsg_mod_discount']['data'][0]); ?> - view['wpsg_mod_discount']['data'][1])); ?> - view['wpsg_mod_discount']['data'][2])); ?> - view['wpsg_mod_discount']['data'][3])); ?> -
-
Index: /views/mods/mod_productgroups/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_productgroups/produkt_addedit_sidebar.phtml (revision 5461) +++ /views/mods/mod_productgroups/produkt_addedit_sidebar.phtml (revision 5461) @@ -0,0 +1,25 @@ + +
+

+
+ +

+
+ + view['wpsg_mod_productgroups']['data']) <= 0) { ?> +

+ + view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> + view['wpsg_mod_productgroups']['sticky_von']); ?> + view['wpsg_mod_productgroups']['sticky_bis']); ?> + + + +
+
Index: ews/mods/mod_productgroups/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_productgroups/produkt_edit_sidebar.phtml (revision 5458) +++ (revision ) @@ -1,25 +1,0 @@ - -
-

-
- -

-
- - view['wpsg_mod_productgroups']['data']) <= 0) { ?> -

- - view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> - view['wpsg_mod_productgroups']['sticky_von']); ?> - view['wpsg_mod_productgroups']['sticky_bis']); ?> - - - -
-
Index: /views/mods/mod_productvars/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_productvars/produkt_addedit_sidebar.phtml (revision 5461) +++ /views/mods/mod_productvars/produkt_addedit_sidebar.phtml (revision 5461) @@ -0,0 +1,24 @@ + +
+

+
+ +

+
+ view['wpsg_mod_productvars']['data']) && sizeof($this->view['wpsg_mod_productvars']['data']) > 0) { ?> + view['wpsg_mod_productvars']['data'] as $pv) { ?> + view['wpsg_mod_productvars']['productvars_set']))?true:false)); ?> + + + + +
+ +
+
Index: ews/mods/mod_productvars/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_productvars/produkt_edit_sidebar.phtml (revision 5458) +++ (revision ) @@ -1,24 +1,0 @@ - -
-

-
- -

-
- view['wpsg_mod_productvars']['data']) && sizeof($this->view['wpsg_mod_productvars']['data']) > 0) { ?> - view['wpsg_mod_productvars']['data'] as $pv) { ?> - view['wpsg_mod_productvars']['productvars_set']))?true:false)); ?> - - - - -
- -
-
Index: /views/mods/mod_produktattribute/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_produktattribute/produkt_addedit_content.phtml (revision 5461) +++ /views/mods/mod_produktattribute/produkt_addedit_content.phtml (revision 5461) @@ -0,0 +1,45 @@ + +view['data']['pa']) > 0) { ?> +
+

+
+ +

+
+ + view['data']['pa'] as $pa) { ?> +
+
+ +
+
+ + + + + + + + + /> + + + +
+
+
+ + +
+
+ Index: ews/mods/mod_produktattribute/produkt_edit_content.phtml =================================================================== --- /views/mods/mod_produktattribute/produkt_edit_content.phtml (revision 5458) +++ (revision ) @@ -1,45 +1,0 @@ - -view['data']['pa']) > 0) { ?> -
-

-
- -

-
- - view['data']['pa'] as $pa) { ?> -
-
- -
-
- - - - - - - - - /> - - - -
-
-
- - -
-
- Index: /views/mods/mod_stock/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_stock/produkt_edit_sidebar.phtml (revision 5458) +++ /views/mods/mod_stock/produkt_edit_sidebar.phtml (revision 5461) @@ -6,28 +6,13 @@ ?> -
-

-
- -

-
-
-
- -
-
- -
-
-
-
-
- -
-
- view['data']['stock_count'] == '1')?'checked="checked"':''); ?> /> -
-
-
+
+ +
+ +
+ +
+ view['data']['stock_count'] == '1')?'checked="checked"':''); ?> />
+ Index: /views/mods/mod_topseller/produkt_addedit_allgemein.phtml =================================================================== --- /views/mods/mod_topseller/produkt_addedit_allgemein.phtml (revision 5461) +++ /views/mods/mod_topseller/produkt_addedit_allgemein.phtml (revision 5461) @@ -0,0 +1,18 @@ + +get_option('wpsg_mod_topseller_auto') == '1') { ?> + __('Einbeziehen', 'wpsg'), + '1' => __('Ausschließen', 'wpsg') +), $this->view['wpsg_mod_topseller']['status']); ?> + + __('Nicht anzeigen', 'wpsg'), + '1' => __('Anzeigen', 'wpsg') +), $this->view['wpsg_mod_topseller']['status']); ?> + Index: ews/mods/mod_topseller/produkt_edit_allgemein.phtml =================================================================== --- /views/mods/mod_topseller/produkt_edit_allgemein.phtml (revision 5458) +++ (revision ) @@ -1,18 +1,0 @@ - -get_option('wpsg_mod_topseller_auto') == '1') { ?> - __('Einbeziehen', 'wpsg'), - '1' => __('Ausschließen', 'wpsg') -), $this->view['wpsg_mod_topseller']['status']); ?> - - __('Nicht anzeigen', 'wpsg'), - '1' => __('Anzeigen', 'wpsg') -), $this->view['wpsg_mod_topseller']['status']); ?> - Index: /views/mods/mod_varianten/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_varianten/produkt_addedit_content.phtml (revision 5461) +++ /views/mods/mod_varianten/produkt_addedit_content.phtml (revision 5461) @@ -0,0 +1,297 @@ + + + + +
+

+
+ +

+
+ view['data']['id'] > 0) { ?> + callMod('wpsg_mod_varianten', 'drawVarianten', array(&$this->view['wpsg_mod_varianten']['data']['id'])); ?> + +

+ +
+
Index: ews/mods/mod_varianten/produkt_edit_content.phtml =================================================================== --- /views/mods/mod_varianten/produkt_edit_content.phtml (revision 5458) +++ (revision ) @@ -1,297 +1,0 @@ - - - - -
-

-
- -

-
- view['data']['id'] > 0) { ?> - callMod('wpsg_mod_varianten', 'drawVarianten', array(&$this->view['wpsg_mod_varianten']['data']['id'])); ?> - -

- -
-