Index: /controller/wpsg_OrderController.class.php =================================================================== --- /controller/wpsg_OrderController.class.php (revision 5632) +++ /controller/wpsg_OrderController.class.php (revision 5637) @@ -365,5 +365,6 @@ public function indexAction() { - + + /* $strQueryWHERE = ''; $strQueryStatusWHERE = ''; @@ -475,5 +476,5 @@ } - if ($this->shop->view['filter']['k_id'] > 0) + if (wpsg_isSizedInt($this->shop->view['filter']['k_id'])) { @@ -649,4 +650,6 @@ $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; + + $strQueryLIMIT = ""; // Beim Export Pager ignorieren @@ -907,4 +910,36 @@ } + */ + + $nPerPage = $this->get_option('wpsg_order_perpage'); + if ($nPerPage <= 0) $nPerPage = 10; + + $this->shop->view['hasFilter'] = false; + $this->shop->view['pages'] = 0; + $this->shop->view['arStatus'] = array(); + $this->shop->view['arFilter'] = array( + 'order' => 'cdate', + 'ascdesc' => 'DESC' + ); + + if (wpsg_isSizedArray($_REQUEST['filter'])) $this->shop->view['arFilter'] = $_REQUEST['filter']; + + foreach ($this->shop->arStatus as $status_key => $status_label) + { + + $count = wpsg_order::count(array('status' => $status_key)); + + if (wpsg_isSizedInt($count)) $this->shop->view['arStatus'][$status_key] = array('label' => $status_label, 'count' => $count); + + } + + $this->shop->view['countAll'] = wpsg_order::count(array()); + + $this->shop->view['seite'] = 1; + $this->shop->view['pages'] = ceil($this->shop->view['countAll'] / $nPerPage); + if ($this->shop->view['seite'] <= 0 || $this->shop->view['seite'] > $this->shop->view['pages']) $this->shop->view['seite'] = 1; + + + $this->shop->render(WPSG_PATH_VIEW.'/order/index.phtml'); } // public function indexAction() Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5632) +++ /controller/wpsg_ShopController.class.php (revision 5637) @@ -624,5 +624,5 @@ if (is_admin() && preg_match('/wpsg/', wpsg_getStr($_REQUEST['page']))) { - + wp_enqueue_script('wpsg_bsjs', $this->getRessourceURL('js/bootstrap-3.3.6-dist/js/bootstrap.min.js')); @@ -642,5 +642,5 @@ 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')); - if (in_array(wpsg_getStr($_REQUEST['page']), array('wpsg-Admin', 'wpsg-Produkt'))) + if (in_array(wpsg_getStr($_REQUEST['page']), array('wpsg-Admin', 'wpsg-Produkt', 'wpsg-Order'))) { @@ -1155,5 +1155,5 @@ /** - * Shortcode für Warenkorbbutton, um Produkte aus Kategorieübersicht in Warenkorb zu legen (muss in jedem Beitrag eingefügt werden) + * Shortcode fï¿œr Warenkorbbutton, um Produkte aus Kategorieï¿œbersicht in Warenkorb zu legen (muss in jedem Beitrag eingefï¿œgt werden) */ public function shortcode_basket($atts, $content = '') @@ -1171,5 +1171,5 @@ $strReturn = 'fetchOne($strQuery); + + } // public static function count($arFilter) + /** * Gibt einen Array von Bestellungen zurÃŒck, die auf den ÃŒbergebenen Filter passen * @param array $arFilter */ - public static function find($arFilter = array()) - { - - $strQueryWHERE = ""; - $strQueryJOIN = ""; - - if (wpsg_isSizedInt($arFilter['k_id'])) - { - - $strQueryWHERE .= " AND O.`k_id` = '".wpsg_q($arFilter['k_id'])."' "; - - } - - if (wpsg_isSizedInt($arFilter['status'])) - { - - $strQueryWHERE .= " AND O.`status` = '".wpsg_q($arFilter['status'])."' "; - - } - else if (wpsg_isSizedArray($arFilter['status'])) - { - - $strQueryWHERE .= " AND O.`status` IN (".wpsg_q(implode(',', $arFilter['status'])).") "; - - } - - if (wpsg_isSizedInt($arFilter['NOTstatus'])) - { - - $strQueryWHERE .= " AND O.`status` != '".wpsg_q($arFilter['NOTstatus'])."' "; - - } - else if (wpsg_isSizedArray($arFilter['NOTstatus'])) - { - - $strQueryWHERE .= " AND O.`status` NOT IN (".wpsg_q(implode(',', $arFilter['NOTstatus'])).") "; - - } - - if (wpsg_isSizedInt($arFilter['cdate_from'])) - { - - $strQueryWHERE .= " AND O.`cdate` > '".wpsg_date('Y-m-d', $arFilter['cdate_from'])."' "; - - } - - if (wpsg_isSizedInt($arFilter['product_id'])) - { - - $strQueryWHERE .= " AND OP.`p_id` = '".wpsg_q($arFilter['product_id'])."' "; - $bJoinProducts = true; - - } - - if ($bJoinProducts === true) $strQueryJOIN = " LEFT JOIN `".WPSG_TBL_ORDERPRODUCT."` AS OP ON (O.`id` = OP.`o_id`) "; + public static function find($arFilter = array(), $load = true) + { + + list($strQueryWHERE, $strQueryJOIN, $strQueryHAVING) = self::getQueryString($arFilter); $strQuery = " @@ -886,10 +867,13 @@ $arOrderID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); + + if ($load !== true) return $arOrderID; + $arReturn = array(); foreach ($arOrderID as $order_id) { - - $oOrder = $GLOBALS['wpsg_sc']->cache->loadOrderObject($order_id); + + $oOrder = $GLOBALS['wpsg_sc']->cache->loadOrderObject($order_id); $arReturn[] = $oOrder; @@ -899,5 +883,67 @@ } // public static function find($arFilter = array()) - + + public static function getQueryString($arFilter = array()) + { + + $strQueryWHERE = ""; + $strQueryJOIN = ""; + $strQueryHAVING = ""; + + $bJoinProducts = false; + + if (wpsg_isSizedInt($arFilter['k_id'])) $strQueryWHERE .= " AND O.`k_id` = '".wpsg_q($arFilter['k_id'])."' "; + if (wpsg_isSizedInt($arFilter['cdate_from'])) $strQueryWHERE .= " AND O.`cdate` > '".wpsg_date('Y-m-d', $arFilter['cdate_from'])."' "; + if (wpsg_isSizedInt($arFilter['product_id'])) { $strQueryWHERE .= " AND OP.`p_id` = '".wpsg_q($arFilter['product_id'])."' "; $bJoinProducts = true; } + if (wpsg_isSizedString($arFilter['s'])) + { + + $strQueryWHERE .= " + C.`vname` LIKE '%".wpsg_q($arFilter['s'])."%' OR + C.`name` LIKE '%".wpsg_q($arFilter['s'])."%' OR + C.`email` LIKE '%".wpsg_q($arFilter['s'])."%' OR + C.`firma` LIKE '%".wpsg_q($arFilter['s'])."%' OR + C.`ustidnr` LIKE '%".wpsg_q($arFilter['s'])."%' OR + O.`onr` LIKE '%".wpsg_q($arFilter['s'])."%' OR + O.`id` = '".wpsg_q($arFilter['s'])."' OR + O.`custom_data` LIKE '%".wpsg_q($arFilter['s'])."%' + "; + + $bJoinProducts = true; + + } + + if (wpsg_isSizedInt($arFilter['status'])) + { + + $strQueryWHERE .= " AND O.`status` = '".wpsg_q($arFilter['status'])."' "; + + } + else if (wpsg_isSizedArray($arFilter['status'])) + { + + $strQueryWHERE .= " AND O.`status` IN (".wpsg_q(implode(',', $arFilter['status'])).") "; + + } + + if (wpsg_isSizedInt($arFilter['NOTstatus'])) + { + + $strQueryWHERE .= " AND O.`status` != '".wpsg_q($arFilter['NOTstatus'])."' "; + + } + else if (wpsg_isSizedArray($arFilter['NOTstatus'])) + { + + $strQueryWHERE .= " AND O.`status` NOT IN (".wpsg_q(implode(',', $arFilter['NOTstatus'])).") "; + + } + + if ($bJoinProducts === true) $strQueryJOIN = " LEFT JOIN `".WPSG_TBL_ORDERPRODUCT."` AS OP ON (O.`id` = OP.`o_id`) "; + + return array($strQueryWHERE, $strQueryJOIN, $strQueryHAVING); + + } + } // class wpsg_mod_order extends wpsg_model Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 5632) +++ /mods/wpsg_mod_deliverytime.class.php (revision 5637) @@ -100,5 +100,5 @@ } - $this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $produkt_data['wpsg_mod_deliverytime_deliverytime']; + $this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = wpsg_getStr($produkt_data['wpsg_mod_deliverytime_deliverytime']); $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverytime/produkt_edit_allgemein.phtml'); Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 5632) +++ /mods/wpsg_mod_productgroups.class.php (revision 5637) @@ -202,5 +202,5 @@ $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' ".$GLOBALS['wpsg_produkt_index_query_where'].") AS countProdukte, + (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 Index: /mods/wpsg_mod_weight.class.php =================================================================== --- /mods/wpsg_mod_weight.class.php (revision 5632) +++ /mods/wpsg_mod_weight.class.php (revision 5637) @@ -150,5 +150,5 @@ if (isset($_REQUEST['wpsg_lang'])) return; - $this->shop->view['wpsg_mod_weight']['weight'] = $produkt_data['weight']; + $this->shop->view['wpsg_mod_weight']['weight'] = wpsg_getFloat($produkt_data['weight']); $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_weight/produkt_edit_allgemein.phtml'); Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5632) +++ /views/css/admin.css (revision 5637) @@ -102,5 +102,11 @@ .wpsg_admin_submenu input[type="submit"], .wpsg_admin_submenu input[type="button"] { width:100%; margin-bottom:10px !important; } -/* Modulverwaltung */ +/* Bestellverwaltung */ +.wpsg_order .wpsg_status_link_wrap ul li { list-style:none; float:left; } +.wpsg_order .wpsg_status_link_wrap ul li:after { content:" | "; width:15px; text-align:center; display:inline-block; } +.wpsg_order .wpsg_status_link_wrap ul li:last-child:after { content:""; width:auto; } +.wpsg_order .wpsg-filter { max-width:800px; margin-left:0px; } + + /* Modulverwaltung */ .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; } .wpsg_admin_submenu .list-group-item.modul_akt .glyphicon { position:absolute; right:5px; top:5px; color:#3c763d; } Index: /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml (revision 5632) +++ /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml (revision 5637) @@ -13,6 +13,6 @@
- view['data']['arFeinheiten'], $this->view['data']['feinheit']); ?> - view['data']['fmenge'])); ?> + view['data']['arFeinheiten'], wpsg_getStr($this->view['data']['feinheit'])); ?> + view['data']['fmenge']))); ?> get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?> Index: /views/mods/mod_productgroups/produkt_addedit_sidebar.phtml =================================================================== --- /views/mods/mod_productgroups/produkt_addedit_sidebar.phtml (revision 5632) +++ /views/mods/mod_productgroups/produkt_addedit_sidebar.phtml (revision 5637) @@ -14,14 +14,12 @@
- view['wpsg_mod_productgroups']['data']) <= 0) { ?> + view['wpsg_mod_productgroups']['data'])) { ?>

- view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> + view['wpsg_mod_productgroups']['data'], @$this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> view['wpsg_mod_productgroups']['sticky_von']); ?> view['wpsg_mod_productgroups']['sticky_bis']); ?> - -

