Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 5531) +++ /controller/wpsg_ProduktController.class.php (revision 5532) @@ -644,4 +644,5 @@ 'shortdesc' => wpsg_q(wpsg_getStr($_REQUEST['shortdesc'])), 'beschreibung' => wpsg_q(wpsg_getStr($_REQUEST['beschreibung'])), + 'longdescription' => wpsg_q(wpsg_getStr($_REQUEST['longdescription'])), 'anr' => wpsg_q(wpsg_getStr($_REQUEST['anr'])), 'mwst_key' => wpsg_q(wpsg_getStr($_REQUEST['mwst_key'])), Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5531) +++ /controller/wpsg_ShopController.class.php (revision 5532) @@ -3641,30 +3641,8 @@ public function getProductName($product_id, $detailname = false) { - + $oProduct = wpsg_product::getInstance($product_id); - $product_detailname = $oProduct->detailname; - - if (wpsg_isSizedString($detailname) && $detailname === true) - { - - $strName = $oProduct->detailname; - - } - else - { - - $strName = $oProduct->name; - - } - - if (strpos($strName, '^') !== false) - { - - $strName = preg_replace('/\^/', '', $strName).''; - - } - - return $strName; + return $oProduct->getProductName($detailname); } // public function getProductName($product_id) Index: /lib/helper_functions.inc.php =================================================================== --- /lib/helper_functions.inc.php (revision 5531) +++ /lib/helper_functions.inc.php (revision 5532) @@ -319,62 +319,14 @@ { - $strOut = ''; - - $strOut .= '
'; - $strOut .= '
'; - $strOut .= '
'.$strTitle.'
'; - $strOut .= '
'; - $strOut .= '
'; - - $strOut .= '
'; - - $strOut .= wpsg_drawForm_Input('wpsg_'.$key.'_betreff', __('Betreff', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_betreff')); - $strOut .= wpsg_drawForm_Input('wpsg_'.$key.'_absender', __('Absender', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_absender')); - - if ($bTo === true) - { - - $strOut .= wpsg_drawForm_Input('wpsg_'.$key.'_empfaenger', __('EmpfÀnger', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_empfaenger')); - - } - - $strOut .= wpsg_drawForm_Input('wpsg_'.$key.'_cc', __('CC', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_cc')); - $strOut .= wpsg_drawForm_Input('wpsg_'.$key.'_bcc', __('BCC', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_bcc')); - - if ($bAttachment === true) - { - - $strOut .= wpsg_drawForm_Upload('wpsg_'.$key.'_attachfile', __('Mailanhang', 'wpsg'), '', '43', '100000', ''); - $strOut .= '
'; - $strOut .= '
'; - $strOut .= ''.__('Aktueller Anhang', 'wpsg').': '.((wpsg_isSizedString($GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_attachfile')))?$GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_attachfile'):'keiner'); - $strOut .= ((wpsg_isSizedString($GLOBALS['wpsg_sc']->get_option('wpsg_kundenmail_attachfile')))?'':''); - $strOut .= '

'; - - } - - // RTE - ob_start(); - wp_editor($GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_text'), 'wpsg_'.$key.'_text'); - $rte_content = ob_get_contents(); - ob_end_clean(); - - $strOut .= '
'; - $strOut .= '
'; - $strOut .= '
'; - $strOut .= '
'; - $strOut .= $rte_content; - - if (wpsg_isSizedString($notice)) - { - - $strOut .= '
'.$notice.'
'; - - } - - $strOut .= '

'; - - return $strOut; - + $TC = new wpsg_SystemController(); + + $TC->view['field_key'] = $key; + $TC->view['field_title'] = $strTitle; + $TC->view['field_notice'] = $notice; + $TC->view['field_to'] = $bTo; + $TC->view['field_attachment'] = $bAttachment; + + return $TC->render(WPSG_PATH_VIEW.'admin/form/emailconf.phtml', false); + } // function wpsg_drawEMailConfig($key) @@ -583,8 +535,8 @@ } // function wpsg_drawForm_Checkbox($field_name, $field_label, $conf = array()) - function wpsg_drawForm_AdminboxStart($title) - { - - echo '
'; + function wpsg_drawForm_AdminboxStart($title, $wrap_class = '') + { + + echo '
'; echo '
'; echo '

