From 0fc69ce3ad89844dd5fb2f87532e7b6fca55923d Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Tue, 22 Mar 2016 13:59:16 +0000 Subject: - sync git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5439 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/access.phtml | 158 ++++++++++++++++--------------- views/admin/customerpreset.phtml | 43 --------- views/admin/extended.phtml | 79 ++++++++-------- views/admin/form/checkbox.phtml | 22 ++++- views/admin/form/input.phtml | 2 +- views/admin/form/select.phtml | 18 +++- views/admin/form/textarea.phtml | 20 ++++ views/admin/includes.phtml | 10 -- views/admin/index.phtml | 50 +--------- views/admin/kalkulation.phtml | 99 ++++++++----------- views/admin/konfiguration.phtml | 16 +--- views/admin/kundendaten.phtml | 184 +++++++++++++++++++++++------------- views/admin/kundendaten_tab1.phtml | 161 +++++-------------------------- views/admin/kundendaten_tab2.phtml | 140 ++++++++++++++------------- views/admin/kundendaten_tab3.phtml | 18 ++++ views/admin/laender.phtml | 6 -- views/admin/loadsavesettings.phtml | 50 +++++----- views/admin/module.phtml | 2 - views/admin/presentation.phtml | 54 +++++------ views/admin/shopdata.phtml | 11 +-- views/admin/versandzonen_list.phtml | 4 +- 21 files changed, 498 insertions(+), 649 deletions(-) delete mode 100644 views/admin/customerpreset.phtml create mode 100644 views/admin/form/textarea.phtml create mode 100644 views/admin/kundendaten_tab3.phtml (limited to 'views/admin') diff --git a/views/admin/access.phtml b/views/admin/access.phtml index 89af85d..4d3f970 100644 --- a/views/admin/access.phtml +++ b/views/admin/access.phtml @@ -7,89 +7,97 @@ ?>
-
-
-
-
- - - +
+ -
+
prefix."user_roles"); ?> - - - - $r) { ?> - - - - - - - $r) { ?> - - - - - - - $r) { ?> - - - - - hasMod('wpsg_mod_core')) { ?> - - - $r) { ?> - - - - - - - - $r) { ?> - - - - - - - $r) { ?> - - - - - callMods('admin_setcapabilities'); ?> -
- - name="wpsg_cap[][wpsg_menu]" value="1" /> -
- - name="wpsg_cap[][wpsg_conf]" value="1" /> -
- - name="wpsg_cap[][wpsg_lizence]" value="1" /> -
- - name="wpsg_cap[][wpsg_order]" value="1" /> -
- - name="wpsg_cap[][wpsg_produkt]" value="1" /> -
+
+
+

+
+
+ + + + + + $r) { ?> + + + + + + + + + $r) { ?> + + + + + + + $r) { ?> + + + + + hasMod('wpsg_mod_core')) { ?> + + + $r) { ?> + + + + + + + + $r) { ?> + + + + + + + $r) { ?> + + + + + callMods('admin_setcapabilities'); ?> + +
+ + name="wpsg_cap[][wpsg_menu]" value="1" /> +
+ + name="wpsg_cap[][wpsg_conf]" value="1" /> +
+ + name="wpsg_cap[][wpsg_lizence]" value="1" /> +
+ + name="wpsg_cap[][wpsg_order]" value="1" /> +
+ + name="wpsg_cap[][wpsg_produkt]" value="1" /> +
+ +
+
-
- +

\ No newline at end of file diff --git a/views/admin/customerpreset.phtml b/views/admin/customerpreset.phtml deleted file mode 100644 index 128c2ac..0000000 --- a/views/admin/customerpreset.phtml +++ /dev/null @@ -1,43 +0,0 @@ - -
- -
-
-
-
- -
    - view['arSubAction'] as $k => $v) { ?> -
    • - -
- -
- -
- -
- - view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?> - view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?> - view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => - 'nohspc_'.wpsg_translate(__('Die Länder können in der Länderverwaltung definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender') - )); ?> - view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title', - 'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den Kundendaten definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'), - 'noIndex' => true - )); ?> - -
- - - -
- -
\ No newline at end of file diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml index d97320b..6a6527c 100644 --- a/views/admin/extended.phtml +++ b/views/admin/extended.phtml @@ -7,54 +7,49 @@ ?>
-
-
-
-
- -
    - view['arSubAction'] as $k => $v) { ?> -
    • +
    + + view['arSubAction'] as $k => $v) { ?> + -
- +
+
-
+
- get_option('wpsg_salt')); ?> - get_option('wpsg_options_nl2br'), array('help' => 'wpsg_options_nl2br')); ?> - get_option('wpsg_debugModus'), array('help' => 'wpsg_debugModus')); ?> - - hasMod('wpsg_mod_core')) { ?> - get_option('wpsg_debugURL'), array('help' => 'wpsg_debugURL')); ?> - - - get_option('wpsg_referer_requesturi'), array('help' => 'wpsg_referer_requesturi')); ?> - get_option('wpsg_ignoreuserview'), array('help' => 'wpsg_ignoreuserview')); ?> - get_option('wpsg_classicupload')); ?> - get_option('wpsg_content_filter_direct')); ?> - get_option('wpsg_options_no_rte_apply_filter')); ?> - get_option('wpsg_options_nl2br_out'), array('help' => 'wpsg_options_n12br_out')); ?> - get_option('wpsg_impexp_clearlinebreak'), array('help' => 'wpsg_impexp_clearlinebreak')); ?> - get_option('wpsg_removeWpAutoOp'), array('help' => 'wpsg_removeWpAutoOp')); ?> - get_option('wpsg_removeWpTrimExcerpt'), array('help' => 'wpsg_removeWpTrimExcerpt')); ?> - get_option('wpsg_lockOrderTables'), array('help' => 'wpsg_lockOrderTables')); ?> - get_option('wpsg_autoraw')); ?> - get_option('wpsg_nocache'), array('help' => 'wpsg_nocache')); ?> - get_option('wpsg_autolineending'), array('help' => 'wpsg_autolineending')); ?> - view['arGeoMode'], $this->get_option('wpsg_geo_determination'), array('help' => 'wpsg_geo_determination')); ?> - - + hasMod('wpsg_mod_core')) { ?> + get_option('wpsg_debugURL'), array('help' => 'wpsg_debugURL')); ?> + + + get_option('wpsg_referer_requesturi'), array('help' => 'wpsg_referer_requesturi')); ?> + get_option('wpsg_ignoreuserview'), array('help' => 'wpsg_ignoreuserview')); ?> + get_option('wpsg_classicupload')); ?> + get_option('wpsg_content_filter_direct')); ?> + get_option('wpsg_options_no_rte_apply_filter')); ?> + get_option('wpsg_options_nl2br_out'), array('help' => 'wpsg_options_n12br_out')); ?> + get_option('wpsg_impexp_clearlinebreak'), array('help' => 'wpsg_impexp_clearlinebreak')); ?> + get_option('wpsg_removeWpAutoOp'), array('help' => 'wpsg_removeWpAutoOp')); ?> + get_option('wpsg_removeWpTrimExcerpt'), array('help' => 'wpsg_removeWpTrimExcerpt')); ?> + get_option('wpsg_lockOrderTables'), array('help' => 'wpsg_lockOrderTables')); ?> + get_option('wpsg_autoraw')); ?> + get_option('wpsg_nocache'), array('help' => 'wpsg_nocache')); ?> + get_option('wpsg_autolineending'), array('help' => 'wpsg_autolineending')); ?> + view['arGeoMode'], $this->get_option('wpsg_geo_determination'), array('help' => 'wpsg_geo_determination')); ?> + +
+

diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml index c183513..e20ddea 100644 --- a/views/admin/form/checkbox.phtml +++ b/views/admin/form/checkbox.phtml @@ -1,14 +1,26 @@ -
+
-
+
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml index 1235fc7..d4870d2 100644 --- a/views/admin/form/input.phtml +++ b/views/admin/form/input.phtml @@ -1,4 +1,4 @@ -
+
diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml index 480f333..ab46b8a 100644 --- a/views/admin/form/select.phtml +++ b/views/admin/form/select.phtml @@ -1,14 +1,22 @@ -
+
- view['atts_select']; ?>> + view['field_values'] as $k => $v) { ?> + + + + + view['field_config']['help'])) { ?> + - + +
diff --git a/views/admin/form/textarea.phtml b/views/admin/form/textarea.phtml new file mode 100644 index 0000000..fabe0de --- /dev/null +++ b/views/admin/form/textarea.phtml @@ -0,0 +1,20 @@ +
+ + + +
+ +
+ + + + view['field_config']['help'])) { ?> + + +
+ +
+ +
+ +
\ No newline at end of file diff --git a/views/admin/includes.phtml b/views/admin/includes.phtml index 8f085cf..ab6da2d 100644 --- a/views/admin/includes.phtml +++ b/views/admin/includes.phtml @@ -38,13 +38,3 @@
- - \ No newline at end of file diff --git a/views/admin/index.phtml b/views/admin/index.phtml index 0b7e1aa..c6f7b0a 100644 --- a/views/admin/index.phtml +++ b/views/admin/index.phtml @@ -46,52 +46,4 @@
-
- - \ No newline at end of file +
\ No newline at end of file diff --git a/views/admin/kalkulation.phtml b/views/admin/kalkulation.phtml index e41888a..a6019b3 100644 --- a/views/admin/kalkulation.phtml +++ b/views/admin/kalkulation.phtml @@ -7,85 +7,64 @@ ?>
-
-
-
-
- -
    - view['arSubAction'] as $k => $v) { ?> -
    • +
    + + view['arSubAction'] as $k => $v) { ?> + -
+
-
+
- get_option('wpsg_kleinunternehmer'), array('help' => 'Preiskalkulation_wpsg_kleinunternehmer')); ?> - get_option('wpsg_kleinunternehmer_text'), array()) ?> -
-
-
- : -
-
- + +
+
+

