From 0d7371748f4bc6a0505416db47e5bb4575388a27 Mon Sep 17 00:00:00 2001 From: hartmut Date: Thu, 11 Jan 2018 15:47:30 +0000 Subject: Lieferzeit aus dem Produkt überschreibt Lieferzeit aus dem Modul nicht (Ticket #581) Anpassung basket.phtml und alle basket_row.phtml und overview_row.phtml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6857 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/css/frontend.css | 4 ++-- views/mods/mod_deliverytime/basket_row.phtml | 11 +++-------- views/mods/mod_deliverytime/overview_row.phtml | 9 ++------- views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml | 11 +++++++++++ views/mods/mod_productvariants/basket_row.phtml | 12 +++++++----- views/mods/mod_productvariants/overview_row.phtml | 11 +++++++---- views/mods/mod_produktattribute/basket_row.phtml | 12 ++++-------- views/mods/mod_produktattribute/overview_row.phtml | 13 +++++-------- views/mods/mod_weight/basket_row.phtml | 12 ++++-------- views/mods/mod_weight/overview_row.phtml | 12 ++++-------- 10 files changed, 49 insertions(+), 58 deletions(-) diff --git a/views/css/frontend.css b/views/css/frontend.css index e344714..ea41924 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -36,7 +36,7 @@ input.wpsg_error { border-color:red !important; } .basket_product_wrap .basket_product_row .product_action .price { width: 39%; display:inline-block; text-align:right; } .basket_product_wrap .basket_product_row .product_action .price_total { width: 39%; display:inline-block; font-weight:bold; text-align:right; } .basket_product_wrap .basket_product_row .product_info { display:flex; width:100%; justify-content:space-between; align-items:center; } -.basket_product_wrap .basket_product_row .product_info .titlep { width: 20%; min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.basket_product_wrap .basket_product_row .product_info .titlep { min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } .basket_product_wrap .basket_product_row .product_info .title { width: 30%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } .basket_product_wrap .basket_product_row .product_info .valuel { width: 50%; display:inline-block; font-weight:normal; text-align:left; } .basket_product_wrap .basket_product_row .product_info .valuer { width: 50%; display:inline-block; font-weight:normal; text-align:right; } @@ -141,7 +141,7 @@ input.wpsg_error { border-color:red !important; } .wpsg_overview .wpsg_table_wrap .overview_product_row .product_action .price { width: 39%; display:inline-block; text-align:right; } .wpsg_overview .wpsg_table_wrap .overview_product_row .product_action .price_total { width: 39%; display:inline-block; font-weight:bold; text-align:right; } .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info { display:flex; width:100%; justify-content:space-between; align-items:center; } -.wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .titlep { width: 20%; min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .titlep { min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .title { width: 30%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .valuel { width: 50%; display:inline-block; font-weight:normal; text-align:left; } .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .valuer { width: 50%; display:inline-block; font-weight:normal; text-align:right; } diff --git a/views/mods/mod_deliverytime/basket_row.phtml b/views/mods/mod_deliverytime/basket_row.phtml index e920f9f..cbc0a47 100644 --- a/views/mods/mod_deliverytime/basket_row.phtml +++ b/views/mods/mod_deliverytime/basket_row.phtml @@ -8,16 +8,10 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + : + view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
-
- view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?> - -
-
- -
-
@@ -25,4 +19,5 @@ view['wpsg_mod_deliverytime']['delaytime'], 'wpsg'); ?>
+
diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml index 89b5960..b447482 100644 --- a/views/mods/mod_deliverytime/overview_row.phtml +++ b/views/mods/mod_deliverytime/overview_row.phtml @@ -8,14 +8,9 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + : -
-
- view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?> - -
-
- + view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml index 72ea6e2..f53b258 100644 --- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml +++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml @@ -8,11 +8,15 @@ + 'Moduleinstellungen', 1 => 'Produkt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_source')); ?> + +
get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?> view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_select')); ?> get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?> view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime']), array('unit' => __('Tage', 'wpsg'), 'help' => 'wpsg_mod_deliverytime_input')); ?> +
get_option('wpsg_mod_deliverytime_store'))) */ {?> view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'])) //echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct1]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?> @@ -64,6 +68,13 @@ else jQuery('.wpsg_mod_deliverytime_delay_activ').hide(); } ).change(); + + jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_source').bind('change', function() { + + if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_show').show(); + else jQuery('.wpsg_mod_deliverytime_show').hide(); + + } ).change(); } ); diff --git a/views/mods/mod_productvariants/basket_row.phtml b/views/mods/mod_productvariants/basket_row.phtml index d94c395..0311179 100644 --- a/views/mods/mod_productvariants/basket_row.phtml +++ b/views/mods/mod_productvariants/basket_row.phtml @@ -9,13 +9,17 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + :
view['variante'] as $vari => $value) { ?> + - : ; ; + : + + ; ; callMod('wpsg_mod_productvariants', 'showVariPrice', array($value['preis']))) { ?> (get_option('wpsg_currency')); ?>) @@ -25,9 +29,7 @@ view['variante']['key']; ?> +
-
- -
- +
\ No newline at end of file diff --git a/views/mods/mod_productvariants/overview_row.phtml b/views/mods/mod_productvariants/overview_row.phtml index 9f6b954..4ea8850 100644 --- a/views/mods/mod_productvariants/overview_row.phtml +++ b/views/mods/mod_productvariants/overview_row.phtml @@ -9,13 +9,17 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + :
view['variante'] as $vari => $value) { ?> + - : ; ; + : + + ; ; callMod('wpsg_mod_productvariants', 'showVariPrice', array($value['preis']))) { ?> (get_option('wpsg_currency')); ?>) @@ -25,9 +29,8 @@ view['variante']['key']; ?> +
-
- -
+
\ No newline at end of file diff --git a/views/mods/mod_produktattribute/basket_row.phtml b/views/mods/mod_produktattribute/basket_row.phtml index 5ad6e81..cb8dcfe 100644 --- a/views/mods/mod_produktattribute/basket_row.phtml +++ b/views/mods/mod_produktattribute/basket_row.phtml @@ -10,14 +10,10 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> - callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?> + + callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>: + callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?>
-
- callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?> -
-
- -
- +
\ No newline at end of file diff --git a/views/mods/mod_produktattribute/overview_row.phtml b/views/mods/mod_produktattribute/overview_row.phtml index 13389a0..f06cad2 100644 --- a/views/mods/mod_produktattribute/overview_row.phtml +++ b/views/mods/mod_produktattribute/overview_row.phtml @@ -10,14 +10,11 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> - callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?> + + callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>: + callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?>
-
- callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?> -
-
- -
- +
+
\ No newline at end of file diff --git a/views/mods/mod_weight/basket_row.phtml b/views/mods/mod_weight/basket_row.phtml index 05ede5d..b2f301b 100644 --- a/views/mods/mod_weight/basket_row.phtml +++ b/views/mods/mod_weight/basket_row.phtml @@ -7,14 +7,10 @@ ?>
view['$bPicture'] == true) { ?>class="titlep">class="title"> + view['$bPicture'] == true) { ?>class="titlep">class="title"> + : + view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>
-
- view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?> -
-
- -
- +
\ No newline at end of file diff --git a/views/mods/mod_weight/overview_row.phtml b/views/mods/mod_weight/overview_row.phtml index 619642b..8eb50ac 100644 --- a/views/mods/mod_weight/overview_row.phtml +++ b/views/mods/mod_weight/overview_row.phtml @@ -7,14 +7,10 @@ ?>
view['$bPicture'] == true) { ?>class="titlep">class="title"> + view['$bPicture'] == true) { ?>class="titlep">class="title"> + : + view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>
-
- view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?> -
-
- -
- +
\ No newline at end of file -- cgit v1.2.3