From 0915da0a21acca9a6c6331b53e15e50398bca957 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Tue, 29 Mar 2016 07:04:10 +0000 Subject: - Anfang Produktverwaltung - Kundenverwaltung überarbeitet - Überarbeitung Produktbilder (Mehrfachupload) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5447 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/kundendaten.phtml | 28 +- views/admin/kundendaten_tab2.phtml | 49 +- views/css/admin.css | 17 +- views/js/ajaxupload.js | 3 +- .../produkt_addedit_content.phtml | 132 ++++++ .../mod_produktbilder/produkt_edit_content.phtml | 123 ----- .../mods/mod_produktbilder/produkt_edit_list.phtml | 3 +- views/mods/mod_produktbilder/produktbild.phtml | 8 - views/produkt/_addedit.phtml | 503 ++++++++++++++++++++ views/produkt/addedit.phtml | 524 +++------------------ views/produkt/addedit_general.phtml | 7 + 11 files changed, 740 insertions(+), 657 deletions(-) create mode 100644 views/mods/mod_produktbilder/produkt_addedit_content.phtml delete mode 100644 views/mods/mod_produktbilder/produkt_edit_content.phtml delete mode 100644 views/mods/mod_produktbilder/produktbild.phtml create mode 100644 views/produkt/_addedit.phtml create mode 100644 views/produkt/addedit_general.phtml diff --git a/views/admin/kundendaten.phtml b/views/admin/kundendaten.phtml index 4c65f1d..3208acc 100644 --- a/views/admin/kundendaten.phtml +++ b/views/admin/kundendaten.phtml @@ -17,7 +17,7 @@ - + -

+

@@ -78,12 +85,12 @@ function wpsg_addCustomField() { - jQuery('#tabcontent2').html('<?php echo __('Bitte warten ...', 'wpsg'); ?>'); + jQuery('#wpsg_kv_list').html('<?php echo __('Bitte warten ...', 'wpsg'); ?>'); jQuery.ajax( { url: 'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=add&noheader=1', success: function(data) { - jQuery('#tabcontent2').html(data); + jQuery('#wpsg_kv_list').html(data); } } ); @@ -136,6 +143,15 @@ return false; } // function wpsg_genPACode(pa_id) + + jQuery(document).ready(function() { + + jQuery('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { localStorage.setItem('wpsg_admin_customer_lastTab', jQuery(this).attr('href')); } ); + + var lastTab = localStorage.getItem('wpsg_admin_customer_lastTab'); + if (lastTab) jQuery('[href="' + lastTab + '"]').tab('show'); + + } ); /* ]]> */ diff --git a/views/admin/kundendaten_tab2.phtml b/views/admin/kundendaten_tab2.phtml index b6073a5..759500b 100644 --- a/views/admin/kundendaten_tab2.phtml +++ b/views/admin/kundendaten_tab2.phtml @@ -17,9 +17,7 @@ - - - + @@ -35,7 +33,7 @@ - @@ -66,7 +64,7 @@ - + @@ -77,47 +75,6 @@ - - -
get_option('wpsg_kundenvariablen_show'), array('fullWidth' => true)); ?> diff --git a/views/css/admin.css b/views/css/admin.css index 3362c81..fc3ef9b 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -19,14 +19,17 @@ #wpsg-bs .wpsg_admin_content .panel-title { line-height:10px; font-size:14px; } #wpsg-bs .table .wpsg-sm { height:20px; line-height:20px; font-size:12px; } #wpsg-bs .wpsg_code { background-color:#EFEFEF; border:1px solid #000000; padding:3px; margin-top:5px; margin-bottom:5px; font-family:monospace; font-size:12px; } +#wpsg-bs .form-horizontal .editable { padding-top:0px; } +#wpsg-bs .wpsg-glyphicon { margin-right:10px; } /* Inline Edit */ #wpsg-bs .editableform > .control-group > div { padding-left:15px; padding-right:15px; } #wpsg-bs .editableform > .control-group > div input[type="text"] { min-width:300px; } /* Kundenverwaltung -> Kundendaten */ -#wpsg-bs .wpsg_customerfield .tab-content { position:relative; padding-top:1.5rem; } - +#wpsg-bs .wpsg_customerfield .tab-content { position:relative; padding-top:1.5rem; } +#wpsg-bs .wpsg_customervar_row2 td { border-top:0px; } + /* Tabelle der Berechtigungen */ .wpsg_access_table .wpsg_col_cap { text-align:center; } @@ -77,6 +80,7 @@ /* Produktverwaltung */ .wpsg_pic_col { width:50px; } +.wpsg_admin_submenu input { width:100%; margin-bottom:10px !important; } /* Modulverwaltung */ .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; } @@ -90,4 +94,11 @@ .wpsg_modul_search_wrap input[type="checkbox"] { right:25px; top:3px; position:absolute; } /* Formularanpassungen */ -.form-checkbox label { font-size:12px; line-height:200%; } \ No newline at end of file +.form-checkbox label { font-size:12px; line-height:200%; } + +/* Produktbilder */ +#produktbilder_target img { } +.wpsg_mod_produktbilder_admin_bild a { position:relative; display:inline-block; float:left; margin-right:5px; margin-bottom:5px; } +.wpsg_mod_produktbilder_admin_bild a > span { left:0px; top:0px; display:none; position:absolute; width:100%; height:100%; text-align:center; background-color:rgba(255, 0, 0, 0.3); } +.wpsg_mod_produktbilder_admin_bild a > span > span { font-size:30px; top:50%; margin-top:-15px; } +.wpsg_mod_produktbilder_admin_bild a:hover > span { display:block; } \ No newline at end of file diff --git a/views/js/ajaxupload.js b/views/js/ajaxupload.js index a704008..bd82e0d 100644 --- a/views/js/ajaxupload.js +++ b/views/js/ajaxupload.js @@ -350,7 +350,8 @@ var input = document.createElement("input"); input.setAttribute('type', 'file'); - input.setAttribute('name', this._settings.name); + input.setAttribute('multiple', 'multiple'); + input.setAttribute('name', this._settings.name + '[]'); addStyles(input, { 'position' : 'absolute', diff --git a/views/mods/mod_produktbilder/produkt_addedit_content.phtml b/views/mods/mod_produktbilder/produkt_addedit_content.phtml new file mode 100644 index 0000000..b5b5029 --- /dev/null +++ b/views/mods/mod_produktbilder/produkt_addedit_content.phtml @@ -0,0 +1,132 @@ + + + + + + +
+
+

