Index: /controller/wpsg_OrderController.class.php =================================================================== --- /controller/wpsg_OrderController.class.php (revision 5717) +++ /controller/wpsg_OrderController.class.php (revision 5720) @@ -51,12 +51,10 @@ public function setAdminCommentAction() { - + $this->db->UpdateQuery(WPSG_TBL_ORDER, array( - 'admincomment' => wpsg_q($_REQUEST['wpsg_order_admincomment']) + 'admincomment' => wpsg_q($_REQUEST['value']) ), "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); - $this->shop->addBackendMessage(__('Bemerkung wurde erfolgreich gespeichert!', 'wpsg')); - - $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$_REQUEST['edit_id']); + die($_REQUEST['value']); } // public function setAdminCommentAction() @@ -204,10 +202,4 @@ } - else if ($_REQUEST['wpsg_action'] == 'orderLog') - { - - die($this->orderLogAction($_REQUEST['edit_id'])); - - } } // public function ajaxAction() @@ -253,26 +245,5 @@ } // public function stornoAction() - - /** - * Zeichnet das Bestell Log - */ - public function orderLogAction($order_id) - { - - $this->shop->view['log'] = $this->db->fetchAssoc(" - SELECT - OL.* - FROM - `".WPSG_TBL_OL."` AS OL - WHERE - OL.`o_id` = '".wpsg_q($order_id)."' - ORDER BY - OL.`cdate` ASC - "); - - return $this->shop->render(WPSG_PATH_VIEW.'/order/orderlog.phtml', false); - - } // public function orderLogAction($order_id) - + /** * Zeigt eine Bestellung an @@ -299,6 +270,5 @@ $this->shop->view['oOrder'] = wpsg_order::getInstance($_REQUEST['edit_id']); - $this->shop->view['orderLog'] = $this->orderLogAction($_REQUEST['edit_id']); - + $custom_data = @unserialize($this->shop->view['data']['custom_data']); @@ -337,4 +307,40 @@ C.`id` = '".$this->shop->view['data']['shipping_land']."' "); + + $this->shop->view['arSubAction'] = array( + 'general' => array( + 'title' => __('Allgemein', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/order/view_general.phtml', false) + ), + 'orderdata' => array( + 'title' => __('Bestelldaten', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/order/view_orderdata.phtml', false) + ), + 'customerdata' => array( + 'title' => __('Kundendaten', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/order/view_customerdata.phtml', false) + ), + 'shippay' => array( + 'title' => __('Versand- /Zahlungsart', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/order/view_shippay.phtml', false) + ) + ); + + $this->shop->callMods('order_view', array($_REQUEST['edit_id'], &$this->shop->view['arSubAction'])); + + $this->shop->view['arSubAction']['orderlog'] = array( + 'title' => __('Bestellprotokoll', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/order/view_orderlog.phtml', false) + ); + + if (wpsg_isSizedInt($this->get_option('wpsg_debugModus'))) + { + + $this->shop->view['arSubAction']['dev'] = array( + 'title' => __('Entwickleroptionen', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/order/view_dev.phtml', false) + ); + + } $this->shop->render(WPSG_PATH_VIEW.'/order/view.phtml'); Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 5717) +++ /lib/functions.inc.php (revision 5720) @@ -737,5 +737,7 @@ function wpsg_formatTimestamp($ts, $dateOnly = false) { - + + if (!is_numeric($ts)) $ts = strtotime($ts); + if ($ts == 0) return ''; Index: /lib/helper_functions.inc.php =================================================================== --- /lib/helper_functions.inc.php (revision 5717) +++ /lib/helper_functions.inc.php (revision 5720) @@ -576,5 +576,5 @@ } // function wpsg_drawForm_TextEnd($field_label) - function wpsg_drawForm_Text($field_label, $field_value, $conf = array()) + function wpsg_drawForm_Text($field_label, $field_value, $field_id = false, $conf = array()) { @@ -584,4 +584,5 @@ $TC->view['field_value'] = $field_value; $TC->view['field_config'] = $conf; + $TC->view['field_id'] = $field_id; return $TC->render(WPSG_PATH_VIEW.'admin/form/text.phtml', false); Index: /model/wpsg_customer.class.php =================================================================== --- /model/wpsg_customer.class.php (revision 5717) +++ /model/wpsg_customer.class.php (revision 5720) @@ -72,5 +72,8 @@ } // public function getName() - + + /** Gibt die Kundennummer zurÃŒck */ + public function getNr() { return $this->knr; } // public function getNr() + /** * Versucht die Hausnummer von der Straße abzutrennen und nur die Straße zurÃŒckzugeben Index: /model/wpsg_order.class.php =================================================================== --- /model/wpsg_order.class.php (revision 5717) +++ /model/wpsg_order.class.php (revision 5720) @@ -49,5 +49,12 @@ } // public function log($subject, $text) - + + public function getLog() + { + + return $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_OL."` WHERE `o_id` = '".wpsg_q($this->id)."' ORDER BY `cdate` DESC "); + + } + /** * Gibt den letzten Log Eintrag zurÃŒck Index: /mods/wpsg_mod_auftragsbestaetigung.class.php =================================================================== --- /mods/wpsg_mod_auftragsbestaetigung.class.php (revision 5717) +++ /mods/wpsg_mod_auftragsbestaetigung.class.php (revision 5720) @@ -31,9 +31,12 @@ * zeigt das Formular zum Senden in der Bestellverwaltung */ - public function order_view_content($order_id) + public function order_view($order_id, &$arSidebarArray) { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_auftragsbestaetigung/order_view.phtml'); - + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_auftragsbestaetigung/order_view.phtml', false) + ); + } // public function order_view_content($order_id) Index: /mods/wpsg_mod_basic.class.php =================================================================== --- /mods/wpsg_mod_basic.class.php (revision 5717) +++ /mods/wpsg_mod_basic.class.php (revision 5720) @@ -316,10 +316,5 @@ */ public function order_ajax() { } - - /** - * Wird in der Bestellansicht aufgerufen um im linken Bereich neue Elemente zu platzieren - */ - public function order_view_content($order_id) { } - + /** Wird in das Formular fÃŒr die StatusÀnderung innerhalb der Bestellung integriert */ public function order_view_switchStatus(&$order_id) { } @@ -332,10 +327,8 @@ */ public function setOrderStatus($order_id, $status_id, $inform) { } - - /** - * Wird in der Bestellverwaltung aufgerufen um im rechten Bereich neue Elemente zu platzieren - */ - public function order_view_sidebar(&$order_id) { } - + + /** Wird in der Bestellansicht eingebunden */ + public function order_view($order_id, &$arSidebarArray) { } + /** Wird bei der Darstellung einer Produktzeile in der Bestellverwaltung aufgerufen */ public function order_view_row(&$p, $i) { } Index: /mods/wpsg_mod_billsafe.class.php =================================================================== --- /mods/wpsg_mod_billsafe.class.php (revision 5717) +++ /mods/wpsg_mod_billsafe.class.php (revision 5720) @@ -351,23 +351,28 @@ } // public function order_ajax() - - public function order_view_sidebar(&$order_id) + + public function order_view($order_id, &$arSidebarArray) { $order_data = $this->shop->cache->loadOrder($order_id); - + if ($order_data['type_payment'] != $this->id) return; - - $this->shop->view['wpsg_mod_billsafe']['data'] = $order_data; - + + $this->shop->view['wpsg_mod_billsafe']['data'] = $order_data; + if (file_exists($this->getFilePath($order_id).'/billsafe_rechnung.pdf')) - { + { + $this->shop->view['wpsg_mod_billsafe']['rechnung_url'] = WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_billsafe&edit_id='.$order_id.'&noheader=1&do=getInvoice'; - } - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_billsafe/order_view_sidebar.phtml'); - - } - + + } + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_billsafe/order_view_sidebar.phtml', false) + ); + + } // public function order_view(&$arSidebarArray) + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_cab.class.php =================================================================== --- /mods/wpsg_mod_cab.class.php (revision 5717) +++ /mods/wpsg_mod_cab.class.php (revision 5720) @@ -207,5 +207,5 @@ } // public function addPayment(&$arPayment) - public function order_view_content($order_id) + public function order_view($order_id, &$arSidebarArray) { @@ -216,6 +216,9 @@ $this->shop->view['wpsg_mod_cab']['order'] = $order_data; $this->shop->view['wpsg_mod_cab']['content'] = $this->order_view_content_inner($order_id); - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_cab/order_view_content.phtml'); + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_cab/order_view_content.phtml', false) + ); } // public function order_view_content($order_id) Index: /mods/wpsg_mod_deliverynote.class.php =================================================================== --- /mods/wpsg_mod_deliverynote.class.php (revision 5717) +++ /mods/wpsg_mod_deliverynote.class.php (revision 5720) @@ -369,5 +369,5 @@ } // public function delOrder(&$order_id) - public function order_view_content($order_id) + public function order_view($order_id, &$arSidebarArray) { @@ -379,6 +379,9 @@ $this->shop->view['wpsg_mod_deliverynote']['arDeliverynotes'] = $this->loadDeliveryNotesFromOrder($order_id); $this->shop->view['wpsg_mod_deliverynote']['arNoDeliveredProducts'] = $this->getNoDeliveredProducts($order_id); - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverynote/order_view_content.phtml'); + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverynote/order_view_content.phtml', false) + ); } // public function order_view_content($order_id) @@ -671,5 +674,5 @@ { - $oOrder = &$this->shop->cache->loadOrderObject($order_id); + $oOrder = $this->shop->cache->loadOrderObject($order_id); $order_products = $oOrder->getProductKeys(); Index: /mods/wpsg_mod_downloadplus.class.php =================================================================== --- /mods/wpsg_mod_downloadplus.class.php (revision 5717) +++ /mods/wpsg_mod_downloadplus.class.php (revision 5720) @@ -59,5 +59,5 @@ $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_dlplus/'; - $new_path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_pdfprodukte/'.$produkt_id.'/'; + $new_path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_pdfprodukte/'; } @@ -66,5 +66,5 @@ $path = WP_CONTENT_DIR.'/uploads/wpsg_dlplus/'; - $new_path = WP_CONTENT_DIR.'/uploads/wpsg_pdfprodukte/'.$produkt_id.'/'; + $new_path = WP_CONTENT_DIR.'/uploads/wpsg_pdfprodukte/'; } @@ -230,5 +230,5 @@ header('Content-Type: application/pdf'); - header('Content-Disposition: inline; filename="'.rawurldecode($indiv_db['out_file']).'"'); + header('Content-Disposition: inline; filename="'.rawurldecode(basename($_REQUEST['file'])).'"'); header('Cache-Control: private, max-age=0, must-revalidate'); header('Pragma: public'); @@ -451,5 +451,5 @@ header('Content-Type: application/pdf'); - header('Content-Disposition: inline; filename="'.rawurldecode($indiv_db['out_file']).'"'); + header('Content-Disposition: inline; filename="'.rawurldecode(basename($_REQUEST['file'])).'"'); header('Cache-Control: private, max-age=0, must-revalidate'); header('Pragma: public'); @@ -460,50 +460,53 @@ } // public function order_ajax() - - public function order_view_sidebar(&$order_id) - { - + + public function order_view($order_id, &$arSidebarArray) + { + $bPDFProdukt = false; $arFiles = array(); - + // Die arFiles brauch ich um zu bestimmen ob Produkte gekauft wurden, die Downloads enthalten foreach ($this->shop->view['basket']['produkte'] as $k => $v) { - + $this->shop->view['arProducts'][$k] = $v; - + if ($this->isPDFProdukt($v['id'])) { - + $bPDFProdukt = true; - + $product_id = $this->shop->getProduktID($v['id']); - + // Hier darf das wpsg_array_merge nicht verwendet werden, da der Index nicht ÃŒberschrieben werden darf //$arFiles = array_merge($arFiles, $this->getFiles($v['id'])); $arFiles_product = $this->getfiles($v['id']); - + foreach ($arFiles_product as $file_product) { - + $arFiles[] = array($product_id, $file_product); - + } - - } - - } - + + } + + } + if ($bPDFProdukt && sizeof($arFiles) > 0) { - + $this->shop->view['order_id'] = $order_id; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_downloadplus/order_view_sidebar.phtml'); - - } - - } // public function order_view_sidebar($order_id) - + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_downloadplus/order_view_sidebar.phtml', false) + ); + + } + + } // public function order_view($order_id, &$arSidebarArray) + public function order_view_sidebar_renderList($order_id) { @@ -914,5 +917,7 @@ if (file_exists($font_file)) { - + + global $name; + include $font_file; Index: /mods/wpsg_mod_kundenkontakt.class.php =================================================================== --- /mods/wpsg_mod_kundenkontakt.class.php (revision 5717) +++ /mods/wpsg_mod_kundenkontakt.class.php (revision 5720) @@ -25,5 +25,5 @@ * zeigt das Formular zum Senden in der Bestellverwaltung */ - public function order_view_content($order_id) + public function order_view($order_id, &$arSidebarArray) { @@ -48,6 +48,9 @@ } - - $this->shop->render(WPSG_PATH_VIEW.'mods/mod_kundenkontakt/order_view.phtml'); + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'mods/mod_kundenkontakt/order_view.phtml', false) + ); } // public function order_view_content($order_id) Index: /mods/wpsg_mod_ordervars.class.php =================================================================== --- /mods/wpsg_mod_ordervars.class.php (revision 5717) +++ /mods/wpsg_mod_ordervars.class.php (revision 5720) @@ -254,30 +254,33 @@ } - - public function order_view_sidebar(&$order_id) + + public function order_view($order_id, &$arSidebarArray) { $arOV_db = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1' ORDER BY `pos` ASC, `id` ASC "); $arOV = array(); - + foreach ($arOV_db as $k => $ov) { - + $arOV[$ov['id']] = wpsg_array_merge(array( - 'value' => $this->getValueByIdAndOrder($ov['id'], $order_id) + 'value' => $this->getValueByIdAndOrder($ov['id'], $order_id) ), $ov); - + $arOV[$ov['id']]['auswahl'] = explode('|', $ov['auswahl']); - - } - + + } + if (!wpsg_isSizedArray($arOV)) return; $this->shop->view['wpsg_mod_ordervars']['data'] = $arOV; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_ordervars/order_view_sidebar.phtml'); - + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_ordervars/order_view_sidebar.phtml', false) + ); + } - + public function clearSession() { Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 5717) +++ /mods/wpsg_mod_rechnungen.class.php (revision 5720) @@ -299,5 +299,5 @@ } // public function settings_edit() - public function order_view_content($order_id) + public function order_view($order_id, &$arSidebarArray) { @@ -322,6 +322,9 @@ `id` ASC "); - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_rechnungen/order_view.phtml'); + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_rechnungen/order_view.phtml', false) + ); } // public function order_view_content($order_id) { } Index: /mods/wpsg_mod_trustedshops.class.php =================================================================== --- /mods/wpsg_mod_trustedshops.class.php (revision 5717) +++ /mods/wpsg_mod_trustedshops.class.php (revision 5720) @@ -285,8 +285,11 @@ } // public function basket_save_order(&$data, &$checkout, &$arBasket, $finish_order) - public function order_view_sidebar(&$order_id) + public function order_view($order_id, &$arSidebarArray) { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_trustedshops/order_view_sidebar.phtml'); + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_trustedshops/order_view_sidebar.phtml', false) + ); } // public function order_view_sidebar(&$order_id) Index: /mods/wpsg_mod_videodownload.class.php =================================================================== --- /mods/wpsg_mod_videodownload.class.php (revision 5717) +++ /mods/wpsg_mod_videodownload.class.php (revision 5720) @@ -114,5 +114,5 @@ } // public function settings_save() - public function order_view_sidebar(&$order_id) + public function order_view($order_id, &$arSidebarArray) { @@ -177,6 +177,9 @@ $this->shop->view['arFiles'] = $arFiles; $this->shop->view['order_id'] = $order_id; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_videodownload/order_view_sidebar.phtml'); + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_videodownload/order_view_sidebar.phtml', false) + ); } Index: /mods/wpsg_mod_voucherproduct.class.php =================================================================== --- /mods/wpsg_mod_voucherproduct.class.php (revision 5717) +++ /mods/wpsg_mod_voucherproduct.class.php (revision 5720) @@ -454,5 +454,5 @@ } - public function order_view_sidebar(&$order_id) + public function order_view($order_id, &$arSidebarArray) { @@ -461,6 +461,9 @@ $this->shop->view['wpsg_mod_voucherproduct']['order_id'] = $order_id; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_voucherproduct/order_view_sidebar.phtml'); + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_voucherproduct/order_view_sidebar.phtml', false) + ); } Index: /system/intern/mods/wpsg_mod_orderupload.class.php =================================================================== --- /system/intern/mods/wpsg_mod_orderupload.class.php (revision 5717) +++ /system/intern/mods/wpsg_mod_orderupload.class.php (revision 5720) @@ -199,6 +199,6 @@ } // public function basket_save_done($o_id, $k_id) - - public function order_view_sidebar(&$order_id) + + public function order_view($order_id, &$arSidebarArray) { @@ -209,6 +209,10 @@ if (sizeof($arFiles) <= 0) return; - $this->shop->view['arFiles'] = $arFiles; - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/order_view_sidebar.phtml'); + $this->shop->view['arFiles'] = $arFiles; + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/order_view_sidebar.phtml', false) + ); } // public function order_view_sidebar(&$order_id) Index: /views/admin/form/text.phtml =================================================================== --- /views/admin/form/text.phtml (revision 5717) +++ /views/admin/form/text.phtml (revision 5720) @@ -7,7 +7,7 @@ view['field_config']['noP'])) { ?> - view['field_value']; ?> + view['field_id']))?' id="'.$this->view['field_id'].'" ':''); ?>>view['field_value']; ?> -