- +
Index: /views/mods/mod_produktbilder/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_produktbilder/produkt_addedit_content.phtml (revision 5632) +++ /views/mods/mod_produktbilder/produkt_addedit_content.phtml (revision 5637) @@ -138,8 +138,6 @@ - - - -

+

+ view['data']['id'])) { ?> Index: /views/order/_index.phtml =================================================================== --- /views/order/_index.phtml (revision 5637) +++ /views/order/_index.phtml (revision 5637) @@ -0,0 +1,566 @@ + + + +
+

+

+ +

+ + + + writeBackendMessage(); ?> + +
+ + + + + view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> + + + + view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> +
    +
  • view['kunde']['vname'].' '.$this->view['kunde']['name']); ?>
    • +
    • +
+
+ +
    + view['arStatus'] as $status_id => $count) { ?> + 0) { ?> +
  • + view['filter']['status']))) { ?> + arStatus[$status_id]; ?> () | + + arStatus[$status_id]; ?> () | + +
    • + + +
  • + view['filter']['status'] == -1) { ?> + (view['count']; ?>) + + (view['countAll']; ?>) + +
    • +
+ +

+ + + +

+ +
+ +
+ +
+ + + + callMods('produkt_index_head'); ?> + +
+ view) ?> +
view['count']); ?> +
+ + « + ‹ + view['pages']; ?> + › + » + +
+ + + +
+ +
+ +
+
+