+
+
+ + 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()) ?>
-
+ +
+ __('Netto (zzgl. Steuer)', 'wpsg'), + WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg') + ), $this->get_option('wpsg_preisangaben')); ?> + __('Brutto (inkl. Steuer)', 'wpsg'), WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg')), $this->get_option('wpsg_preisangaben_frontend')); ?> +
+
- __('Brutto (inkl. Steuer)', 'wpsg'), WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg')), $this->get_option('wpsg_preisangaben_frontend')); ?> -
- - get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?> - get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?> - +
+

- + /* ]]> */
\ No newline at end of file diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml index 38a3a8a..42f1231 100644 --- a/views/admin/konfiguration.phtml +++ b/views/admin/konfiguration.phtml @@ -107,8 +107,7 @@ '1' => __('Zum Warenkorb leiten', 'wpsg'), '2' => __('Warenkorb im Fenster anzeigen', 'wpsg'), '3' => __('Lightbox Meldung', 'wpsg') - ), $this->get_option('wpsg_afterinsert')); ?> - get_option('wpsg_skip_checkout2')); ?> + ), $this->get_option('wpsg_afterinsert')); ?> __('In Session belassen', 'wpsg'), '1' => __('Löschen', 'wpsg') @@ -118,18 +117,9 @@ get_option('wpsg_customer_start')); ?> get_option('wpsg_format_onr'), array('help' => 'Formatierung_Bestellnummer')); ?> get_option('wpsg_order_start')); ?> + get_option('wpsg_skip_checkout2')); ?>
-
- - +
diff --git a/views/admin/kundendaten.phtml b/views/admin/kundendaten.phtml index 6896577..4c65f1d 100644 --- a/views/admin/kundendaten.phtml +++ b/views/admin/kundendaten.phtml @@ -5,84 +5,138 @@ */ ?> +
-
-
-
-
- -
    - view['arSubAction'] as $k => $v) { ?> -
    • +
    + + view['arSubAction'] as $k => $v) { ?> + -
- +
+
-
-
- -
- -
-
-
-
-
- + + + +
+ + + +
+
+

+
+
+ +
    + +
    • +
    • +
+ +
+
+ render(WPSG_PATH_VIEW.'/admin/kundendaten_tab1.phtml'); ?> +
+
+ render(WPSG_PATH_VIEW.'/admin/kundendaten_tab2.phtml'); ?> +
+
+ render(WPSG_PATH_VIEW.'/admin/kundendaten_tab3.phtml'); ?>
-
-
-
-
- -
- render(WPSG_PATH_VIEW.'/admin/kundendaten_tab1.phtml'); ?> -
-
- - render(WPSG_PATH_VIEW.'/admin/kundendaten_tab2.phtml'); ?> -
- +
+
+ +

+ + + + - -
+ /** + * Zeigt den HTML Code, der die gewählte Kundenvariablen in die Templates einbaut + */ + function wpsg_genKVCode(kv_index) + { + + jQuery('#wpsg_code_dialog .modal-body').html('<?php echo __('Bitte warten ...', 'wpsg'); ?>'); + + jQuery('#wpsg_code_dialog').modal( { } ) + + jQuery.ajax( { + url: 'admin.php?page=wpsg-Admin&subaction=kundendaten&noheader=1&show=code', + data: { 'kv_id': kv_index }, + success: function(data) { jQuery('#wpsg_code_dialog .modal-body').html(data); } + } ); + + return false; + + } // function wpsg_genPACode(pa_id) + + /* ]]> */ +
\ No newline at end of file diff --git a/views/admin/kundendaten_tab1.phtml b/views/admin/kundendaten_tab1.phtml index 6fe5425..d619bdc 100644 --- a/views/admin/kundendaten_tab1.phtml +++ b/views/admin/kundendaten_tab1.phtml @@ -4,143 +4,26 @@ * Template für den ersten Karteireiter der Kundendaten */ + $arSelect = array( + '0' => __('Ja', 'wpsg'), + '1' => __('Nein', 'wpsg') + ); + ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
: - -
: - -
: - -
: - -
- -
: - -
- -
: - -
: - -
: - -
: - -
: - -
: - -
: - -
+ +view['pflicht']['anrede']); ?> +view['pflicht']['anrede_auswahl']); ?> +view['pflicht']['firma'])?> +view['pflicht']['vname'])?> +view['pflicht']['name'])?> +view['pflicht']['geb'])?> +view['pflicht']['email'])?> +view['pflicht']['emailconfirm']); ?> +view['pflicht']['tel'])?> +view['pflicht']['fax'])?> +view['pflicht']['strasse'])?> +view['pflicht']['plz'])?> +view['pflicht']['ort'])?> +view['pflicht']['land'])?> +view['pflicht']['ustidnr'])?> + diff --git a/views/admin/kundendaten_tab2.phtml b/views/admin/kundendaten_tab2.phtml index e506f2e..b6073a5 100644 --- a/views/admin/kundendaten_tab2.phtml +++ b/views/admin/kundendaten_tab2.phtml @@ -5,9 +5,80 @@ */ ?> + view['pflicht']['custom'])) { ?> + + + + + + + + + + + + + + + view['pflicht']['custom'] as $c_id => $c) { ?> + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + +
+ +
+ - +/* ]]> */ - - - - - - - - - - - - view['pflicht']['custom'] as $c_id => $c) { ?> - - - - - - - - - - - - - - -
- -
- - - - - - - - - - -
- -

-get_option('wpsg_kundenvariablen_show')); ?> +get_option('wpsg_kundenvariablen_show'), array('fullWidth' => true)); ?>