view['field_value']; ?>

+

view['field_id']))?' id="'.$this->view['field_id'].'" ':''); ?> class="form-control-static" style="padding-left:0px;">view['field_value']; ?>

@@ -17,4 +17,21 @@ + + view['field_config']['inlineEdit']) && $this->view['field_config']['inlineEdit']) { ?> + + Index: /views/admin/form/textarea.phtml =================================================================== --- /views/admin/form/textarea.phtml (revision 5717) +++ /views/admin/form/textarea.phtml (revision 5720) @@ -1,7 +1,13 @@
+ view['field_config']['noLabel']) || $this->view['field_config']['noLabel'] != true) { ?> - -
+ + + view['field_config']['noLabel']) && $this->view['field_config']['noLabel'] == true) { ?> +
+ +
+
Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5717) +++ /views/css/admin.css (revision 5720) @@ -133,4 +133,7 @@ .wpsg_order .wpsg-order-tab { padding-top:15px; padding-bottom:15px; } +#wpsg-bs.wpsg_order_view .editableform textarea { height:150px;} +.wpsg_order_view .wpsg_cell_gesamtpreis { text-align:right; } + /* Modulverwaltung */ .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; } Index: /views/js/editable.js =================================================================== --- /views/js/editable.js (revision 5717) +++ /views/js/editable.js (revision 5720) @@ -26,9 +26,44 @@ if (typeof options.type == "string") opt['type'] = options.type; - if (options.type == 'string' && typeof options.data == "string") { - + if (options.type == "select" && typeof options.data == "string") + { + + // Normale Übergabe eines JSON Strings + opt.source = jQuery.parseJSON(options.data); + opt.type = 'select'; + + } + else if (options.type == 'multiarray') + { + + var ar = []; + var arData = jQuery.parseJSON(options.data); + + for (var i in arData) + { + + objData = { 'text': arData[i].name, 'children': [] }; + + for (var j in arData[i]['fields']) + { + + objData['children'].push( { 'value': j, 'text': arData[i]['fields'][j] } ); + + } + + ar.push(objData); + + } + + opt.source = ar; + opt.type = 'select'; + + } + else if (options.type == 'string' && typeof options.data == "string") + { + var ar = []; var arData = jQuery.parseJSON(options.data); - + for (var i in arData) { @@ -49,5 +84,5 @@ else { - + opt.display = function(value, sourceData) { Index: /views/mods/mod_export/profil.phtml =================================================================== --- /views/mods/mod_export/profil.phtml (revision 5717) +++ /views/mods/mod_export/profil.phtml (revision 5720) @@ -259,5 +259,5 @@ submit: '', data: 'view['fields']); ?>', - type: 'select', + type: 'multiarray', placeholder: '', indicator: '', Index: /views/mods/mod_ordervars/ov_list.phtml =================================================================== --- /views/mods/mod_ordervars/ov_list.phtml (revision 5717) +++ /views/mods/mod_ordervars/ov_list.phtml (revision 5720) @@ -7,112 +7,116 @@ ?> view['data']) && sizeof($this->view['data']) > 0) { ?> - - - - - - - - +
+ + + + + + + + + view['data'] as $ov) { $i ++; ?> - - - - - - - - - - - + jQuery('#wpsg_ov_typ_').wspg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', { + submitdata: { + field: 'typ', + ov_id: '' + }, + submit: '', + data: 'mod->arTypen); ?>', + type: 'select', + placeholder: '', + indicator: '', + tooltip: '', + callback: function(el) { + if (el == '') + { + jQuery('#wpsg_ov_auswahlrow_').show(); + } + else + { + jQuery('#wpsg_ov_auswahlrow_').hide(); + } + } + }); + + function wpsg_removeOV(id) + { + jQuery.ajax({ + url: 'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&noheader=1&do=del', + data: { + ov_id: id + }, + success: function(data){ + if (data == 1) + { + location.reload(); + } + } + }); + } + + + + + + + + + +
mod->arTypen[$ov['typ']]; ?> id="wpsg_ov_pflicht_" /> - - - - - -
- : - - -
+ : + + +
@@ -125,5 +129,5 @@ jQuery('.wpsg_ov_table').sortable( { helper: wpsg_Tablefix, - items: 'tr.wpsg_tablerow', + items: 'tbody', handler: '.wpsg_id', update: function(event, ui) { Index: /views/mods/mod_rechnungen/order_view.phtml =================================================================== --- /views/mods/mod_rechnungen/order_view.phtml (revision 5717) +++ /views/mods/mod_rechnungen/order_view.phtml (revision 5720) @@ -75,204 +75,199 @@ -
-

-
- -

-
- - view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?> -

- - - view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { ?> - - - - - -
# - - - - - - - - - - - - - - callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'R'.$r['rnr'].'.pdf'; - } - else if ($r['gnr'] != "") - { - $rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'G'.$r['gnr'].'.pdf'; - } - - ?> - -   - - -
-
- - - view['mod_rechnungen']['arRechnungen']) > 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_gesamt']) != sizeof($this->view['mod_rechnungen']['arRechnungen_storno'])) { ?> -
- -
-
- - - -
-
-
- - - -

- - " style="float:right;" /> - - - - -
-
-
-
-
- - -
- -
- -
- - - - - -
- - - get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" /> -
- - - -
- - -
- - - " /> -
- - - - get_option("wpsg_rechnungen_footer"); - if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer")); - if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array(); - - ?> - - 0) { ?> - - - -
-
-
- - - - " /> - " /> - -
- -
-
-
- - - -
-
+ + + view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?> +

+ + + view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { ?> + + + + + +
# + + + + + + + + + + + + + + callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'R'.$r['rnr'].'.pdf'; + } + else if ($r['gnr'] != "") + { + $rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'G'.$r['gnr'].'.pdf'; + } + + ?> + +   + + +
+
+ + + view['mod_rechnungen']['arRechnungen']) > 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_gesamt']) != sizeof($this->view['mod_rechnungen']['arRechnungen_storno'])) { ?> +
+ +
+
+ + + +
+
+
+ + + +

+ + " style="float:right;" /> + + + + +
+
+
+
+
+ + +
+ + +
+ +
+ + + + + +
+ + + get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" /> +
+ + + +
+ + +
+ + + " /> +
+ + + + get_option("wpsg_rechnungen_footer"); + if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer")); + if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array(); + + ?> + + 0) { ?> + + + +
+
+
+ + + + " /> + " /> + +
+ +
+
+
+ + + + Index: /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml =================================================================== --- /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml (revision 5717) +++ /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml (revision 5720) @@ -9,69 +9,74 @@ -
-
- : - -
-
-

- view['wpsg_mod_shippingadress']['shipping_firma']) != '') { ?> - view['wpsg_mod_shippingadress']['shipping_firma']); ?>
- - view['wpsg_mod_shippingadress']['shipping_title']); ?> view['wpsg_mod_shippingadress']['shipping_vname']); ?> view['wpsg_mod_shippingadress']['shipping_name']); ?>
- view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
- view['wpsg_mod_shippingadress']['shipping_plz']); ?> view['wpsg_mod_shippingadress']['shipping_ort']); ?> view['shipping_country']['kuerzel']); ?>
-