+
+
+ + view['data']['id'] > 0) { ?> + +
view['ProduktList']; ?>
+ + + +

+
+

+ + + + + +

+
+

+ + + + + + + + + + + + + +

+ + + +
+
\ No newline at end of file diff --git a/views/mods/mod_produktbilder/produkt_edit_content.phtml b/views/mods/mod_produktbilder/produkt_edit_content.phtml deleted file mode 100644 index 20435b8..0000000 --- a/views/mods/mod_produktbilder/produkt_edit_content.phtml +++ /dev/null @@ -1,123 +0,0 @@ - -
-

-
- -

-
- - view['data']['id'] > 0) { ?> - -
view['ProduktList']; ?>
- - - -

-
-

- - - - - -

-
-

- - - - - - - - - - - - - -

- -
-
- -
-
-

- -

-
-
-
- -
-
\ No newline at end of file diff --git a/views/mods/mod_produktbilder/produkt_edit_list.phtml b/views/mods/mod_produktbilder/produkt_edit_list.phtml index 7250933..d0aaf12 100644 --- a/views/mods/mod_produktbilder/produkt_edit_list.phtml +++ b/views/mods/mod_produktbilder/produkt_edit_list.phtml @@ -11,7 +11,8 @@
- <?php echo wpsg_hspc($b); ?> + <?php echo wpsg_hspc($b); ?> +
diff --git a/views/mods/mod_produktbilder/produktbild.phtml b/views/mods/mod_produktbilder/produktbild.phtml deleted file mode 100644 index 91737b1..0000000 --- a/views/mods/mod_produktbilder/produktbild.phtml +++ /dev/null @@ -1,8 +0,0 @@ - -<?php echo htmlspecialchars($this->view['produkt']['name']); ?> \ No newline at end of file diff --git a/views/produkt/_addedit.phtml b/views/produkt/_addedit.phtml new file mode 100644 index 0000000..d19b055 --- /dev/null +++ b/views/produkt/_addedit.phtml @@ -0,0 +1,503 @@ + + +
+ + + + + + writeBackendMessage(); ?> + +
+ +
+ +
+ +
+ +
+
+ + +
+

+

+ +

+
+ view['data']['mwst_key']); ?> + getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?> + getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['oldprice'])); ?> + view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?> + view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?> + Länderverwaltung +
+
+
+

+

+ +

+
+ +
+ arPayment as $p) { if (!isset($p['deleted']) || $p['deleted'] != '1') { ?> + view['allowedPayment']), array('id' => 'wpsg_paymentmethods_'.$p['id'], 'value' => $p['id'])); ?> + +
+ + +
+
+
+