\ No newline at end of file diff --git a/views/admin/kundendaten_tab3.phtml b/views/admin/kundendaten_tab3.phtml new file mode 100644 index 0000000..815a37b --- /dev/null +++ b/views/admin/kundendaten_tab3.phtml @@ -0,0 +1,18 @@ + + +view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?> +view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?> +view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => + 'nohspc_'.wpsg_translate(__('Die Länder können in der Länderverwaltung definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender') +)); ?> +view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title', + 'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den Kundendaten definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'), + 'noIndex' => true +)); ?> + diff --git a/views/admin/laender.phtml b/views/admin/laender.phtml index e3fef52..45e2fa9 100644 --- a/views/admin/laender.phtml +++ b/views/admin/laender.phtml @@ -230,12 +230,6 @@ return false; } - - jQuery(document).ready(function() { - - jQuery('.wpsg_form_help').tipTip(); - - } ); /* ]]> */ diff --git a/views/admin/loadsavesettings.phtml b/views/admin/loadsavesettings.phtml index 4ff2599..e5ea549 100644 --- a/views/admin/loadsavesettings.phtml +++ b/views/admin/loadsavesettings.phtml @@ -7,42 +7,40 @@ ?>

-
-
-
-
- -
    - view['arSubAction'] as $k => $v) { ?> -
    • +
    + + view['arSubAction'] as $k => $v) { ?> + -
+
-
+
-
-
- -
-
- -
-
-
-
-
- -
-
- + +
+
+

+
+
+ + + + + + + + +
-
+

+

+
\ No newline at end of file diff --git a/views/admin/module.phtml b/views/admin/module.phtml index ec04f3f..4d08b2d 100644 --- a/views/admin/module.phtml +++ b/views/admin/module.phtml @@ -179,8 +179,6 @@ jQuery('#wpsg_modul_search').focus().bind('blur', wpsg_ssh_module); jQuery('#wpsg_modul_search').focus().bind('keyup', wpsg_ssh_module); - jQuery('.wpsg_form_help').tipTip(); - wpsg_ssh_module(); } ); diff --git a/views/admin/presentation.phtml b/views/admin/presentation.phtml index 10958eb..54ac5ad 100644 --- a/views/admin/presentation.phtml +++ b/views/admin/presentation.phtml @@ -7,43 +7,37 @@ ?>
-
-
-
-
- -
    - view['arSubAction'] as $k => $v) { ?> -
    • +
    + + view['arSubAction'] as $k => $v) { ?> + -
+
-
+
- get_option('wpsg_showMwstAlways')); ?> - get_option('wpsg_showArticelnumber')); ?> - __('Serverseitig', 'wpsg'), - '1' => __('Serverseitig + Javascript V1', 'wpsg'), - '2' => __('Serverseitig + Javascript V2', 'wpsg') - ), $this->get_option('wpsg_form_validation')); ?> - get_option('wpsg_hideBasketCountrySelect')); ?> - - callMods('admin_presentation'); ?> +
+
+

+
+
- - + __('Serverseitig', 'wpsg'), + '1' => __('Serverseitig + Javascript V1', 'wpsg'), + '2' => __('Serverseitig + Javascript V2', 'wpsg') + ), $this->get_option('wpsg_form_validation')); ?> + callMods('admin_presentation'); ?> + get_option('wpsg_showMwstAlways')); ?> + get_option('wpsg_showArticelnumber')); ?> + get_option('wpsg_hideBasketCountrySelect')); ?> + +
+
+

diff --git a/views/admin/shopdata.phtml b/views/admin/shopdata.phtml index a9d1ca0..892962d 100644 --- a/views/admin/shopdata.phtml +++ b/views/admin/shopdata.phtml @@ -65,14 +65,5 @@

- - +
\ No newline at end of file diff --git a/views/admin/versandzonen_list.phtml b/views/admin/versandzonen_list.phtml index 5e15862..d76e497 100644 --- a/views/admin/versandzonen_list.phtml +++ b/views/admin/versandzonen_list.phtml @@ -35,7 +35,7 @@