-
- - - + -
+ + + + view['wpsg_mod_shippingadress']['shipping_firma']) != '') { ?> + view['wpsg_mod_shippingadress']['shipping_firma']); ?>
+ + view['wpsg_mod_shippingadress']['shipping_title']) && $this->view['wpsg_mod_shippingadress']['shipping_title'] != '-1') + echo $this->view['arTitles'][$this->view['wpsg_mod_shippingadress']['shipping_title']]; + + ?> view['wpsg_mod_shippingadress']['shipping_vname']); ?> view['wpsg_mod_shippingadress']['shipping_name']); ?>
+ view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
+ view['wpsg_mod_shippingadress']['shipping_plz']); ?> view['wpsg_mod_shippingadress']['shipping_ort']); ?> view['shipping_country']['kuerzel']); ?>
+ + + + + + + Index: ews/order/orderlog.phtml =================================================================== --- /views/order/orderlog.phtml (revision 5717) +++ (revision ) @@ -1,32 +1,0 @@ - -view['log']) && sizeof($this->view['log']) > 0) { ?> - - - - - - - view['log'] as $l) { ?> - - - - - - - - - -
- -
- - - Index: /views/order/view.phtml =================================================================== --- /views/order/view.phtml (revision 5717) +++ /views/order/view.phtml (revision 5720) @@ -6,574 +6,72 @@ ?> +
+ + + + writeBackendMessage(); ?> + +
+ +
+ view['data']['id']); ?> + + view['arSubAction'] as $k => $v) { $i ++; ?> + + +
+ +
+ +
+ +
+ + view['arSubAction'] as $k => $v) { $i ++; ?> +
+ + + +
+ + +
+ +
+ - -
-

-

- view['data']['onr']); ?> -

