Index: /controller/wpsg_OrderController.class.php =================================================================== --- /controller/wpsg_OrderController.class.php (revision 5750) +++ /controller/wpsg_OrderController.class.php (revision 5751) @@ -586,6 +586,19 @@ $this->shop->callMods('product_index_tab', array(&$this->shop->view['tabs'])); - if (wpsg_isSizedArray($_REQUEST['filter'])) $this->shop->view['arFilter'] = $_REQUEST['filter']; - else if (wpsg_isSizedArray($_SESSION['wpsg']['backend']['order']['arFilter'])) $this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['order']['arFilter']; + if (wpsg_isSizedArray($_REQUEST['filter'])) + { + + $this->shop->view['hasFilter'] = true; + $this->shop->view['arFilter'] = $_REQUEST['filter']; + + } + else if (wpsg_isSizedArray($_SESSION['wpsg']['backend']['order']['arFilter'])) + { + + //$this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['order']['arFilter']; + + } + + if (!isset($this->shop->view['arFilter']['status'])) $this->shop->view['arFilter']['status'] = '0'; foreach ($this->shop->arStatus as $status_key => $status_label) @@ -601,9 +614,11 @@ } - $arFilterState = $this->shop->view['arFilter']; + $arFilterState = $this->shop->view['arFilter']; unset($arFilterState['status']); $arFilterState['NOTstatus'] = wpsg_ShopController::STATUS_UNVOLLSTAENDIG; $this->shop->view['arStatus'] = wpsg_array_merge(array('-1' => array('label' => __('Alle', 'wpsg'), 'count' => wpsg_Order::count($arFilterState))), $this->shop->view['arStatus']); + if ($this->shop->view['arFilter']['status'] == '-1') $this->shop->view['arFilter']['NOTstatus'] = wpsg_ShopController::STATUS_UNVOLLSTAENDIG; + $this->shop->view['countAll'] = wpsg_order::count($this->shop->view['arFilter']); @@ -611,5 +626,5 @@ $this->shop->view['pages'] = ceil($this->shop->view['countAll'] / $nPerPage); - if ($this->shop->view['arFilter']['page'] <= 0 || $this->shop->view['arFilter']['page'] > $this->shop->view['pages']) $this->shop->view['arFilter']['page'] = 1; + if (!isset($this->shop->view['arFilter']['page']) || $this->shop->view['arFilter']['page'] <= 0 || $this->shop->view['arFilter']['page'] > $this->shop->view['pages']) $this->shop->view['arFilter']['page'] = 1; $this->shop->view['arFilter']['limit'] = array(($this->shop->view['arFilter']['page'] - 1) * $nPerPage, $nPerPage); Index: /model/wpsg_customer.class.php =================================================================== --- /model/wpsg_customer.class.php (revision 5750) +++ /model/wpsg_customer.class.php (revision 5751) @@ -79,5 +79,5 @@ { - return trim($this->getFirstname().' '.$this->getName(). ' ('.$this->getNr().')'); + return trim($this->getFirstname().' '.$this->getName()); } // public function getLabel() @@ -315,5 +315,5 @@ public static function find($arFilter = array()) { - + list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); @@ -338,5 +338,5 @@ ".$strLimit." "; - + $arCustomerID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); $arReturn = array(); @@ -360,5 +360,4 @@ $strQueryJOIN = ""; $strQueryHAVING = ""; - $strQueryORDER = " K.`id` ASC "; $strQuerySELECT .= ", @@ -388,4 +387,13 @@ } + + if (wpsg_isSizedString($arFilter['order'], 'nr')) { $strQueryORDER = " K.`knr`, K.`vname`, K.`name` "; } + else if (wpsg_isSizedString($arFilter['order'], 'adress')) { $strQueryORDER = " CONCAT(K.`plz`, K.`ort`) "; } + else if (wpsg_isSizedString($arFilter['order'], 'status')) { $strQueryORDER = " order_count "; } + else $strQueryORDER = " K.`id` "; + + // Richtung + if (wpsg_isSizedString($arFilter['ascdesc'], "DESC")) $strQueryORDER .= " DESC "; + else $strQueryORDER .= " ASC "; return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER); Index: /mods/mod_customergroup/wpsg_customergroup.php =================================================================== --- /mods/mod_customergroup/wpsg_customergroup.php (revision 5750) +++ /mods/mod_customergroup/wpsg_customergroup.php (revision 5751) @@ -51,5 +51,40 @@ } // public static function delete($customer_group_id) - + + public function countProducts() + { + + return 1; + + } + + public static function count($arFilter = array()) + { + + list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strQuery = " + SELECT + COUNT(*) + FROM + ( + SELECT + DISTINCT CG.`id` + FROM + `".WPSG_TBL_KG."` AS CG + ".$strQueryJOIN." + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + ) AS innerSelect + "; + + return $GLOBALS['wpsg_db']->fetchOne($strQuery); + + } // public static function count($arFilter = array()) + /** * Gibt einen Array von Kundengruppen zurÌck, die auf den Ìbergebenen Filter passen @@ -58,66 +93,74 @@ public static function find($arFilter = array()) { - - $strQueryWHERE = ""; - $strQueryORDER = ""; - - if (wpsg_isSizedString($arFilter['name'])) - { - - $strQueryWHERE .= " AND KG.`name` LIKE '%".wpsg_q($arFilter['name'])."%' "; - - } - - switch (strtolower($arFilter['order'])) - { - - case 'name': $strQueryORDER .= " KG.`name` "; break; - case 'customercount': $strQueryORDER .= " `customercount` "; break; - case 'calculation': $strQueryORDER .= " `calculation` "; break; - case 'id': - default: - $strQueryORDER .= " KG.`id` "; - - } - - switch (strtolower($arFilter['ascdesc'])) - { - - case 'asc': $strQueryORDER .= " ASC "; break; - case 'desc': - default: - $strQueryORDER .= " DESC "; - - } - + + list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strLimit = ""; + + if (wpsg_isSizedArray($arFilter['limit'])) $strLimit = "LIMIT ".wpsg_q($arFilter['limit'][0]).", ".wpsg_q($arFilter['limit'][1]); + $strQuery = " SELECT - KG.`id`, - (SELECT COUNT(*) FROM `".WPSG_TBL_KU."` AS K WHERE K.`group_id` = KG.`id`) AS `customercount` + CG.`id` + ".$strQuerySELECT." FROM - `".WPSG_TBL_KG."` AS KG + `".WPSG_TBL_KG."` AS CG + ".$strQueryJOIN." WHERE 1 ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." ORDER BY - ".$strQueryORDER." + ".$strQueryORDER." + ".$strLimit." "; - - $arCustomerGroupID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); + + $arCustomerID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); $arReturn = array(); - - foreach ($arCustomerGroupID as $customer_group_id) + + foreach ($arCustomerID as $customer_id) { - - $oCustomerGroup = new wpsg_customergroup(); - $oCustomerGroup->load($customer_group_id); - $arReturn[] = $oCustomerGroup; - + + $arReturn[$customer_id] = self::getInstance($customer_id); + } - + return $arReturn; - + + } // public static function find($arFilter = array()) - + + public static function getQueryParts($arFilter = array()) + { + + $strQuerySELECT = ""; + $strQueryWHERE = ""; + $strQueryJOIN = ""; + $strQueryHAVING = ""; + $strQueryORDER = ""; + + $strQuerySELECT .= " + ,(SELECT COUNT(*) FROM `".WPSG_TBL_KU."` AS K WHERE K.`group_id` = CG.`id`) AS `customercount` + "; + + if (wpsg_isSizedString($arFilter['s'])) $strQueryWHERE .= " AND CG.`name` LIKE '%".wpsg_q($arFilter['s'])."%' "; + + if (wpsg_isSizedString($arFilter['name'])) $strQueryWHERE .= " AND CG.`name` LIKE '%".wpsg_q($arFilter['name'])."%' "; + + if (wpsg_isSizedString($arFilter['order'], 'name')) { $strQueryORDER = " CG.`name` "; } + else if (wpsg_isSizedString($arFilter['order'], 'customercount')) { $strQueryORDER = " `customercount` "; } + else if (wpsg_isSizedString($arFilter['order'], 'calculation')) { $strQueryORDER = " CG.`calculation` "; } + else $strQueryORDER = " CG.`id` "; + + // Richtung + if (wpsg_isSizedString($arFilter['ascdesc'], "DESC")) $strQueryORDER .= " DESC "; + else $strQueryORDER .= " ASC "; + + return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER); + + } + } // class wpsg_customergroup Index: /mods/mod_productgroups/wpsg_productgroup.php =================================================================== --- /mods/mod_productgroups/wpsg_productgroup.php (revision 5751) +++ /mods/mod_productgroups/wpsg_productgroup.php (revision 5751) @@ -0,0 +1,131 @@ +fetchOne($strQuery); + + } // public static function count($arFilter) + + public static function find($arFilter = array()) + { + + list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strLimit = ""; + + if (wpsg_isSizedArray($arFilter['limit'])) $strLimit = "LIMIT ".wpsg_q($arFilter['limit'][0]).", ".wpsg_q($arFilter['limit'][1]); + + $strQuery = " + SELECT + PG .`id` + ".$strQuerySELECT." + FROM + `".WPSG_TBL_PRODUCTS_GROUP."` AS PG + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + ORDER BY + ".$strQueryORDER." + ".$strLimit." + "; + + $arCustomerID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); + $arReturn = array(); + + foreach ($arCustomerID as $customer_id) + { + + $arReturn[$customer_id] = self::getInstance($customer_id); + + } + + return $arReturn; + + } // public function find($arQuery = array()) + + public static function getQueryParts($arFilter = array()) + { + + $strQuerySELECT = ""; + $strQueryWHERE = ""; + $strQueryJOIN = ""; + $strQueryHAVING = ""; + + $strQuerySELECT .= ", + (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count, + (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete + "; + + if (wpsg_isSizedString($arFilter['email'])) + { + + $strQueryWHERE .= " AND K.`email` = '".wpsg_q($arFilter['email'])."' "; + + } + + if (wpsg_isSizedString($arFilter['s'])) + { + + $strQueryWHERE .= " + AND ( + K.`name` LIKE '%".wpsg_q($arFilter['s'])."%' OR + K.`vname` LIKE '%".wpsg_q($arFilter['s'])."%' OR + K.`email` LIKE '%".wpsg_q($arFilter['s'])."%' OR + K.`id` = '".wpsg_q($arFilter['s'])."' OR + K.`knr` LIKE '%".wpsg_q($arFilter['s'])."%' + ) + "; + + } + + if (wpsg_isSizedString($arFilter['order'], 'nr')) { $strQueryORDER = " K.`knr`, K.`vname`, K.`name` "; } + else if (wpsg_isSizedString($arFilter['order'], 'adress')) { $strQueryORDER = " CONCAT(K.`plz`, K.`ort`) "; } + else if (wpsg_isSizedString($arFilter['order'], 'status')) { $strQueryORDER = " order_count "; } + else $strQueryORDER = " K.`id` "; + + // Richtung + if (wpsg_isSizedString($arFilter['ascdesc'], "DESC")) $strQueryORDER .= " DESC "; + else $strQueryORDER .= " ASC "; + + return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER); + + } // public function getQueryParts($arFilter = array()) + + } Index: /mods/wpsg_mod_customergroup.class.php =================================================================== --- /mods/wpsg_mod_customergroup.class.php (revision 5750) +++ /mods/wpsg_mod_customergroup.class.php (revision 5751) @@ -12,5 +12,6 @@ var $hilfeURL = 'http://wpshopgermany.maennchen1.de/?p=13706'; - var $customerGroupPerPage = 25; + var $customerGroupPerPage = 1;// 25; + var $free = false; /** @@ -228,44 +229,44 @@ public function indexAction() { - - $arFilter = array(); - + + $nPerPage = $this->customerGroupPerPage; + if ($nPerPage <= 0) $nPerPage = 10; + + $this->shop->view['hasFilter'] = false; + $this->shop->view['arFilter'] = array( + 'order' => 'cdate', + 'ascdesc' => 'ASC', + 'status' => '0', + 'page' => '1' + ); + + $this->shop->view['arData'] = array(); + $this->shop->view['pages'] = 1; + if (wpsg_isSizedArray($_REQUEST['filter'])) { - - if (wpsg_isSizedString($_REQUEST['filter']['s'])) - { - - $arFilter['name'] = $_REQUEST['filter']['s']; - - } - - $arFilter['order'] = $_REQUEST['filter']['order']; - $arFilter['ascdesc'] = $_REQUEST['filter']['ascdesc']; - - $this->shop->view['filter'] = $_REQUEST['filter']; - - } - else - { - - $arFilter['order'] = 'id'; - $arFilter['ascdesc'] = 'desc'; - - $this->shop->view['filter'] = $arFilter; - - } - - $this->shop->view['data'] = wpsg_customergroup::find($arFilter); - - $this->shop->view['count'] = sizeof($this->shop->view['data']); - if (isset($_REQUEST['seite'])) $this->shop->view['seite'] = $_REQUEST['seite']; else $this->shop->view['seite'] = 1; - $this->shop->view['pages'] = ceil($this->shop->view['count'] / $this->customerGroupPerPage); - if ($this->shop->view['seite'] <= 0 || $this->shop->view['seite'] > $this->shop->view['pages']) $this->shop->view['seite'] = 1; - - $this->shop->view['data'] = array_slice($this->shop->view['data'], ($this->shop->view['seite'] - 1) * $this->customerGroupPerPage, $this->customerGroupPerPage); - + + $this->shop->view['arFilter'] = $_REQUEST['filter']; + $this->shop->view['hasFilter'] = true; + + } + else if (wpsg_isSizedArray($_SESSION['wpsg']['backend']['customergroup']['arFilter'])) $this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['customergroup']['arFilter']; + + $this->shop->view['countAll'] = wpsg_customergroup::count($this->shop->view['arFilter']); + + if (wpsg_isSizedInt($_REQUEST['seite'])) $this->shop->view['arFilter']['page'] = $_REQUEST['seite']; + + $this->shop->view['pages'] = ceil($this->shop->view['countAll'] / $nPerPage); + if ($this->shop->view['arFilter']['page'] <= 0 || $this->shop->view['arFilter']['page'] > $this->shop->view['pages']) $this->shop->view['arFilter']['page'] = 1; + + $this->shop->view['arFilter']['limit'] = array(($this->shop->view['arFilter']['page'] - 1) * $nPerPage, $nPerPage); + + // Filter speichern + $_SESSION['wpsg']['backend']['customergroup']['arFilter'] = $this->shop->view['arFilter']; + + $this->shop->view['arData'] = wpsg_customergroup::find($this->shop->view['arFilter']); + $this->shop->render(WPSG_PATH_VIEW.'mods/mod_customergroup/index.phtml'); - + } // public function indexAction() Index: /mods/wpsg_mod_export.class.php =================================================================== --- /mods/wpsg_mod_export.class.php (revision 5750) +++ /mods/wpsg_mod_export.class.php (revision 5751) @@ -311,5 +311,5 @@ 'tab_title' => __('Export', 'wpsg'), 'tab_icon' => 'glyphicon glyphicon-export', - 'tab_content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_export/product_index_tab.phtml', false) + 'tab_content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_export/order_index_tab.phtml', false) ); Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 5750) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 5751) @@ -1636,6 +1636,17 @@ $this->shop->view['pages'] = 1; - if (wpsg_isSizedArray($_REQUEST['filter'])) $this->shop->view['arFilter'] = $_REQUEST['filter']; - else if (wpsg_isSizedArray($_SESSION['wpsg']['backend']['customer']['arFilter'])) $this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['customer']['arFilter']; + if (wpsg_isSizedArray($_REQUEST['filter'])) + { + + $this->shop->view['arFilter'] = $_REQUEST['filter']; + $this->shop->view['hasFilter'] = true; + + } + else if (wpsg_isSizedArray($_SESSION['wpsg']['backend']['customer']['arFilter'])) + { + + //$this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['customer']['arFilter']; + + } $this->shop->view['countAll'] = wpsg_customer::count($this->shop->view['arFilter']); @@ -1654,157 +1665,4 @@ $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml'); - - /* - $strQueryWHERE = ''; - - if (isset($_REQUEST['s']) && $_REQUEST['s'] != '') - { - - $strQueryWHERE .= " - AND ( - K.`name` LIKE '%".wpsg_q($_REQUEST['s'])."%' OR - K.`vname` LIKE '%".wpsg_q($_REQUEST['s'])."%' OR - K.`email` LIKE '%".wpsg_q($_REQUEST['s'])."%' OR - K.`id` = '".wpsg_q($_REQUEST['s'])."' OR - K.`knr` LIKE '%".wpsg_q($_REQUEST['s'])."%' - ) - "; - - } - - if ($this->shop->hasMod('wpsg_mod_customergroup')) - { - - if (isset($_REQUEST['customergroup']) && $_REQUEST['customergroup'] > 0) - { - - $strQueryWHERE .= " AND `group_id` = '".wpsg_q($_REQUEST['customergroup'])."' "; - - } - else if (isset($_REQUEST['customergroup']) && $_REQUEST['customergroup'] === '0') - { - - $strQueryWHERE .= " AND (`group_id` = 0 OR `group_id` IS NULL) "; - - } - - } - - $nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage'); - if ($nPerPage <= 0) $nPerPage = 10; - - if (isset($_REQUEST['seite'])) $seite = $_REQUEST['seite']; else $seite = 1; - - $this->shop->view['count'] = $this->db->fetchOne(" - SELECT - COUNT(*) - FROM - ( - SELECT - K.`id`, - (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count, - (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete - FROM - `".WPSG_TBL_KU."` AS K - WHERE - 1 - ".$strQueryWHERE." - HAVING - (order_count_incomplete = 0 OR order_count > 0) - ) AS OUTER_TABLE - "); - - $this->shop->view['seite'] = $seite; - $this->shop->view['pages'] = ceil($this->shop->view['count'] / $nPerPage); - if ($this->shop->view['seite'] <= 0 || $this->shop->view['seite'] > $this->shop->view['pages']) $this->shop->view['seite'] = 1; - - if (isset($_REQUEST['filter'])) - $this->shop->view['filter'] = $_REQUEST['filter']; - else - $this->shop->view['filter'] = array(); - - $strQueryORDER = ''; - - if (!isset($this->shop->view['filter']['order'])) - { - - $this->shop->view['filter']['order'] = 'nr'; - - } - - switch ($this->shop->view['filter']['order']) - { - - case 'name': $strQueryORDER .= "`order_name`"; break; - case 'adress': $strQueryORDER = "`order_adress`"; break; - case 'status': $strQueryORDER = "`order_count`"; break; - default: $strQueryORDER = " `order_nr` "; break; - - } - - if (!isset($this->shop->view['filter']['ascdesc'])) - { - - $this->shop->view['filter']['ascdesc'] = 'DESC'; - - } - - if (wpsg_isSizedString($this->shop->get_option('wpsg_order_knr'), '1')) $strQueryORDERNR = " `knr` AS `order_nr` "; - else $strQueryORDERNR = " CAST(`knr` AS UNSIGNED) AS `order_nr` "; - - // Das HAVING ist so "kompliziert" weil ich erreichen wollte das Kunden die gÀnzlich keine Bestellungen haben denoch angezeigt werden - // Kunden die aber nur unvollstÀndige Bestellungen haben aber nicht - $strQuery = " - SELECT - K.*, - L.`kuerzel` AS land_kuerzel, - CONCAT(K.`firma`, ' ', K.`strasse`, ' ', K.`plz`, ' ', K.`ort`) AS `order_adress`, - CONCAT(K.`vname`, ' ', K.`name`) AS `order_name`, - ".$strQueryORDERNR.", - (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count, - (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete, - (SELECT SUM(`price_gesamt`) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` IN (100, 110)) as order_umsatz - FROM - `".WPSG_TBL_KU."` AS K - LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (K.`land` = L.`id`) - WHERE - 1 - ".$strQueryWHERE." - HAVING - (order_count_incomplete = 0 OR order_count > 0) - ORDER BY - ".$strQueryORDER." ".wpsg_q($this->shop->view['filter']['ascdesc']).", K.`id` DESC - LIMIT - ".(($this->shop->view['seite'] - 1) * $nPerPage).", ".$nPerPage." - "; - - $this->shop->view['arData'] = $this->db->fetchAssoc($strQuery); - - // Kundengruppen laden - if ($this->shop->hasMod('wpsg_mod_customergroup')) - { - - $this->shop->view['arCustomergroup'] = $this->db->fetchAssocField(" - SELECT - KG.`id`, CONCAT(KG.`name`, ' (ID:', KG.`id`, ')') AS `name` - FROM - `".WPSG_TBL_KG."` AS KG - ORDER BY - KG.`name` ASC - ", "id", "name"); - - } - - foreach ($this->shop->view['arData'] as $k => $customer_db) - { - - $this->shop->view['arData'][$k]['oCustomer'] = new wpsg_customer(); - $this->shop->view['arData'][$k]['oCustomer']->load($customer_db['id']); - $this->shop->view['arData'][$k]['order_umsatz'] = $this->shop->view['arData'][$k]['oCustomer']->getOrderAmount(array(100, 110)); - - } - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml'); - */ } // private function be_indexAction() Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 5750) +++ /mods/wpsg_mod_productgroups.class.php (revision 5751) @@ -660,16 +660,45 @@ { - $this->shop->view['data'] = $this->db->fetchAssoc(" - SELECT - PG.*, - (SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`pgruppe` = PG.`id` AND P.`deleted` != '1') AS countProdukte - FROM - `".WPSG_TBL_PRODUCTS_GROUP."` AS PG - WHERE - PG.`deleted` != '1' - ORDER BY - PG.`id` ASC - "); - + $nPerPage = 25; + if ($nPerPage <= 0) $nPerPage = 10; + + $this->shop->view['hasFilter'] = false; + $this->shop->view['arFilter'] = array( + 'order' => 'cdate', + 'ascdesc' => 'ASC', + 'status' => '0', + 'page' => '1' + ); + $this->shop->view['arData'] = array(); + $this->shop->view['pages'] = 1; + + if (wpsg_isSizedArray($_REQUEST['filter'])) + { + + $this->shop->view['arFilter'] = $_REQUEST['filter']; + $this->shop->view['hasFilter'] = true; + + } + else if (wpsg_isSizedArray($_SESSION['wpsg']['backend']['customergroup']['arFilter'])) + { + + //$this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['customer']['arFilter']; + + } + + $this->shop->view['countAll'] = wpsg_productgroup::count($this->shop->view['arFilter']); + + if (wpsg_isSizedInt($_REQUEST['seite'])) $this->shop->view['arFilter']['page'] = $_REQUEST['seite']; + + $this->shop->view['pages'] = ceil($this->shop->view['countAll'] / $nPerPage); + if ($this->shop->view['arFilter']['page'] <= 0 || $this->shop->view['arFilter']['page'] > $this->shop->view['pages']) $this->shop->view['arFilter']['page'] = 1; + + $this->shop->view['arFilter']['limit'] = array(($this->shop->view['arFilter']['page'] - 1) * $nPerPage, $nPerPage); + + // Filter speichern + $_SESSION['wpsg']['backend']['customergroup']['arFilter'] = $this->shop->view['arFilter']; + + $this->shop->view['arData'] = wpsg_customergroup::find($this->shop->view['arFilter']); + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/index.phtml'); Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5750) +++ /views/css/admin.css (revision 5751) @@ -8,5 +8,6 @@ #wpsg-bs nav.navbar .active { margin-right:2px; } #wpsg-bs nav.navbar .glyphicon { margin-right:10px; } -#wpsg-bs .wpsg-filter { border-top:1px solid #E0E0E0; padding-top:15px; } +#wpsg-bs .wpsg-filter-tab, +#wpsg-bs .wpsg-filter { border-top:1px solid #E0E0E0; padding:15px; } #wpsg-bs .pagination_wrap { text-align:right; padding-right:20px; } #wpsg-bs .pagination_wrap_bottom { padding-right:0px; } Index: /views/mods/mod_customergroup/addedit.phtml =================================================================== --- /views/mods/mod_customergroup/addedit.phtml (revision 5750) +++ /views/mods/mod_customergroup/addedit.phtml (revision 5751) @@ -6,158 +6,55 @@ ?> -
-

- -

- view['mode'] == 'edit') { ?> - - - - -

-
- +
+ + + +
+ writeBackendMessage(); ?> - -
- - view['mode'] == 'edit') { ?> - - - -
- -
- -
- - callMods('customergroup_edit', array(&$this->view['data'])); ?> - -
- -
- -
- -
- -
-

-
- -

-
- - view['data']->name); ?> - __('Standard', 'wpsg'), - WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg'), - WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg') - ), $this->view['data']->calculation); ?> - -
-
- -
- -

