From e486bed6ea2a13e97cfc78a03f30c0999d92eb26 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sat, 20 Jul 2019 15:17:02 +0000 Subject: - Backup Wertgutscheine git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7486 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/input.phtml | 6 +- views/css/admin.css | 10 +- views/js/admin.js | 26 +++- views/mods/mod_gutschein/add.phtml | 156 ++++++++++----------- .../mods/mod_gutschein/basket_row_end_coupon.phtml | 50 +++++++ views/mods/mod_gutschein/index.phtml | 124 ++++++++++++++-- .../mod_gutschein/overview_row_end_coupon.phtml | 52 +++++++ views/order/backendEdit/addVoucher.phtml | 28 +++- views/order/product_table.phtml | 81 ++++++++++- views/order/view_orderdata.phtml | 8 +- views/warenkorb/basket.phtml | 53 ++++--- views/warenkorb/overview.phtml | 44 +++--- 12 files changed, 491 insertions(+), 147 deletions(-) create mode 100644 views/mods/mod_gutschein/basket_row_end_coupon.phtml create mode 100644 views/mods/mod_gutschein/overview_row_end_coupon.phtml (limited to 'views') diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml index 08278d2..a55e454 100644 --- a/views/admin/form/input.phtml +++ b/views/admin/form/input.phtml @@ -8,7 +8,7 @@ /* jQuery(document).ready(function() { @@ -59,7 +59,7 @@ } ); - /* ]]> */ +
diff --git a/views/css/admin.css b/views/css/admin.css index 1d67d0c..27b8727 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -7,6 +7,8 @@ .wpsg_flex_justify_content_space_between { justify-content:space-between; } .wpsg_flex_align_items_center { align-items:center; } +.ajax_loading { position:absolute; display:flex; align-items:center; justify-content:center; left:0px; top:0px; width:100%; height:100%; background-color:rgba(255, 255, 255, 0.5); z-index:1000000; } + /* Bootstrap Teil */ #wpsg-bs { margin-top:20px; min-width:1000px; } #wpsg-bs .updated, @@ -123,7 +125,7 @@ .wphb_clear { clear:none !important; } /* Datepicker */ -#ui-datepicker-div { z-index:3 !important; } +#ui-datepicker-div { z-index:1151221 !important; } /* Kundenkontakt */ .wpsg_kundenkontakt_template, @@ -376,7 +378,13 @@ .wpsg_mod_voucher_fieldtable .col_color { width:80px; } .wpsg_mod_voucher_fieldtable .col_groesse { width:60px; } .wpsg_voucher .wpsg_status_link_wrap { min-height:50px; float:left; display:inline-block; } +.wpsg_voucher td .actions { opacity:1; font-size: 0.9em; } +.wpsg_voucher td:hover .actions { opacity:1; } + +@media (min-width: 768px) { + #wpsg_voucher_dialog > .modal-dialog { width:1000px; } +} /* Modul Lieferschein/Rechnung */ .wpsg_mod_deliverynote_fieldtable { font-size:12px; } diff --git a/views/js/admin.js b/views/js/admin.js index c466f59..2e36305 100644 --- a/views/js/admin.js +++ b/views/js/admin.js @@ -1,3 +1,27 @@ +function wpsg_loading(selector) { + + var jqSel = jQuery(selector); + + jqSel.css( { + 'position': 'relative', + 'display': 'block', + 'width': jqSel.width(), + 'height': jqSel.height(true) + } ); + + jqSel.append('
Bitte warten
'); + +} + +function wpsg_loading_done(selector) { + + var jqSel = jQuery(selector); + + jqSel.find('.ajax_loading').remove(); + +} + + wpsg_number_format = function (number, decimals, dec_point, thousands_sep) { var n = !isFinite(+number) ? 0 : + number, prec = !isFinite(+decimals) ? 0 : Math.abs(decimals), @@ -208,7 +232,7 @@ function wpsg_in_array(needle, haystack) return false; - } ); + } ).css('pointer-events', 'auto'); } diff --git a/views/mods/mod_gutschein/add.phtml b/views/mods/mod_gutschein/add.phtml index 2bd6fec..b6b4b6a 100644 --- a/views/mods/mod_gutschein/add.phtml +++ b/views/mods/mod_gutschein/add.phtml @@ -3,97 +3,93 @@ /** * Template für die Maske eines neuen Gutscheins */ - + ?> -
+
- - -
- -
- - - - - view['mod_gutschein']['value']); ?> - __('Absoluter Betrag', 'wpsg'), - 'p' => __('Prozentual', 'wpsg') - ), $this->view['mod_gutschein']['calc']); ?> - - view['mod_gutschein']['start'], array('datepicker' => true)); ?> - view['mod_gutschein']['end'], array('datepicker' => true)); ?> - - view['edit_id'])) { ?> - - __('Automatisch', 'wpsg'), - '1' => __('Manuell', 'wpsg') - ), wpsg_getStr($this->view['mod_gutschein']['gen']), array('help' => 'wpsg_mod_gutschein_gen')); ?> -
- view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?> -
- - - - view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?> - - - - view['mod_gutschein']['minvalue']), array('help' => 'wpsg_mod_gutschein_minvalue')); ?> - - view['edit_id'])) { ?> - view['mod_gutschein']['count']); ?> - - - view['mod_gutschein']['multi']); ?> - view['mod_gutschein']['comment']); ?> - hasMod('wpsg_mod_productgroups') && wpsg_isSizedArray($this->view['wpsg_mod_gutschein']['arProductGroups'])) { ?> - view['wpsg_mod_gutschein']['arProductGroups'], $this->view['mod_gutschein']['productgroups'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProductGroups']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProductGroups'])), 'help' => 'wpsg_mod_gutschein_productgroups')); ?> - - view['wpsg_mod_gutschein']['arProducts'], @$this->view['mod_gutschein']['products'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProducts']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProducts'])), 'help' => 'wpsg_mod_gutschein_products')); ?> - - - view['edit_id'])) { ?> - - - - - - - - - - - - -
+ + view['mod_gutschein']['start'], array('datepicker' => true)); ?> + view['mod_gutschein']['end'], array('datepicker' => true)); ?> + + view['edit_id'])) { ?> + + __('Automatisch', 'wpsg'), + '1' => __('Manuell', 'wpsg') + ), wpsg_getStr($this->view['mod_gutschein']['gen']), array('help' => 'wpsg_mod_gutschein_gen')); ?> +
+ view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?> +
+ + + + view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?> + + + + view['mod_gutschein']['minvalue']), array('help' => 'wpsg_mod_gutschein_minvalue')); ?> + + view['edit_id'])) { ?> + view['mod_gutschein']['count']); ?> + + + view['mod_gutschein']['multi']); ?> + view['mod_gutschein']['comment']); ?> + hasMod('wpsg_mod_productgroups') && wpsg_isSizedArray($this->view['wpsg_mod_gutschein']['arProductGroups'])) { ?> + view['wpsg_mod_gutschein']['arProductGroups'], $this->view['mod_gutschein']['productgroups'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProductGroups']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProductGroups'])), 'help' => 'wpsg_mod_gutschein_productgroups')); ?> + + view['wpsg_mod_gutschein']['arProducts'], @$this->view['mod_gutschein']['products'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProducts']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProducts'])), 'help' => 'wpsg_mod_gutschein_products')); ?> + + + view['edit_id'])) { ?> + + + + + +
- \ No newline at end of file + \ No newline at end of file diff --git a/views/mods/mod_gutschein/basket_row_end_coupon.phtml b/views/mods/mod_gutschein/basket_row_end_coupon.phtml new file mode 100644 index 0000000..95f8f43 --- /dev/null +++ b/views/mods/mod_gutschein/basket_row_end_coupon.phtml @@ -0,0 +1,50 @@ +view['basket']['arCalculation']; + + if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto'; + else $display_brutto_netto = 'netto'; + +?> + + + +
+
+ + +
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> +
+ +
get_option('wpsg_currency')); + + if (strpos($gs['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($gs['set']), '%').')'; + + } + + ?>
+ +
+ + + +
+
+ : +
+
+ get_option('wpsg_currency')); ?> +
+
+
diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml index fc6ddb0..4582533 100644 --- a/views/mods/mod_gutschein/index.phtml +++ b/views/mods/mod_gutschein/index.phtml @@ -17,7 +17,7 @@
- - render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?> + render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?> + +
+ + + + - - - +
@@ -149,12 +166,95 @@ + + +