+

+ +

+
+ +
+ arShipping as $s) { if (!isset($s['deleted']) || $s['deleted'] != '1') { ?> + view['allowedShipping']), array('id' => 'wpsg_paymentmethods_'.$s['id'], 'value' => $s['id'])); ?> + +
+
+ + +
+ + + callMods('produkt_edit_sidebar', array(&$this->view['data'])); ?> + +
+
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+

+
+ +

+
+ isMultiLingual()) { ?> +
+
+ +
+
+ getStoreLanguages() as $a) { ?> + + + + + + + <?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?> + + + +
+
+
+ +
+
+ +
+
+ +
+
+
+ view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?> +
+
+ +
+
+ +
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+ +
+
+ view['templates']) || sizeof($this->view['templates']) <= 0) { ?> +

+ + + +
+
+
+
+
+ +
+
+ +
+ +    + + +
+
+
+ + + hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?> +
+
+ +
+
+ +
+
+
+ + + + __('Nur einmal mit beliebiger Menge (Standard)', 'wpsg'), + '4' => __('Nur einmal mit Menge 1', 'wpsg'), + '1' => __('Mehrfach mit beliebiger Menge', 'wpsg'), + '2' => __('Mehrfach mit Menge 1', 'wpsg') + ), @$this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?> + + + view['data']['id'] > 0) { ?> +
+
+ +
+
+

+ getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?> +

+
+
+
+ + + callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> + +
+
+ +
+

+
+ +

+
+ + view['data']['beschreibung'], 'beschreibung'); + + ?> + +
+
+ + callMods('produkt_edit_content', array(&$this->view['data'])); ?> + +
+ + 0) { ?> + + + + + + + +

+ + +

+ +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml index d19b055..7dbd456 100644 --- a/views/produkt/addedit.phtml +++ b/views/produkt/addedit.phtml @@ -7,7 +7,7 @@ ?> -
+
- - - - writeBackendMessage(); ?> - -
+
+ +
-
- -
- -
- -
-
- - -
-

-

- -

-
- view['data']['mwst_key']); ?> - getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?> - getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['oldprice'])); ?> - view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?> - view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?> - Länderverwaltung -
-
-
-

-

- -

-
- -
- arPayment as $p) { if (!isset($p['deleted']) || $p['deleted'] != '1') { ?> - view['allowedPayment']), array('id' => 'wpsg_paymentmethods_'.$p['id'], 'value' => $p['id'])); ?> - -
- - -
-
-
-

-

- -

-
- -
- arShipping as $s) { if (!isset($s['deleted']) || $s['deleted'] != '1') { ?> - view['allowedShipping']), array('id' => 'wpsg_paymentmethods_'.$s['id'], 'value' => $s['id'])); ?> - -
-
- - -
- - - callMods('produkt_edit_sidebar', array(&$this->view['data'])); ?> - -
-
- -
- -
-
- -
-
- -
- -
- -
-

-
- -

-
- isMultiLingual()) { ?> -
-
- -
-
- getStoreLanguages() as $a) { ?> - - - - - - - <?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?> - - - -
-
-
- -
-
- -
-
- -
-
-
- view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?> -
-
- -
-
- -
-
-
- - -
-
- -
-
- -
-
-
-
-
- -
-
- view['templates']) || sizeof($this->view['templates']) <= 0) { ?> -

- - - -
-
-
-
-
- -
-
- -
- -    - - -
-
-
- - - hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?> -
-
- -
-
- -
-
-
- - - - __('Nur einmal mit beliebiger Menge (Standard)', 'wpsg'), - '4' => __('Nur einmal mit Menge 1', 'wpsg'), - '1' => __('Mehrfach mit beliebiger Menge', 'wpsg'), - '2' => __('Mehrfach mit Menge 1', 'wpsg') - ), @$this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?> - - - view['data']['id'] > 0) { ?> -
-
- -
-
-

- getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?> -

-
-
-
- - - callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> - -
-
- -
-

-
- -

-
- - view['data']['beschreibung'], 'beschreibung'); - - ?> - -
-
+
+ + view['arSubAction'] as $k => $v) { $i ++; ?> +
- callMods('produkt_edit_content', array(&$this->view['data'])); ?> - -
- - 0) { ?> - - - - - - + -

- - -

- -
- -
+
+ - +
- + + + + \ No newline at end of file diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml new file mode 100644 index 0000000..5f1897a --- /dev/null +++ b/views/produkt/addedit_general.phtml @@ -0,0 +1,7 @@ +TODO \ No newline at end of file -- cgit v1.2.3