Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 5560) +++ /controller/wpsg_AdminController.class.php (revision 5562) @@ -789,96 +789,51 @@ { - if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'saveNew') - { - - if (!wpsg_isSizedString($_REQUEST['newland']['name'])) - { - - $this->shop->addBackendError(__('Bitte einen Namen fÌr das neue Land angeben.', 'wpsg')); - - } - else - { - - $land = $_REQUEST['newland']; - - $land_id = $this->db->ImportQuery(WPSG_TBL_LAND, array( - 'name' => wpsg_q($land['name']), - 'kuerzel' => wpsg_q($land['kuerzel']), - 'vz' => wpsg_q($land['vz']), - 'mwst' => wpsg_q($land['mwst']), - 'mwst_a' => ((wpsg_tf($land['mwst_a']) >= 0 && wpsg_tf($land['mwst_a']) !== '')?wpsg_q(wpsg_tf($land['mwst_a'])):'NULL'), - 'mwst_b' => ((wpsg_tf($land['mwst_b']) >= 0 && wpsg_tf($land['mwst_b']) !== '')?wpsg_q(wpsg_tf($land['mwst_b'])):'NULL'), - 'mwst_c' => ((wpsg_tf($land['mwst_c']) >= 0 && wpsg_tf($land['mwst_c']) !== '')?wpsg_q(wpsg_tf($land['mwst_c'])):'NULL'), - 'mwst_d' => ((wpsg_tf($land['mwst_d']) >= 0 && wpsg_tf($land['mwst_d']) !== '')?wpsg_q(wpsg_tf($land['mwst_d'])):'NULL') - )); - - if (wpsg_isSizedInt($land['standard'])) $this->shop->update_option('wpsg_defaultland', $land_id); - - $this->shop->addTranslationString('land_'.$land_id, $land['name']); - $this->shop->addTranslationString('landkrzl_'.$land_id, $land['kuerzel']); - - $this->shop->addBackendMessage(__('Land wurde erfolgreich gespeichert.', 'wpsg')); - - } - - $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender'); - - } - else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'saveEdit') - { - - $land = array(); - parse_str($_REQUEST['form_data'], $land); - $land = $land['land']; - - if (!wpsg_isSizedInt($land['id'])) $this->shop->throwErrorCode('100_9'); - - $this->db->UpdateQuery(WPSG_TBL_LAND, array( - 'name' => wpsg_q($land['name']), - 'kuerzel' => wpsg_q($land['kuerzel']), - 'vz' => wpsg_q($land['vz']), - 'mwst' => wpsg_q($land['mwst']), - 'mwst_a' => ((wpsg_tf($land['mwst_a']) >= 0 && wpsg_tf($land['mwst_a']) !== '')?wpsg_q(wpsg_tf($land['mwst_a'])):'NULL'), - 'mwst_b' => ((wpsg_tf($land['mwst_b']) >= 0 && wpsg_tf($land['mwst_b']) !== '')?wpsg_q(wpsg_tf($land['mwst_b'])):'NULL'), - 'mwst_c' => ((wpsg_tf($land['mwst_c']) >= 0 && wpsg_tf($land['mwst_c']) !== '')?wpsg_q(wpsg_tf($land['mwst_c'])):'NULL'), - 'mwst_d' => ((wpsg_tf($land['mwst_d']) >= 0 && wpsg_tf($land['mwst_d']) !== '')?wpsg_q(wpsg_tf($land['mwst_d'])):'NULL') - ), " `id` = '".wpsg_q($land['id'])."' "); - - if (wpsg_isSizedInt($land['standard'])) $this->shop->update_option('wpsg_defaultland', $land['id']); - - $this->shop->addTranslationString('land_'.$land['id'], $land['name']); - $this->shop->addTranslationString('landkrzl_'.$land['id'], $land['kuerzel']); - - $land_db = $this->db->fetchRow(" - SELECT - L.`id` AS `id`, - (IF (LENGTH(L.`kuerzel`) > 0, CONCAT(L.`name`, ' (', L.`kuerzel`, ')'), L.`name`)) AS `name`, - VZ.`name` AS `vz`, - ( - CASE L.`mwst` - WHEN '2' THEN '".__('keine MwSt. bei USt.IdNr.', 'wpsg')."' - WHEN '1' THEN '".__('keine MwSt.', 'wpsg')."' - ELSE '".__('mit MwSt.', 'wpsg')."' - END - ) AS `mwst`, - L.`mwst_a`, L.`mwst_b`, L.`mwst_c`, L.`mwst_d` - FROM - `".WPSG_TBL_LAND."` AS L - LEFT JOIN `".WPSG_TBL_VZ."` AS VZ ON (L.`vz` = VZ.`id`) - WHERE - L.`id` = '".wpsg_q($land['id'])."' - "); - - if ($this->shop->get_option('wpsg_defaultland') == $land['id']) $land_db['standard'] = '1'; - - if (wpsg_tf($land_db['mwst_a']) >= 0 && wpsg_tf($land_db['mwst_a']) != '') $land_db['mwst_a'] = wpsg_ff(wpsg_tf($land_db['mwst_a']), '%'); else $land_db['mwst_a'] = ''; - if (wpsg_tf($land_db['mwst_b']) >= 0 && wpsg_tf($land_db['mwst_b']) != '') $land_db['mwst_b'] = wpsg_ff(wpsg_tf($land_db['mwst_b']), '%'); else $land_db['mwst_b'] = ''; - if (wpsg_tf($land_db['mwst_c']) >= 0 && wpsg_tf($land_db['mwst_c']) != '') $land_db['mwst_c'] = wpsg_ff(wpsg_tf($land_db['mwst_c']), '%'); else $land_db['mwst_c'] = ''; - if (wpsg_tf($land_db['mwst_d']) >= 0 && wpsg_tf($land_db['mwst_d']) != '') $land_db['mwst_d'] = wpsg_ff(wpsg_tf($land_db['mwst_d']), '%'); else $land_db['mwst_d'] = ''; - - header('Content-Type: application/json'); - - die(json_encode($land_db)); + if (isset($_REQUEST['submit'])) + { + + if (!wpsg_isSizedArray($_REQUEST['arDelete'])) + { + + $this->addBackendError(__('Bitte mindestens ein Land zum löschen auswÀhlen.', 'wpsg')); + + } + else + { + + foreach ($_REQUEST['arDelete'] as $country_id => $c) + { + + $oCountry = wpsg_country::getInstance($country_id); + $oCountry->delete(); + + } + + } + + $this->addBackendMessage(__('Die markierten LÀnder wurden erfolgreich gelöscht.', 'wpsg')); + + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender'); + } + + if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'save') + { + + $form_data = array(); parse_str($_REQUEST['form_data'], $form_data); + + if (wpsg_isSizedInt($form_data['id'])) + { + + $this->db->UpdateQuery(WPSG_TBL_LAND, wpsg_q($form_data), " `id` = '".wpsg_q($form_data['id'])."' "); + + } + else + { + + $this->db->ImportQuery(WPSG_TBL_LAND, wpsg_q($form_data)); + + } + + wpsg_debug($form_data); + die(wpsg_debug($_REQUEST)); } @@ -904,9 +859,25 @@ else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'remove') { - - $this->db->Query("DELETE FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($_REQUEST['land_id'])."' "); + + $oCountry = wpsg_country::getInstance($_REQUEST['land_id']); + $oCountry->delete(); die("1"); + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'add') + { + + $this->shop->view['vz'] = $this->db->fetchAssocField("SELECT `id`, `name` FROM `".WPSG_TBL_VZ."` ORDER BY `name` ASC", "id", "name"); + + $this->shop->view['land']['mwst_a'] = ''; + $this->shop->view['land']['mwst_b'] = ''; + $this->shop->view['land']['mwst_c'] = ''; + $this->shop->view['land']['mwst_d'] = ''; + + $this->shop->view['land']['standard'] = '0'; + + die($this->shop->render(WPSG_PATH_VIEW.'/admin/laender_edit.phtml')); + } else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'edit') @@ -1185,5 +1156,7 @@ $this->shop->addBackendMessage(__('E-Mail Konfiguration erfolgreich gespeichert.', 'wpsg')); - + + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf'); + } Index: /model/wpsg_country.class.php =================================================================== --- /model/wpsg_country.class.php (revision 5560) +++ /model/wpsg_country.class.php (revision 5562) @@ -28,4 +28,14 @@ } // public function load($deliverynote_id) + + /** + * Löscht das Land + */ + public function delete() + { + + $this->db->Query("DELETE FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->id)."' "); + + } // public function delete() /** Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 5560) +++ /mods/wpsg_mod_produktartikel.class.php (revision 5562) @@ -559,5 +559,5 @@ ), 'show_ui' => true, - 'show_in_menu' => true, + 'show_in_menu' => false, 'hierarchical' => true )); @@ -573,5 +573,5 @@ 'rewrite' => array('slug' => $this->shop->get_option('wpsg_mod_produktartikel_pathkey')), 'show_ui' => $show_ui, - 'show_in_menu' => true, + 'show_in_menu' => false, 'taxonomies' => array('wpsg-tax'), 'has_archive' => true, Index: /views/admin/emailconf.phtml =================================================================== --- /views/admin/emailconf.phtml (revision 5560) +++ /views/admin/emailconf.phtml (revision 5562) @@ -19,5 +19,5 @@
-
+ @@ -85,5 +85,5 @@ wpsg_mail_save_cookie(); - } ).disableSelection().next().hide(); + } ).css( { 'cursor': 'pointer' } ).disableSelection().next().hide(); if (jQuery.cookie('wpsg_mail') != null) Index: /views/admin/form/emailconf.phtml =================================================================== --- /views/admin/form/emailconf.phtml (revision 5560) +++ /views/admin/form/emailconf.phtml (revision 5562) @@ -6,5 +6,5 @@ view['field_to'] === true) { ?> - view['field_key'].'_empfaenger', __('EmpfÀnger', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_empfaenger')); ?> + view['field_key'].'_empfaenger', __('EmpfÀnger', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$this->view['field_key'].'_empfaenger')); ?> @@ -22,22 +22,38 @@
- - - 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/laender.phtml =================================================================== --- /views/admin/laender.phtml (revision 5560) +++ /views/admin/laender.phtml (revision 5562) @@ -17,65 +17,168 @@
+ +
- - - view['data'])) { ?> - - - - - - - - - - - - - - view['data'] as $l) { ?> - - - + + + + + + +
- view['vz'][$l['vz']])) { ?> - view['vz'][$l['vz']]); ?> + + + + +
+ + view['data'])) { ?> + + + + + + + + + + + + + + + view['data'] as $l) { ?> + + + + + + + + + + + - - - - - - - - - - -
+ view['vz'][$l['vz']])) { ?> + view['vz'][$l['vz']]); ?> + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - -
- -