-
- writeBackendMessage(); ?> - -
- -
-
- -
-

-
- -

-
- -
-
- : -
-
-

- view['data']['knr']); ?> - hasMod('wpsg_mod_kundenverwaltung')) { ?> - [  ] - -

-
-
-
- -
-
- : - -
-
-

- view['data']['firma']) != '') { ?> - 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']['strasse']); ?>
- view['data']['plz']); ?> view['data']['ort']); ?> view['country']['kuerzel']); ?>
-

-
-
-
- - - - view['data']['geb']) > 0) { ?> - view['data']['geb']), array('text' => true)); ?> - - - view['data']['fax']) > 0) { ?> - view['data']['fax'], array('text' => true)); ?> - - - view['data']['tel']) > 0) { ?> - view['data']['tel'], array('text' => true)); ?> - - - view['data']['ustidnr']) > 0) { ?> - view['data']['ustidnr'], array('text' => true)); ?> - - -
-
- : -
-
-

- view['data']['email']; ?> -

-
-
-
- - callMods('wpsg_order_view_customerdata', array(&$this->view['data']['id'])); ?> - -
-
- -
-

-
- -

-
- -
-
- : -
-
-

- view['oOrder']->getShippingLabel()); ?> - view['basket']['sum']['preis_shipping']) && $this->view['basket']['sum']['preis_shipping'] > 0) { ?> - (view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>) - -

-
-
-
- -
-
- : -
-
-

- - view['arPayment'][$this->view['data']['type_payment']]['name'], 'wpsg'); ?> - view['basket']['sum']['preis_payment']) && $this->view['basket']['sum']['preis_payment'] > 0) { ?> - (view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>) - - -

-
-
-
- callMods('order_view_afterpayment', array(&$this->view['data']['id'])); ?> - -
-
- - view['data']['order_comment']) != '') { ?> -
-

-
- -

-
- view['data']['order_comment']); ?> -
-
- - -
-

