Index: /mods/wpsg_mod_fuellmenge.class.php =================================================================== --- /mods/wpsg_mod_fuellmenge.class.php (revision 7154) +++ /mods/wpsg_mod_fuellmenge.class.php (revision 7155) @@ -75,6 +75,118 @@ } + $this->shop->update_option('wpsg_mod_fuellmenge_showBasket', $_REQUEST['wpsg_mod_fuellmenge_showBasket']); + $this->shop->update_option('wpsg_mod_fuellmenge_showBasketProduct', $_REQUEST['wpsg_mod_fuellmenge_showBasketProduct']); + $this->shop->update_option('wpsg_mod_fuellmenge_showOverview', $_REQUEST['wpsg_mod_fuellmenge_showOverview']); + $this->shop->update_option('wpsg_mod_fuellmenge_showOverviewProduct', $_REQUEST['wpsg_mod_fuellmenge_showOverviewProduct']); + $this->shop->update_option('wpsg_mod_fuellmenge_showRequestPage', $_REQUEST['wpsg_mod_fuellmenge_showRequestPage']); + $this->shop->update_option('wpsg_mod:fuellmenge_showRequestPageProduct', $_REQUEST['wpsg_mod_fuellmenge_showRequestPageProduct']); } // public function settings_save() + + public function basket_row(&$p, $i) + { + + if ($this->shop->get_option('wpsg_mod_fuellmenge_showBasketProduct') != '1') return; + + $this->shop->view['fuellmenge'] =$p['fuellmenge']; + + $this->shop->view['fuellmenge'] = $p ['fuellmenge']; + + $this->shop->view['i'] = $i; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/basket_row.phtml'); + + } // public function basket_row(&$p, $i) + + public function basket_row_end(&$basket_view) + { + + if ($this->shop->get_option('wpsg_mod_fuellmenge_showBasket') != '1') return; + + $this->shop->view['wpsg_mod_fuellmenge']['fuellmenge'] = $basket_view['basket']['sum']['fuellmenge']; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/basket_row_end.phtml'); + + } // public function basket_row_end(&$basket) + + public function overview_row(&$p, $i) + { + if ($this->shop->get_option('wpsg_mod_fuellmenge_showOverviewProduct') != '1') return; + + $this->shop->view['i'] = $i; + $this->shop->view['fuellmenge'] = $p['fuellmenge']; + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/overview_row.phtml'); + + } //public function overview_row(&$p, $i) + + public function overview_row_end(&$overview_view) + { + if ($this->shop->get_option('wpsg_mod_fuellmenge_showOverview') != '1' ) return; + + $this->shop->view['wpsg_mod_fuellmenge']['fuellmenge'] = $overview_view['basket']['sum']['fuellmenge']; + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/overview_row_end.phtml'); + + + } //public function overview_row_end(&$overview_view) + + public function basket_toArray(&$produkt, $backend = false, $noMwSt = false) + { + + $produkt['fuellmenge_one'] = $this->getFuellmenge($produkt['id']); + $produkt['fuellmenge'] = $this->getFuellmenge($produkt['id']) * $produkt['menge']; + + } //public function basket_toArray(&$produkt, $backend = false; $noMwSt = false) + + public function basket_toArray_preshippayment(&$basket, &$arBasket) + { + + if ($basket->loadFromSession) + { + + $fuellmenge_sum = 0; + + foreach ($arBasket['produkte'] as $k => $p) + { + + $fuellmenge_sum += $p['fuellmenge']; + + } + + $arBasket['sum']['fuellmenge'] = $fuellmenge_sum; + + } + else if ($basket->o_id > 0) + { + + $order_data = $this->shop->cache->loadOrder($basket->o_id); + + $arBasket['sum']['fuellmenge'] = $order_data['fuellmenge']; + + } + + } // public function basket_toArray_final(&$basket, &$arBasket) + + public function getFuellmenge($product_key) + { + + $product_data_db = $this->shop->cache->loadProduct($this->shop->getProduktId($product_key)); + + if ($this->shop->hasMod('wpsg_mod_productvariants') && $this->shop->callMod('wpsg_mod_productvariants', 'isVariantsProductKey', array($product_key))) + { + + $variInfo = $this->shop->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($product_key)); + $fuellmenge = $product_data_db['fuellmenge'] + $variInfo['fuellmenge']; + + } + else + { + + $fuellmenge = $product_data_db['fuellmenge']; + + } + + return $fuellmenge; + + } // public function getFuellmenge($produkt_key) public function product_addedit_content(&$product_content, &$product_data) @@ -113,6 +225,5 @@ } - - + } Index: /views/mods/mod_fuellmenge/basket_row.phtml =================================================================== --- /views/mods/mod_fuellmenge/basket_row.phtml (revision 7155) +++ /views/mods/mod_fuellmenge/basket_row.phtml (revision 7155) @@ -0,0 +1,33 @@ +view); +?> +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + + view['data']['fmenge']) > '0') { */ ?> + + + + + + '.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']) + ); ?> + + + + + + + + +
+
+
Index: /views/mods/mod_fuellmenge/basket_row_end.phtml =================================================================== --- /views/mods/mod_fuellmenge/basket_row_end.phtml (revision 7155) +++ /views/mods/mod_fuellmenge/basket_row_end.phtml (revision 7155) @@ -0,0 +1,18 @@ + +
+
+ : +
+
+ view['wpsg_mod_fuellmenge']['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?> +
+
+ +
+
Index: /views/mods/mod_fuellmenge/overview_row.phtml =================================================================== --- /views/mods/mod_fuellmenge/overview_row.phtml (revision 7155) +++ /views/mods/mod_fuellmenge/overview_row.phtml (revision 7155) @@ -0,0 +1,16 @@ + +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + + : + view['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?> +
+
+
Index: /views/mods/mod_fuellmenge/overview_row_end.phtml =================================================================== --- /views/mods/mod_fuellmenge/overview_row_end.phtml (revision 7155) +++ /views/mods/mod_fuellmenge/overview_row_end.phtml (revision 7155) @@ -0,0 +1,18 @@ + +
+
+ : +
+
+ view['wpsg_mod_fuellmenge']['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?> +
+
+ +
+
Index: /views/mods/mod_fuellmenge/settings_edit.phtml =================================================================== --- /views/mods/mod_fuellmenge/settings_edit.phtml (revision 7154) +++ /views/mods/mod_fuellmenge/settings_edit.phtml (revision 7155) @@ -9,7 +9,27 @@ get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?> get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?> -get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?> + +
+ hasMod('wpsg_mod_productindex')) { ?> get_option('wpsg_mod_fuellmenge_showProductindex_fmenge'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_fmenge')); ?> get_option('wpsg_mod_fuellmenge_showProductindex_grundpreis'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_grundpreis')); ?> + +
+ +get_option('wpsg_mod_fuellmenge_showBasket'), array('help' => 'wpsg_mod_fuellmenge_showBasket')); ?> +get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?> +get_option('wpsg_mod_fuellmenge_showBasketProduct'), array('help' => 'wpsg_mod_fuellmenge_showBasketProduct')); ?> + +
+ +get_option('wpsg_mod_fuellmenge_showOverview'), array('help' => 'wpsg_mod_fuellmenge_showOverview')); ?> +get_option('wpsg_mod_fuellmenge_showOverviewProduct'), array('help' => 'wpsg_mod_fuellmenge_showOverviewProduct')); ?> + +
+ +hasMod('wpsg_mod_request')) { ?> +get_option('wpsg_mod_fuellmenge_showRequestPage'), array('help' => 'wpsg_mod_fuellmenge_showRequestPage')); ?> +get_option('wpsg_mod_fuellmenge_showRequestPageProduct'), array('help' => 'wpsg_mod_fuellmenge_showRequestPageProduct')); ?> +