'.$title.'

'; @@ -609,5 +561,5 @@ } // function wpsg_drawForm_TextStart() - function wpsg_drawForm_TextEnd($field_label, $field_config = array()) + function wpsg_drawForm_TextEnd($field_label = '', $field_config = array()) { @@ -872,4 +824,18 @@ function wpsg_drawForm_Upload($field_name, $field_label, $field_value = false, $size = '50', $maxlength = '100000', $conf = array()) { + + $TC = new wpsg_ShopController(); + + $TC->view['field_name'] = $field_name; + $TC->view['field_label'] = $field_label; + $TC->view['field_id'] = wpsg_drawForm_getID($field_name); + $TC->view['field_value'] = $field_value; + $TC->view['field_size'] = $size; + $TC->view['field_maxLength'] = $maxlength; + $TC->view['field_config'] = $conf; + + return $TC->render(WPSG_PATH_VIEW.'admin/form/upload.phtml', false); + + /* $field_id = $field_name; @@ -904,4 +870,5 @@ return $strReturn; + */ } Index: /lib/install.php =================================================================== --- /lib/install.php (revision 5531) +++ /lib/install.php (revision 5532) @@ -37,4 +37,5 @@ mwst_key VARCHAR(1) NOT NULL, beschreibung longtext NOT NULL, + longdescription longtext NOT NULL, pgruppe INT(11) NOT NULL, ptemplate_file VARCHAR(255) NOT NULL, Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5531) +++ /model/wpsg_product.class.php (revision 5532) @@ -108,8 +108,30 @@ * Gibt den Namen des Produktes zurÃŒck */ - public function getProductName() - { - - return $this->name; + public function getProductName($detailname = false) + { + + $product_detailname = $this->detailname; + + if (wpsg_isSizedString($detailname) && $detailname === true) + { + + $strName = $this->detailname; + + } + else + { + + $strName = $this->name; + + } + + if (strpos($strName, '^') !== false) + { + + $strName = preg_replace('/\^/', '', $strName).''; + + } + + return $strName; } // public function getProductName() Index: /mods/wpsg_mod_amazon.class.php =================================================================== --- /mods/wpsg_mod_amazon.class.php (revision 5531) +++ /mods/wpsg_mod_amazon.class.php (revision 5532) @@ -159,5 +159,5 @@ } // public function wp_head() - public function order_done($order_id, $done_view) + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_fuellmenge.class.php =================================================================== --- /mods/wpsg_mod_fuellmenge.class.php (revision 5531) +++ /mods/wpsg_mod_fuellmenge.class.php (revision 5532) @@ -125,6 +125,25 @@ } - - $produkt['feinheit'] = $arFeinheiten[$produkt['feinheit']]; + + if (!wpsg_isSizedDouble($produkt['fmenge'])) $produkt['fmenge'] = 0; + $produkt['fmenge_preis'] = 0; + + if (wpsg_isSizedString($produkt['feinheit'])) + { + + $produkt['feinheit'] = $arFeinheiten[$produkt['feinheit']]; + + + } + else + { + + $produkt['feinheit'] = array_values($arFeinheiten)[0]; + + + } + + + if ($produkt['fmenge'] > 0) $produkt['fmenge_preis'] = $produkt['preis'] / $produkt['fmenge'] * wpsg_tf($this->shop->get_option('wpsg_mod_fuellmenge_bezug')); Index: /views/admin/emailconf.phtml =================================================================== --- /views/admin/emailconf.phtml (revision 5531) +++ /views/admin/emailconf.phtml (revision 5532) @@ -17,53 +17,42 @@
-
+ +
+
-

- - -

- -

+ + get_option('wpsg_htmlmail')); ?> + - + + + + + + + + + callMods('admin_emailconf'); ?> - get_option('wpsg_htmlmail')); ?> +
+ +

