Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 6855) +++ /mods/wpsg_mod_deliverytime.class.php (revision 6857) @@ -38,5 +38,6 @@ */ $sql = "CREATE TABLE ".WPSG_TBL_PRODUCTS." ( - wpsg_mod_deliverytime_deliverytime VARCHAR(255) NOT NULL, + wpsg_mod_deliverytime_source INT(1) DEFAULT 0 NOT NULL COMMENT '1=vom Produkt', + wpsg_mod_deliverytime_deliverytime VARCHAR(255) NOT NULL, wpsg_mod_deliverytime_storeproduct VARCHAR (255) NOT NULL, wpsg_mod_deliverytime_storetext VARCHAR (255) NOT NULL COMMENT 'Hinweistext', @@ -94,4 +95,5 @@ // Neue Felder im Produkt ÃŒbergeben + $this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source'] = $product_data['wpsg_mod_deliverytime_source']; $this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'] = $product_data['wpsg_mod_deliverytime_storetext']; $this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink'] = $product_data['wpsg_mod_deliverytime_storelink']; @@ -142,4 +144,5 @@ $this->shop->update_option('wpsg_mod_deliverytime_show_overview', $_REQUEST['wpsg_mod_deliverytime_show_overview']); $this->shop->update_option('wpsg_mod_deliverytime_show_mail', $_REQUEST['wpsg_mod_deliverytime_show_mail']); + $this->shop->update_option('wpsg_mod_deliverytime_source', $_REQUEST['wpsg_mod_deliverytime_source']); $this->shop->update_option('wpsg_mod_deliverytime_delay', $_REQUEST['wpsg_mod_deliverytime_delay']); $this->shop->update_option('wpsg_mod_deliverytime_delayText', $_REQUEST['wpsg_mod_deliverytime_delayText']); @@ -160,4 +163,5 @@ $produkt_data['wpsg_mod_deliverytime_storetext'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'])); $produkt_data['wpsg_mod_deliverytime_storelink'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink'])); + $produkt_data['wpsg_mod_deliverytime_source'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source'])); $produkt_data['wpsg_mod_deliverytime_delay'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'])); $produkt_data['wpsg_mod_deliverytime_delaytext'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext'])); @@ -312,10 +316,11 @@ { - $temp = $oProduct->wpsg_mod_deliverytime_deliverytime; - + //$temp = $oProduct->wpsg_mod_deliverytime_deliverytime; + + $temp = $oProduct->wpsg_mod_deliverytime_source; if (wpsg_isSizedInt($temp)) { - /* Lieferzeit > 0 im Produkte */ + /* Lieferzeit = 1 vom Produkt */ $strValue = wpsg_translate(__('#1# Tag(e)', 'wpsg'), $oProduct->wpsg_mod_deliverytime_deliverytime); @@ -324,5 +329,5 @@ { - /* Lieferzeit > 0 Global */ + /* Lieferzeit = 0 Global */ $strValue = wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->shop->get_option('wpsg_mod_deliverytime_mode_days_default')); @@ -342,9 +347,13 @@ $strDeliveryTime = @$oProduct->wpsg_mod_deliverytime_deliverytime; - if (wpsg_isSizedString($strDeliveryTime) && in_array($strDeliveryTime, $arPossibleDelivery)) + //if (wpsg_isSizedString($strDeliveryTime) && in_array($strDeliveryTime, $arPossibleDelivery)) + //if (wpsg_isSizedString($strDeliveryTime) && array_key_exists($strDeliveryTime, $arPossibleDelivery)) + $temp = $oProduct->wpsg_mod_deliverytime_source; + if (wpsg_isSizedInt($temp)) { $strValue = __($strDeliveryTime, 'wpsg'); - + $strValue = __(@$arPossibleDelivery[$strDeliveryTime], 'wpsg'); + } else @@ -405,5 +414,7 @@ { - if (!wpsg_isSizedString($product_data['wpsg_mod_deliverytime_deliverytime'])) + //if (!wpsg_isSizedString($product_data['wpsg_mod_deliverytime_deliverytime'])) + + if (!wpsg_isSizedInt($product_data['wpsg_mod_deliverytime_source'])) { @@ -424,8 +435,10 @@ $arPossibleDeliveryTimes = $this->getPossibleSelection(); - if (!in_array($product_data['wpsg_mod_deliverytime_deliverytime'], $arPossibleDeliveryTimes)) - { - - return __($this->shop->get_option('wpsg_mod_deliverytime_mode_select_default'), 'wpsg'); + //if (!in_array($product_data['wpsg_mod_deliverytime_deliverytime'], $arPossibleDeliveryTimes)) + //if (!array_key_exists($product_data['wpsg_mod_deliverytime_deliverytime'], $arPossibleDeliveryTimes)) + if (!wpsg_isSizedInt($product_data['wpsg_mod_deliverytime_source'])) + { + + return __($arPossibleDeliveryTimes[$this->shop->get_option('wpsg_mod_deliverytime_mode_select_default')], 'wpsg'); } @@ -433,6 +446,6 @@ { - return __($product_data['wpsg_mod_deliverytime_deliverytime'], 'wpsg'); - + return __($arPossibleDeliveryTimes[$product_data['wpsg_mod_deliverytime_deliverytime']], 'wpsg'); + } Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 6855) +++ /views/css/frontend.css (revision 6857) @@ -37,5 +37,5 @@ .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; } @@ -142,5 +142,5 @@ .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; } Index: /views/mods/mod_deliverytime/basket_row.phtml =================================================================== --- /views/mods/mod_deliverytime/basket_row.phtml (revision 6855) +++ /views/mods/mod_deliverytime/basket_row.phtml (revision 6857) @@ -9,14 +9,8 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + : + view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
-
- view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?> - -
-
- -
- @@ -26,3 +20,4 @@ +
Index: /views/mods/mod_deliverytime/overview_row.phtml =================================================================== --- /views/mods/mod_deliverytime/overview_row.phtml (revision 6855) +++ /views/mods/mod_deliverytime/overview_row.phtml (revision 6857) @@ -9,12 +9,7 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + : -
-
- view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?> - -
-
- + view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
Index: /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml =================================================================== --- /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml (revision 6855) +++ /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml (revision 6857) @@ -9,4 +9,7 @@ + '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')); ?> @@ -14,4 +17,5 @@ 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'])) @@ -65,4 +69,11 @@ } ).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(); } ); Index: /views/mods/mod_productvariants/basket_row.phtml =================================================================== --- /views/mods/mod_productvariants/basket_row.phtml (revision 6855) +++ /views/mods/mod_productvariants/basket_row.phtml (revision 6857) @@ -10,4 +10,5 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + :
@@ -15,6 +16,9 @@ view['variante'] as $vari => $value) { ?> + - : ; ; + : + + ; ; callMod('wpsg_mod_productvariants', 'showVariPrice', array($value['preis']))) { ?> (get_option('wpsg_currency')); ?>) @@ -26,8 +30,6 @@ view['variante']['key']; ?> + -
- -
- +
Index: /views/mods/mod_productvariants/overview_row.phtml =================================================================== --- /views/mods/mod_productvariants/overview_row.phtml (revision 6855) +++ /views/mods/mod_productvariants/overview_row.phtml (revision 6857) @@ -10,4 +10,5 @@
view['$bPicture'] == true) { ?>class="titlep">class="title"> + :
@@ -15,6 +16,9 @@ view['variante'] as $vari => $value) { ?> + - : ; ; + : + + ; ; callMod('wpsg_mod_productvariants', 'showVariPrice', array($value['preis']))) { ?> (get_option('wpsg_currency')); ?>) @@ -26,8 +30,7 @@ view['variante']['key']; ?> + -
- -
+
Index: /views/mods/mod_produktattribute/basket_row.phtml =================================================================== --- /views/mods/mod_produktattribute/basket_row.phtml (revision 6855) +++ /views/mods/mod_produktattribute/basket_row.phtml (revision 6857) @@ -11,13 +11,9 @@
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)); ?> -
-
- -
- +
Index: /views/mods/mod_produktattribute/overview_row.phtml =================================================================== --- /views/mods/mod_produktattribute/overview_row.phtml (revision 6855) +++ /views/mods/mod_produktattribute/overview_row.phtml (revision 6857) @@ -11,13 +11,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)); ?> -
-
- -
- +
+ Index: /views/mods/mod_weight/basket_row.phtml =================================================================== --- /views/mods/mod_weight/basket_row.phtml (revision 6855) +++ /views/mods/mod_weight/basket_row.phtml (revision 6857) @@ -8,13 +8,9 @@
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')); ?> -
-
- -
- +
Index: /views/mods/mod_weight/overview_row.phtml =================================================================== --- /views/mods/mod_weight/overview_row.phtml (revision 6855) +++ /views/mods/mod_weight/overview_row.phtml (revision 6857) @@ -8,13 +8,9 @@
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')); ?> -
-
- -
- +