Index: /controller/wpsg_OrderController.class.php =================================================================== --- /controller/wpsg_OrderController.class.php (revision 6103) +++ /controller/wpsg_OrderController.class.php (revision 6104) @@ -321,5 +321,5 @@ $this->shop->view['data'] = $this->db->fetchRow(" SELECT - K.*, O.*, + K.*, O.*, CA.*, O.`id` AS id, O.`comment` AS `order_comment`, @@ -331,5 +331,6 @@ `".WPSG_TBL_ORDER."` AS O LEFT JOIN `".WPSG_TBL_KU."` AS K ON (O.`k_id` = K.`id`) - LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (K.`land` = L.`id`) + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (O.`adress_id` = CA.`id`) + LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (CA.`land` = L.`id`) WHERE O.`id` = '".wpsg_q($_REQUEST['edit_id'])."' Index: /lib/wpsg_cache.class.php =================================================================== --- /lib/wpsg_cache.class.php (revision 6103) +++ /lib/wpsg_cache.class.php (revision 6104) @@ -205,6 +205,5 @@ $this->_arKunden[$kunde_id] = $this->_db->fetchRow(" SELECT - C.*, - CA.`title`, CA.`name`, CA.`vname`, CA.`firma`, CA.`fax`, CA.`strasse`, CA.`nr`, CA.`plz`, CA.`ort`, CA.`land`, CA.`tel` + C.*, CA.* FROM `".WPSG_TBL_KU."` AS C Index: /model/wpsg_customer.class.php =================================================================== --- /model/wpsg_customer.class.php (revision 6103) +++ /model/wpsg_customer.class.php (revision 6104) @@ -94,6 +94,7 @@ else $title = $this->adress_data['title']; - if ($title == "-1") return ""; - else return $title; + $arAnrede = explode('|', $this->shop->get_option('wpsg_admin_pflicht')['anrede_auswahl']); + if ($title < 0) return ''; + else return $arAnrede[$title]; } // public function getTitle() Index: /model/wpsg_order.class.php =================================================================== --- /model/wpsg_order.class.php (revision 6103) +++ /model/wpsg_order.class.php (revision 6104) @@ -541,6 +541,7 @@ else $title = wpsg_getStr($this->adress_data['title']); - if ($title == "-1") return ""; - else return $title; + $arAnrede = explode('|', $this->shop->get_option('wpsg_admin_pflicht')['anrede_auswahl']); + if ($title < 0) return ''; + else return $arAnrede[$title]; } // public function getTitle() @@ -784,6 +785,8 @@ else $title = $this->getInvoiceTitle(); - if ($title <= 0) return ''; - else return $title; + $arAnrede = explode('|', $this->shop->get_option('wpsg_admin_pflicht')['anrede_auswahl']); + if ($title < 0) return ''; + else return $arAnrede[$title]; + } Index: /mods/mod_statistics/wpsg_statisticabstract.php =================================================================== --- /mods/mod_statistics/wpsg_statisticabstract.php (revision 6103) +++ /mods/mod_statistics/wpsg_statisticabstract.php (revision 6104) @@ -8,5 +8,5 @@ protected $db; - public $sqlWhere = ''; + public $sqlWhere = Array(); protected $observeStatuscodes; Index: /mods/wpsg_mod_autodebit.class.php =================================================================== --- /mods/wpsg_mod_autodebit.class.php (revision 6103) +++ /mods/wpsg_mod_autodebit.class.php (revision 6104) @@ -128,10 +128,11 @@ SELECT O.`id` AS `order_id`, O.`custom_data`, - K.`id` AS `customer_id`, + K.`id` AS `customer_id`, CA.*, L.`kuerzel` AS `land_kuerzel` FROM `".WPSG_TBL_ORDER."` AS O LEFT JOIN `".WPSG_TBL_KU."` AS K ON (K.`id` = O.`k_id`) - LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (K.`land` = L.`id`) + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (O.`adress_id` = CA.`id`) + LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (CA.`land` = L.`id`) WHERE O.`type_payment` = '20' Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 6103) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 6104) @@ -1416,15 +1416,15 @@ SELECT C.*, C.`id` AS kid, - IF (CA.`id` > 0, CA.`title`, C.`title`) AS `title`, - IF (CA.`id` > 0, CA.`name`, C.`name`) AS `name`, - IF (CA.`id` > 0, CA.`vname`, C.`vname`) AS `vname`, - IF (CA.`id` > 0, CA.`firma`, C.`firma`) AS `firma`, - IF (CA.`id` > 0, CA.`fax`, C.`fax`) AS `fax`, - IF (CA.`id` > 0, CA.`strasse`, C.`strasse`) AS `strasse`, - IF (CA.`id` > 0, CA.`nr`, '') AS `nr`, - IF (CA.`id` > 0, CA.`plz`, C.`plz`) AS `plz`, - IF (CA.`id` > 0, CA.`ort`, C.`ort`) AS `ort`, - IF (CA.`id` > 0, CA.`land`, C.`land`) AS `land`, - IF (CA.`id` > 0, CA.`tel`, C.`tel`) AS `tel`, + CA.`title` AS `title`, + CA.`name` AS `name`, + CA.`vname` AS `vname`, + CA.`firma` AS `firma`, + CA.`fax` AS `fax`, + CA.`strasse` AS `strasse`, + CA.`nr` AS `nr`, + CA.`plz` AS `plz`, + CA.`ort` AS `ort`, + CA.`land` AS `land`, + CA.`tel` AS `tel`, CA.`id` FROM @@ -2099,15 +2099,15 @@ SELECT C.`id`, - IF (CA.`id` > 0, CA.`title`, C.`title`) AS `title`, - IF (CA.`id` > 0, CA.`name`, C.`name`) AS `name`, - IF (CA.`id` > 0, CA.`vname`, C.`vname`) AS `vname`, - IF (CA.`id` > 0, CA.`firma`, C.`firma`) AS `firma`, - IF (CA.`id` > 0, CA.`fax`, C.`fax`) AS `fax`, - IF (CA.`id` > 0, CA.`strasse`, C.`strasse`) AS `strasse`, - IF (CA.`id` > 0, CA.`nr`, '') AS `nr`, - IF (CA.`id` > 0, CA.`plz`, C.`plz`) AS `plz`, - IF (CA.`id` > 0, CA.`ort`, C.`ort`) AS `ort`, - IF (CA.`id` > 0, CA.`land`, C.`land`) AS `land`, - IF (CA.`id` > 0, CA.`tel`, C.`tel`) AS `tel`, + CA.`title` AS `title`, + CA.`name` AS `name`, + CA.`vname` AS `vname`, + CA.`firma` AS `firma`, + CA.`fax` AS `fax`, + CA.`strasse` AS `strasse`, + CA.`nr` AS `nr`, + CA.`plz` AS `plz`, + CA.`ort` AS `ort`, + CA.`land` AS `land`, + CA.`tel` AS `tel`, C.`geb`, C.`ustidnr`, C.`email`, C.`id`, C.`wp_user_id` FROM Index: /mods/wpsg_mod_productindex.class.php =================================================================== --- /mods/wpsg_mod_productindex.class.php (revision 6103) +++ /mods/wpsg_mod_productindex.class.php (revision 6104) @@ -58,8 +58,15 @@ } - $this->shop->view['wpsg_mod_productindex']['template'] = $template; + $arTemplates = $this->getTemplates(); + $templatefile = $arTemplates[$template]; + + //$this->shop->view['wpsg_mod_productindex']['template'] = $template; - $content = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productindex/layouts/'.$template, false); + //$content = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productindex/layouts/'.$template, false); + $this->shop->view['wpsg_mod_productindex']['template'] = $templatefile; + + $content = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productindex/layouts/'.$templatefile, false); + return -2; @@ -377,7 +384,7 @@ $this->update_post_meta($post_ID, 'wpsg_mod_productindex_perPage', $_REQUEST['wpsg_mod_productindex_perPage']); $this->update_post_meta($post_ID, 'wpsg_mod_productindex_order', $_REQUEST['wpsg_mod_productindex_order']); - $this->update_post_meta($post_ID, 'wpsg_mod_productindex_groups', array_values((array)$_REQUEST['wpsg_mod_productindex_groups'])); + $this->update_post_meta($post_ID, 'wpsg_mod_productindex_groups', array_values((array)wpsg_getArray($_REQUEST['wpsg_mod_productindex_groups']))); $this->update_post_meta($post_ID, 'wpsg_mod_productindex_productids', $_REQUEST['wpsg_mod_productindex_productids']); - $this->update_post_meta($post_ID, 'wpsg_mod_productindex_categories', array_values((array)$_REQUEST['wpsg_mod_productindex_categories'])); + $this->update_post_meta($post_ID, 'wpsg_mod_productindex_categories', array_values((array)wpsg_getArray($_REQUEST['wpsg_mod_productindex_categories']))); $this->update_post_meta($post_ID, 'wpsg_mod_productindex_hideOrder', $_REQUEST['wpsg_mod_productindex_hideOrder']); $this->update_post_meta($post_ID, 'wpsg_mod_productindex_hideViewSelect', $_REQUEST['wpsg_mod_productindex_hideViewSelect']); Index: /mods/wpsg_mod_produktbilder.class.php =================================================================== --- /mods/wpsg_mod_produktbilder.class.php (revision 6103) +++ /mods/wpsg_mod_produktbilder.class.php (revision 6104) @@ -520,4 +520,32 @@ } // public function getProductImage($product_key) + + /** + * Gibt false oder die URL zu einem Bild des Produktes zurÃŒck + */ + public function getProductImage_MT($product_key, $setW, $setH, $mode, $size = 'thumbnail') + { + + $product_id = $this->shop->getProduktID($product_key); + global $wpdb; + $data = $this->db->fetchAssoc("SELECT * FROM `".$wpdb->prefix."postmeta` WHERE `meta_key`='".wpsg_q('wpsg_produkt_id')."' AND `meta_value`='".wpsg_q($product_id)."' "); + + if (!wpsg_isSizedArray($data)) + { + + $file = $this->shop->getRessourcePath('mods/mod_produktbilder/dummy.jpg'); + + if (!file_exists($file)) return false; + else return $file; + + } + + $p = wp_get_attachment_image_src($data[0]['post_id'], $size); // Array mit Full-Path, Width, Height + + $img_url = $p[0]; + + return $img_url; + + } // public function getProductImage_MT($product_key) /** @@ -558,5 +586,5 @@ * Gibt ein Array mit den Produktbildern zurÃŒck */ - public function getProduktBilder_MT($produkt_id) + public function getProduktBilder_MT($produkt_id, $size = 'thumbnail') { @@ -568,5 +596,5 @@ $i = 0; foreach ($data as $key => $val) { - $p = wp_get_attachment_image_src($val['post_id'], 'full'); // Array mit Full-Path, Width, Height + $p = wp_get_attachment_image_src($val['post_id'], $size); // Array mit Full-Path, Width, Height $guid = $p[0]; $arrf = pathinfo($guid); Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 6103) +++ /mods/wpsg_mod_rechnungen.class.php (revision 6104) @@ -584,15 +584,15 @@ SELECT C.`id`, - IF (CA.`id` > 0, CA.`title`, C.`title`) AS `title`, - IF (CA.`id` > 0, CA.`name`, C.`name`) AS `name`, - IF (CA.`id` > 0, CA.`vname`, C.`vname`) AS `vname`, - IF (CA.`id` > 0, CA.`firma`, C.`firma`) AS `firma`, - IF (CA.`id` > 0, CA.`fax`, C.`fax`) AS `fax`, - IF (CA.`id` > 0, CA.`strasse`, C.`strasse`) AS `strasse`, - IF (CA.`id` > 0, CA.`nr`, '') AS `nr`, - IF (CA.`id` > 0, CA.`plz`, C.`plz`) AS `plz`, - IF (CA.`id` > 0, CA.`ort`, C.`ort`) AS `ort`, - IF (CA.`id` > 0, CA.`land`, C.`land`) AS `land`, - IF (CA.`id` > 0, CA.`tel`, C.`tel`) AS `tel`, + CA.`title` AS `title`, + CA.`name` AS `name`, + CA.`vname` AS `vname`, + CA.`firma` AS `firma`, + CA.`fax` AS `fax`, + CA.`strasse` AS `strasse`, + CA.`nr` AS `nr`, + CA.`plz` AS `plz`, + CA.`ort` AS `ort`, + CA.`land` AS `land`, + CA.`tel` AS `tel`, C.`geb`, C.`ustidnr`, C.`email`, C.`id`, C.`knr`, C.`wp_user_id` FROM Index: /views/mods/mod_productindex/layouts/grid.phtml =================================================================== --- /views/mods/mod_productindex/layouts/grid.phtml (revision 6103) +++ /views/mods/mod_productindex/layouts/grid.phtml (revision 6104) @@ -96,10 +96,15 @@
- hasMod('wpsg_mod_produktbilder')) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($p['id'])); ?> + hasMod('wpsg_mod_produktbilder')) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($p['id'])); ?>
- + - <?php wpsg_hspc($p['name']); ?> + + + @@ -133,5 +138,5 @@ wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $p['feinheit']) ); ?> - +
Index: /views/mods/mod_productindex/layouts/list.phtml =================================================================== --- /views/mods/mod_productindex/layouts/list.phtml (revision 6103) +++ /views/mods/mod_productindex/layouts/list.phtml (revision 6104) @@ -90,10 +90,15 @@ view['arProducts'] as $p) { $i ++; ?>
- hasMod('wpsg_mod_produktbilder')) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($p['id'])); ?> + hasMod('wpsg_mod_produktbilder')) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($p['id'])); ?>
- + - <?php wpsg_hspc($p['name']); ?> + + + @@ -130,5 +135,5 @@ wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $p['feinheit']) ); ?> - +
Index: /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml =================================================================== --- /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml (revision 6103) +++ /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml (revision 6104) @@ -69,5 +69,5 @@ if (wpsg_isSizedString($this->view['wpsg_mod_shippingadress']['shipping_title']) && $this->view['wpsg_mod_shippingadress']['shipping_title'] != '-1') - echo $this->view['wpsg_mod_shippingadress']['shipping_title']; + echo $this->view['arTitles'][$this->view['wpsg_mod_shippingadress']['shipping_title']]; ?> view['wpsg_mod_shippingadress']['shipping_vname']); ?> view['wpsg_mod_shippingadress']['shipping_name']); ?>
Index: /views/mods/mod_stock/settings_edit.phtml =================================================================== --- /views/mods/mod_stock/settings_edit.phtml (revision 6103) +++ /views/mods/mod_stock/settings_edit.phtml (revision 6104) @@ -15,5 +15,5 @@ get_option('wpsg_mod_stock_allow'), array('help' => 'wpsg_mod_stock_allow')); ?> get_option('wpsg_mod_stock_showBackendStock'), array('help' => 'wpsg_mod_stock_showBackendStock')); ?> -hasMod('wpsg_mod_productindex')) { ?> +hasMod('wpsg_mod_productindex')) { ?> get_option('wpsg_mod_stock_showProductindex'), array('help' => 'wpsg_mod_stock_showProductindex')); ?> Index: /views/order/view_customerdata.phtml =================================================================== --- /views/order/view_customerdata.phtml (revision 6103) +++ /views/order/view_customerdata.phtml (revision 6104) @@ -58,5 +58,5 @@ view['data']['firma']); ?>
- view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['data']['title']).' ':''); ?>view['data']['vname']); ?> view['data']['name']); ?>
+ view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['arTitles'][$this->view['data']['title']]).' ':''); ?>view['data']['vname']); ?> view['data']['name']); ?>
view['data']['strasse']); ?>
view['data']['plz']); ?> view['data']['ort']); ?> view['country']['kuerzel']); ?>
Index: /views/produkt/index.phtml =================================================================== --- /views/produkt/index.phtml (revision 6103) +++ /views/produkt/index.phtml (revision 6104) @@ -115,5 +115,5 @@ callMod('wpsg_mod_produktbilder', 'getProductImage', array($d['id'], 40, 40, 'c')); + $img = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($d['id'], 40, 40, 'c')); if ($img !== false) @@ -121,5 +121,5 @@ echo ''; - echo ''; + echo ''; echo ''; Index: /views/produkttemplates/standard_mt.phtml =================================================================== --- /views/produkttemplates/standard_mt.phtml (revision 6103) +++ /views/produkttemplates/standard_mt.phtml (revision 6104) @@ -35,5 +35,5 @@ $pbh = $this->get_option('wpsg_mod_produktbilder_height'); $pbm = $this->get_option('wpsg_mod_produktbilder_mode'); - $pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder2', array($this->view['data']['id'])); + $pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id'])); ?>