- - -

- + +

+ + + +
+ +

+ + +
+ +
+ + + +

+ + + + + +
Index: /views/admin/laender_edit.phtml =================================================================== --- /views/admin/laender_edit.phtml (revision 5560) +++ /views/admin/laender_edit.phtml (revision 5562) @@ -1,29 +1,17 @@ -
+ - view['land']['id'])) $prefix = 'land'; else $prefix = 'newland'; ?> - - view['land']['name']), array('help' => 'wpsg_land_name')); ?> - view['land']['kuerzel']), array('help' => 'wpsg_land_kuerzel')); ?> - view['vz'], wpsg_getStr($this->view['land']['vz']), array('help' => 'wpsg_land_vz')); ?> - view['land']['name']), array('help' => 'wpsg_land_name')); ?> + view['land']['kuerzel']), array('help' => 'wpsg_land_kuerzel')); ?> + view['vz'], wpsg_getStr($this->view['land']['vz']), array('help' => 'wpsg_land_vz')); ?> + __('mit MwSt.', 'wpsg'), '1' => __('keine MwSt.', 'wpsg'), '2' => __('keine MwSt. bei USt.IdNr.', 'wpsg') ), wpsg_getStr($this->view['land']['mwst']), array('help' => 'wpsg_land_mwst')); ?> - view['land']['mwst_a']), array('help' => 'wpsg_land_mwst_a')); ?> - view['land']['mwst_b']), array('help' => 'wpsg_land_mwst_b')); ?> - view['land']['mwst_c']), array('help' => 'wpsg_land_mwst_c')); ?> - view['land']['mwst_d']), array('help' => 'wpsg_land_mwst_d')); ?> - view['land']['standard']), array('disabled' => ((isset($this->view['land']['standard']) && $this->view['land']['standard'] == '1')?true:false), 'help' => 'wpsg_land_standard')); ?> - - view['land']['id'])) { ?> - - - -
- - - -

- + view['land']['mwst_a']), array('help' => 'wpsg_land_mwst_a')); ?> + view['land']['mwst_b']), array('help' => 'wpsg_land_mwst_b')); ?> + view['land']['mwst_c']), array('help' => 'wpsg_land_mwst_c')); ?> + view['land']['mwst_d']), array('help' => 'wpsg_land_mwst_d')); ?> + view['land']['standard']), array('disabled' => ((isset($this->view['land']['standard']) && $this->view['land']['standard'] == '1')?true:false), 'help' => 'wpsg_land_standard')); ?> +
Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5560) +++ /views/css/admin.css (revision 5562) @@ -42,8 +42,13 @@ /* LÀnderverwaltung */ +.wpsg_table_country { margin-bottom:0px; } +.wpsg_table_country .col_mwst { width:25px; } .wpsg_table_country .col_mwst { width:75px; } -.wpsg_table_country .col_action { width:35px; } - -/* Tabelle der Berechtigungen */ +.wpsg_table_country .col_mwstsetting { width:100px; } +.wpsg_table_country .col_vz { width:100px; } +.wpsg_table_country .col_action { width:60px; text-align:right; } +.wpsg_table_country .col_action a { margin-left:5px; } + + /* Tabelle der Berechtigungen */ .wpsg_access_table .wpsg_col_cap { text-align:center; }