-
- -

-
-
- - -
-
-
- - callMods('order_view_sidebar', array(&$this->view['data']['id'])); ?> - -
-
- -
-
-
-

-
- -

-
- -
-
- : -
-
-

- view['data']['onr']); ?> [arStatus[$this->view['data']['status']]); ?>] -

-
-
-
- - view['data']['language']) && $this->view['data']['language'] != $this->getCurrentLanguage()) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$this->view['data']['language']]; ?> -
-
- : -
-
-

- <?php echo wpsg_translate(__('Produkt fÃŒr Sprache #1# bearbeiten.', 'wpsg'), $lang['name']); ?> - -

-
-
-
- - -
-
- : -
-
-

- view['data']['cdate'])); ?> -

-
-
-
- -
-
-
- : -
-
- -   -
- -
-
-
- callMods('order_view_switchStatus', array(&$this->view['data']['id'])); ?> -
- - get_option('wpsg_debugModus'))) { ?> -
-
- : -
-
- -
-
-
-
-
-
- - view['basket']); ?> - - -
-
-
- - -
-
- -
-

-
- -

-
- - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?> - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - - - - - - - callMods('order_view_row', array(&$p, $i)); ?> - - view['basket']['gs'])) { ?> - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - - view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?> - - - - - - - - - - view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> - - - - - - view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?> - - - - - - get_option('wpsg_preisangaben') == '1' && $this->get_option('wpsg_kleinunternehmer') != '1') { ?> - view['basket']['mwst'] as $mwst_id => $mwst) { ?> - - - - - - - - - - - get_option('wpsg_kleinunternehmer') == '1' || $this->get_option('wpsg_preisangaben') != '1') { ?> - view['basket']['mwst'] as $mwst_id => $mwst) { ?> - - - - - - -
- - getProductName($this->getProduktID($p['id']))); ?> - - get_option('wpsg_currency'); ?> % get_option('wpsg_currency'); ?>
- : - - - getShippingName($shipping); ?>, - -
view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>1view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
- - - view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> -
- get_option('wpsg_kleinunternehmer') == '1') { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> - - getFrontendTaxview() == WPSG_NETTO) { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> - - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> - - - - view['basket']['sum']['preis']); ?> get_option('wpsg_currency'); ?> -
- - - view['basket']['sum']['preis_shipping']); ?> get_option('wpsg_currency'); ?> -
- - - view['basket']['sum']['preis_payment']); ?> get_option('wpsg_currency'); ?> -
- - - get_option('wpsg_currency'); ?> -
- - - view['basket']['sum']['preis_gesamt_brutto']); ?> get_option('wpsg_currency'); ?> -
- get_option('wpsg_kleinunternehmer') == '1') { ?> - get_option('wpsg_kleinunternehmer_text'); ?> - - - - - get_option('wpsg_currency'); ?> -
- -
-
- - callMods('order_view_content', array($this->view['data']['id'])); ?> - -
-

-
- -

-
- view['orderLog']; ?> -
-
- -
- -
- -
- -
Index: /views/order/view_customerdata.phtml =================================================================== --- /views/order/view_customerdata.phtml (revision 5720) +++ /views/order/view_customerdata.phtml (revision 5720) @@ -0,0 +1,112 @@ + + + + + + + + view['oOrder']->getCustomer()->getNr(); ?> + hasMod('wpsg_mod_kundenverwaltung')) { ?> + [  ] + + + + + view['data']['firma']) != '') { ?> + view['data']['firma']); ?>
+ + 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']); ?>
+ + + + + + + + view['data']['geb']) > 0) { ?> + view['data']['geb']), array('text' => true)); ?> + + + view['data']['fax']) > 0) { ?> + view['data']['fax'], array('text' => true)); ?> + + + view['data']['tel']) > 0) { ?> + view['data']['tel'], array('text' => true)); ?> + + + view['data']['ustidnr']) > 0) { ?> + view['data']['ustidnr'], array('text' => true)); ?> + + + callMods('wpsg_order_view_customerdata', array(&$this->view['data']['id'])); ?> + + + view['data']['email']; ?> + + + + + Index: /views/order/view_dev.phtml =================================================================== --- /views/order/view_dev.phtml (revision 5720) +++ /views/order/view_dev.phtml (revision 5720) @@ -0,0 +1,32 @@ + + + + +
+
+
+
+
+ +
+ +
+
+

