Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 5752) +++ /controller/wpsg_ProduktController.class.php (revision 5753) @@ -78,146 +78,48 @@ public function indexAction() { - - $search = array(); - $strQueryWHERE = ""; - - if (isset($_REQUEST['s']) && $_REQUEST['s'] != '') - { - - $strQueryWHERE_OR = ""; - - if ($this->shop->hasMod('wpsg_mod_varianten')) $strQueryWHERE_OR .= " OR `mod_varianten` LIKE '%".wpsg_q($_REQUEST['s'])."%' "; - - $strQueryWHERE .= " - AND ( - P.`name` LIKE '%".wpsg_q($_REQUEST['s'])."%' OR - P.`anr` LIKE '%".wpsg_q($_REQUEST['s'])."%' - ".$strQueryWHERE_OR." - ) - "; - - $search['s'] = $_REQUEST['s']; - - } - - if (isset($_REQUEST['search']['pgruppe']) && $_REQUEST['search']['pgruppe'] > 0) - { - - $strQueryWHERE .= " AND P.`pgruppe` = '".wpsg_q($_REQUEST['search']['pgruppe'])."' "; - $search['pgruppe'] = $_REQUEST['search']['pgruppe']; - - } - - if (wpsg_isSizedString($strQueryWHERE)) $this->shop->view['hasFilter'] = true; - else $this->shop->view['hasFilter'] = false; - - $strQueryORDER = ''; - - if (!isset($_REQUEST['search']['order'])) - { - - $search['order'] = 'name'; - - } - else - { - - $search['order'] = $_REQUEST['search']['order']; - - } - - switch ($search['order']) - { - - case 'mwst': $strQueryORDER = "P.`mwst_key`"; break; - case 'anr': $strQueryORDER = "P.`anr`"; break; - case 'stock': $strQueryORDER = "P.`stock`"; break; - case 'pgruppe': $strQueryORDER = "`pgruppe_name`"; break; - case 'price': - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO) $strQueryORDER = "P.`preis_netto`"; - else $strQueryORDER = "P.`preis`"; - - break; - - case 'id': $strQueryORDER = "P.`id`"; break; - - default: $strQueryORDER = "P.`name`"; break; - - } - - if (!isset($_REQUEST['search']['ascdesc'])) - { - - $search['ascdesc'] = 'asc'; - - } - else - { - - $search['ascdesc'] = $_REQUEST['search']['ascdesc']; - - } - - $this->shop->view['search'] = $search; - - $GLOBALS['wpsg_produkt_index_query_where'] = $strQueryWHERE; - - $nPerPage = $this->get_option('wpsg_produkte_perpage'); + + $nPerPage = $this->shop->get_option('wpsg_produkte_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 - `".WPSG_TBL_PRODUCTS."` AS P - WHERE - `deleted` != '1' AND - `lang_parent` = 0 - ".$strQueryWHERE." - "); - - $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; - - $strQuerySELECT = ""; - - if ($this->shop->hasMod('wpsg_mod_productgroups')) - { - - $strQuerySELECT .= ", (SELECT PG.`name` FROM `".WPSG_TBL_PRODUCTS_GROUP."` AS PG WHERE PG.`id` = P.`pgruppe`) AS `pgruppe_name` "; - - } - - $this->shop->view['data'] = $this->db->fetchAssoc(" - SELECT - P.* - ".$strQuerySELECT." - FROM - `".WPSG_TBL_PRODUCTS."` AS P - WHERE - `deleted` != '1' AND - `lang_parent` = 0 - ".$strQueryWHERE." - ORDER BY - ".wpsg_q($strQueryORDER)." ".wpsg_q($search['ascdesc'])." - LIMIT - ".(($this->shop->view['seite'] - 1) * $nPerPage).", ".$nPerPage." - "); - - $default_country = $this->shop->getDefaultCountry(); - - foreach ($this->shop->view['data'] as &$d) - { - - $d['mwst_value'] = $default_country->getTax($d['mwst_key']); - - } - + + $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']['products']['arFilter'])) + { + + //$this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['customer']['arFilter']; + + } + + $this->shop->view['countAll'] = wpsg_product::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']['products']['arFilter'] = $this->shop->view['arFilter']; + + $this->shop->view['arData'] = wpsg_product::find($this->shop->view['arFilter']); + $this->shop->render(WPSG_PATH_VIEW.'/produkt/index.phtml'); - + } // public function indexAction() Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5752) +++ /controller/wpsg_ShopController.class.php (revision 5753) @@ -654,5 +654,5 @@ wp_enqueue_script('common'); - + wp_enqueue_script('wpsg_adminjs', $this->getRessourceURL('js/admin.js')); wp_enqueue_script('wpsg_cookiejs', $this->getRessourceURL('js/jquery.cookie.js')); @@ -662,8 +662,8 @@ wp_enqueue_script('utils'); wp_enqueue_script('jquery-color'); - + wp_enqueue_script('jquery-ui-core'); wp_enqueue_script('jquery-ui-sortable'); - wp_enqueue_script('jquery-ui-datepicker', $this->url(WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/ui/jquery.ui.datepicker.js'), array('jquery', 'jquery-ui-core')); + wp_enqueue_script('jquery-ui-datepicker'); //, $this->url(WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/ui/jquery.ui.datepicker.js'), array('jquery', 'jquery-ui-core')); wp_enqueue_script('jquery-ui-datepicker-de', $this->url(WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/ui/jquery.ui.datepicker-de.js'), array('jquery', 'jquery-ui-core')); @@ -677,4 +677,5 @@ } + wp_enqueue_style('jquery-ui-datepicker'); wp_enqueue_style('wpsg-adminstyle', $GLOBALS['wpsg_sc']->getRessourceURL('css/admin.css'), array('wpsg-bscss', 'wpsg-bs-theme-css')); Index: /lib/helper_functions.inc.php =================================================================== --- /lib/helper_functions.inc.php (revision 5752) +++ /lib/helper_functions.inc.php (revision 5753) @@ -535,11 +535,18 @@ } // function wpsg_drawForm_Checkbox($field_name, $field_label, $conf = array()) - function wpsg_drawForm_AdminboxStart($title, $wrap_class = '') + function wpsg_drawForm_AdminboxStart($title = false, $wrap_class = '') { echo '
'; - echo '
'; - echo '

'.$title.'

'; - echo '
'; + + if (wpsg_isSizedString($title)) + { + + echo '
'; + echo '

'.$title.'

'; + echo '
'; + + } + echo '
'; Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5752) +++ /model/wpsg_product.class.php (revision 5753) @@ -115,4 +115,21 @@ } // public function getMeta($meta_key) + public function getProductgroup() + { + + return wpsg_productgroup::getInstance($this->pgruppe); + + } // public function getProductgroup() + + public function getProductgroupName() + { + + $oProductGroup = $this->getProductgroup(); + + if ($oProductGroup === false) return '----'; + else return $oProductGroup->name; + + } // public function getProductgroupName() + /** * Gibt die Produktbeschreibung zurÃŒck @@ -210,5 +227,12 @@ } // public function getProductURL() - + + public function getDefaultTaxValue() + { + + return $GLOBALS['wpsg_sc']->getDefaultCountry()->getTax($this->mwst_key); + + } // public function getDefaultTaxValue() + /** * Gibt den MwSt. Wert fÃŒr das Frontend zurÃŒck @@ -429,13 +453,46 @@ } // public static function getMinPrice($arFilter = array()) - + + public static function count($arFilter = array()) + { + + list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strQuery = " + SELECT + COUNT(*) + FROM + ( + SELECT + DISTINCT P.`id` + FROM + `".WPSG_TBL_PRODUCTS."` AS P + ".$strQueryJOIN." + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + ) AS innerSelect + "; + + return $GLOBALS['wpsg_db']->fetchOne($strQuery); + + } + public static function find($arFilter = array(), $load = true) { - - list($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); - + + 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 P.`id` + ".$strQuerySELECT." FROM `".WPSG_TBL_PRODUCTS."` AS P @@ -450,7 +507,8 @@ ".$strQueryHAVING." ORDER BY - ".$strQueryORDER." + ".$strQueryORDER." + ".$strLimit." "; - + $arID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); $arReturn = array(); @@ -470,19 +528,35 @@ public static function getQueryParts($arFilter = array()) { - + + $strQuerySELECT = ""; $strQueryWHERE = ""; $strQueryJOIN = ""; $strQueryHAVING = ""; $strQueryORDER = ""; - - if (wpsg_isSizedString($arFilter['order_col'])) $strQueryORDER .= " ".$arFilter['order_col']." "; - if (wpsg_isSizedString($arFilter['order_direction'])) $strQueryORDER .= $arFilter['order_direction']; - if (!wpsg_isSizedString($strQueryORDER)) $strQueryORDER = " P.`cdate` ASC "; - + if (wpsg_isSizedArray($arFilter['product_ids'])) $strQueryWHERE .= " AND P.`id` IN (".wpsg_q(implode(',', $arFilter['product_ids'])).") "; + if (wpsg_isSizedArray($arFilter['productgroup_ids'])) $strQueryWHERE .= " AND P.`pgruppe` IN (".wpsg_q(implode(',', $arFilter['productgroup_ids'])).") "; + else if (wpsg_isSizedString($arFilter['productgroup_ids']) && $arFilter['productgroup_ids'] != '-1') $strQueryWHERE .= " AND P.`pgruppe` IN (".wpsg_q($arFilter['productgroup_ids']).") "; + if (wpsg_isSizedString($arFilter['price_min'])) $strQueryWHERE .= " AND P.`preis` >= '".wpsg_q($arFilter['price_min'])."' "; if (wpsg_isSizedString($arFilter['price_max'])) $strQueryWHERE .= " AND P.`preis` <= '".wpsg_q($arFilter['price_max'])."' "; - + if (wpsg_isSizedString($arFilter['s'])) + { + + $strQueryWHERE_OR = ""; + + if ($GLOBALS['wpsg_sc']->hasMod('wpsg_mod_varianten')) $strQueryWHERE_OR .= " OR `mod_varianten` LIKE '%".wpsg_q($arFilter['s'])."%' "; + + $strQueryWHERE .= " + AND ( + P.`name` LIKE '%".wpsg_q($arFilter['s'])."%' OR + P.`anr` LIKE '%".wpsg_q($arFilter['s'])."%' + ".$strQueryWHERE_OR." + ) + "; + + } + if (wpsg_isSizedArray($arFilter['cat_ids']) && $GLOBALS['wpsg_sc']->hasMod('wpsg_mod_produktartikel')) { @@ -526,8 +600,23 @@ } - + + if (wpsg_isSizedString($arFilter['order'], 'name')) { $strQueryORDER = " P.`name` "; } + else if (wpsg_isSizedString($arFilter['order'], 'anr')) { $strQueryORDER = " P.`anr` "; } + else if (wpsg_isSizedString($arFilter['order'], 'pgruppe')) + { + + $strQuerySELECT .= " , (SELECT PG.`name` FROM `".WPSG_TBL_PRODUCTS_GROUP."` AS PG WHERE PG.`id` = P.`pgruppe`) AS `order_count` "; + $strQueryORDER = " order_count "; + + } + else $strQueryORDER = " P.`id` "; + + // Richtung + if (wpsg_isSizedString($arFilter['ascdesc'], "DESC")) $strQueryORDER .= " DESC "; + else $strQueryORDER .= " ASC "; + $strQueryWHERE .= " AND P.`deleted` != '1' "; - return array($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER); + return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER); } // public function getQueryParts($arFilter = array()) Index: /mods/mod_customergroup/wpsg_customergroup.php =================================================================== --- /mods/mod_customergroup/wpsg_customergroup.php (revision 5752) +++ /mods/mod_customergroup/wpsg_customergroup.php (revision 5753) @@ -51,12 +51,5 @@ } // public static function delete($customer_group_id) - - public function countProducts() - { - - return 1; - - } - + public static function count($arFilter = array()) { Index: /mods/mod_gutschein/wpsg_voucher.php =================================================================== --- /mods/mod_gutschein/wpsg_voucher.php (revision 5753) +++ /mods/mod_gutschein/wpsg_voucher.php (revision 5753) @@ -0,0 +1,159 @@ +data = $this->db->fetchRow(" + SELECT + V.* + FROM + `".WPSG_TBL_GUTSCHEIN."` AS V + WHERE + V.`id` = '".wpsg_q($voucher_id)."' + "); + + if ($this->data['id'] != $voucher_id || !wpsg_isSizedInt($voucher_id)) return false; + + return true; + + } // public function __construct($voucher_id) + + public function getUsed() + { + + return 14; + + } + + public function getStatusLabel() + { + + return "TODO"; + + } + + public function delete() + { + + $this->db->Query("DELETE FROM `".WPSG_TBL_GUTSCHEIN."` WHERE `id` = '".wpsg_q($this->id)."' "); + + } + + /* Statische Funktionen */ + + public static function count($arFilter = array()) + { + + list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strQuery = " + SELECT + COUNT(*) + FROM + ( + SELECT + DISTINCT V.`id` + FROM + `".WPSG_TBL_GUTSCHEIN."` AS V + ".$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 + * @param array $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 + V.`id` + ".$strQuerySELECT." + FROM + `".WPSG_TBL_GUTSCHEIN."` AS V + ".$strQueryJOIN." + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + ORDER BY + ".$strQueryORDER." + ".$strLimit." + "; + + $arID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); + $arReturn = array(); + + foreach ($arID as $id) + { + + $arReturn[$id] = self::getInstance($id); + + } + + return $arReturn; + + + } // public static function find($arFilter = array()) + + public static function getQueryParts($arFilter = array()) + { + + $strQuerySELECT = ""; + $strQueryWHERE = ""; + $strQueryJOIN = ""; + $strQueryHAVING = ""; + $strQueryORDER = ""; + + if (wpsg_isSizedString($arFilter['s'])) $strQueryWHERE .= " AND V.`code` LIKE '%".wpsg_q($arFilter['s'])."%' "; + + if (wpsg_isSizedString($arFilter['code'])) $strQueryWHERE .= " AND V.`code` LIKE '%".wpsg_q($arFilter['code'])."%' "; + + if (wpsg_isSizedString($arFilter['order'], 'code')) { $strQueryORDER = " V.`code` "; } + else if (wpsg_isSizedString($arFilter['order'], 'start_date')) { $strQueryORDER = " V.`start_date` "; } + else if (wpsg_isSizedString($arFilter['order'], 'end_date')) { $strQueryORDER = " V.`end_date` "; } + else if (wpsg_isSizedString($arFilter['order'], 'value')) { $strQueryORDER = " V.`value` "; } + else $strQueryORDER = " V.`id` "; + + // Richtung + if (wpsg_isSizedString($arFilter['ascdesc'], "DESC")) $strQueryORDER .= " DESC "; + else $strQueryORDER .= " ASC "; + + return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER); + + } + + } // class wpsg_voucher + +?> Index: /mods/mod_productgroups/wpsg_productgroup.php =================================================================== --- /mods/mod_productgroups/wpsg_productgroup.php (revision 5752) +++ /mods/mod_productgroups/wpsg_productgroup.php (revision 5753) @@ -8,5 +8,55 @@ { + /** + * LÀdt die Daten der Produktgruppe + */ + public function load($productgroup_id) + { + + parent::load($productgroup_id); + + $this->data = $this->db->fetchRow(" + SELECT + PG.*, + (SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`pgruppe` = PG.`id`) AS `product_count` + FROM + `".WPSG_TBL_PRODUCTS_GROUP."` AS PG + WHERE + PG.`id` = '".wpsg_q($productgroup_id)."' + "); + + if ($this->data['id'] != $productgroup_id || !wpsg_isSizedInt($productgroup_id)) return false; + + return true; + + } // public function __construct($customer_group_id) + + public function countProducts() + { + + return $this->product_count; + + } + /* Statische Funktionen */ + + public static function getProductgroupSelect() + { + + return $GLOBALS['wpsg_db']->fetchAssocField(" + SELECT + PG.`id`, CONCAT(PG.`name`,' (', ( + SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`pgruppe` = PG.`id` + ), ')') AS `name` , + (SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`pgruppe` = PG.`id`) AS `product_count` + FROM + `".WPSG_TBL_PRODUCTS_GROUP."` AS PG + HAVING + `product_count` > 0 + ORDER BY + `name` ASC + ", "id", "name"); + + } // public static function getProductgroupSelect() /** @@ -87,37 +137,15 @@ $strQueryWHERE = ""; $strQueryJOIN = ""; - $strQueryHAVING = ""; + $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['order'], 'name')) { $strQueryORDER = " PG.`name` "; } + else if (wpsg_isSizedString($arFilter['order'], 'template_file')) { $strQueryORDER = " PG.`template_file` "; } + else if (wpsg_isSizedString($arFilter['order'], 'product_count')) { - if (wpsg_isSizedString($arFilter['email'])) - { - - $strQueryWHERE .= " AND K.`email` = '".wpsg_q($arFilter['email'])."' "; + $strQuerySELECT .= ", (SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`pgruppe` = PG.`id`) AS `product_count`) "; + $strQueryORDER = " `product_count` "; } - - 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` "; + else $strQueryORDER = " PG.`id` "; // Richtung Index: /mods/wpsg_mod_gutschein.class.php =================================================================== --- /mods/wpsg_mod_gutschein.class.php (revision 5752) +++ /mods/wpsg_mod_gutschein.class.php (revision 5753) @@ -65,5 +65,8 @@ public function init() { - + + // Modell einbinden + require_once(WPSG_PATH_MOD.'mod_gutschein/wpsg_voucher.php'); + $role_object = get_role('administrator'); $role_object->add_cap('wpsg_voucher'); @@ -768,5 +771,6 @@ public function indexAction() { - + + /* if (isset($_REQUEST['wpshopgermany-submit-gs_del'])) { @@ -970,4 +974,74 @@ } + */ + + if (isset($_REQUEST['submit-multidelete'])) + { + + if (!wpsg_isSizedArray($_REQUEST['wpsg_multido'])) + { + + $this->shop->addBackendError(__('Bitte mindestens einen Gutschein auswÀhlen', 'wpsg')); + + } + else + { + + $nDelete = 0; + + foreach ($_REQUEST['wpsg_multido'] as $k => $voucher_id) + { + + $oVoucher = wpsg_voucher::getInstance($voucher_id); + $oVoucher->delete(); + + $nDelete ++; + + } + + $this->shop->addBackendMessage(wpsg_translate(__('#1# Gutschein(e) wurden gelöscht.', 'wpsg'), $nDelete)); + + } + + $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Voucher&action=index'); + + } + + $nPerPage = $this->shop->get_option('wpsg_mod_gutschein_perPage'); + if ($nPerPage <= 0) $nPerPage = 25; + + $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']['voucher']['arFilter'])) $this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['voucher']['arFilter']; + + $this->shop->view['countAll'] = wpsg_voucher::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']['voucher']['arFilter'] = $this->shop->view['arFilter']; + + $this->shop->view['arData'] = wpsg_voucher::find($this->shop->view['arFilter']); $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_gutschein/index.phtml'); Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 5752) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 5753) @@ -1507,5 +1507,19 @@ SELECT L.`id`, L.`name` FROM `".WPSG_TBL_LAND."` AS L ORDER BY `name` ASC ", "id", "name"); - + + if ($this->shop->hasMod('wpsg_mod_customergroup')) + { + + $this->shop->view['arCustomergroup'] = wpsg_array_merge(array('0' => __('Unzugeordnet', 'wpsg')), $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")); + + } + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/edit.phtml'); Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 5752) +++ /mods/wpsg_mod_productgroups.class.php (revision 5753) @@ -67,4 +67,6 @@ public function init() { + + require_once(WPSG_PATH_MOD.'mod_productgroups/wpsg_productgroup.php'); $role_object = get_role('administrator'); @@ -193,33 +195,5 @@ } // public function shortcode($atts) - - /** - * Integriert den Produktgruppenfilter in die Übersicht der Produkte (Produkte/index) - */ - public function produkt_index_filter() - { - - $this->shop->view['productgroups'] = $this->db->fetchAssoc(" - SELECT - (SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`pgruppe` = PG.`id` AND P.`deleted` != '1' ".wpsg_getStr($GLOBALS['wpsg_produkt_index_query_where']).") AS countProdukte, - PG.* - FROM - `".WPSG_TBL_PRODUCTS_GROUP."` AS PG - WHERE - PG.`deleted` != '1' - HAVING - countProdukte > 0 - "); - - $this->shop->view['countProducts'] = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE P.`deleted` != '1' AND P.`lang_parent` = 0 "); - - $this->shop->view['arSelect'] = []; - foreach ($this->shop->view['productgroups'] as $pg) { $this->shop->view['arSelect'][$pg['id']] = $pg['name'].' ('.$pg['countProdukte'].')'; } - $this->shop->view['arSelect'][0] = __('Alle', 'wpsg').' ('.$this->shop->view['countProducts'].')'; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/produkt_index_filter.phtml'); - - } // public function produkt_index_filter() - + /** * Integriert den Namen der Gruppe in das Produktarray @@ -699,5 +673,5 @@ $_SESSION['wpsg']['backend']['customergroup']['arFilter'] = $this->shop->view['arFilter']; - $this->shop->view['arData'] = wpsg_customergroup::find($this->shop->view['arFilter']); + $this->shop->view['arData'] = wpsg_productgroup::find($this->shop->view['arFilter']); $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/index.phtml'); @@ -768,4 +742,10 @@ $this->addeditAction(); + $this->shop->view['data'] = array( + 'name' => '', + 'template_file' => '', + 'infopage' => '' + ); + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/add.phtml'); @@ -830,5 +810,5 @@ $this->shop->view['wpsg_mod_productgroups']['data'] = $productgroupdata; - if ($this->shop->view['wpsg_mod_productgroups']['data']['stock_aktiv'] == '1') { $this->shop->view['wpsg_mod_productgroups']['data']['stock_aktiv'] = true; } + if (wpsg_isSizedInt($this->shop->view['wpsg_mod_productgroups']['data']['stock_aktiv'])) { $this->shop->view['wpsg_mod_productgroups']['data']['stock_aktiv'] = true; } $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/productgroups_addedit_sidebar.phtml'); Index: /views/admin/form/input.phtml =================================================================== --- /views/admin/form/input.phtml (revision 5752) +++ /views/admin/form/input.phtml (revision 5753) @@ -37,10 +37,22 @@ /> view['field_config']['help'])) { ?> - +
- + + view['field_config']['datepicker'])) { ?> + + +
Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5752) +++ /views/css/admin.css (revision 5753) @@ -1,2 +1,5 @@ +/* Datepicker */ +.ui-datepicker .ui-datepicker-calendar td a,.ui-datepicker a,.ui-datepicker a:hover{text-decoration:none}.ui-datepicker{background-color:#fff;border:1px solid #66AFE9;border-radius:4px;box-shadow:0 0 8px rgba(102,175,233,.6);display:none;margin-top:4px;padding:10px;width:240px}.ui-datepicker a:hover,.ui-datepicker td:hover a{color:#2A6496;-webkit-transition:color .1s ease-in-out;-moz-transition:color .1s ease-in-out;-o-transition:color .1s ease-in-out;transition:color .1s ease-in-out}.ui-datepicker .ui-datepicker-header{margin-bottom:4px;text-align:center}.ui-datepicker .ui-datepicker-title{font-weight:700}.ui-datepicker .ui-datepicker-next,.ui-datepicker .ui-datepicker-prev{cursor:default;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:400;height:20px;line-height:1;margin-top:2px;width:30px}.ui-datepicker .ui-datepicker-prev{float:left;text-align:left}.ui-datepicker .ui-datepicker-next{float:right;text-align:right}.ui-datepicker .ui-datepicker-prev:before{content:"\e079"}.ui-datepicker .ui-datepicker-next:before{content:"\e080"}.ui-datepicker .ui-icon{display:none}.ui-datepicker .ui-datepicker-calendar{table-layout:fixed;width:100%}.ui-datepicker .ui-datepicker-calendar td,.ui-datepicker .ui-datepicker-calendar th{text-align:center;padding:4px 0}.ui-datepicker .ui-datepicker-calendar td{border-radius:4px;-webkit-transition:background-color .1s ease-in-out,color .1s ease-in-out;-moz-transition:background-color .1s ease-in-out,color .1s ease-in-out;-o-transition:background-color .1s ease-in-out,color .1s ease-in-out;transition:background-color .1s ease-in-out,color .1s ease-in-out}.ui-datepicker .ui-datepicker-calendar td:hover{background-color:#eee;cursor:pointer}.ui-datepicker .ui-datepicker-current-day{background-color:#4289cc}.ui-datepicker .ui-datepicker-current-day a{color:#fff}.ui-datepicker .ui-datepicker-calendar .ui-datepicker-unselectable:hover{background-color:#fff;cursor:default} + /* Allgemein */ .wpsg_clear { clear:both; } @@ -126,4 +129,5 @@ .wpsg_pic_col { width:50px; } .wpsg_admin_submenu input[type="submit"], .wpsg_admin_submenu input[type="button"] { width:100%; margin-bottom:10px !important; } +#wpsg-bs.wpsg_products .wpsg_productgroup_link_wrap { float:left; } /* Bestellverwaltung */ @@ -204,4 +208,7 @@ #wpsg_oc_list .wpsg_mod_ordercondition_text { width:100%; height:150px; } +/* Modul Gutschein */ +#wpsg-bs.wpsg_voucher .col_checkbox { width:20px; } + /* Modul Lieferschein */ .wpsg_mod_deliverynote_fieldtable { font-size:12px; } Index: /views/mods/mod_customergroup/addedit.phtml =================================================================== --- /views/mods/mod_customergroup/addedit.phtml (revision 5752) +++ /views/mods/mod_customergroup/addedit.phtml (revision 5753) @@ -16,6 +16,6 @@ -
-
+ +
+
- - - - - - - - -
+ + + + + + view['arFilter']['s'])); ?> + +
+ +
-
-
- - +
+
+ + + + view['pages'] > 1) { ?> + + + +
+ writeBackendMessage(); ?> - -
- - - - - - - view['arStatus'])) { ?> - - - -

- - - -

- - view['data'] > 0)) { ?> -
-
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
-
-
- - -
- -
- - view['data']) && sizeof($this->view['data']) > 0) { ?> - - - - - - - - - - - - - - view['data'] as $g) { ?> - - - - - - - - - - - - - - - - - - - - - - -
" type="checkbox" onclick="markAll(this);"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
. - - get_option('wpsg_currency')); ?> - - - - 0) { ?> -
get_option('wpsg_currency'))); ?>
- - 		- - - <?php echo wpsg_hspc($g['comment']); ?> - - - - - 0) { ?> - - -  [M] - -
" type="checkbox" onclick="markAll(this);"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
-
-
- - " />  -

- -

- - -
+
+ + + + + + + + + + + + + view['arData'] as $oVoucher) { ?> + + + + + + + + + + +
+ + + + code; ?>start_date); ?>end_date); ?>calc_typ == 'w') echo wpsg_ff($oVoucher->value, $this->get_option('wpsg_currency')); + else if ($oVoucher->calc_typ == 'p') echo wpsg_ff($oVoucher->value, '%'); + + ?> + + comment; if (wpsg_isSizedString($comment)) { ?> + " onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"> + + + getStatusLabel(); ?> + + getUsed(); if (wpsg_isSizedInt($used)) { ?> + + + + multi === '1') { ?> +  [M] + + +
+ +
+ + + +
+ + + + view['pages'] > 1) { ?> + + + + + + + + + + + + + Index: /views/mods/mod_gutschein/settings_edit.phtml =================================================================== --- /views/mods/mod_gutschein/settings_edit.phtml (revision 5752) +++ /views/mods/mod_gutschein/settings_edit.phtml (revision 5753) @@ -6,4 +6,4 @@ ?> -get_option('wpsg_mod_gutschein_size'), array ('help' => wpsg_mod_gutschein_size)); ?> +get_option('wpsg_mod_gutschein_size'), array ('help' => 'wpsg_mod_gutschein_size')); ?> get_option('wpsg_mod_gutschein_perPage'), array ('help' => 'wpsg_mod_gutschein_perPage')); ?> Index: /views/mods/mod_kundenverwaltung/edit.phtml =================================================================== --- /views/mods/mod_kundenverwaltung/edit.phtml (revision 5752) +++ /views/mods/mod_kundenverwaltung/edit.phtml (revision 5753) @@ -17,5 +17,5 @@