+
+ +

+
+ + __('Alle', 'wpsg')); + foreach ($this->view['arStatus'] as $status_id => $v) { $arStatus[$status_id] = $this->arStatus[$status_id]; } + + ?> + + view['filter']['search']); ?> + view['filter']['status'], array('id' => 'filter_status')); ?> +
+
+ +
+
+ + +
+
+
+ hasMod('wpsg_mod_rechnungen')) { ?> +
+
+ +
+
+ + +
+
+ + +
+ +
+ " /> + +
+
+
+ + + + + + + + +
+ + callMods('produkt_index_aftersearch'); ?> + + view['data']) && sizeof($this->view['data']) > 0) { ?> +
+ + + + + + + + + + + + + + + hasMod('wpsg_mod_abo')) { ?> + + + + + + + view['data'] as $o) { ?> + + + + + + + + + hasMod('wpsg_mod_abo')) { ?> + + + + + + + + + + + + + + + + hasMod('wpsg_mod_abo')) { ?> + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + getCurrentLanguage()) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$o['language']]; ?> + <?php echo wpsg_translate(__('Bestellung wurde in der Sprache #1# durchgefÃŒhrt.', 'wpsg'), $lang['name']); ?> + +
+ + + + + + + " onclick="return false;" href=""> + + + +
+ " href="wp-admin/admin.php?page=wpsg-Order&action=view&edit_id="> + | + " href="wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id="> + | + +
+ 		+ +
+ +
+ +
+ + + 		+ + + hasMod('wpsg_mod_crefopay')) { ?> + callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($o['id']))); ?> + + arPayment[$o['type_payment']]['name']), 'wpsg'); ?> + + + 0) { ?> +
get_option('wpsg_currency')); ?> + + 		+ getShippingTypName()); ?> + 0) { ?> +
get_option('wpsg_currency')); ?> + + 		+ + #3# fÃŒr je #4#', 'wpsg'), $p['menge'], WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$this->getProduktID($p['id']), $p['name'], wpsg_ff($p['preis'], $this->get_option('wpsg_currency'))); ?>
+ + 		+ get_option('wpsg_currency')); ?> + + callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 1) { ?> + callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($o['id'])) ?> + callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 2) { ?> + callMod('wpsg_mod_abo', 'getOriginOrder', array($o['id'])); + $origin_order_data = $this->cache->loadOrder($origin_order_id); + + ?> + callMod('wpsg_mod_abo', 'getOrderAboExpiration', array( + $origin_order_data['id'] + )) ?>
+ #2#', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$origin_order_id, $origin_order_data['onr']); ?> + + 		+ arStatus[$o['status']]); ?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + +
+ +
view['count']); ?> +
+ + « + ‹ + view['pages']; ?> + › + » + +
+ + + +
+
+
+ + callMod('wpsg_mod_export', 'produkt_index_foot'); ?> + +
+ +

