Index: /mods/wpsg_mod_abo.class.php =================================================================== --- /mods/wpsg_mod_abo.class.php (revision 5455) +++ /mods/wpsg_mod_abo.class.php (revision 5456) @@ -101,29 +101,32 @@ } // public function settings_save() - public function produkt_edit_content(&$product_data) - { - + public function product_addedit_content(&$product_content, &$product_data) + { + if (isset($_REQUEST['wpsg_lang'])) return false; - + if ($product_data['wpsg_mod_abo_resell'] > 0) { - + $product_data['wpsg_mod_abo_resell_count'] = $product_data['wpsg_mod_abo_resell']; $product_data['wpsg_mod_abo_resell'] = 1; - + } else { - + $product_data['wpsg_mod_abo_resell_count'] = '1'; $product_data['wpsg_mod_abo_resell'] = 0; - - } - + + } + $this->shop->view['product'] = $product_data; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_abo/produkt_edit_content.phtml'); - - } // public function produkt_edit_content(&$produkt_data) + + $product_content['wpsg_mod_abo'] = array( + 'title' => __('Abo', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_abo/produkt_addedit_content.phtml', false) + ); + + } // public function product_addedit_content(&$product_content, &$produkt_data) public function produkt_save_before(&$product_data) Index: /mods/wpsg_mod_fuellmenge.class.php =================================================================== --- /mods/wpsg_mod_fuellmenge.class.php (revision 5455) +++ /mods/wpsg_mod_fuellmenge.class.php (revision 5456) @@ -68,25 +68,30 @@ } // public function settings_save() - public function product_addedit_content(&$product_content, &$product_data) + public function product_addedit_content(&$product_content, &$product_data) { - + if (wpsg_isSizedInt($product_data['id'])) - { - - $product_data = wpsg_array_merge($product_data, $this->db->fetchRow(" - SELECT - `feinheit`, `fmenge` - FROM - `".WPSG_TBL_PRODUCTS."` - WHERE - `id` = '".wpsg_q($product_data['id'])."' - ")); - - } - + { + + $product_data = wpsg_array_merge($product_data, $this->db->fetchRow(" + SELECT + `feinheit`, `fmenge` + FROM + `".WPSG_TBL_PRODUCTS."` + WHERE + `id` = '".wpsg_q($product_data['id'])."' + ")); + + } + $product_data['arFeinheiten'] = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit')); - - } // public function product_addedit_content(&$product_content, &$product_data) - + + $product_content['wpsg_mod_fuellmenge'] = array( + 'title' => __('FÃŒllmenge', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false) + ); + + } + public function produkt_save(&$produkt_id) { Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5455) +++ /views/css/admin.css (revision 5456) @@ -83,5 +83,5 @@ .wpsg_admin_submenu { width:180px; float:left; } .wpsg_admin_content { padding-left:20px; width:800px; float:left; } -.wpsg_admin_content h3 { margin-top:0px; margin-bottom:25px; } +.wpsg_admin_content h3 { margin:20px; } .wpsg_admin_content h3.panel-title { margin-bottom:0px; } .wpsg_admin_submenu .list-group-item { padding:5px 10px; } Index: /views/mods/mod_abo/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_abo/produkt_addedit_content.phtml (revision 5456) +++ /views/mods/mod_abo/produkt_addedit_content.phtml (revision 5456) @@ -0,0 +1,58 @@ + + + +
+

+
+ +

+
+ + view['product']['wpsg_mod_abo_activ']); ?> + +
+ + view['product']['wpsg_mod_abo_resell']); ?> + +
+ + view['product']['wpsg_mod_abo_resell_count']); ?> + +
+ + get_option('wpsg_preisangaben') == WPSG_NETTO)?__('Netto', 'wpsg'):__('Brutto', 'wpsg'))), wpsg_ff($this->view['product']['wpsg_mod_abo_price']), array('unit' => $this->get_option('wpsg_currency'))); ?> + view['product']['wpsg_mod_abo_durration']); ?> + view['product']['wpsg_mod_abo_url'], array('hint' => wpsg_translate(__('nohspc_Wird hier nichts angegeben, so wird die URL aus der Modulkonfiguration bei Ablauf/VerlÀngerung benachrichtigt.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo'))); ?> + +
+ +
+ +
+
Index: ews/mods/mod_abo/produkt_edit_content.phtml =================================================================== --- /views/mods/mod_abo/produkt_edit_content.phtml (revision 5455) +++ (revision ) @@ -1,58 +1,0 @@ - - - -
-

-
- -

-
- - view['product']['wpsg_mod_abo_activ']); ?> - -
- - view['product']['wpsg_mod_abo_resell']); ?> - -
- - view['product']['wpsg_mod_abo_resell_count']); ?> - -
- - get_option('wpsg_preisangaben') == WPSG_NETTO)?__('Netto', 'wpsg'):__('Brutto', 'wpsg'))), wpsg_ff($this->view['product']['wpsg_mod_abo_price']), array('unit' => $this->get_option('wpsg_currency'))); ?> - view['product']['wpsg_mod_abo_durration']); ?> - view['product']['wpsg_mod_abo_url'], array('hint' => wpsg_translate(__('nohspc_Wird hier nichts angegeben, so wird die URL aus der Modulkonfiguration bei Ablauf/VerlÀngerung benachrichtigt.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo'))); ?> - -
- -
- -
-
Index: /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml (revision 5455) +++ /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml (revision 5456) @@ -15,3 +15,11 @@ view['data']['fmenge'])); ?> + + get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?> + get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?> + get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?> + hasMod('wpsg_mod_productindex')) { ?> + get_option('wpsg_mod_fuellmenge_showProductindex_fmenge'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_fmenge')); ?> + get_option('wpsg_mod_fuellmenge_showProductindex_grundpreis'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_grundpreis')); ?> +