Index: /controller/wpsg_SystemController.class.php =================================================================== --- /controller/wpsg_SystemController.class.php (revision 5990) +++ /controller/wpsg_SystemController.class.php (revision 5997) @@ -680,5 +680,5 @@ if (function_exists("get_currentuserinfo")) { - get_currentuserinfo(); + //get_currentuserinfo(); $user_id = $current_user->user_ID; } Index: /mods/mod_statistics/wpsg_salestopaymentmethod.class.php =================================================================== --- /mods/mod_statistics/wpsg_salestopaymentmethod.class.php (revision 5990) +++ /mods/mod_statistics/wpsg_salestopaymentmethod.class.php (revision 5997) @@ -363,5 +363,5 @@ protected function calculate($arData =array()) { - + $total = 0.0; foreach ($arData as $data) { Index: /mods/mod_statistics/wpsg_topsellertosales.class.php =================================================================== --- /mods/mod_statistics/wpsg_topsellertosales.class.php (revision 5990) +++ /mods/mod_statistics/wpsg_topsellertosales.class.php (revision 5997) @@ -508,4 +508,6 @@ { + $totalAmount = 0.0; + $totalSales = 0.0; $arTempData = array(); Index: /mods/wpsg_mod_downloadplus.class.php =================================================================== --- /mods/wpsg_mod_downloadplus.class.php (revision 5990) +++ /mods/wpsg_mod_downloadplus.class.php (revision 5997) @@ -14,4 +14,7 @@ var $valid_ending = array('pdf'); var $barCodeFonts = array('EAN13', 'Code128', 'UPC_A'); + + var $arMessage = Array(); + var $arError = Array(); /** @@ -337,6 +340,8 @@ // In der Session auch korrigieren - foreach ($_SESSION['wpsg']['basket'] as $k => $v) { { if ($v['id'] == $produkt['id']) $_SESSION['wpsg']['basket'][$k]['menge'] = 1; } } - + if (isset($_SESSION['wpsg']['basket'])) + { + foreach ($_SESSION['wpsg']['basket'] as $k => $v) { { if ($v['id'] == $produkt['id']) $_SESSION['wpsg']['basket'][$k]['menge'] = 1; } } + } } @@ -686,8 +691,8 @@ { - if (file_exists($_FILES['wpsg_mod_downloadplus_file']['tmp_name'])) - { - - $ending = strtolower(preg_replace('/(.*)\./', '', $_FILES['wpsg_mod_downloadplus_file']['name'])); + if (file_exists($_FILES['wpsg_mod_downloadplus_file']['tmp_name'][0])) + { + + $ending = strtolower(preg_replace('/(.*)\./', '', $_FILES['wpsg_mod_downloadplus_file']['name'][0])); if (!in_array($ending, $this->valid_ending)) @@ -704,6 +709,6 @@ if (!file_exists($uploaddir)) mkdir($uploaddir, 0777, true); - $uploadfile = $uploaddir.basename($_FILES['wpsg_mod_downloadplus_file']['name']); - move_uploaded_file($_FILES['wpsg_mod_downloadplus_file']['tmp_name'], $uploadfile); + $uploadfile = $uploaddir.basename($_FILES['wpsg_mod_downloadplus_file']['name'][0]); + move_uploaded_file($_FILES['wpsg_mod_downloadplus_file']['tmp_name'][0], $uploadfile); if (!$die) return '1'; Index: /mods/wpsg_mod_downloadprodukte.class.php =================================================================== --- /mods/wpsg_mod_downloadprodukte.class.php (revision 5990) +++ /mods/wpsg_mod_downloadprodukte.class.php (revision 5997) @@ -182,5 +182,7 @@ { - if (file_exists($_FILES['wpsg_mod_downloadprodukte_file']['tmp_name'])) + $temp = wpsg_getStr($_FILES['wpsg_mod_downloadprodukte_file']['tmp_name'][0]); + //if (file_exists($_FILES['wpsg_mod_downloadprodukte_file']['tmp_name'])) + if (file_exists($temp)) { @@ -208,7 +210,7 @@ } - $uploadfile = $uploaddir.basename($_FILES['wpsg_mod_downloadprodukte_file']['name']); - - move_uploaded_file($_FILES['wpsg_mod_downloadprodukte_file']['tmp_name'], $uploadfile); + $uploadfile = $uploaddir.basename($_FILES['wpsg_mod_downloadprodukte_file']['name'][0]); + + move_uploaded_file($_FILES['wpsg_mod_downloadprodukte_file']['tmp_name'][0], $uploadfile); if ($die) die('1'); @@ -361,6 +363,8 @@ // In der Session auch korrigieren - foreach ((array)$_SESSION['wpsg']['basket'] as $k => $v) { { if ($v['id'] == $produkt['id']) $_SESSION['wpsg']['basket'][$k]['menge'] = 1; } } - + if (isset($_SESSION['wpsg']['basket'])) + { + foreach ((array)$_SESSION['wpsg']['basket'] as $k => $v) { { if ($v['id'] == $produkt['id']) $_SESSION['wpsg']['basket'][$k]['menge'] = 1; } } + } } Index: /mods/wpsg_mod_productvars.class.php =================================================================== --- /mods/wpsg_mod_productvars.class.php (revision 5990) +++ /mods/wpsg_mod_productvars.class.php (revision 5997) @@ -155,8 +155,8 @@ if (isset($_REQUEST['wpsg_lang'])) return; - $this->shop->view['wpsg_mod_productvars']['productvars_set'] = explode(",", $produkt_data['productvars']); + $this->shop->view['wpsg_mod_productvars']['productvars_set'] = explode(",", $product_data['produktvars']); $this->shop->view['wpsg_mod_productvars']['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_PRODUCTS_VARS."` ORDER BY `pos` ASC, `id` ASC"); - $this->shop->view['wpsg_mod_productvars']['data'] = $produkt_data; + //$this->shop->view['wpsg_mod_productvars']['data'] = $product_data; $product_content['wpsg_mod_productvars'] = array( Index: /mods/wpsg_mod_statistics.class.php =================================================================== --- /mods/wpsg_mod_statistics.class.php (revision 5990) +++ /mods/wpsg_mod_statistics.class.php (revision 5997) @@ -120,5 +120,7 @@ } - + //TODO warum wird admin.css nicht global eingelesen + wp_enqueue_style('admin.css', WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/views/css/admin.css'); + } // public wpsg_enqueue_scripts() Index: /mods/wpsg_mod_voucherproduct.class.php =================================================================== --- /mods/wpsg_mod_voucherproduct.class.php (revision 5990) +++ /mods/wpsg_mod_voucherproduct.class.php (revision 5997) @@ -133,5 +133,5 @@ } - else if ($_REQUEST['wpsg_rechnungen_bp_del'] == "1") + else if ($_REQUEST['wpsg_mod_voucherproduct_bp_del'] == "1") { Index: /views/admin/form/input.phtml =================================================================== --- /views/admin/form/input.phtml (revision 5990) +++ /views/admin/form/input.phtml (revision 5997) @@ -37,5 +37,11 @@ /> view['field_config']['help'])) { ?> - + view['field_config']['rAlign'])) { ?> + + + + Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5990) +++ /views/css/admin.css (revision 5997) @@ -52,4 +52,5 @@ /* Allgemeine Klassen */ .wpsg_grey { color:#999999; } +.wpsg_editable { line-height:125%; } /* Tabellensortierung */ @@ -243,2 +244,36 @@ .wpsg_mod_downloadplus_fieldtable .col_x, .wpsg_mod_downloadplus_fieldtable .col_y { width:50px; } + +/* Produktvariablen */ +.wpsg_pv_table { width:100%; } +.wpsg_pv_table tr td { vertical-align:top; } +.wpsg_pv_table .wpsg_id { width:20px; text-align:left; cursor:move; } +.wpsg_pv_table .wpsg_delcol { width:24px; text-align:center; } +.wpsg_pv_table .wpsg_typ { width:100px; text-align:left; } +.wpsg_pv_table .wpsg_pflicht { width:100px; text-align:center; } +.wpsg_pv_table .wpsg_label { text-align:left; } + +/* Bestellvariablen */ +.wpsg_ov_table { width:100%; } +.wpsg_ov_table .wpsg_id { width:20px; text-align:left; } +.wpsg_ov_table .wpsg_delcol { width:24px; text-align:center; } +.wpsg_ov_table .wpsg_typ { width:100px; text-align:left; } +.wpsg_ov_table .wpsg_pflicht { width:100px; text-align:center; } +.wpsg_ov_table .wpsg_label { text-align:left; } + +/* Statistikmodul */ +.wpsg_mod_statistics_totals_row { width:100%; } +.wpsg_mod_statistics_totals_block { float:left; width:auto; text-align:center; font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif; } +.wpsg_mod_statistics_totals_block .number { font-size:18px; color:#21759B; display:block; padding-bottom:10px; padding-top:5px; } +.wpsg_mod_statistics_totals_block .label { font-size:16px; color:#8F8F8F; display:block; padding-bottom:5px; } +.wpsg_mod_statistics_totals_block .label a { color:#8F8F8F; border-bottom:1px solid #ECECEC; padding-left:10px; padding-right:15px; padding-bottom:5px; } +.subsubsub #table-data .th-right span { float:right; } +.subsubsub #table-data .td-right { text-align:right; } + +/* Download plus */ +.wpsg_mod_downloadplus_order_view_filelist { width:100%; } +.wpsg_mod_downloadplus_order_view_filelist .col_file { text-align:left; } +.wpsg_mod_downloadplus_order_view_filelist .col_status { text-align:left; width:200px; } +.wpsg_mod_downloadplus_order_view_filelist .col_counter { text-align:center; width:100px;} +.wpsg_mod_downloadplus_order_view_filelist .col_action { text-align:left; width:100px;} +.wpsg_mod_downloadplus_order_view_filelist .row_raid td { color:red; } Index: /views/mods/mod_deliverynote/settings_edit.phtml =================================================================== --- /views/mods/mod_deliverynote/settings_edit.phtml (revision 5990) +++ /views/mods/mod_deliverynote/settings_edit.phtml (revision 5997) @@ -24,5 +24,5 @@ - + view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = ' @@ -30,6 +30,7 @@  '.__('Löschen', 'wpsg').' '; - } ?> - true, 'help' => 'wpsg_mod_deliverynote_bp')); ?> + echo __($strSuffix); + } ?> + true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?> @@ -39,5 +40,5 @@ - + view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = ' @@ -45,6 +46,7 @@  '.__('Löschen', 'wpsg').' '; + echo __($strSuffix); } ?> - true, 'help' => 'wpsg_mod_deliverynote_logo')); ?> + true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?>
@@ -103,5 +105,5 @@

- +
Index: /views/mods/mod_discount/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_discount/produkt_addedit_sidebar.phtml (revision 5990) +++ /views/mods/mod_discount/produkt_addedit_sidebar.phtml (revision 5997) @@ -14,7 +14,7 @@
view['wpsg_mod_discount']['data'][0]); ?> - view['wpsg_mod_discount']['data'][1])); ?> - view['wpsg_mod_discount']['data'][2])); ?> - view['wpsg_mod_discount']['data'][3])); ?> + view['wpsg_mod_discount']['data'][1]))); ?> + view['wpsg_mod_discount']['data'][2]))); ?> + view['wpsg_mod_discount']['data'][3]))); ?> Index: /views/mods/mod_downloadplus/filelist.phtml =================================================================== --- /views/mods/mod_downloadplus/filelist.phtml (revision 5990) +++ /views/mods/mod_downloadplus/filelist.phtml (revision 5997) @@ -12,7 +12,8 @@ view['files'] as $v) { ?>
  • - + (callMod('wpsg_mod_downloadplus', 'getPDFPath', array($_REQUEST['edit_id'])).'/'.$v); ?>) -
    +
    +
    • Index: /views/mods/mod_downloadprodukte/order_view_row.phtml =================================================================== --- /views/mods/mod_downloadprodukte/order_view_row.phtml (revision 5990) +++ /views/mods/mod_downloadprodukte/order_view_row.phtml (revision 5997) @@ -6,5 +6,5 @@ ?> - + : Index: /views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml (revision 5990) +++ /views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml (revision 5997) @@ -74,5 +74,5 @@
    -
    +
    view['prodFiles']; ?>
    Index: /views/mods/mod_downloadprodukte/produkt_edit_list.phtml =================================================================== --- /views/mods/mod_downloadprodukte/produkt_edit_list.phtml (revision 5990) +++ /views/mods/mod_downloadprodukte/produkt_edit_list.phtml (revision 5997) @@ -8,13 +8,13 @@ view['prodFiles']) && wpsg_isSizedInt($_REQUEST['edit_id'])) { ?> Index: /views/mods/mod_ordercondition/list.phtml =================================================================== --- /views/mods/mod_ordercondition/list.phtml (revision 5990) +++ /views/mods/mod_ordercondition/list.phtml (revision 5997) @@ -107,6 +107,6 @@ jQuery('#oc_typ_').wpsg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', { - type: 'string', - data: ' __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'))); ?>', + type: 'select', + data: __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'))); ?>, submitdata: { field: 'typ', Index: /views/mods/mod_productvars/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_productvars/produkt_addedit_sidebar.phtml (revision 5990) +++ /views/mods/mod_productvars/produkt_addedit_sidebar.phtml (revision 5997) @@ -23,10 +23,10 @@

    - +

    - +
    Index: /views/mods/mod_productvars/pv_list.phtml =================================================================== --- /views/mods/mod_productvars/pv_list.phtml (revision 5990) +++ /views/mods/mod_productvars/pv_list.phtml (revision 5997) @@ -7,5 +7,6 @@ ?> view['data']) && sizeof($this->view['data']) > 0) { ?> - +
    + @@ -15,5 +16,7 @@ + view['data'] as $pv) { $i ++; ?> + @@ -98,6 +101,8 @@ +
    +

    Index: /views/mods/mod_productvars/settings_edit.phtml =================================================================== --- /views/mods/mod_productvars/settings_edit.phtml (revision 5990) +++ /views/mods/mod_productvars/settings_edit.phtml (revision 5997) @@ -58,6 +58,5 @@

    - - +
    @@ -66,4 +65,6 @@ mod->pv_list(); ?>
    - +
    + + Index: /views/mods/mod_rechnungen/foottext_list.phtml =================================================================== --- /views/mods/mod_rechnungen/foottext_list.phtml (revision 5990) +++ /views/mods/mod_rechnungen/foottext_list.phtml (revision 5997) @@ -9,5 +9,6 @@

    - +
    + @@ -16,12 +17,16 @@ + + view['data'] as $key => $d) { ?> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view['wpsg_mod_userpayment']['data'])) { ?> - - - -
    get_option('wpsg_rechnungen_foottext_standard') == $key)?'checked="checked"':''); ?> class="wpsg_rechnungen_foottext_standard" name="wpsg_rechnungen_foottext_standard" /> - + + + - -
    : - -
    : - id="zv__aktiv" /> - - -
    : - -
    : -
    -
    get_option('wpsg_currency'); ?> / %
    -     		- -
    : - -
    : - type="checkbox" value="1" /> - - -
    + + + + + + + + + + + + + + + + + + + + id="zv_mwst_laender_" /> + + + + + + + view['wpsg_mod_userpayment']['data'])) { ?>
    + + + Index: /views/mods/mod_userpayment/settings_edit.phtml =================================================================== --- /views/mods/mod_userpayment/settings_edit.phtml (revision 5990) +++ /views/mods/mod_userpayment/settings_edit.phtml (revision 5997) @@ -70,5 +70,4 @@
    -
    @@ -81,2 +80,5 @@

    + +
    +Neue Zahlvariante anlegen Index: /views/mods/mod_versandarten/list.phtml =================================================================== --- /views/mods/mod_versandarten/list.phtml (revision 5990) +++ /views/mods/mod_versandarten/list.phtml (revision 5997) @@ -9,233 +9,176 @@ - - - - - - + + view['arVZ'] as $k=>$vz) { $arVzNamen[$k] = $vz['name']; } ?> + view['data'] as $va) { $i ++; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view['arVZ'][$va['vz']]['arPLZ'])) { ?> - view['arVZ'][$va['vz']]['arPLZ'] as $plz_key => $plz) { ?> - - - - - - - - - - - - - - - - - - - - callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?> - view['data'])) { ?> - - - -
    : - - view['arVZ'] as $k=>$vz) { $arVzNamen[$k] = $vz['name']; } ?> - - jQuery('#va__hint').wpsg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { - submitdata: { - field: 'hint', - va_id: '' - }, - submit : '', - placeholder: '', - indicator: '', - tooltip: '' - }); - - jQuery('#va__typ').wpsg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { - submitdata: { - field: 'typ', - va_id: '' - }, - submit : '', - data : view['arTypen']); ?>, - type : 'select', - placeholder: '', - indicator: '', - tooltip: '' - }); + + id="va__aktiv" /> + + + - jQuery('#va__mwst').wpsg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { - submitdata: { - field: 'mwst_key', - va_id: '' - }, - submit: '', - data: , - type: 'select', - placeholder: '', - indicator: '', - tooltip: '' - }); + + + + + - - jQuery('#va__aktiv').bind('change', function() { + + view['arTypen'][$va['typ']]); + ?> + + + - var value = 0; - - if (jQuery(this).attr("checked") == "checked") value = 1; + + + 0) { ?> + view['arVZ'][$va['vz']]['name']); ?> + + + + + + + - jQuery.ajax( { - url: 'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', - data: { - field: 'aktiv', - va_id: '', - value: value - } - } ); - - } ); - + + + + + + + view['arVZ'][$va['vz']]['arPLZ'])) { ?> + view['arVZ'][$va['vz']]['arPLZ'] as $plz_key => $plz) { ?> + + + + + + + + + + + + + + + + + id="va_mwst_laender_" /> + + + - -
    : - -
    - id="va__aktiv" /> - - -
    : - -
    :view['arTypen'][$va['typ']]); ?> - -
    : - 0) { ?> - view['arVZ'][$va['vz']]['name']); ?> - - - - - -
    : - -
    [ ]: - + + view['data'])) { ?>
    - jQuery(document).ready(function() { - - jQuery('#va__plz_').wpsg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { - submitdata: { - field: 'kosten_plz', - va_id: '', - key: '' - }, - submit : '', - placeholder: '', - indicator: '', - tooltip: '', - callback: function(data) - { - //location.reload(); - } - } ); - - } ); - - -
    : - -
    : - type="checkbox" value="1" /> - - -
    + Index: /views/mods/mod_versandarten/settings_edit.phtml =================================================================== --- /views/mods/mod_versandarten/settings_edit.phtml (revision 5990) +++ /views/mods/mod_versandarten/settings_edit.phtml (revision 5997) @@ -90,5 +90,4 @@
    -
    @@ -97,4 +96,6 @@ mod->va_list(); ?> + + Neue Versandart anlegen Index: /views/mods/mod_voucherproduct/settings_edit.phtml =================================================================== --- /views/mods/mod_voucherproduct/settings_edit.phtml (revision 5990) +++ /views/mods/mod_voucherproduct/settings_edit.phtml (revision 5997) @@ -19,37 +19,30 @@
    -
    -
    -
    - view['bp']) && $this->view['bp'] !== false) { ?> - - -
    -
    - view['bp']) || $this->view['bp'] === false) { ?> -

    - - - - - -
    -
    -
    - get_option('wpsg_voucherproduct_width'), array ('help' => 'wpsg_voucherproduct_width')); ?> - get_option('wpsg_voucherproduct_height'), array ('help' => 'wpsg_voucherproduct_height')); ?> -
    -
    - -
    -
    -

    hier konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?> -

    -
    -
    -
    - + + + view['bp'] === false) { ?> +

    + + + + + + view['bp'] !== false) { $strSuffix = ' + '; + echo __($strSuffix); + } ?> + true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?> + + get_option('wpsg_voucherproduct_width'), array ('rAlign' => true, 'help' => 'wpsg_voucherproduct_width')); ?> + get_option('wpsg_voucherproduct_height'), array ('rAlign' => true, 'help' => 'wpsg_voucherproduct_height')); ?> + + + hier konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?> + + + true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?> +
    Index: /views/mods/mod_wirecard/settings_edit.phtml =================================================================== --- /views/mods/mod_wirecard/settings_edit.phtml (revision 5990) +++ /views/mods/mod_wirecard/settings_edit.phtml (revision 5997) @@ -16,19 +16,6 @@
    get_option('wpsg_mod_wirecard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?> -
    -
    - -
    -
    - - -
    -
    -
    +get_option('wpsg_mod_wirecard_mwst'), array('help' => 'wpsg_mod_wirecard_mwst')); ?> + get_option('wpsg_mod_wirecard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>