From eaf11126b7c5a763dc70701ddf205ffe30676ef6 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 9 Sep 2016 20:05:19 +0000 Subject: - Fertigstellung neue Länderverwaltung - Deinstallationsoptionen an Layout angepasst - Bestellvariablen löschen - Backend Kleinigkeiten MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5748 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/deinstall.phtml | 48 +++--- views/admin/form/input.phtml | 23 ++- views/admin/form/select.phtml | 23 ++- views/admin/konfiguration.phtml | 30 ++-- views/admin/laender.phtml | 338 ++++++---------------------------------- views/admin/laender_edit.phtml | 6 +- views/admin/laender_list.phtml | 87 +++++++++++ 7 files changed, 222 insertions(+), 333 deletions(-) create mode 100644 views/admin/laender_list.phtml (limited to 'views/admin') diff --git a/views/admin/deinstall.phtml b/views/admin/deinstall.phtml index ac760f7..f90c135 100644 --- a/views/admin/deinstall.phtml +++ b/views/admin/deinstall.phtml @@ -17,40 +17,36 @@
- -
- + + + + +

- -
-
-
-
- + + view['count_products'] > 0)?$this->view['count_products']:0)), false, array('fullWidth' => true)); ?> + view['count_customer'] > 0)?$this->view['count_customer']:0)), false, array('fullWidth' => true)); ?> + view['count_order'] > 0)?$this->view['count_order']:0)), false, array('fullWidth' => true)); ?> + view['count_order_incomplete'] > 0)?$this->view['count_order_incomplete']:0)), false, array('fullWidth' => true)); ?> +
- - + + true)); ?> +

- +
-

+

- +
+ + +
- \ No newline at end of file +/* ]]> */ \ No newline at end of file diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml index aad0896..3a936a6 100644 --- a/views/admin/form/input.phtml +++ b/views/admin/form/input.phtml @@ -8,8 +8,27 @@ view['field_config']['readonly'])) { ?> diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml index f0466c8..34993d0 100644 --- a/views/admin/form/select.phtml +++ b/views/admin/form/select.phtml @@ -6,7 +6,28 @@
- view['atts_select']; ?>> hasMod('wpsg_mod_core')) { ?> arLizenz['l'] == 0) { ?> -
-
- : -
-
- getDemoDays() < 0) { ?> -

getDemoDays())); ?>

- -

getDemoDays()); ?>

- - -
-
-
+ getDemoDays() < 0) + { + $strText = wpsg_translate(__('Vor #1# Tage(n) abgelaufen.', 'wpsg'), abs($this->getDemoDays())); + + } else { + + $strText = wpsg_translate(__('#1# Tage verbleibend.', 'wpsg'), $this->getDemoDays()); + + } + + echo wpsg_drawForm_Text(__('Lizenzende', 'wpsg'), $strText, '', array('help' => 'DemoMode')); + + ?> + - view['data'])) { ?> - - - - - - - - - - - - - - - view['data'] as $l) { ?> - - - - - - - - - - - - - - - - - - - - -
- view['vz'][$l['vz']])) { ?> - view['vz'][$l['vz']]); ?> - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- -

- + render(WPSG_PATH_VIEW.'/admin/laender_list.phtml'); ?>
@@ -117,8 +49,13 @@ -

- +
+
+
+ +
+ + @@ -141,6 +78,46 @@ } // function wpsg_country_add() + function wpsg_country_import() + { + + if (!confirm('')) return false; + + jQuery('#wpsg_country_list').html(''); + + jQuery.ajax( { + url: 'wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=import&noheader=1', + success: function(data) { + + jQuery('#wpsg_country_list').html(data); + + } + } ); + + return false; + + } // function wpsg_country_import() + + function wpsg_country_importEU() + { + + if (!confirm('')) return false; + + jQuery('#wpsg_country_list').html(''); + + jQuery.ajax( { + url: 'wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=eu_import&noheader=1', + success: function(data) { + + jQuery('#wpsg_country_list').html(data); + + } + } ); + + return false; + + } // function wpsg_country_importEU() + function wpsg_country_save() { @@ -167,7 +144,7 @@ jQuery('#Modal_wpsg_country_edit').modal('show'); jQuery.ajax( { - url: 'wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=edit&noheader=1&land_id' + land_id, + url: 'wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=edit&noheader=1&land_id=' + land_id, success: function(data) { jQuery('#Modal_wpsg_country_edit .modal-body').html(data); } } ); @@ -177,221 +154,4 @@ /* ]]> */ - - - - -
- -

- - -

- - render(WPSG_PATH_VIEW.'/admin/laender_edit.phtml'); ?> - -

- - view['data'])) { ?> - - - - - - - - - - - - view['data'] as $l) { $i ++; ?> - - - - - - - - - - - -
- view['vz'][$l['vz']])) { ?> - view['vz'][$l['vz']]); ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -

- - -

- - - - - - -

- \ No newline at end of file diff --git a/views/admin/laender_edit.phtml b/views/admin/laender_edit.phtml index 8886851..2f5725c 100644 --- a/views/admin/laender_edit.phtml +++ b/views/admin/laender_edit.phtml @@ -1,5 +1,9 @@
+ view['land']['id'])) { ?> + + + 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')); ?> @@ -12,6 +16,6 @@ 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']['standard']), array('disabled' => ((isset($this->view['land']['standard']) && $this->view['land']['standard'] == '1')?true:false), 'help' => 'wpsg_land_standard')); ?>
\ No newline at end of file diff --git a/views/admin/laender_list.phtml b/views/admin/laender_list.phtml new file mode 100644 index 0000000..8551f7c --- /dev/null +++ b/views/admin/laender_list.phtml @@ -0,0 +1,87 @@ + + +writeBackendMessage(true); ?> + +view['data'])) { ?> + + + + + + + + + + + + + + + + + + view['data'] as $l) { ?> + + + + + + + + + + + + + + + + + + + + + +
+ view['vz'][$l['vz']])) { ?> + view['vz'][$l['vz']]); ?> + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+ +
blau markiert und wird für die MwSt. Berechnung im Backend verwendet.', 'wpsg'); ?>
+ + +

+ + -- cgit v1.2.3