- - -

- -
- -
- -
- + +
+ +
+ + + view['mode'] == 'edit') { ?> + + + + callMods('customergroup_edit', array(&$this->view['data'])); ?> + + view['data']->name); ?> + __('Standard', 'wpsg'), + WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg'), + WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg') + ), @$this->view['data']->calculation); ?> + + + + + + +
+ +
+
- - Index: /views/mods/mod_customergroup/index.phtml =================================================================== --- /views/mods/mod_customergroup/index.phtml (revision 5750) +++ /views/mods/mod_customergroup/index.phtml (revision 5751) @@ -6,212 +6,149 @@ ?> -
- -

- -

- - -

- + +
+ + + + view['pages'] > 1) { ?> + + + +
+ writeBackendMessage(); ?> - -
- - view['data']) > 0) { ?> -

- - - -

- - -
- - view['data']) > 0) { ?> -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
-
- - -
- - - - - - -
- - view['data']) && sizeof($this->view['data']) > 0) { ?> - - - - - - - - - - - view['data'] as $oCustomerGroup) { ?> - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- id); ?> - - name); ?> -
- " href="wp-admin/admin.php?page=wpsg-Customergroup&action=edit&edit_id=id; ?>"> - | - " href="wp-admin/admin.php?page=wpsg-Customer&customergroup=id; ?>"> - | - ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Customergroup&action=del&edit_id=id; ?>&noheader=1"> -
- 		- calculation == WPSG_BRUTTO) { ?> - - calculation == WPSG_NETTO) { ?> - - - - - - customercount); ?> -
- - - - - - - - - - - - - - - - - - - -
- - -
- - view['data']) && sizeof($this->view['data']) > 0) { ?> - -
view['count']); ?> -
- -
- « - ‹ - view['pages']; ?> - › - » -
- -
- - - -
-
- - - -
- - - + view['arData']) && sizeof($this->view['arData']) > 0) { ?> + + + + + + + + + + + view['arData'] as $oCustomerGroup) { ?> + + + + + + + +
+ name); ?> +
+ " href="wp-admin/admin.php?page=wpsg-Customergroup&action=edit&edit_id=id; ?>"> + | + " href="wp-admin/admin.php?page=wpsg-Customer&customergroup=id; ?>"> + | + ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Customergroup&action=del&edit_id=id; ?>&noheader=1"> +
+ 		+ calculation == WPSG_BRUTTO) { ?> + + calculation == WPSG_NETTO) { ?> + + + + + + customercount); ?> +
+ + view['pages'] > 1) { ?> + + + + +

+ + +
+
+ + Index: /views/mods/mod_export/order_index_tab.phtml =================================================================== --- /views/mods/mod_export/order_index_tab.phtml (revision 5751) +++ /views/mods/mod_export/order_index_tab.phtml (revision 5751) @@ -0,0 +1,35 @@ + +
+ +
+
+ + view['wpsg_mod_export']['arProfile'] as $p) { ?> + $p['id'])); ?> + + +
+ +
+
+ + + +
+ + Index: ews/mods/mod_export/product_index_tab.phtml =================================================================== --- /views/mods/mod_export/product_index_tab.phtml (revision 5750) +++ (revision ) @@ -1,37 +1,0 @@ - -
- -
- view['wpsg_mod_export']['arProfile'] as $p) { ?> -
-
-
- -
- -
- - - - - -
- - Index: /views/mods/mod_kundenverwaltung/index.phtml =================================================================== --- /views/mods/mod_kundenverwaltung/index.phtml (revision 5750) +++ /views/mods/mod_kundenverwaltung/index.phtml (revision 5751) @@ -34,10 +34,10 @@
- + - - + + - + view['arFilter']['s'])); ?>
@@ -78,5 +78,5 @@ - + @@ -88,7 +88,9 @@ + + - " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">getLabel(); ?> + " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">GetNr().' '.$c->getLabel()); ?> getEMail()) > 0) { ?> getEMail(); ?> @@ -144,9 +146,9 @@
-view['search']); ?> + Index: /views/order/index.phtml =================================================================== --- /views/order/index.phtml (revision 5750) +++ /views/order/index.phtml (revision 5751) @@ -17,5 +17,5 @@