Index: /mods/wpsg_mod_abo.class.php =================================================================== --- /mods/wpsg_mod_abo.class.php (revision 6330) +++ /mods/wpsg_mod_abo.class.php (revision 6331) @@ -542,4 +542,20 @@ } // public function overview_row(&$p, $i) + public function overview_row2(&$p, $i) + { + + if (substr($p['id'], 0, 3) == 'abo') + { + + $this->shop->view['wpsg_mod_abo']['order'] = $this->shop->cache->loadOrder($this->getOrderIDFromKey($p['id'])); + $this->shop->view['wpsg_mod_abo']['product'] = $this->shop->cache->loadProduct($this->shop->getProduktID($p['id'])); + $this->shop->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge'] = $p['menge'] * $this->shop->view['wpsg_mod_abo']['product']['wpsg_mod_abo_durration']; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_abo/overview_row2.phtml'); + + } + + } // public function overview_row(&$p, $i) + public function mail_row($index, $produkt) { Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 6330) +++ /mods/wpsg_mod_deliverytime.class.php (revision 6331) @@ -169,4 +169,17 @@ } // public function overview_row(&$p, $i) + public function overview_row2(&$p, $i) + { + + if ($this->shop->get_option('wpsg_mod_deliverytime_show_overview') != '1') return; + + $this->shop->view['wpsg_mod_deliverytime']['i'] = $i; + $this->shop->view['wpsg_mod_deliverytime']['p'] = $p; + $this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->getProductDeliveryTime($this->shop->getProduktID($p['id'])); + + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverytime/overview_row2.phtml'); + + } // public function overview_row(&$p, $i) + public function wpsg_mod_export_loadFields(&$arFields) { Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 6330) +++ /mods/wpsg_mod_productvariants.class.php (revision 6331) @@ -2130,5 +2130,18 @@ } // public function basket_row(&$p) - + + public function overview_row2(&$p, $i) + { + + if (!preg_match('/pv_(.*)/', $p['id'])) return; + + $this->shop->view['variante'] = $this->getVariantenInfoArray($p['id']); + + $this->shop->view['i'] = $i; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/overview_row.phtml'); + + } // public function basket_row(&$p) + /** * Liest die Informationen anhand eines VariantenschlÃŒssels aus Index: /mods/wpsg_mod_productvars.class.php =================================================================== --- /mods/wpsg_mod_productvars.class.php (revision 6330) +++ /mods/wpsg_mod_productvars.class.php (revision 6331) @@ -672,4 +672,44 @@ } // public function overview_row(&$p, $i) + public function overview_row2(&$p, $i) + { + + $produkt_id = $this->shop->basket->getProduktDBID($p['id']); + + if ($produkt_id > 0) + { + + $pVarsSet = explode(",", $this->db->fetchOne("SELECT `produktvars` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_id)."'")); + foreach ($pVarsSet as $k => $v) { if (trim($v) == '') { unset($pVarsSet[$k]); } } + + if (is_array($pVarsSet) && sizeof($pVarsSet) > 0) + { + + $this->shop->view['wpsg_mod_productvars']['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_PRODUCTS_VARS."` WHERE `id` IN (".wpsg_q(implode(',', $pVarsSet)).") ORDER BY `pos` ASC, `id` ASC"); + + if ($this->shop->get_option('wpsg_mod_productvars_showvariprice') !== '1' && wpsg_isSizedArray($this->shop->view['wpsg_mod_productvars']['data'])) + { + + // Es sollen nicht alle angezeigt werden + foreach ($this->shop->view['wpsg_mod_productvars']['data'] as $k => $v) + { + + if ($v['typ'] === '1' && $p['wpsg_mod_productvars'][$v['id']] === 'not_set') { unset($this->shop->view['wpsg_mod_productvars']['data'][$k]); } + else if ($v['typ'] === '2' && !wpsg_isSizedString($p['wpsg_mod_productvars'][$v['id']])) { unset($this->shop->view['wpsg_mod_productvars']['data'][$k]); } + + } + + } + + $this->shop->view['wpsg_mod_productvars']['i'] = $i; + $this->shop->view['wpsg_mod_productvars']['p'] = $p; + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvars/overview_row2.phtml'); + + } + + } + + } // public function overview_row(&$p, $i) + public function replaceUniversalPlatzhalter(&$arReplace, $order_id = false, $kunden_id = false, $rechnung_id = false, $product_id = false, $product_index = false) { Index: /mods/wpsg_mod_produktattribute.class.php =================================================================== --- /mods/wpsg_mod_produktattribute.class.php (revision 6330) +++ /mods/wpsg_mod_produktattribute.class.php (revision 6331) @@ -364,4 +364,25 @@ } // public function overview_row(&$p, $i) + public function overview_row2(&$p, $i) + { + + $this->shop->view['wpsg_mod_produktattribute']['data'] = $this->db->fetchAssocField(" + SELECT + AT.`id` + FROM + `".WPSG_TBL_AT."` AS AT + WHERE + AT.`autoshow` = '1' + ORDER BY + AT.`pos` ASC, AT.`id` ASC + "); + + $this->shop->view['wpsg_mod_produktattribute']['id'] = $this->shop->getProduktID($p['id']); + $this->shop->view['i'] = $i; + + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktattribute/overview_row2.phtml'); + + } // public function overview_row(&$p, $i) + public function mail_row($i, $p) { Index: /mods/wpsg_mod_weight.class.php =================================================================== --- /mods/wpsg_mod_weight.class.php (revision 6330) +++ /mods/wpsg_mod_weight.class.php (revision 6331) @@ -136,4 +136,16 @@ } // public function overview_row(&$p, $i) + public function overview_row2(&$p, $i) + { + + if ($this->shop->get_option('wpsg_mod_weight_showOverviewProduct') != '1') return; + + $this->shop->view['i'] = $i; + $this->shop->view['weight'] = $p['weight']; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_weight/overview_row2.phtml'); + + } // public function overview_row(&$p, $i) + public function overview_row_end(&$overview_view) { @@ -142,4 +154,13 @@ $this->shop->view['wpsg_mod_weight']['weight'] = $overview_view['basket']['sum']['weight']; $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_weight/overview_row_end.phtml'); + + } // public function overview_row_end(&$overview_view) + + public function overview_row_end2(&$overview_view) { + + if ($this->shop->get_option('wpsg_mod_weight_showOverview') != '1') return; + + $this->shop->view['wpsg_mod_weight']['weight'] = $overview_view['basket']['sum']['weight']; + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_weight/overview_row_end2.phtml'); } // public function overview_row_end(&$overview_view) Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 6330) +++ /views/css/frontend.css (revision 6331) @@ -113,5 +113,5 @@ .wpsg_overview .subtitle { font-weight:bold; margin-bottom:0.5rem; } .wpsg_overview .wpsg_orderbutton { float:right; } -.wpsg_overview .wpsg_table_wrap { background-color:#EAEAEA; margin:10px -10px 10px -10px; padding:10px; } +.wpsg_overview .wpsg_table_wrap { background-color:#FFF; margin:10px -10px 10px -10px; padding:10px; } .wpsg_overview .wpsg_table_wrap table { width:100%; } .wpsg_overview .wpsg_table_wrap td, .wpsg_overview .wpsg_table_wrap th { } @@ -129,4 +129,42 @@ .wpsg_overview .wpsg_cell_deliverytime_value { text-align:right; } +.wpsg_overview .wpsg_table_wrap {} +.wpsg_overview .wpsg_table_wrap .overview_product_row { display:flex; align-items:top; border-bottom:1px solid #EAEAEA; padding-bottom:1em; margin-bottom:1em; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_shortdesc { margin-top:0.5em; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .productimage { max-width:150px; padding-right:0.75em; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_content { width:100%; display:flex; flex-direction:column; justify-content:space-between; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_action { display:flex; width:100%; justify-content:space-between; align-items:center; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_action .amount { width:80px; margin-top:0.5em; margin-bottom:0.5em; text-align:center;} +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_action .title { width: 60%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.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%; 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; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .fulll { width: 80%; display:inline-block; font-weight:normal; text-align:left; } +.wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .dummyr { width: 19%; display:inline-block; font-weight:normal; text-align:right; } +.overview_sum_wrap .overview_sum_row { display:flex; width:100%; justify-content:space-between; align-items:center; } +.overview_sum_wrap .overview_sum_row .title { width: 60%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.overview_sum_wrap .overview_sum_row .title2 { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.overview_sum_wrap .overview_sum_row .value { width: 20%; display:inline-block; font-weight:normal; text-align:right; } +.overview_sum_wrap .overview_sum_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; } +.overview_sum_wrap .overview_sum_row .sum { width: 20%; display:inline-block; font-weight:bold; text-align:right; } +.overview_sum_wrap .overview_sum_row .delgs { width: 20%; display:inline-block; font-weight:normal; text-align:right; } +.overview_sum_wrap .overview_sum_row .codegs { width: 34%; display:inline-block; font-weight:normal; text-align:left; } +.overview_sum_wrap .overview_sum_row .codegsl { width: 33%; display:inline-block; font-weight:normal; text-align:left; } +.overview_sum_wrap .overview_sum_row .codegsr { width: 33%; display:inline-block; font-weight:normal; text-align:right; } +.overview_sum_wrap .overview_sum_row .colgsl { width: 20%; display:inline-block; font-weight:normal; text-align:left; } +.overview_sum_wrap .overview_sum_row .colgsr { width: 20%; display:inline-block; font-weight:normal; text-align:right; } +.overview_sum_wrap .overview_sum_row .titlegs { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } + +.wpsg_overview .wpsg_checkoutbutton { float:left; } +.wpsg_overview .wpsg_orderbutton { float:right; } +/* +.wpsg_overview .wpsg_table_wrap .overview_product_row .wpsg_overview_removelink { float:right; text-decoration:none; border:0px !important; } +.wpsg_overview .wpsg_cell_gesamtsumme_value { font-weight:bold; } +.wpsg_overview .wpsg_refreshbutton, .wpsg_basketbutton { float:left; } +*/ /* Bestellvariablen */ .wpsg_checkout .wpsg_mod_ordervars_field { display:inline; } Index: /views/mods/mod_basketteaser/basket_row.phtml =================================================================== --- /views/mods/mod_basketteaser/basket_row.phtml (revision 6330) +++ /views/mods/mod_basketteaser/basket_row.phtml (revision 6331) @@ -23,5 +23,5 @@
- +
Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 6330) +++ /views/warenkorb/basket.phtml (revision 6331) @@ -97,5 +97,5 @@
- +
@@ -144,4 +144,6 @@
+
+ @@ -366,13 +368,4 @@
-
-
- -
-
- -
-
- callMods('basket_inner_prebutton', array(&$this->view)); ?>