Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 5630) +++ /mods/wpsg_mod_deliverytime.class.php (revision 5632) @@ -38,5 +38,6 @@ */ $sql = "CREATE TABLE ".WPSG_TBL_PRODUCTS." ( - wpsg_mod_deliverytime_deliverytime VARCHAR(255) NOT NULL + wpsg_mod_deliverytime_deliverytime VARCHAR(255) NOT NULL, + storeproduct VARCHAR (255) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;"; @@ -71,4 +72,8 @@ $this->shop->update_option('wpsg_mod_deliverytime_mode_select_default', $_REQUEST['wpsg_mod_deliverytime_mode_select_default']); $this->shop->update_option('wpsg_mod_deliverytime_mode_days_default', $_REQUEST['wpsg_mod_deliverytime_mode_days_default']); + + $this->shop->update_option('wpsg_mod_deliverytime_store', $_REQUEST['wpsg_mod_deliverytime_store']); + $this->shop->update_option('wpsg_mod_deliverytime_storetext', $_REQUEST['wpsg_mod_deliverytime_storetext']); + $this->shop->update_option('wpsg_page_mod_deliverytime_storelink', $_REQUEST['wpsg_page_mod_deliverytime_storelink']); $this->shop->update_option('wpsg_mod_deliverytime_show_product', $_REQUEST['wpsg_mod_deliverytime_show_product']); Index: /views/mods/mod_deliverytime/produkt_edit_allgemein.phtml =================================================================== --- /views/mods/mod_deliverytime/produkt_edit_allgemein.phtml (revision 5630) +++ /views/mods/mod_deliverytime/produkt_edit_allgemein.phtml (revision 5632) @@ -11,2 +11,10 @@ view['wpsg_mod_deliverytime']['deliverytime'], array('unit' => __('Tage', 'wpsg'))); ?> + +
+ +get_option('wpsg_mod_deliverytime_store'))) {?> +view['data']['storeproduct']);?> + + +
Index: /views/mods/mod_deliverytime/settings_edit.phtml =================================================================== --- /views/mods/mod_deliverytime/settings_edit.phtml (revision 5630) +++ /views/mods/mod_deliverytime/settings_edit.phtml (revision 5632) @@ -17,4 +17,9 @@ get_option('wpsg_mod_deliverytime_mode_days_default'), array('help' => 'wpsg_mod_deliverytime_mode_days_default')); ?> + +
+ +get_option('wpsg_mod_deliverytime_store'), array('help' => 'wpsg_mod_deliverytime_store')); ?> +get_option('wpsg_mod_deliverytime_storetext'), array('help' => 'wpsg_mod_deliverytime_storetext')); ?>
Index: /views/mods/mod_kundenverwaltung/settings_edit.phtml =================================================================== --- /views/mods/mod_kundenverwaltung/settings_edit.phtml (revision 5630) +++ /views/mods/mod_kundenverwaltung/settings_edit.phtml (revision 5632) @@ -10,5 +10,5 @@ get_option('wpsg_mod_kundenverwaltung_showCheckoutRegister'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegister')); ?> get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand')); ?> -get_option('wpsg_mod_kundenverwaltung_loginZwang'), array('help' => 'wpsg_mod_kundenverwaltung_loginZwang')); ?> +get_option('wpsg_mod_kundenverwaltung_loginZwang'), array('help' => 'wpsg_mod_kundenverwaltung_loginZwang')); ?> get_option('wpsg_mod_kundenverwaltung_preisAnzeige'), array('help' => 'wpsg_mod_kundenverwaltung_preisAnzeige')); ?> Index: /views/produkttemplates/standard.phtml =================================================================== --- /views/produkttemplates/standard.phtml (revision 5630) +++ /views/produkttemplates/standard.phtml (revision 5632) @@ -131,17 +131,26 @@ hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> -
- view['data']['wpsg_mod_deliverytime_deliverytime']) >= '1') { /* Lieferzeit > 0 */ ?> - callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?> - - + + view['data']['storeproduct'] >= '1') {?> + + get_option('wpsg_mod_deliverytime_storetext')); ?>
+ + + +
+ view['data']['wpsg_mod_deliverytime_deliverytime']) >= '1') { /* Lieferzeit > 0 */ ?> + callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?> + + + +
+ + + get_option('wpsg_mod_deliverytime_delay') == '1') { ?> +
+ get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> +
-
- - - get_option('wpsg_mod_deliverytime_delay') == '1') { ?> -
- get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> -
+ @@ -218,17 +227,24 @@ - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - - - - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> - - - - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - + + + view['data']['storeproduct'] >= '1') {?> + + get_option('wpsg_mod_deliverytime_storetext')); ?>
+ + + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + callMods('productForSale', array($this->view['data']['product_key']))) { ?> + + + + getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> + + + + hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> + +