-
- -
- - - - - - - - - - callMods('admin_emailconf'); ?> - -
- -
- -

- -
+
@@ -78,5 +67,5 @@ var wpsg_mail_open = Array(); - jQuery('.wpsg_admin_box .wpsg_mail_content:visible').each(function() { + jQuery('.wpsg_email_box .panel-body:visible').each(function() { wpsg_mail_open.push(jQuery(this).prev().attr("id")); @@ -90,22 +79,11 @@ jQuery(document).ready(function() { - jQuery('.wpsg_admin_box .wpsg_mail_head').bind('click', function() { - - jQuery(this).next().toggle(); - - if (!jQuery(this).next().is(":visible")) - { - jQuery(this).css('border-bottom', '1px solid #AAAAAA'); - } - else - { - jQuery(this).css('border-bottom', '0px'); - } - + jQuery('.wpsg_email_box .panel-heading').bind('click', function() { + + jQuery(this).next().toggle(); + wpsg_mail_save_cookie(); - } ); - - jQuery('.wpsg_admin_box .wpsg_mail_head').disableSelection(); + } ).disableSelection().next().hide(); if (jQuery.cookie('wpsg_mail') != null) Index: /views/admin/form/emailconf.phtml =================================================================== --- /views/admin/form/emailconf.phtml (revision 5532) +++ /views/admin/form/emailconf.phtml (revision 5532) @@ -0,0 +1,52 @@ + +view['field_title'], 'wpsg_email_box'); ?> + + view['field_key'].'_betreff', __('Betreff', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_betreff')); ?> + view['field_key'].'_absender', __('Absender', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_absender')); ?> + + view['field_to'] === true) { ?> + view['field_key'].'_empfaenger', __('EmpfÀnger', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_empfaenger')); ?> + + + view['field_key'].'_cc', __('CC', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_cc')); ?> + view['field_key'].'_bcc', __('BCC', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_bcc')); ?> + + view['field_attachment'] === true) { ?> + + view['field_key'].'_attachfile', __('Mailanhang', 'wpsg'), '', '43', '100000', ''); ?> +
+
+ : get_option('wpsg_'.$this->view['field_key'].'_attachfile')))?$this->get_option('wpsg_'.$this->view['field_key'].'_attachfile'):__('keiner', 'wpsg')); ?> + get_option('wpsg_kundenmail_attachfile')))?'':''); ?> +
+
+ + + + get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text'); + $rte_content = ob_get_contents(); + ob_end_clean(); + + ?> + +
+
+
+
+ + + + + +
+
+ + + +
+ + Index: /views/admin/form/text.phtml =================================================================== --- /views/admin/form/text.phtml (revision 5531) +++ /views/admin/form/text.phtml (revision 5532) @@ -5,5 +5,5 @@
-

view['field_value']; ?>

+

view['field_value']; ?>