+
+
+
+ 
view['basket']); ?>
+
+
+
+ + Index: /views/order/view_general.phtml =================================================================== --- /views/order/view_general.phtml (revision 5720) +++ /views/order/view_general.phtml (revision 5720) @@ -0,0 +1,32 @@ + + + + view['oOrder']->getNr().' ['.$this->view['oOrder']->getStateLabel().']'); ?> + view['oOrder']->cdate)); ?> + view['oOrder']->getAmount(), $this->get_option('wpsg_currency'))); ?> + view['data']['admincomment'], 'wpsg_order_admincomment', array('inlineEdit' => true, 'inlineEdit_type' => 'textarea', 'inlineEdit_url' => WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&noheader=1&action=setAdminComment&edit_id='.$this->view['data']['id'])); ?> + + + + +
+ + arStatus, $this->view['data']['status']); ?> + + +
+ + + + + +
+ Index: /views/order/view_orderdata.phtml =================================================================== --- /views/order/view_orderdata.phtml (revision 5720) +++ /views/order/view_orderdata.phtml (revision 5720) @@ -0,0 +1,144 @@ + + + + + + + + view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> + + + + + + view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?> + + + + view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> + + + + + + + + + + + + callMods('order_view_row', array(&$p, $i)); ?> + + view['basket']['gs'])) { ?> + + + + view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> + + + + + + + view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?> + + + + + + + + + + view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> + + + + + + view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?> + + + + + + get_option('wpsg_preisangaben') == '1' && $this->get_option('wpsg_kleinunternehmer') != '1') { ?> + view['basket']['mwst'] as $mwst_id => $mwst) { ?> + + + + + + + + + + + get_option('wpsg_kleinunternehmer') == '1' || $this->get_option('wpsg_preisangaben') != '1') { ?> + view['basket']['mwst'] as $mwst_id => $mwst) { ?> + + + + + + +
+ + getProductName($this->getProduktID($p['id']))); ?> + + get_option('wpsg_currency'); ?> % get_option('wpsg_currency'); ?>
+ : + + + getShippingName($shipping); ?>, + +
view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>1view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
+ + + view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> +
+ get_option('wpsg_kleinunternehmer') == '1') { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> + + getFrontendTaxview() == WPSG_NETTO) { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> + + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> + + + + view['basket']['sum']['preis']); ?> get_option('wpsg_currency'); ?> +
+ + + view['basket']['sum']['preis_shipping']); ?> get_option('wpsg_currency'); ?> +
+ + + view['basket']['sum']['preis_payment']); ?> get_option('wpsg_currency'); ?> +
+ + + get_option('wpsg_currency'); ?> +
+ + + view['basket']['sum']['preis_gesamt_brutto']); ?> get_option('wpsg_currency'); ?> +
+ get_option('wpsg_kleinunternehmer') == '1') { ?> + get_option('wpsg_kleinunternehmer_text'); ?> + + + + + get_option('wpsg_currency'); ?> +
+ Index: /views/order/view_orderlog.phtml =================================================================== --- /views/order/view_orderlog.phtml (revision 5720) +++ /views/order/view_orderlog.phtml (revision 5720) @@ -0,0 +1,28 @@ + + + +
+ view['oOrder']->getLog() as $k => $ol) { ?> +
+
+

+

+
+
+
+
+
+
+
+ +
+ + Index: /views/order/view_shippay.phtml =================================================================== --- /views/order/view_shippay.phtml (revision 5720) +++ /views/order/view_shippay.phtml (revision 5720) @@ -0,0 +1,31 @@ + + + + + + view['oOrder']->getShippingLabel()); ?> + view['oOrder']->getShippingAmount($this->getBackendTaxview()); ?> + 0) { ?> + (get_option('wpsg_currency')); ?>) + + + + + view['oOrder']->getPaymentLabel()); ?> + view['oOrder']->getPaymentAmount($this->getBackendTaxview()); ?> + 0) { ?> + (get_option('wpsg_currency')); ?>) + + + + callMods('order_view_afterpayment', array(&$this->view['data']['id'])); ?> + + Index: /views/produkt/addedit.phtml =================================================================== --- /views/produkt/addedit.phtml (revision 5717) +++ /views/produkt/addedit.phtml (revision 5720) @@ -33,5 +33,5 @@ view['data']['id'])) { ?> - ', 'wpsg'), $this->view['data']['id'], $this->view['oProduct']->getProductURL()); ?> + ', 'wpsg'), $this->view['data']['id'], $this->view['oProduct']->getProductURL()); ?>