+

+ + +
Index: /views/order/index.phtml =================================================================== --- /views/order/index.phtml (revision 5632) +++ /views/order/index.phtml (revision 5637) @@ -4,561 +4,143 @@ * Template fÃŒr die Übersicht der Bestellungen */ - //wpsg_debug($this->view); + ?> -
-

-

- -

- - - writeBackendMessage(); ?> - -
- - - - - view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> - - - - view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> -
    -
  • view['kunde']['vname'].' '.$this->view['kunde']['name']); ?>
    • -
    • -
-
- -
    - view['arStatus'] as $status_id => $count) { ?> - 0) { ?> -
  • - view['filter']['status']))) { ?> - arStatus[$status_id]; ?> () | - - arStatus[$status_id]; ?> () | - -
    • - - -
  • - view['filter']['status'] == -1) { ?> - (view['count']; ?>) - - (view['countAll']; ?>) - -
    • -
- -

- - - -

- -
- -
- -
- - - - callMods('produkt_index_head'); ?> - -
- view) ?> -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
- -
- -
-
-

-
- -

-
- - __('Alle', 'wpsg')); - foreach ($this->view['arStatus'] as $status_id => $v) { $arStatus[$status_id] = $this->arStatus[$status_id]; } - - ?> - - view['filter']['search']); ?> - view['filter']['status'], array('id' => 'filter_status')); ?> -
-
- -
-
- - -
-
-
- hasMod('wpsg_mod_rechnungen')) { ?> -
-
- -
-
- - -
-
- - -
- -
- " /> - +
- - - - - - - - - - - callMods('produkt_index_aftersearch'); ?> - - view['data']) && sizeof($this->view['data']) > 0) { ?> -
- - - - - - - - - - - - - - - hasMod('wpsg_mod_abo')) { ?> - - - - - - - view['data'] as $o) { ?> - - - - - - - - - hasMod('wpsg_mod_abo')) { ?> - - - - - - - - - - - - - - - - hasMod('wpsg_mod_abo')) { ?> - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - getCurrentLanguage()) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$o['language']]; ?> - <?php echo wpsg_translate(__('Bestellung wurde in der Sprache #1# durchgefÃŒhrt.', 'wpsg'), $lang['name']); ?> - -
- - - - - - - " onclick="return false;" href=""> - - - -
- " href="wp-admin/admin.php?page=wpsg-Order&action=view&edit_id="> - | - " href="wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id="> - | - -
- 		- -
- -
- -
- - - 		- - - hasMod('wpsg_mod_crefopay')) { ?> - callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($o['id']))); ?> - - arPayment[$o['type_payment']]['name']), 'wpsg'); ?> - - - 0) { ?> -
get_option('wpsg_currency')); ?> - - 		- getShippingTypName()); ?> - 0) { ?> -
get_option('wpsg_currency')); ?> - - 		- - #3# fÃŒr je #4#', 'wpsg'), $p['menge'], WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$this->getProduktID($p['id']), $p['name'], wpsg_ff($p['preis'], $this->get_option('wpsg_currency'))); ?>
- - 		- get_option('wpsg_currency')); ?> - - callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 1) { ?> - callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($o['id'])) ?> - callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 2) { ?> - callMod('wpsg_mod_abo', 'getOriginOrder', array($o['id'])); - $origin_order_data = $this->cache->loadOrder($origin_order_id); - - ?> - callMod('wpsg_mod_abo', 'getOrderAboExpiration', array( - $origin_order_data['id'] - )) ?>
- #2#', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$origin_order_id, $origin_order_data['onr']); ?> - - 		- arStatus[$o['status']]); ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - -
- -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
-
-
- - callMod('wpsg_mod_export', 'produkt_index_foot'); ?> - -
- -

-

- - -
+
+ + view['data']) && sizeof($this->view['data']) > 0) { ?> + + +

+ + +
+ + Index: /views/produkt/addedit.phtml =================================================================== --- /views/produkt/addedit.phtml (revision 5632) +++ /views/produkt/addedit.phtml (revision 5637) @@ -45,5 +45,5 @@
- 0) { ?> + Index: /views/produkt/index.phtml =================================================================== --- /views/produkt/index.phtml (revision 5632) +++ /views/produkt/index.phtml (revision 5637) @@ -6,49 +6,4 @@ ?> - -
@@ -62,5 +17,5 @@
    - +
@@ -290,2 +245,47 @@
+ +