+
+
+
+
+
getProductName($this->view['data']['id']); ?>
+
+
+ hasMod('wpsg_mod_produktbilder')) { ?>
+
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>
+ view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?>
+
+
+
+
+
+
+
+
+
+
+
+ get_option('wpsg_showArticelnumber') == '1') { ?>
+
+ : view['data']['anr']); ?>
+
+
+
+
+
+
+
+ view['data']['preis'], $this->get_option('wpsg_currency')); ?>
+ view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
+ hasMod('wpsg_mod_discount') && $this->view['data']['preis_prediscount'] > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
+
+
+
+
+ view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?>
+
+
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
+
+
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
+
+
+
+
+
+
+
+
+
+ hasMod('wpsg_mod_fuellmenge')) { ?>
+
+
+ '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'],
+ ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ',
+ wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
+ ); ?>
+
+
+
+
+
+
+ hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>
+
+
+ callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?>
+
+
+
+
+
+
+ hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
+
+ view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?>
+
+
+
+
+
+
+ callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?>
+
+
+
+
+
+ :
+
+
+
+ view['oProduct']->canOrder()) { ?>
+
+
+
+ hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?>
+
+
+
+
+
+
+ callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
+
+
+
+
+
+
+ view['data']['beschreibung'])) > 0) { ?>
+
+
+
+ callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
Index: /system/intern/views/produkttemplates/standard_alt.phtml
===================================================================
--- /system/intern/views/produkttemplates/standard_alt.phtml (revision 6314)
+++ /system/intern/views/produkttemplates/standard_alt.phtml (revision 6314)
@@ -0,0 +1,327 @@
+view['data']);
+
+ // Damit keine Zubehörprodukte ausgegeben werden
+ //$this->noReleatedProducts = true;
+
+ //wpsg_debug($_SESSION);
+
+if (!function_exists('is_plugin_active'))
+ require_once(ABSPATH.'/wp-admin/includes/plugin.php');
+?>
+
+
+
+
+
+
+ callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+
+
+
+
+
+
+
getProductName($this->view['data']['id']); ?>
+ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+ get_option('wpsg_showArticelnumber') == '1') { ?>
+
+ : view['data']['anr']); ?> view['data']['ean']); ?> view['data']['gtin']); ?>
+
+
+
+ callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
+
+
+
+
+
+ view['data']['preis'], $this->get_option('wpsg_currency')); ?>
+ view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
+
+ hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
+
+ : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?>
+
+
+
+
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
+
+
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
+
+
+
+
+
+
+
+
+
+ getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?>
+
+
+
+
+
+
+
view['data']['shortdesc']; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+
+
Index: /system/intern/views/produkttemplates/standard_login.phtml
===================================================================
--- /system/intern/views/produkttemplates/standard_login.phtml (revision 6314)
+++ /system/intern/views/produkttemplates/standard_login.phtml (revision 6314)
@@ -0,0 +1,177 @@
+view['data']['stock']);
+
+ // Damit keine Zubehörprodukte ausgegeben werden
+ //$this->noReleatedProducts = true;
+
+?>
+
+
+
+
+ hasMod('wpsg_mod_produktbilder')) { ?>
+
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>
+
+
+ callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
+ getTemplateIndex(); ?>" src="callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="" />*/?>
+
+
+
+ callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
+
+
+
+
+
+
+
+
+
+
+
+
view['data']['name']); ?>
+
+
+ : view['data']['anr']); ?>
+
+
+
+ callMod('wpsg_mod_kundenverwaltung', 'getUserStatus', array($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn'))) == true) { ?>
+
+
+
+
+ view['data']['preis']); ?> get_option('wpsg_currency'); ?>
+
+
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
+
+
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ hasMod('wpsg_mod_fuellmenge')) { ?>
+
+
+ view['data']['fmenge'], $this->view['data']['feinheit'], true),
+ wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')),
+ wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
+ ); ?>
+
+
+
+
+
+ hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
+
+ view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?>
+
+
+
+
+
+
+ callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?>
+
+
+
+
+ callMod('wpsg_mod_kundenverwaltung', 'getUserStatus', array($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn'))) == true) { ?>
+
+
+
+
+ :
+
+
+
+
+
+
+
+
+
+
+
+
+ callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
+
+
+
+
+ view['data']['beschreibung'])) > 0) { ?>
+
+
+
+ callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
Index: /system/intern/views/produkttemplates/standard_mt.phtml
===================================================================
--- /system/intern/views/produkttemplates/standard_mt.phtml (revision 6314)
+++ /system/intern/views/produkttemplates/standard_mt.phtml (revision 6314)
@@ -0,0 +1,341 @@
+view['data']);
+
+ // Damit keine Zubehörprodukte ausgegeben werden
+ //$this->noReleatedProducts = true;
+
+ //wpsg_debug($_SESSION);
+
+if (!function_exists('is_plugin_active'))
+ require_once(ABSPATH.'/wp-admin/includes/plugin.php');
+?>
+
+
+
+
+
+
+ callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+
+
+
+
+
+
+
getProductName($this->view['data']['id']); ?>
+ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+ get_option('wpsg_showArticelnumber') == '1') { ?>
+
+ : view['data']['anr']); ?> view['data']['ean']); ?> view['data']['gtin']); ?>
+
+
+
+ callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
+
+
+
+
+
+ view['data']['preis'], $this->get_option('wpsg_currency')); ?>
+ view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
+
+ hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
+
+ : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?>
+
+
+
+
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
+
+
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
+
+
+
+
+
+
+
+
+
+ getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?>
+
+
+
+
+
+
+
view['data']['shortdesc']; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+
+
Index: /views/admin/ueber.phtml
===================================================================
--- /views/admin/ueber.phtml (revision 6310)
+++ /views/admin/ueber.phtml (revision 6314)
@@ -85,5 +85,5 @@
-
+
Index: /views/css/frontend.css
===================================================================
--- /views/css/frontend.css (revision 6310)
+++ /views/css/frontend.css (revision 6314)
@@ -4,7 +4,11 @@
.wpsg_clear { clear:both; }
#wpsg_error, #wpsg_message { margin-bottom:1rem; }
-#wpsg_message p, #wpsg_error p, #wpsg_notice p { background-color:#FAFAFA; margin-bottom:4px; padding:3px 0px 3px 8px; }
+#wpsg_message li, #wpsg_error li, #wpsg_notice li,
+#wpsg_message p, #wpsg_error p, #wpsg_notice p { margin-bottom:4px; padding:3px 0px 3px 8px; }
+#wpsg_message li,
#wpsg_message p { border-left:4px solid #7AD03A; }
+#wpsg_notice li,
#wpsg_notice p { border-left:4px solid #FDF60A; }
+#wpsg_error li,
#wpsg_error p { border-left:4px solid #DD3D36; }
.wpsg_error { border-color:#DD3D36; }
@@ -16,7 +20,5 @@
.wpsg_spacer { width:100%; height:1px; background-color:#EAEAEA; margin-bottom:1rem; }
.wpsg_noscroll { overflow:hidden; }
-#TB_ajaxContent { width:100% !important; }
.wpsg_upper { vertical-align:top; font-size:60%; }
-
/* Basket Widget */
@@ -24,33 +26,12 @@
/* Basket */
-.wpsg_basket { margin-bottom:1rem; }
-.wpsg_basket h2 { }
-.wpsg_basket table { margin-top:1rem; width:100%; }
-.wpsg_basket table th { }
-.wpsg_basket .wpsg_basket_removelink { text-decoration:none; border:0px !important; }
-.wpsg_basket .wpsg_cell_number { padding-left:0.3rem; padding-right:0.3rem; text-align:center; min-width:20px; }
-.wpsg_basket .wpsg_cell_number img { max-width:auto !important; display:inline-block; }
-.wpsg_basket .wpsg_cell_menge { text-align:center; }
-.wpsg_basket .wpsg_cell_menge input { text-align:center; }
-.wpsg_basket .wpsg_cell_preis { text-align:right; }
-.wpsg_basket .wpsg_cell_gesamtpreis { text-align:right; }
-.wpsg_basket .wpsg_cell_summe_value { text-align:right; }
-.wpsg_basket .wpsg_cell_shipping_value { text-align:right; }
-.wpsg_basket .wpsg_cell_shipping_label select,
-.wpsg_basket .wpsg_cell_shipping_label span { float:right; width:150px;clear:right; }
-.wpsg_basket .wpsg_cell_shipping_label select.set_shipping { margin-bottom:5px; }
-.wpsg_basket .wpsg_cell_payment_label select,
-.wpsg_basket .wpsg_cell_payment_label span { float:right; width:150px; }
-.wpsg_basket .wpsg_cell_payment_value { text-align:right; }
-.wpsg_basket .wpsg_cell_gesamtsumme_value { text-align:right; }
-.wpsg_basket .wpsg_cell_deliverytime_value { text-align:right; }
-.wpsg_basket .wpsg_cell_name { vertical-align:middle; }
-.wpsg_basket .wpsg_cell_name .wpsg_basket_productimage { display:inline; padding-right:0.2rem; vertical-align:baseline; }
-.wpsg_basket .wpsg_cell_mwst { text-align:center; min-width:60px; }
-.wpsg_basket .wpsg_cell_mwst_value { text-align:right; }
-.wpsg_basket .wpsg_cell_weight_value { text-align:right; }
-.wpsg_basket .wpsg_checkoutbutton { float:right; }
-.wpsg_basket .wpsg_cell_gesamtsumme_value { font-weight:bold; }
-.wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; }
+.basket_product_wrap {}
+.basket_product_wrap .basket_product_row { display:flex; align-items:top; border-bottom:1px solid #EAEAEA; padding-bottom:1em; margin-bottom:1em; }
+.basket_product_wrap .basket_product_row .product_shortdesc { margin-top:0.5em; }
+.basket_product_wrap .basket_product_row .productimage { max-width:150px; padding-right:0.75em; }
+.basket_product_wrap .basket_product_row .product_content { width:100%; display:flex; flex-direction:column; justify-content:space-between; }
+.basket_product_wrap .basket_product_row .product_action { display:flex; width:100%; justify-content:space-between; align-items:center; }
+.basket_product_wrap .basket_product_row .product_action .amount { margin-top:0.5em; margin-bottom:0.5em; }
+.basket_product_wrap .basket_product_row .product_action .price_total { font-weight:bold; }
/* Checkout + Request*/
@@ -117,7 +98,4 @@
.wpsg_checkout .wpsg_mod_ordervars_field { display:inline; }
-/* Produktvariablen */
-.wpsg_basket .wpsg_basket_productvars input[type="text"], .wpsg_basket .wpsg_basket_productvars select { width:100%; }
-
/* Profilseite */
.wpsg_profil .wpsg_pwdvergessen_link { line-height:30px; }
@@ -143,31 +121,35 @@
/* Produkttemplate */
-.wpsg_produkt_wrapper { margin:5px -10px 5px -10px; padding:10px; width:100%; line-height:1.5em; box-sizing:content-box; }
-.wpsg_produkt_wrapper .wpsg_produkt_produktbilder { float:left; margin-right:1rem; margin-bottom:1rem; }
-.wpsg_produkt_wrapper .wpsg_product_afterimage { }
-.wpsg_produkt_wrapper .wpsg_product_afterimage .wpsg_producttitle { clear:none; }
-.wpsg_produkt_wrapper .wpsg_add_basket { margin:1rem 0; float:right; }
-.wpsg_produkt_wrapper .wpsg_produkt_add_basket_wrapper { clear:both; float:left; margin:1rem 0 0 0; }
-.wpsg_produkt_wrapper .wpsg_label { display:inline; }
-.wpsg_produkt_wrapper .wpsg_value { display:inline; }
-.wpsg_produkt_wrapper .wpsg_preis_prediscount { text-decoration: line-through; }
-.wpsg_produkt_wrapper .wpsg_menge { width:auto; }
.wpsg_productform { position:relative; }
-.wpsg_productform .wpsg_product_layer { z-index:1000; background-color:rgba(125, 125, 125, 0.5); position:absolute; left:-10px; top:-10px; width:100%; height:100%; padding:20px; }
-.wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; top:50%; margin-left:-8px; margin-top:-5.5px; }
-
-/* Ajax Meldung ÃŒber das Produkttemplate */
-#wpsg_basket_ajax_message { z-index:2000; position:absolute; top:55px; width:100%; position:fixed; }
-#wpsg_basket_ajax_message .wpsg_basket_ajax_message_content {
- width:800px; margin:auto; background-color:white; padding:25px; text-align:center;
- -webkit-border-radius:15px;
- -moz-border-radius:15px;
- border-radius:15px;
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_productimages { float:left; margin-right:0.75em; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_produkt_preishinweis { font-size:0.75em; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productview_oldprice { text-decoration:line-through; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productview_price { font-weight:bold; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_produkt_shortdescription { margin-top:0.75em; margin-bottom:0.75em; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_only_store { margin-top:0.75em; margin-bottom:0.75em; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap { margin-top:0.75em; margin-bottom:0.75em; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap select,
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap input { width:100%; box-sizing:border-box; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_informationarea { margin-top:1.5em; margin-bottom:1.5em; }
+.wpsg_productform .wpsg_produkt_wrapper label { font-weight:bold; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="text"] { width:48%; float:left; box-sizing:border-box; padding:0.7em; line-height:1.5em; font-size:1rem; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:48%; float:right; box-sizing: border-box; padding:0.7em; line-height:1.5em; font-size:1rem; border:1px solid transparent; border-radius:3px; }
+.wpsg_productform .wpsg_product_layer { position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); padding:0.75em; margin:-0.75em; box-sizing:content-box; }
+.wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; margin-left:-8px; top:50%; margin-top:-5px; }
+.wpsg_productform .wpsg_produkt_produktbilder { max-width:200px; }
+
+@media (max-width:400px) {
+
+ .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="text"] { width:28%; }
+ .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:68%; }
+
}
-#wpsg_basket_ajax_layer { z-index:199; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.75); position:fixed; }
-#wpsg_basket_ajax_message .wpsg_basket_ajax_message_content_success { color:green; }
-#wpsg_basket_ajax_message .wpsg_button_continue_shopping { float:left; }
-#wpsg_basket_ajax_message .wpsg_button_basket { float:right; }
-#wpsg_basket_ajax_message .wpsg_button_wrap { margin-top:4rem; }
+
+@media (max-width:600px) {
+
+ .wpsg_productform .wpsg_productimages { width:100%; }
+ .wpsg_productform .wpsg_produkt_produktbilder { max-width:100%; }
+
+}
/* Varianten */
@@ -188,10 +170,4 @@
.wpsg_basket_widget table .wpsg_cell_amount { text-align:right; padding-right:0.2rem; }
.wpsg_basket_widget table .wpsg_row_summary .wpsg_cell_amount { font-weight:bold; }
-
-/* Modul Gutscheine */
-.wpsg_basket .wpsg_cell_gutschein { vertical-align:middle; }
-.wpsg_basket .wpsg_cell_gutschein input[type="submit"] { float:right; }
-.wpsg_basket .wpsg_cell_gutschein input[type="text"] { float:right; margin-top:2px; margin-right:10px; vertical-align:baseline; }
-.wpsg_basket .wpsg_cell_gutschein label { line-height:35px; }
/* Modul Kundenverwaltung */
@@ -262,5 +238,4 @@
.wpsg_mod_request_requestpage .wpsg_cell_amount { width:125px; }
.wpsg_mod_request_requestpage .wpsg_cell_sumprice { text-align:right; width:200px; }
-.wpsg_mod_request_requestpage .wpsg_basket_productimage { float:left; margin-right:5px; }
.wpsg_mod_request_requestpage .wpsg_cell_total_brutto,
.wpsg_mod_request_requestpage .wpsg_cell_total_netto { text-align:right; }
@@ -271,28 +246,4 @@
.requestlist_ajax_wrap { padding-bottom:2rem; }
-/* Modul Zubehörprodukte */
-.wpsg_mod_relatedproducts_basket { margin-top:2rem; }
-
-/* Progress bar
-.steps { list-style:none; margin:0; padding:10px 0; overflow:hidden; font-family:'inherit',sans-serif; font-size:1.5rem; width:100%; height:auto; line-height:20px; font-weight:bold; counter-reset:li; }
-.steps > a, .steps > p { float:left; margin:5px 0;}
-.steps a, .steps p { list-style-image:none; list-style-type:none; margin-left:0; text-align:center; color:#bbb; background:#f2f2f2; position:relative; margin-left:43px; border-bottom:medium none !important; }
-
-.steps a:after, .steps p:after { position:absolute; top:50%; left:100%; content:" "; height:0; width:0; border:solid transparent; border-left-color:#f2f2f2; border-width:19px; margin-top:-19px; }
-.steps a span:after, .steps p span:after { position:absolute; top:50%; right:100%; content:" "; height:0; width:0; border:solid #f2f2f2; border-left-color:transparent; border-width:19px; margin-top:-19px; }
-
-.steps a span, .steps p span { display:block; padding:9px 28px 9px 9px; }
-.steps a span:before, .steps p span:before { counter-increment:li; }
-
-.steps a.current, .steps p.current { color:#3a3a3a; background:#c9c9c9; }
-.steps a.current:after, .steps p.current:after { border-left-color:#c9c9c9; }
-.steps a.current span:after, .steps p.current span:after { border-color:#c9c9c9; border-left-color:transparent; }
-
-.steps a.step1, .steps p.step1 { z-index:9; }
-.steps a.step2, .steps p.step2 { z-index:8; }
-.steps a.step3, .steps p.step3 { z-index:7; }
-.steps a.step4, .steps p.step4 { z-index:6; }
-*/
-
.wpsg_progress { padding:0px; margin:0px; width:100%; margin-bottom:100px; margin-top:30px; }
.wpsg_progress:after { border:1px solid #C5C5C5; height:10px; background-color:#F2F2F2; box-sizing:border-box; display:block; width:100%; content:" "; }
@@ -366,20 +317,14 @@
.wpsg_mod_productview-order-layer a:hover { text-decoration:none; color:#FFFFFF; background-color:#29556E; }
-@media screen and (max-width: 600px) {
-
- #wpsg_basket_ajax_message .wpsg_basket_ajax_message_content { width:80%; }
- #wpsg_basket_ajax_message .wpsg_button_basket,
- #wpsg_basket_ajax_message .wpsg_button_continue_shopping { width:100%; margin-top:2rem; }
- .wpsg_progress span.step > .text { visibility:hidden; }
+/* Dialog fÃŒr Meldungen wenn nicht auf einer Shop Seite / Warenkorbmeldung BEGIN */
+#wpsg_ajax_layer { position:fixed; z-index:1000; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.75); display:flex; justify-content:center; align-items:center; }
+#wpsg_ajax_layer .wpsg_ajax_message_content { background-color:#FFFFFF; padding:1.5rem; text-align:center; }
+#wpsg_ajax_layer .wpsg_ajax_message_content li { list-style:none; }
+
+@media screen and (max-width: 320px) {
+
+ #wpsg_ajax_layer .wpsg_ajax_message_content { width:300px; }
}
-
-@media screen and (max-width: 400px) {
-
- .wpsg .wpsg_button { padding-left:10px; padding-right:10px; }
-
- .wpsg_basket .wpsg_cell_gutschein label { width:100%; display:block; }
- .wpsg_basket #wpsg_gutschein_input { float:left; }
-
-}
-
+/* Dialog fÃŒr Meldungen wenn nicht auf einer Shop Seite / Warenkorbmeldung ENDE */
+
Index: /views/js/frontend.js
===================================================================
--- /views/js/frontend.js (revision 6310)
+++ /views/js/frontend.js (revision 6314)
@@ -39,4 +39,26 @@
}
+
+ /**
+ * Sperrt die Funktionen im Produkttemplate, wÀhrend einer Ajax Aktion
+ * @param template_index
+ */
+ function wpsg_blockProductTemplate(template_index)
+ {
+
+ jQuery('#wpsg_produktform_' + template_index).append('
');
+
+ } // function wpsg_blockProductTemplate(template_index)
+
+ /**
+ * Entsperrt die Funktionen im Produkttemplate nach einer Ajax Aktion
+ * @param template_index
+ */
+ function wpsg_unblockProductTemplate(template_index)
+ {
+
+ jQuery('#wpsg_produktform_' + template_index + ' .wpsg_product_layer').remove();
+
+ } // function wpsg_unblockProductTemplate(template_index)
wpsg_numberformat = function (number, decimals, dec_point, thousands_sep)
Index: /views/mods/mod_productvariants/frontend.js
===================================================================
--- /views/mods/mod_productvariants/frontend.js (revision 6310)
+++ /views/mods/mod_productvariants/frontend.js (revision 6314)
@@ -1,53 +1,10 @@
-
- var wpsg_vp_vari = new Array();
-
- function wpsg_vp_switch(product_id, product_index, elem)
- {
- /*
- var var_key = 'pv_' + product_id + "|";
- //alert('LÀnge: ' + wpsg_vp_vari[product_id].length);
-
- for (var i = 0; i < wpsg_vp_vari[product_id].length; i ++)
- {
-
- vkey1 = i + ":";
- vkey2 = '';
-
- if (wpsg_vp_vari[product_id][i] == "select")
- {
- vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + " #wpsg_vpfield_" + product_id + "_" + i).val();
- }
- else if (wpsg_vp_vari[product_id][i] == "radio")
- {
- vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' input[name="wpsg_vp[' + i + ']"]:checked').val();
- }
- else if (wpsg_vp_vari[product_id][i] == "checkbox")
- {
- vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' input[name="wpsg_vp[' + i + ']"]:checked').length;
- }
- else if (wpsg_vp_vari[product_id][i] == "image")
- {
- vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' .wpsg_mod_productvariants_imageselect_' + i + ' .akt').attr("data-wpsg-id");
- }
-
- if (vkey2 != '') {
- if (wpsg_vp_vari[product_id][i] == "image")
- jQuery('#wpsg_vp_' + i).val(vkey2);
- var_key += vkey1 + vkey2;
- if (i < (wpsg_vp_vari[product_id].length - 1)) var_key += "|";
- }
- }
- */
- //console.log(jQuery('#wpsg_produktform_' + product_index).serialize());
- //console.log(var_key);
- //return;
-
- v1 = jQuery(elem).attr("data-wpsg-id");
- //v2 = jQuery(elem).parent().find('input').val();
- jQuery(elem).parent().find('input').val(v1);
- //alert('v1=' + v1 + ' v2=' + v2);
-
- jQuery('#wpsg_produktform_' + product_index).append('
');
+ function wpsg_mod_productvariants_reload(event)
+ {
+
+ var template_index = jQuery(event.target).closest('.wpsg_mod_productvariants_product_wrap').attr('wpsg-productindex');
+
+ wpsg_blockProductTemplate(template_index);
+
jQuery.ajax( {
'url': wpsg_ajax.ajaxurl,
@@ -55,40 +12,11 @@
'data': {
'action': 'wpsg_productvariants_switch',
- 'wpsg_post_id': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg_post_id"]').val(),
- 'quantity': jQuery('#wpsg_menge_' + product_index).val(),
- 'template': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg[template]"]').val(),
- 'referer': jQuery('#wpsg_produktform_' + product_index + ' input[name="myReferer"]').val(),
- 'form_data': jQuery('#wpsg_produktform_' + product_index).serialize(),
- // 'product_key': var_key,
- 'product_index': product_index
+ 'wpsg_post_id': jQuery('#wpsg_produktform_' + template_index + ' input[name="wpsg_post_id"]').val(),
+ 'form_data': jQuery('#wpsg_produktform_' + template_index).serialize(),
+ 'product_index': template_index
},
'success': function(data) {
- jQuery('#wpsg_produktform_' + product_index).replaceWith(data);
-
- }
- } );
-
- } // function wpsg_vp_switch(produkt_id)
-
- function wpsg_mod_productvariants_reload(event)
- {
-
- var product_index = jQuery(event.target).parents('.wpsg_mod_productvariants_product_wrap').attr('wpsg-productindex');
-
- //jQuery('#wpsg_produktform_' + product_index).append('
');
-
- jQuery.ajax( {
- 'url': wpsg_ajax.ajaxurl,
- 'method': 'get',
- 'data': {
- 'action': 'wpsg_productvariants_switch',
- 'wpsg_post_id': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg_post_id"]').val(),
- 'form_data': jQuery('#wpsg_produktform_' + product_index).serialize(),
- 'product_index': product_index
- },
- 'success': function(data) {
-
- jQuery('#wpsg_produktform_' + product_index).replaceWith(data);
+ jQuery('#wpsg_produktform_' + template_index).replaceWith(data);
}
Index: /views/mods/mod_produktbilder/settings_edit.phtml
===================================================================
--- /views/mods/mod_produktbilder/settings_edit.phtml (revision 6310)
+++ /views/mods/mod_produktbilder/settings_edit.phtml (revision 6314)
@@ -6,8 +6,2 @@
?>
-get_option('wpsg_mod_produktbilder_width'), array('help' => 'wpsg_mod_produktbilder_width')); ?>
-get_option('wpsg_mod_produktbilder_height'), array('help' => 'wpsg_mod_produktbilder_height')); ?>
-callMod('wpsg_mod_produktbilder', 'getImageModes'), $this->get_option('wpsg_mod_produktbilder_mode'), array('help' => 'wpsg_mod_produktbilder')); ?>
-get_option('wpsg_mod_produktbilder_quality'), array('help' => 'wpsg_mod_produktbilder_quality','hint' => __('0 = Schlechte QualitÀt, 100 = Gute QualitÀt', 'wpsg'))); ?>
-
-
Index: ews/produkttemplates/bildertest.phtml
===================================================================
--- /views/produkttemplates/bildertest.phtml (revision 6310)
+++ (revision )
@@ -1,42 +1,0 @@
-callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id']));
-
-?>
-
-
-
-
-
-
-
-
-
:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: ews/produkttemplates/produktseite.phtml
===================================================================
--- /views/produkttemplates/produktseite.phtml (revision 6310)
+++ (revision )
@@ -1,135 +1,0 @@
-view['data']);
-
- // Damit keine Zubehörprodukte ausgegeben werden
- //$this->noReleatedProducts = true;
-
-?>
-
-
-
-
-
-
view['data']['name']); ?>
-
-
- hasMod('wpsg_mod_produktbilder')) { ?>
-
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>
-
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
- getTemplateIndex(); ?>" src="callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="" />*/?>
-
-
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
-
-
-
-
-
-
-
-
-
- get_option('wpsg_showArticelnumber') == '1') { ?>
-
- : view['data']['anr']); ?>
-
-
-
-
-
-
-
view['data']['preis']); ?> get_option('wpsg_currency'); ?>view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_fuellmenge')) { ?>
-
-
- view['data']['id'].'">'.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'],
- ''.wpsg_ff($this->view['data']['fmenge_preis']).' '. $this->get_option('wpsg_currency'),
- wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
- ); ?>
-
-
-
-
-
-
- hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>
-
-
- callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?>
-
-
-
-
-
-
- hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
-
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?>
-
-
-
-
-
-
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?>
-
-
-
-
-
-
-
-
- callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
-
-
-
-
-
-
- view['data']['beschreibung'])) > 0) { ?>
-
-
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml (revision 6310)
+++ /views/produkttemplates/standard.phtml (revision 6314)
@@ -14,308 +14,172 @@
if (!wpsg_isSizedArray($arImages)) $arImages = array();
-?>
-
-
-
-
-
-
-
-
- titleDisplayed) { ?>
-
getProductName($this->view['data']['id']); ?>
-
-
- callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
-
- 0) { ?>
-
-
-
-
-
- callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
+?>
+
+
+
+
+
+
+
+
+ titleDisplayed) { ?>
+
getProductName($this->view['data']['id']); ?>
+
+
+ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+
+ callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1) { for ($i = 1; $i < sizeof($arImages); $i ++) { ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ get_option('wpsg_showArticelnumber') == '1') { ?>
+
+ : view['data']['anr']); ?> view['data']['ean']); ?> view['data']['gtin']); ?>
+
+
+
+ view['oProduct']->canDisplayPrice()) { ?>
+
+
+
+ view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?>
+ get_option('wpsg_currency')); ?>
+
+ view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?>
+
+
+
+
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
+
+
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
+
+
+
+
+
+
+
+
+
+ getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?>
+
+
+
+
+
+ view['data']['shortdesc']; ?>
+
+
+
+
+
+ hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?>
+
+ view['data']['stock']); ?>
+
+
+
+
+
+ hasMod('wpsg_mod_fuellmenge')) { ?>
+
+
+ '.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ',
+ wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
+ ); ?>
+
-
-
-
-
-
-
-
-
-
- get_option('wpsg_showArticelnumber') == '1') { ?>
-
- : view['data']['anr']); ?> view['data']['ean']); ?> view['data']['gtin']); ?>
-
-
-
- callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
-
-
-
-
-
- view['data']['preis'], $this->get_option('wpsg_currency')); ?>
- view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
-
- hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
-
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?>
-
-
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
- getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?>
-
-
-
-
-
-
-
view['data']['shortdesc']; ?>
-
-
-
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?>
-
-
-
-
-
-
-
-
-
-
+
+ hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
+
+
+
+
+
+
+ hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>
+
+
+ callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) { ?>
+
+
get_option('wpsg_mod_deliverytime_storetext')); ?>
+
+ get_option('wpsg_page_mod_deliverytime_storelink'))) { ?>
+
+
+
+
+
+
+
+
+ callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?>
+
+
+
+
+
+
+
+
+
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
-
-
+
+
+
+ callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+
+
Index: ews/produkttemplates/standard2.phtml
===================================================================
--- /views/produkttemplates/standard2.phtml (revision 6310)
+++ (revision )
@@ -1,210 +1,0 @@
-view['data']['stock']);
-
- // Damit keine Zubehörprodukte ausgegeben werden
- //$this->noReleatedProducts = true;
-
-?>
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_produktbilder')) { ?>
-
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id']));
-
- ?>
- 0) { ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
view['data']['name']); ?>
-
- get_option('wpsg_showArticelnumber') == '1') { ?>
-
- : view['data']['anr']); ?>
-
-
-
-
-
- view['data']['preis']); ?> get_option('wpsg_currency'); ?>
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_fuellmenge')) { ?>
-
-
- view['data']['fmenge'], $this->view['data']['feinheit'], true),
- wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')),
- wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
- ); ?>
-
-
-
-
-
- hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
-
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?>
-
-
-
-
-
-
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?>
-
-
-
-
-
- :
-
-
-
-
-
-
-
-
- callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
-
-
-
-
- view['data']['beschreibung'])) > 0) { ?>
-
-
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
Index: ews/produkttemplates/standard_1544.phtml
===================================================================
--- /views/produkttemplates/standard_1544.phtml (revision 6310)
+++ (revision )
@@ -1,435 +1,0 @@
-view['data']['stock']);
-
- // Damit keine Zubehörprodukte ausgegeben werden
- //$this->noReleatedProducts = true;
-
-?>
-
-
-
-
-
-
view['data']['name']); ?>
-
-
- hasMod('wpsg_mod_produktbilder')) { ?>
-
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>
-
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
- getTemplateIndex(); ?>" src="callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="" />*/?>
-
-
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
-
-
-
-
-
-
-
-
-
- get_option('wpsg_showArticelnumber') == '1') { ?>
-
- : view['data']['anr']); ?>
-
-
-
-
-
-
-
view['data']['preis']); ?> get_option('wpsg_currency'); ?>view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_fuellmenge')) { ?>
-
-
- view['data']['id'].'">'.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'],
- ''.wpsg_ff($this->view['data']['fmenge_preis']).' '. $this->get_option('wpsg_currency'),
- wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
- ); ?>
-
-
-
-
-
-
- hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>
-
-
- callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?>
-
-
-
-
-
-
- hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
-
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?>
-
-
-
-
-
-
callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id']));
-
- $arVarianten = @unserialize($this->view['data']['mod_varianten']);
-
- ?>
-
-
- view['data']['vp_data']) && sizeof($this->view['data']['vp_data']) > 0) { ?>
- view['data']['vp_data'] as $k => $var) { if ($var['aktiv'] == "1") { $vAktiv = true; ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $vari) { if ($vari['aktiv'] == "1" && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?>
-
-
- callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
- (get_option('wpsg_currency')); ?>)
-
-
-
-
- get_option("wpsg_vp_showpic") == "1") { ?>
-
- $vari) { if ($vari['aktiv'] == "1" && isset($vari['showpic'])) { ?>
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $vari['showpic'], $this->get_option("wpsg_vp_showpic_width"), $this->get_option("wpsg_vp_showpic_height"), 's')); ?>
-
-
-
-
-
-
-
-
- $vari) { if ($vari['aktiv'] == "1" && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { $j ++; ?>
-
-
- $vari) { if ($vari['aktiv'] == "1" && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { $j ++; ?>
- $kv, 'j' => $j, 'name' => $variCode[1], 'vari' => $vari);
-
- }
- else
- {
-
- $arVariGroup[0][] = array('kv' => $kv, 'j' => $j, 'name' => $variCode[0], 'vari' => $vari);
-
- }
-
- ?>
-
-
- $vg) { ?>
-
-
-
-
-
-
-
-
-
- (get_option('wpsg_currency')); ?>)
-
- get_option("wpsg_vp_showpic") == "1" && $vari['showpic'] != false) { ?>
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $vari['showpic'], $this->get_option("wpsg_vp_showpic_width"), $this->get_option("wpsg_vp_showpic_height"), 's')); ?>
-
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_stock') || $var['stock'] > 0)) { ?>
-
-
- (get_option('wpsg_currency')); ?>)
-
- get_option("wpsg_vp_showpic") == "1" && $var['showpic'] != false) { ?>
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $var['showpic'], $this->get_option("wpsg_vp_showpic_width"), $this->get_option("wpsg_vp_showpic_height"), 's')); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- :
-
-
-
-
-
-
-
-
- callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
-
-
-
-
-
-
- view['data']['beschreibung'])) > 0) { ?>
-
-
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
Index: ews/produkttemplates/standard_ajax.phtml
===================================================================
--- /views/produkttemplates/standard_ajax.phtml (revision 6310)
+++ (revision )
@@ -1,196 +1,0 @@
-view['data']);
-
- // Damit keine Zubehörprodukte ausgegeben werden
- //$this->noReleatedProducts = true;
-
- //wpsg_debug($_SESSION);
-
-?>
-
-
-
-
-
-
getProductName($this->view['data']['id']); ?>
-
-
- hasMod('wpsg_mod_produktbilder')) { ?>
-
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>
- view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?>
-
-
-
-
-
-
-
-
-
-
-
- get_option('wpsg_showArticelnumber') == '1') { ?>
-
- : view['data']['anr']); ?>
-
-
-
-
-
-
-
- view['data']['preis'], $this->get_option('wpsg_currency')); ?>
- view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
- hasMod('wpsg_mod_discount') && $this->view['data']['preis_prediscount'] > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
-
-
-
-
- view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?>
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_fuellmenge')) { ?>
-
-
- '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'],
- ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ',
- wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
- ); ?>
-
-
-
-
-
-
- hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>
-
-
- callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?>
-
-
-
-
-
-
- hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
-
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?>
-
-
-
-
-
-
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?>
-
-
-
-
-
- :
-
-
-
- view['oProduct']->canOrder()) { ?>
-
-
-
- hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?>
-
-
-
-
-
-
- callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
-
-
-
-
-
-
- view['data']['beschreibung'])) > 0) { ?>
-
-
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
Index: ews/produkttemplates/standard_alt.phtml
===================================================================
--- /views/produkttemplates/standard_alt.phtml (revision 6310)
+++ (revision )
@@ -1,327 +1,0 @@
-view['data']);
-
- // Damit keine Zubehörprodukte ausgegeben werden
- //$this->noReleatedProducts = true;
-
- //wpsg_debug($_SESSION);
-
-if (!function_exists('is_plugin_active'))
- require_once(ABSPATH.'/wp-admin/includes/plugin.php');
-?>
-
-
-
-
-
-
- callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
-
-
-
-
-
-
-
getProductName($this->view['data']['id']); ?>
- callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
- get_option('wpsg_showArticelnumber') == '1') { ?>
-
- : view['data']['anr']); ?> view['data']['ean']); ?> view['data']['gtin']); ?>
-
-
-
- callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
-
-
-
-
-
- view['data']['preis'], $this->get_option('wpsg_currency')); ?>
- view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
-
- hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
-
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?>
-
-
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
- getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?>
-
-
-
-
-
-
-
view['data']['shortdesc']; ?>
-
-
-
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
-
-
Index: ews/produkttemplates/standard_login.phtml
===================================================================
--- /views/produkttemplates/standard_login.phtml (revision 6310)
+++ (revision )
@@ -1,177 +1,0 @@
-view['data']['stock']);
-
- // Damit keine Zubehörprodukte ausgegeben werden
- //$this->noReleatedProducts = true;
-
-?>
-
-
-
-
- hasMod('wpsg_mod_produktbilder')) { ?>
-
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>
-
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
- getTemplateIndex(); ?>" src="callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="" />*/?>
-
-
-
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?>
-
-
-
-
-
-
-
-
-
-
-
-
view['data']['name']); ?>
-
-
- : view['data']['anr']); ?>
-
-
-
- callMod('wpsg_mod_kundenverwaltung', 'getUserStatus', array($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn'))) == true) { ?>
-
-
-
-
- view['data']['preis']); ?> get_option('wpsg_currency'); ?>
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_fuellmenge')) { ?>
-
-
- view['data']['fmenge'], $this->view['data']['feinheit'], true),
- wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')),
- wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
- ); ?>
-
-
-
-
-
- hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
-
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?>
-
-
-
-
-
-
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?>
-
-
-
-
- callMod('wpsg_mod_kundenverwaltung', 'getUserStatus', array($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn'))) == true) { ?>
-
-
-
-
- :
-
-
-
-
-
-
-
-
-
-
-
-
- callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
-
-
-
-
- view['data']['beschreibung'])) > 0) { ?>
-
-
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
Index: ews/produkttemplates/standard_mt.phtml
===================================================================
--- /views/produkttemplates/standard_mt.phtml (revision 6310)
+++ (revision )
@@ -1,341 +1,0 @@
-view['data']);
-
- // Damit keine Zubehörprodukte ausgegeben werden
- //$this->noReleatedProducts = true;
-
- //wpsg_debug($_SESSION);
-
-if (!function_exists('is_plugin_active'))
- require_once(ABSPATH.'/wp-admin/includes/plugin.php');
-?>
-
-
-
-
-
-
- callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
-
-
-
-
-
-
-
getProductName($this->view['data']['id']); ?>
- callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
- get_option('wpsg_showArticelnumber') == '1') { ?>
-
- : view['data']['anr']); ?> view['data']['ean']); ?> view['data']['gtin']); ?>
-
-
-
- callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
-
-
-
-
-
- view['data']['preis'], $this->get_option('wpsg_currency')); ?>
- view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?>
-
- hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
-
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?>
-
-
-
-
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>
-
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', '
Endpreis '); ?>
-
-
-
-
-
-
-
-
-
- getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?>
-
-
-
-
-
-
-
view['data']['shortdesc']; ?>
-
-
-
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
-
-
-
Index: /views/warenkorb/ajaxDialog.phtml
===================================================================
--- /views/warenkorb/ajaxDialog.phtml (revision 6310)
+++ /views/warenkorb/ajaxDialog.phtml (revision 6314)
@@ -5,5 +5,4 @@
*/
- // $this->view['error'] // Steht auf true wenn ein Fehler produziert und angezeigt werden soll
// $this->view['product_key'] // Der ProduktSchlÃŒssel des hinzugefÃŒgten Produktes
// $this->view['amount_add'] // So oft wurde das Produkt hinzugefÃŒgt
@@ -12,143 +11,91 @@
// $this->view['product_index'] // Index des Produktes im Warenkorb
-?>
-
-
-
- view['error'] === true) { ?>
+ $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['product_data']['product_id']));
+ if (!wpsg_isSizedArray($arImages)) $arImages = array();
-
+ $arBasket = $this->basket->toArray();
- writeFrontendMessage(); ?>
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_produktbilder')) { ?>
- callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($this->view['product_data']['id']))); ?>
-
-
-
-
-
-
-
-
-
- view['error'] === true) { echo $this->writeFrontendMessage(); } else { ?>
-
-
- view['amount_add'],
- $this->getProductName($this->view['product_data']['id'], true)); ?>
-
-
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+ view['product_data']['preis'], $this->get_option('wpsg_currency'))
+ ); ?>
+
+
+
+
+
+ hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog') === '1') { ?>
+
+ '.wpsg_ff($this->view['product_data']['fmenge']).'', $this->view['product_data']['feinheit']); ?>
+
+
+
+
+
+
+ hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showAjaxDialog') === '1') { ?>
+
+ '.wpsg_ff($this->view['product_data']['weight']).'', $this->view['product_data']['weight_unit']); ?>
+
+
+
+
+
+
+
+
+
+
+ hasMod('wpsg_mod_relatedproducts') && $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog') === '1') { ?>
+ callMod('wpsg_mod_relatedproducts', 'getRelatedProducts', array($this->getProduktID($this->view['product_key']))); ?>
+
+
+
+
+
-
- hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog') === '1') { ?>
-
- '.wpsg_ff($this->view['product_data']['fmenge']).'', $this->view['product_data']['feinheit']); ?>
-
-
-
-
-
-
- hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showAjaxDialog') === '1') { ?>
-
- '.wpsg_ff($this->view['product_data']['weight']).'', $this->view['product_data']['weight_unit']); ?>
-
-
-
-
-
-
-
-
-
-
- hasMod('wpsg_mod_relatedproducts') && $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog') === '1') { ?>
- callMod('wpsg_mod_relatedproducts', 'getRelatedProducts', array($this->getProduktID($this->view['product_key']))); ?>
-
-
-
-
-
-
-
-
-
-
-
-
- clearFrontendMessage(); ?>
-
-
+
+
-
-
-
+
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml (revision 6310)
+++ /views/warenkorb/basket.phtml (revision 6314)
@@ -35,4 +35,54 @@
+
+
+
+ view['basket']['produkte'] as $k => $product_data) { ?>
+
+
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_data['product_id'])); if (!wpsg_isSizedArray($arImages)) $arImages = array(); ?>
+
+
+
+
+
+
+
+
+
+
+
+ getProduktLink($product_data)) { ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ get_option('wpsg_currency')); ?>
+
+
+ get_option('wpsg_currency')); ?>
+
+
+
+
+
+
+
+
+
Index: /views/warenkorb/messageDialog.phtml
===================================================================
--- /views/warenkorb/messageDialog.phtml (revision 6310)
+++ /views/warenkorb/messageDialog.phtml (revision 6314)
@@ -8,26 +8,26 @@
?>
-
-
-
- writeFrontendMessage(); $this->clearFrontendMessage(); ?>
-
-
-
+
+
+ writeFrontendMessage(); $this->clearFrontendMessage(); ?>
+ view['content']); ?>
+
+
+
+
+ /* ]]> */
+
+
+
+ 
+
+ callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?>
+
+ 
+
+