view['field_config']['help'])) { ?> Index: /views/admin/form/upload.phtml =================================================================== --- /views/admin/form/upload.phtml (revision 5532) +++ /views/admin/form/upload.phtml (revision 5532) @@ -0,0 +1,33 @@ +
+ + + +
+ +
+ view['field_config']['accept'])) { ?> + accept="view['field_config']['accept']; ?>" + + class="form-control input-sm" + name="view['field_name']; ?>" + value="view['field_value']); ?>" + id="view['field_id']; ?>" + placeholder="view['field_config']['placeholder']); ?>" + view['field_config']['readonly'])) { ?> + readonly="readonly" + + /> + view['field_config']['help'])) { ?> + + +
+ +
+ +
+ +
Index: /views/admin/includes.phtml =================================================================== --- /views/admin/includes.phtml (revision 5531) +++ /views/admin/includes.phtml (revision 5532) @@ -17,17 +17,19 @@
-
-
+
+ - get_option('wpsg_load_css'), array('help' => 'wpsg_load_css')); ?> - get_option('wpsg_load_jquery'), array('help' => 'wpsg_load_jquery')); ?> - get_option('wpsg_load_thickbox_js'), array('help' => 'wpsg_load_thickbox')); ?> - get_option('wpsg_load_thickbox_css'), array('help' => 'wpsg_load_thickbox')); ?> - get_option('wpsg_load_validierung_js'), array('help' => 'wpsg_load_validierung')); ?> - get_option('wpsg_load_validierung_css'), array('help' => 'wpsg_load_validierung')); ?> - - callMods('admin_includes'); ?> - - + + + get_option('wpsg_load_css'), array('help' => 'wpsg_load_css')); ?> + get_option('wpsg_load_jquery'), array('help' => 'wpsg_load_jquery')); ?> + get_option('wpsg_load_thickbox_js'), array('help' => 'wpsg_load_thickbox')); ?> + get_option('wpsg_load_thickbox_css'), array('help' => 'wpsg_load_thickbox')); ?> + get_option('wpsg_load_validierung_js'), array('help' => 'wpsg_load_validierung')); ?> + get_option('wpsg_load_validierung_css'), array('help' => 'wpsg_load_validierung')); ?> + + callMods('admin_includes'); ?> + +

Index: /views/admin/kalkulation.phtml =================================================================== --- /views/admin/kalkulation.phtml (revision 5531) +++ /views/admin/kalkulation.phtml (revision 5532) @@ -25,10 +25,5 @@
- - get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?> - get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?> - - get_option('wpsg_kleinunternehmer'), array('help' => 'Preiskalkulation_wpsg_kleinunternehmer')); ?> - +
get_option('wpsg_kleinunternehmer_text'), array()) ?> @@ -41,6 +36,11 @@ ), $this->get_option('wpsg_preisangaben')); ?> __('Brutto (inkl. Steuer)', 'wpsg'), WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg')), $this->get_option('wpsg_preisangaben_frontend')); ?> -
+
+ + get_option('wpsg_kleinunternehmer'), array('help' => 'Preiskalkulation_wpsg_kleinunternehmer')); ?> + get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?> + get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?> +
Index: /views/admin/laender.phtml =================================================================== --- /views/admin/laender.phtml (revision 5531) +++ /views/admin/laender.phtml (revision 5532) @@ -18,4 +18,64 @@
+ + + + view['data'])) { ?> + + + + + + + + + + + + + + view['data'] as $l) { ?> + + + + + + + + + + + + +
+ view['vz'][$l['vz']])) { ?> + view['vz'][$l['vz']]); ?> + + + + + + + + + + + + + + + + + +
+ +

+ + +

+ + + +

Index: /views/admin/seiten.phtml =================================================================== --- /views/admin/seiten.phtml (revision 5531) +++ /views/admin/seiten.phtml (revision 5532) @@ -17,9 +17,9 @@
-
-
+
+ + + - - view['pages'], $this->get_option('wpsg_page_basket')); ?> view['pages'], $this->get_option('wpsg_page_versand')); ?> @@ -29,9 +29,11 @@ get_option('wpsg_page_onlinedisputeresolution')); ?> view['pages'], $this->get_option('wpsg_page_impressum')); ?> - -

- - -
+ + +

+ + + +
Index: /views/admin/versandzonen.phtml =================================================================== --- /views/admin/versandzonen.phtml (revision 5531) +++ /views/admin/versandzonen.phtml (revision 5532) @@ -6,5 +6,30 @@ ?> - - -
- -
- - view['arSubAction'] as $k => $v) { ?> - - -
- -
- -
- -
- -
-
-
- - -
-
-
-
- view['adminController']->vz_listAction(); ?> -
- -
-
+/* ]]> */ Index: /views/admin/versandzonen_list.phtml =================================================================== --- /views/admin/versandzonen_list.phtml (revision 5531) +++ /views/admin/versandzonen_list.phtml (revision 5532) @@ -9,5 +9,5 @@ - +
@@ -20,8 +20,7 @@
- -
- - - + + [ PLZ ] +