diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2016-07-17 14:26:40 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2016-07-17 14:26:40 +0000 |
| commit | 0271bef3d4c28fae86f299b3441f6ca90a49d46d (patch) | |
| tree | d20211dff620fa62cf5c27b9174f0616c2de3447 | |
| parent | 0d29d2ff39a05dc1d9bff94addde26d716a1f08b (diff) | |
- Export in neues Layout integriert
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5683 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rw-r--r-- | views/css/admin.css | 7 | ||||
| -rw-r--r-- | views/js/editable.js | 2 | ||||
| -rw-r--r-- | views/mods/mod_bankalignment/order_ajax.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_bankalignment/product_index_tab.phtml | 21 | ||||
| -rw-r--r-- | views/mods/mod_bankalignment/produkt_index_aftersearch.phtml | 29 | ||||
| -rw-r--r-- | views/mods/mod_bankalignment/produkt_index_head.phtml | 11 | ||||
| -rw-r--r-- | views/mods/mod_export/product_index_tab.phtml | 37 | ||||
| -rw-r--r-- | views/mods/mod_export/produkt_index_aftersearch.phtml | 65 | ||||
| -rw-r--r-- | views/mods/mod_export/produkt_index_head.phtml | 13 | ||||
| -rw-r--r-- | views/mods/mod_export/profil.phtml | 214 | ||||
| -rw-r--r-- | views/mods/mod_export/profillist.phtml | 12 | ||||
| -rw-r--r-- | views/mods/mod_export/settings_edit.phtml | 17 | ||||
| -rw-r--r-- | views/order/_index.phtml | 566 | ||||
| -rw-r--r-- | views/order/index.phtml | 376 | ||||
| -rw-r--r-- | views/produkt/index.phtml | 2 |
15 files changed, 400 insertions, 976 deletions
diff --git a/views/css/admin.css b/views/css/admin.css index 299c42b..e54f906 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -9,6 +9,7 @@ #wpsg-bs nav.navbar .glyphicon { margin-right:10px; }
#wpsg-bs .wpsg-filter { border-top:1px solid #E0E0E0; padding-top:15px; }
#wpsg-bs .pagination_wrap { text-align:right; padding-right:20px; }
+#wpsg-bs .pagination_wrap_bottom { padding-right:0px; }
#wpsg-bs .pagination { margin-top:0px; margin-bottom:10px; }
#wpsg-bs .content { width:100%; box-sizing:border-box; padding-right:20px; }
#wpsg-bs .form-group { margin-bottom:5px; margin-top:5px; }
@@ -32,6 +33,8 @@ #wpsg-bs .list-group-head a { color:#FFFFFF; }
#wpsg-bs .modal-dialog { width:70%; }
#wpsg-bs .table-bordered thead { background-color:#FFFFFF; }
+#wpsg-bs .table-body-striped > tbody:nth-of-type(odd) { background-color:#f9f9f9; }
+#wpsg-bs .checkbox input { margin-top:1px; }
/* Allgemeine Klassen */
.wpsg_grey { color:#999999; }
@@ -124,6 +127,7 @@ .wpsg_order .col_nr .glyphicon { margin-top:5px; font-size:1.2em; margin-right:5px; text-decoration:none; }
.wpsg_order .col_nr .glyphicon.shippingadress { color:red; }
.wpsg_order .col_nr .glyphicon.admincomment { color:red; }
+.wpsg_order .wpsg-order-tab { padding-top:15px; padding-bottom:15px; }
/* Modulverwaltung */
.wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; }
@@ -181,4 +185,7 @@ .wpsg_mod_productvariants_dialog_noDialog .modal-body { padding:1rem 0px; }
.wpsg_mod_productvariants_dialog_noDialog .modal-footer { padding:1rem 0px; }
+/* Modul Exportprofile */
+#wpsg_profil_list { padding:10px; border:1px solid #DDDDDD; }
+
#beschreibung_ifr { height:500px; }
\ No newline at end of file diff --git a/views/js/editable.js b/views/js/editable.js index 636804e..bc0be99 100644 --- a/views/js/editable.js +++ b/views/js/editable.js @@ -54,6 +54,8 @@ };
}
+
+ if (typeof options.callback == "function") opt.success = options.callback;
jQuery(this).editable(opt);
diff --git a/views/mods/mod_bankalignment/order_ajax.phtml b/views/mods/mod_bankalignment/order_ajax.phtml index bf8bc4b..d0fa44a 100644 --- a/views/mods/mod_bankalignment/order_ajax.phtml +++ b/views/mods/mod_bankalignment/order_ajax.phtml @@ -3,9 +3,7 @@ /**
* Template für die Zuweisung der Bestellungen zu Datensätzen aus der CSV Datei
*/
-
- //wpsg_debug($this->view);
-
+
?>
<div class="wrap wpsg_mod_bankalignment_order_ajax">
<div class="icon32 icon32-posts-post" id="icon-edit"><br></div>
diff --git a/views/mods/mod_bankalignment/product_index_tab.phtml b/views/mods/mod_bankalignment/product_index_tab.phtml new file mode 100644 index 0000000..0469fb2 --- /dev/null +++ b/views/mods/mod_bankalignment/product_index_tab.phtml @@ -0,0 +1,21 @@ +<?php
+
+ /**
+ * Integriert das Uploadformular in die Bestellverwaltung
+ */
+
+?>
+
+
+<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_bankalignment" enctype="multipart/form-data">
+
+ <?php echo wpsg_drawForm_Upload('wpsg_mod_bankalignment_file', __('CSV Datei', 'wpsg')); ?>
+
+ <br />
+
+ <div class="container-fluid">
+ <input type="submit" value="<?php echo __('Abgleich starten', 'wpsg'); ?>" name="submit" class="button" />
+ </div>
+
+</form>
+
diff --git a/views/mods/mod_bankalignment/produkt_index_aftersearch.phtml b/views/mods/mod_bankalignment/produkt_index_aftersearch.phtml deleted file mode 100644 index 8f0d09a..0000000 --- a/views/mods/mod_bankalignment/produkt_index_aftersearch.phtml +++ /dev/null @@ -1,29 +0,0 @@ -<?php
-
- /**
- * Integriert das Uploadformular in die Bestellverwaltung
- */
-
-?>
-<div class="wpsg_clear"></div>
-<div class="metabox-holder" id="wpsg_mod_bankalignment_layer" style="<?php echo (($_COOKIE['wpsg_mod_bankalignment_layer'] == '1')?'display:block;':'display:none;'); ?>">
- <div id="mod_bankalignment" class="postbox">
- <h3 class="wpsg_handlediv">
- <span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br></span>
- <span><?php echo __('Bankabgleich', 'wpsg'); ?></span>
- </h3>
- <div class="inside">
-
- <form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_bankalignment" enctype="multipart/form-data">
-
- <?php echo wpsg_drawForm_Upload('wpsg_mod_bankalignment_file', __('CSV Datei', 'wpsg')); ?>
-
- <br />
-
- <input type="submit" value="<?php echo __('Abgleich starten', 'wpsg'); ?>" name="submit" class="button" />
-
- </form>
-
- </div>
- </div>
-</div>
\ No newline at end of file diff --git a/views/mods/mod_bankalignment/produkt_index_head.phtml b/views/mods/mod_bankalignment/produkt_index_head.phtml deleted file mode 100644 index 92cbcf5..0000000 --- a/views/mods/mod_bankalignment/produkt_index_head.phtml +++ /dev/null @@ -1,11 +0,0 @@ -<?php
-
- /**
- * Template für die Integration in den Kopf der Bestellverwaltung
- * Integriert lediglich den Link zum Upload der CSV Datei
- */
-
-?>
-<label>
- <input type="checkbox" <?php echo (($_COOKIE['wpsg_mod_bankalignment_layer'] == '1')?'checked="checked"':''); ?> onclick="if (jQuery(this).attr('checked') == 'checked') { jQuery('#wpsg_mod_bankalignment_layer').show(); jQuery.cookie('wpsg_mod_bankalignment_layer', '1'); } else { jQuery('#wpsg_mod_bankalignment_layer').hide(); jQuery.cookie('wpsg_mod_bankalignment_layer', null); }" /> <?php echo __('Bankabgleich', 'wpsg'); ?>
-</label>
\ No newline at end of file diff --git a/views/mods/mod_export/product_index_tab.phtml b/views/mods/mod_export/product_index_tab.phtml new file mode 100644 index 0000000..88672dc --- /dev/null +++ b/views/mods/mod_export/product_index_tab.phtml @@ -0,0 +1,37 @@ +<?php
+
+ /**
+ * Template für die Integration des Produktexportes in die Bestellvarwaltung im unteren Bereich
+ */
+
+?>
+<form class="container-fluid" method="post" action="<?php echo WPSG_URL_WP ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_export&noheader=1" onsubmit="wpsg_mod_export_serializefilter();">
+
+ <div class="form-group form-group-sm">
+ <?php foreach ($this->view['wpsg_mod_export']['arProfile'] as $p) { ?>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="wpsg_mod_export_profile[]" value="<?php echo $p['id']; ?>" /> <?php echo $p['name']; ?>
+ </label><br />
+ </div>
+ <?php } ?>
+ </div>
+
+ <br />
+
+ <input class="button" type="submit" value="<?php echo __('Export starten', 'wpsg'); ?>" />
+
+ <input type="hidden" name="filter" id="wpsg_mod_export_filter" value="" />
+
+</form>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+ function wpsg_mod_export_serializefilter()
+ {
+
+ jQuery('#wpsg_mod_export_filter').val(jQuery('#filter_form').serialize());
+
+ }
+
+/* ]]> */</script>
diff --git a/views/mods/mod_export/produkt_index_aftersearch.phtml b/views/mods/mod_export/produkt_index_aftersearch.phtml deleted file mode 100644 index 73ce3cc..0000000 --- a/views/mods/mod_export/produkt_index_aftersearch.phtml +++ /dev/null @@ -1,65 +0,0 @@ -<?php
-
- /**
- * Template für die Integration des Produktexportes in die Bestellvarwaltung im unteren Bereich
- */
-
-?>
-<script type="text/javascript">/* <![CDATA[ */
-
- /**
- * Startet den Export, dazu wird der obere Filter mißbraucht
- */
- function wpsg_mod_export_do()
- {
-
- var arProfileIDs = Array();
-
- jQuery('.wpsg_mod_export_profilid:checked').each(function() {
-
- arProfileIDs.push(jQuery(this).val());
-
- } );
-
- if (arProfileIDs.length <= 0)
- {
-
- alert('<?php echo __('Bitte mindestens ein Profil zum exportieren wählen.', 'wpsg'); ?>');
- return false;
-
- }
-
- jQuery('#wpsg_mod_export_profile').val(arProfileIDs.join(','));
- jQuery('#submit_export').val('1');
- jQuery('#wpsg_order_index_noheader_filter').attr('name', 'noheader');
- jQuery('#filter_form').attr('target', '_new');
-
- jQuery('#filter_form').submit();
-
- jQuery('#wpsg_order_index_noheader_filter').attr('name', '');
- jQuery('#submit_export').val('0');
- jQuery('#filter_form').attr('target', '');
-
- return false;
-
- } // function wpsg_mod_export_do()
-
-/* ]]> */</script>
-
-<div class="metabox-holder" id="wpsg_mod_export_layer" style="<?php echo (($_COOKIE['wpsg_mod_export_layer'] == '1')?'display:block;':'display:none;'); ?>padding-top:0px;">
- <div id="wpsg_modexport" class="postbox">
- <h3 class="wpsg_handlediv">
- <span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br></span>
- <span><?php echo __('Bestellexport', 'wpsg'); ?></span>
- </h3>
- <div class="inside">
- <?php foreach ($this->view['wpsg_mod_export']['arProfile'] as $p) { ?>
- <label class="wpsg_mod_export_profillabel">
- <input type="checkbox" class="wpsg_mod_export_profilid" value="<?php echo $p['id']; ?>" type="checkbox" /> <?php echo __($p['name'], 'wpsg'); ?>
- </label>
- <?php } ?>
- <div class="wpsg_clear"></div><br />
- <input type="submit" onclick="return wpsg_mod_export_do();" value="<?php echo __('Export starten', 'wpsg'); ?>" class="button" name="submit_export" />
- </div>
- </div>
-</div>
\ No newline at end of file diff --git a/views/mods/mod_export/produkt_index_head.phtml b/views/mods/mod_export/produkt_index_head.phtml deleted file mode 100644 index 23f3759..0000000 --- a/views/mods/mod_export/produkt_index_head.phtml +++ /dev/null @@ -1,13 +0,0 @@ -<?php
-
- /**
- * Template für die Integration der Exportprofile in die Übersicht der Bestellungen
- */
-
-?>
-<input type="hidden" name="submit_export" id="submit_export" value="" />
-<input type="hidden" id="wpsg_mod_export_profile" name="wpsg_mod_export_profile" value="" />
-
-<label>
- <input type="checkbox" <?php echo (($_COOKIE['wpsg_mod_export_layer'] == '1')?'checked="checked"':''); ?> onclick="if (jQuery(this).attr('checked') == 'checked') { jQuery('#wpsg_mod_export_layer').show(); jQuery.cookie('wpsg_mod_export_layer', '1'); } else { jQuery('#wpsg_mod_export_layer').hide(); jQuery.cookie('wpsg_mod_export_layer', null); }" /> <?php echo __('Bestellexport', 'wpsg'); ?>
-</label>
\ No newline at end of file diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml index 96ca6fc..0d525b1 100644 --- a/views/mods/mod_export/profil.phtml +++ b/views/mods/mod_export/profil.phtml @@ -159,109 +159,117 @@ <div class="wpsg_clear"></div>
</div>
<br />
-<table class="wpsg_mod_export_fieldlist" cellpadding="0" cellspacing="0">
- <tr>
- <th class="wpsg_mod_export_col_name"><?php echo __('Spaltenname', 'wpsg'); ?></th>
- <th class="wpsg_mod_export_col_value"><?php echo __('Wert', 'wpsg'); ?></th>
- <th class="wpsg_mod_export_col_format"><?php echo __('Format', 'wpsg'); ?></th>
- <th class="wpsg_mod_export_col_remove"></th>
- </tr>
- <?php $i = 0; foreach ((array)$this->view['profil']['data']['fields'] as $f_key => $f) { $i ++; ?>
- <tr class="wpsg_tablerow wpsg_mod_export_row1 wpsg_mod_export_fieldrow_<?php echo $f_key; ?> <?php echo (($i % 2 == 0)?'odd':'even'); ?>">
- <td class="wpsg_mod_export_col_name wpsg_editable" id="field_name_<?php echo $f_key; ?>"><?php echo $f['name']; ?></td>
- <td class="wpsg_mod_export_col_field wpsg_editable" id="field_typ_<?php echo $f_key; ?>"><?php
-
- foreach ($this->view['fields'] as $fieldgroup)
- {
-
- foreach ($fieldgroup['fields'] as $field_key => $field)
- {
-
- if ($field_key == $f['value'])
- {
- echo $field;
- }
-
- }
-
- }
-
- ?></td>
- <td class="wpsg_mod_export_col_format wpsg_editable" id="field_format_<?php echo $f_key; ?>"><?php echo $this->view['arFormats'][$f['format']]; ?></td>
- <td>
- <a style="float:right;" onclick="return wpsg_mod_export_removeField(<?php echo $this->view['profil']['id']; ?>, <?php echo $f_key; ?>);" title="<?php echo __('Profil löschen', 'wpsg'); ?>" href="#" class="wpsg_icon wpsg_icon_remove"></a>
- </td>
- </tr>
- <tr id="userformatrow_<?php echo $f_key; ?>" style="<?php echo (($f['format'] != 700)?'display:none;':''); ?>" class="wpsg_mod_export_row2 wpsg_tablerow wpsg_mod_export_fieldrow_<?php echo $f_key; ?> <?php echo (($i % 2 == 0)?'odd':'even'); ?>">
- <td class="wpsg_mod_export_col_name"></td>
- <td class="wpsg_mod_export_col_field_user"><?php echo __('Format:', 'wpsg'); ?></td>
- <td class="wpsg_mod_export_col_format_user wpsg_editable" id="field_userformat_<?php echo $f_key; ?>"><?php echo wpsg_hspc($f['userformat']); ?></td>
- <td style="position:relative;">
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" class="wpsg_form_help" style="float:right; position:relative;"></a>
- <script type="text/javascript">
-
- jQuery('#field_userformat_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'fielduserformat_<?php echo $f_key; ?>',
- profil_id: '<?php echo $this->view['profil']['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- });
-
- jQuery('#field_format_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'fieldformat_<?php echo $f_key; ?>',
- profil_id: '<?php echo $this->view['profil']['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: '<?php echo json_encode($this->view['arFormats']); ?>',
- type: 'select',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- callback: function(el) {
- if (el == '<?php echo $this->view['arFormats'][700]; ?>')
- {
- jQuery('#userformatrow_<?php echo $f_key; ?>').show();
- }
- else
- {
- jQuery('#userformatrow_<?php echo $f_key; ?>').hide();
- }
- }
- });
-
- jQuery('#field_name_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'fieldname_<?php echo $f_key; ?>',
- profil_id: '<?php echo $this->view['profil']['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- });
-
- jQuery('#field_typ_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'fieldtyp_<?php echo $f_key; ?>',
- profil_id: '<?php echo $this->view['profil']['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: '<?php echo json_encode($this->view['fields']); ?>',
- type: 'select',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- });
-
- </script>
- </td>
- </tr>
- <?php } ?>
+<table class="table table-body-striped">
+ <thead>
+ <tr>
+ <th class="wpsg_mod_export_col_name"><?php echo __('Spaltenname', 'wpsg'); ?></th>
+ <th class="wpsg_mod_export_col_value"><?php echo __('Wert', 'wpsg'); ?></th>
+ <th class="wpsg_mod_export_col_format"><?php echo __('Format', 'wpsg'); ?></th>
+ <th class="wpsg_mod_export_col_remove"></th>
+ </tr>
+ </thead>
+
+ <?php $i = 0; foreach ((array)$this->view['profil']['data']['fields'] as $f_key => $f) { $i ++; ?>
+ <tbody>
+ <tr class="wpsg_tablerow wpsg_mod_export_row1 wpsg_mod_export_fieldrow_<?php echo $f_key; ?> <?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+ <td class="wpsg_mod_export_col"><div class="name wpsg_editable" id="field_name_<?php echo $f_key; ?>"><?php echo $f['name']; ?></div></td>
+ <td class="wpsg_mod_export_col_field"><div class="wpsg_editable" id="field_typ_<?php echo $f_key; ?>"><?php
+
+ foreach ($this->view['fields'] as $fieldgroup)
+ {
+
+ foreach ($fieldgroup['fields'] as $field_key => $field)
+ {
+
+ if ($field_key == $f['value'])
+ {
+ echo $field;
+ }
+
+ }
+
+ }
+
+ ?></div></td>
+ <td class="wpsg_mod_export_col_format"><div class="wpsg_editable" id="field_format_<?php echo $f_key; ?>"><?php echo $this->view['arFormats'][$f['format']]; ?></div></td>
+ <td>
+ <a style="float:right;" onclick="return wpsg_mod_export_removeField(<?php echo $this->view['profil']['id']; ?>, <?php echo $f_key; ?>);" title="<?php echo __('Profil löschen', 'wpsg'); ?>" href="#" class="wpsg_icon wpsg_icon_remove"></a>
+ </td>
+ </tr>
+ <tr id="userformatrow_<?php echo $f_key; ?>" style="<?php echo (($f['format'] != 700)?'display:none;':''); ?>" class="wpsg_mod_export_row2 wpsg_tablerow wpsg_mod_export_fieldrow_<?php echo $f_key; ?> <?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+ <td class="wpsg_mod_export_col_name"></td>
+ <td class="wpsg_mod_export_col_field_user"><?php echo __('Format:', 'wpsg'); ?></td>
+ <td class="wpsg_mod_export_col_format_user"><div class="wpsg_editable" id="field_userformat_<?php echo $f_key; ?>"><?php echo wpsg_hspc(wpsg_getStr($f['userformat'])); ?></div></td>
+ <td style="position:relative;">
+ <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" class="wpsg_form_help" style="float:right; position:relative;"></a>
+ <script type="text/javascript">
+
+ jQuery('#field_userformat_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'fielduserformat_<?php echo $f_key; ?>',
+ profil_id: '<?php echo $this->view['profil']['id']; ?>'
+ },
+ submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+ placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+ indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+ });
+
+ jQuery('#field_format_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'fieldformat_<?php echo $f_key; ?>',
+ profil_id: '<?php echo $this->view['profil']['id']; ?>'
+ },
+ submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+ data: '<?php echo json_encode($this->view['arFormats']); ?>',
+ type: 'select',
+ placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+ indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+ callback: function(el) {
+
+ if (el == '<?php echo $this->view['arFormats'][700]; ?>')
+ {
+ jQuery('#userformatrow_<?php echo $f_key; ?>').show();
+ }
+ else
+ {
+ jQuery('#userformatrow_<?php echo $f_key; ?>').hide();
+ }
+
+ }
+ });
+
+ jQuery('#field_name_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'fieldname_<?php echo $f_key; ?>',
+ profil_id: '<?php echo $this->view['profil']['id']; ?>'
+ },
+ submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+ placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+ indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+ });
+
+ jQuery('#field_typ_<?php echo $f_key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'fieldtyp_<?php echo $f_key; ?>',
+ profil_id: '<?php echo $this->view['profil']['id']; ?>'
+ },
+ submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+ data: '<?php echo json_encode($this->view['fields']); ?>',
+ type: 'select',
+ placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+ indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+ });
+
+ </script>
+ </td>
+ </tr>
+ </tbody>
+ <?php } ?>
+
</table>
<script type="text/javascript">
diff --git a/views/mods/mod_export/profillist.phtml b/views/mods/mod_export/profillist.phtml index eb866f2..f73903f 100644 --- a/views/mods/mod_export/profillist.phtml +++ b/views/mods/mod_export/profillist.phtml @@ -4,14 +4,14 @@ * Template für die Liste der Profile
*/
+ $arProfilSelect = array();
+ foreach ($this->view['arProfile'] as $p) $arProfilSelect[$p['id']] = $p['name'];
+
?>
+
<?php if (sizeof($this->view['arProfile']) > 0) { ?>
-<select name="wpsg_mod_export[profil]" id="wpsg_mod_export_profil" onchange="wpsg_mod_export_profilSwitch();" style="width:99%;">
- <?php foreach ($this->view['arProfile'] as $p) { ?>
- <option value="<?php echo $p['id']; ?>" <?php echo ((isset($this->view['profil_id']) && $p['id'] == $this->view['profil_id'])?'selected="selected"':''); ?>><?php echo $p['name']; ?></option>
- <?php } ?>
-</select>
-<div id="profil_content" style="padding:5px 0px 5px 0px;"></div>
+<?php echo wpsg_drawForm_Select('wpsg_mod_export[profil]', __('Exportprofile', 'wpsg'), $arProfilSelect, @$this->view['profil_id'], array('id' => 'wpsg_mod_export_profil', 'onchange' => 'wpsg_mod_export_profilSwitch();')); ?>
+<div id="profil_content" style="padding:15px 0px 15px 0px;"></div>
<?php } else { ?>
<p><?php echo __('Bisher noch keine Profile angelegt.', 'wpsg'); ?></p>
<?php } ?>
diff --git a/views/mods/mod_export/settings_edit.phtml b/views/mods/mod_export/settings_edit.phtml index 39aec29..263dd47 100644 --- a/views/mods/mod_export/settings_edit.phtml +++ b/views/mods/mod_export/settings_edit.phtml @@ -92,16 +92,7 @@ </script>
-<div class="wpsg_admin_box">
- <div class="head">
- <div class="title">
- <div class="fulltab">
- <?php echo __('Exportprofile', 'wpsg'); ?>
- <a title="<?php echo __('Neuens Exportprofil anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_mod_export_addProfil();"></a>
- </div>
- </div>
- <div id="wpsg_profil_list" class="content">
- <?php echo $this->callMod('wpsg_mod_export', 'profilList'); ?>
- </div>
- </div>
-</div>
\ No newline at end of file +<a title="<?php echo __('Neuens Exportprofil anlegen', 'wpsg'); ?>" href="#" class="" onclick="return wpsg_mod_export_addProfil();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Exportprofil anlegen', 'wpsg'); ?></a>
+<br /><br />
+
+<div id="wpsg_profil_list"><?php echo $this->callMod('wpsg_mod_export', 'profilList'); ?></div>
\ No newline at end of file diff --git a/views/order/_index.phtml b/views/order/_index.phtml deleted file mode 100644 index 6ca0ad0..0000000 --- a/views/order/_index.phtml +++ /dev/null @@ -1,566 +0,0 @@ -<?php
-
- /**
- * Template für die Übersicht der Bestellungen
- */
-
-?>
-
-
-<div class="wrap wpsg_order_index">
- <div class="icon32 icon32-posts-post" id="icon-edit"><br></div>
- <h2>
- <?php echo __('Bestellverwaltung', 'wpsg'); ?>
- </h2>
-
- <script type="text/javascript">/* <![CDATA[ */
-
- var wpsg_order = '<?php echo $this->view['filter']['order']; ?>';
- var wpsg_ascdesc = '<?php echo $this->view['filter']['ascdesc']; ?>';
-
- function goPage(page)
- {
-
- if (page <= 0 || page == <?php echo $this->view['seite']; ?> || page > <?php echo $this->view['pages']; ?>) return;
-
- jQuery('#seite').val(page);
- jQuery('#filter_form').submit();
-
- return false;
-
- } // function goPage(page)
-
- function wpsg_setOrder(order)
- {
-
- if (order == wpsg_order)
- {
-
- // Nur Richtung ändern
- if (wpsg_ascdesc == 'asc') jQuery('#wpsg_ascdesc').val('desc');
- else jQuery('#wpsg_ascdesc').val('asc');
-
- }
- else
- {
-
- jQuery('#wpsg_order').val(order);
- jQuery('#wpsg_ascdesc').val('asc');
-
- }
-
- jQuery('#seite').val(1);
- jQuery('#filter_form').submit();
-
- return false;
-
- } // function wpsg_setOrder(order)
-
- function goStatus(status_id)
- {
-
- jQuery.cookie("wpsg_order_status", status_id);
-
- jQuery('#filter_status option').attr("selected", false);
- jQuery('#filter_status option[value="' + status_id + '"]').attr("selected", true);
- jQuery('#seite').val(1);
-
- jQuery('#filter_form').submit();
-
- return false;
-
- } // function goStatus(status_id)
-
- /**
- * Markiert/Demarkiert alle Rechnungen
- */
- function wpsg_checkOrderCol(oElement)
- {
-
- if (jQuery(oElement).attr("checked") == "checked")
- {
-
- jQuery('#wpsg_order_index_submit input').attr("checked", true);
-
- }
- else
- {
-
- jQuery('#wpsg_order_index_submit input').attr("checked", false);
-
- }
-
- } // function wpsg_checkOrderCol()
-
- jQuery(document).ready(function() {
-
- jQuery('.wpsg_handlediv').bind('click', function() {
- jQuery(this).next().toggle();
-
- var arClose = new Array();
- jQuery('.wpsg_order_index .postbox .inside:hidden').each(function() {
- arClose.push(jQuery(this).parent().attr("id"));
- } );
-
- jQuery.cookie('wpsg_order_index_closed', arClose.join(','));
-
- } );
-
- if (jQuery.cookie('wpsg_order_index_closed') != null)
- {
-
- var arClose = jQuery.cookie('wpsg_order_index_closed').split(',');
-
- for (index in arClose)
- {
-
- if (arClose[index] != '') jQuery('#' + arClose[index] + ' .inside').hide();
-
- }
-
- }
-
- } );
-
- /* ]]> */</script>
-
- <?php echo $this->writeBackendMessage(); ?>
-
- <form method="get" id="filter_form">
-
- <input type="hidden" name="" id="wpsg_order_index_noheader_filter" value="1" />
- <input type="hidden" name="page" value="wpsg-Order" />
-
- <?php if (isset($this->view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?>
- <input type="hidden" name="filter[k_id]" id="filter_k_id" value="<?php echo $this->view['filter']['k_id']; ?>" />
- <?php } ?>
-
- <?php if (isset($this->view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?>
- <ul class="subsubsub wpsg_order_index_status">
- <li><span class="text"><?php echo wpsg_translate(__('Bestellungen von Kunden #1#', 'wpsg'), $this->view['kunde']['vname'].' '.$this->view['kunde']['name']); ?></span></li>
- <li><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __('Alle anzeigen', 'wpsg'); ?></a></li>
- </ul>
- <div class="wpsg_clear"></div>
- <?php } ?>
- <ul class="subsubsub wpsg_order_index_status">
- <?php $i = 0; foreach ($this->view['arStatus'] as $status_id => $count) { ?>
- <?php if ($count > 0) { ?>
- <li>
- <?php if (in_array($status_id, explode(',', $this->view['filter']['status']))) { ?>
- <span class="akt"><?php echo $this->arStatus[$status_id]; ?></span> <span class="count">(<?php echo $count; ?>) | </span>
- <?php } else { ?>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goStatus(<?php echo $status_id; ?>);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo $this->arStatus[$status_id]; ?> <span class="count">(<?php echo $count; ?>)</span></a> |
- <?php } ?>
- </li>
- <?php $i ++; } ?>
- <?php } ?>
- <li>
- <?php if ($this->view['filter']['status'] == -1) { ?>
- <span class="akt"><?php echo __('Alle', 'wpsg'); ?></span> <span class="count">(<?php echo $this->view['count']; ?>)</span>
- <?php } else { ?>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goStatus(-1);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __('Alle', 'wpsg'); ?> <span class="count">(<?php echo $this->view['countAll']; ?>)</span></a>
- <?php } ?>
- </li>
- </ul>
-
- <p class="search-box wpsg-search-box">
- <label for="post-search-input" class="screen-reader-text"><?php echo __('Bestellungen suchen', 'wpsg'); ?>:</label>
- <input type="text" onchange="jQuery('#filtersearch').val(jQuery(this).val());" value="<?php echo wpsg_hspc($this->view['filter']['search']); ?>" name="filter[search]" id="post-search-input" />
- <input type="submit" onclick="jQuery('#wpsg_mod_export_noheader').attr('name', '');" value="<?php echo __('Bestellung suchen', 'wpsg'); ?>" class="button" id="search-submit" name="search-submit" />
- </p>
-
- <br class="clear" />
-
- <div class="tablenav top">
-
- <div class="alignleft actions">
-
- <label>
- <input type="checkbox" <?php echo (($_COOKIE['wpsg_order_index_filter'] == '1')?'checked="checked"':''); ?> name="wpsg_order_index_filter" id="wpsg_order_index_filter" /> <?php echo __('Filter', 'wpsg'); ?>
- </label>
-
- <?php $this->callMods('produkt_index_head'); ?>
-
- </div>
- <?php //wpsg_debug($this->view) ?>
- <div class="tablenav-pages tablenav-pages-wrap"><span class="displaying-num"><?php echo wpsg_translate(__('#1# Elemente', 'wpsg'), $this->view['count']); ?></span>
- <div class="tablenav-pages">
- <span class="pagination-links">
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(1);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=1&s=<?php echo $_REQUEST['s']; ?>" title="<?php echo __('Zur ersten Seite gehen', 'wpsg'); ?>" class="first-page <?php echo (($this->view['seite'] == '1')?'disabled':''); ?>">«</a>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(<?php echo $this->view['seite'] - 1; ?>);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=<?php echo $this->view['seite'] - 1; ?>" title="<?php echo __('Zur vorherigen Seite gehen', 'wpsg'); ?>" class="prev-page <?php echo (($this->view['seite'] <= 1)?'disabled':''); ?>">‹</a>
- <span class="paging-input"><input onfocus="jQuery('#wpsg_mod_export_noheader').attr('name', '');" type="text" size="1" value="<?php echo $this->view['seite']; ?>" id="seite" name="seite" title="<?php echo __('Aktuelle Seite', 'wpsg'); ?>" class="current-page"> <?php echo __('von', 'wpsg'); ?> <span class="total-pages"><?php echo $this->view['pages']; ?></span></span>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(<?php echo $this->view['seite'] + 1; ?>);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=<?php echo $this->view['seite'] + 1; ?>" title="<?php echo __('Zur nächsten Seite gehen', 'wpsg'); ?>" class="next-page <?php echo (($this->view['seite'] >= $this->view['pages'])?'disabled':''); ?>">›</a>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(<?php echo $this->view['pages']; ?>);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=<?php echo $this->view['pages']; ?>" title="<?php echo __('Zur letzten Seite gehen', 'wpsg'); ?>" class="last-page <?php echo (($this->view['seite'] == $this->view['pages'])?'disabled':''); ?>">»</a>
- </span>
- </div>
-
- <script type="text/javascript">
-
- jQuery('.tablenav-pages .disabled').bind('click', function() { return false; } );
-
- </script>
-
- </div>
-
- </div>
-
- <div class="metabox-holder" id="wpsg_order_index_filter_layer" style="<?php echo (($_COOKIE['wpsg_order_index_filter'] == '1')?'display:block;':'display:none;'); ?>">
- <div id="wpsg_orderindexfilter" class="postbox">
- <h3 class="wpsg_handlediv">
- <span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br></span>
- <span><?php echo __('Bestellfilter', 'wpsg'); ?></span>
- </h3>
- <div class="inside">
-
- <?php
-
- // Array der Zustände aufbereiten
- $arStatus = array('-1' => __('Alle', 'wpsg'));
- foreach ($this->view['arStatus'] as $status_id => $v) { $arStatus[$status_id] = $this->arStatus[$status_id]; }
-
- ?>
-
- <?php echo wpsg_drawForm_Input('filter[search]', __('Suchtext', 'wpsg'), $this->view['filter']['search']); ?>
- <?php echo wpsg_drawForm_Select('filter[status]', __('Status', 'wpsg'), $arStatus, $this->view['filter']['status'], array('id' => 'filter_status')); ?>
- <div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for=""><?php echo __('Bestelldatum (Monat/Jahr)', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <select name="filter[month_von]" id="month_von" style="float:left; width:45%; margin-right:5%;">
- <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
- <?php for ($i = 1; $i <= 12; $i ++) { ?>
- <option <?php echo (($this->view['filter']['month_von'] == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo utf8_encode(strftime("%B", mktime(0, 0, 0, $i, 1, 2000))); ?></option>
- <?php } ?>
- </select>
- <select name="filter[year_von]" id="year_von" style="float:left; width:45%;">
- <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
- <?php foreach ($this->view['years'] as $y) { ?>
- <option <?php echo (($this->view['filter']['year_von'] == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
- <?php } ?>
- </select>
- </div>
- <div class="wpsg_clear"></div>
- </div>
- <?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
- <div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for=""><?php echo __('Rechnungsdatum (Monat/Jahr)', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <select name="filter[invoice_month_von]" id="invoice_month_von" style="float:left; width:45%; margin-right:5%;">
- <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
- <?php for ($i = 1; $i <= 12; $i ++) { ?>
- <option <?php echo (($this->view['filter']['invoice_month_von'] == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
- <?php } ?>
- </select>
- <select name="filter[invoice_year_von]" id="invoice_year_von" style="float:left; width:45%;">
- <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
- <?php foreach ($this->view['invoice_years'] as $y) { ?>
- <option <?php echo (($this->view['filter']['invoice_year_von'] == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
- <?php } ?>
- </select>
- </div>
- </div>
- <?php } ?>
-
- <div class="clear"></div>
-
- <br />
- <input onclick="jQuery('#wpsg_mod_export_noheader').attr('name', '');" class="button" name="search-submit" type="submit" value="<?php echo __("Auswahl einschränken", "wpsg"); ?>" />
-
- </div>
- </div>
- </div>
-
- <script type="text/javascript">/* <![CDATA[ */
-
- jQuery(document).ready(function() {
-
- jQuery('#wpsg_order_index_filter').bind('change', function() {
-
- if (jQuery(this).attr("checked"))
- {
-
- jQuery('#wpsg_order_index_filter_layer').show();
- jQuery.cookie('wpsg_order_index_filter', '1');
-
- }
- else
- {
-
- jQuery('#wpsg_order_index_filter_layer').hide();
- jQuery.cookie('wpsg_order_index_filter', '0');
-
- }
-
- } );
-
- } );
-
- /* ]]> */</script>
-
- <input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo $this->view['filter']['order']; ?>" />
- <input id="wpsg_ascdesc" type="hidden" name="filter[ascdesc]" value="<?php echo $this->view['filter']['ascdesc']; ?>" />
-
- <input style="display:none;" type="submit" name="suchen" value="" />
-
- </form>
-
- <?php $this->callMods('produkt_index_aftersearch'); ?>
-
- <?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
- <form method="get" id="wpsg_order_index_submit">
-
- <input type="hidden" name="" id="wpsg_order_index_noheader" value="1" />
- <input type="hidden" name="page" value="wpsg-Order" />
-
- <table class="widefat post fixed">
- <thead>
- <tr>
- <th class="manage-column column-cb check-column" scope="col"><input type="checkbox" value="1" id="wpsg_check_all_order" onclick="wpsg_checkOrderCol(this);" name="" /></th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'nr')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('nr');">
- <span><?php echo __("Nr.", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'customer')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('customer');">
- <span><?php echo __("Kunde", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'payment')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('payment');">
- <span><?php echo __("Bezahlmethode", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'shipping')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('shipping');">
- <span><?php echo __("Versandart", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'produkte')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('produkte');">
- <span><?php echo __("Produkte", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'amount')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('amount');">
- <span><?php echo __("Bestellwert", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <?php if ($this->hasMod('wpsg_mod_abo')) { ?>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'abo')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('abo');">
- <span><?php echo __("Abo Ende", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <?php } ?>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'status')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('status');">
- <span><?php echo __("Status", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- </tr>
- </thead>
- <tbody>
- <?php $i = 1; foreach ($this->view['data'] as $o) { ?>
- <tr>
- <td class="">
- <input type="checkbox" value="1" name="wpsg_multido[<?php echo $o['id']; ?>]" />
- </td>
- <td class="post-title column-title">
- <?php if (wpsg_isSizedString($o['language']) && $o['language'] != $this->getCurrentLanguage()) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$o['language']]; ?>
- <img src="<?php echo $this->getFlagURL().$lang['flag']; ?>" alt="<?php echo wpsg_translate(__('Bestellung wurde in der Sprache #1# durchgeführt.', 'wpsg'), $lang['name']); ?>" title="<?php echo wpsg_translate(__('Bestellung wurde in der Sprache #1# durchgeführt.', 'wpsg'), $lang['name']); ?>" />
- <?php } ?>
- <?php echo (($o['onr'] == "")?$o['id']:$o['onr']); ?> <span class="wpsg_order_datum"><?php echo wpsg_hspc(date('d.m.Y H:i:s', strtotime($o['cdate']))); ?></span><br />
- <?php if (trim($o['order_comment']) != '') { ?>
- <a title="<?php echo wpsg_translate(__('Kommentar (Kunde): #1#', 'wpsg'), wpsg_hspc($o['order_comment'])); ?>" onclick="return false" href="">
- <img alt="" src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/gfx/comment.png" />
- </a>
- <?php } ?>
- <?php if (trim($o['admincomment']) != "") { ?>
- <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($o['admincomment']); ?>" onclick="return false;" href="">
- <img alt="" src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/gfx/comment_admin.png" />
- </a>
- <?php } ?>
- <div class="row-actions">
- <span class="view"><a title="<?php echo __("Diese Bestellung ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $o['id']; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>
- |
- <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung stornieren möchten?', 'wpsg'); ?>');" title="<?php echo __("Diese Bestellung stornieren", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=<?php echo $o['id']; ?>"><?php echo __("Stornieren", "wpsg"); ?></a></span>
- |
- <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Bestellung löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&noheader=1&edit_id=<?php echo $o['id']; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
- </div>
- </td>
- <td>
- <?php if (trim($o['firma']) != '') { ?>
- <?php echo wpsg_hspc($o['firma']); ?><br />
- <?php } ?>
- <?php echo ((trim($o['title']) != '' && $o['title'] != '-1')?$o['title'].' ':'').wpsg_hspc($o['vname'].' '.$o['name']); ?><br />
- <span class="wpsg_order_adress">
- <?php echo wpsg_hspc($o['strasse']); ?><br />
- <?php echo wpsg_hspc($o['plz'].' '.$o['ort'].' '.$o['land_krzl']); ?>
- </span>
- </td>
- <td>
-
- <?php /* Bei Crefopay wird die Darstellung der Zahlungsart über das Modul geregelt */ ?>
- <?php if ($o['type_payment'] == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?>
- <?php echo wpsg_hspc($this->callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($o['id']))); ?>
- <?php } else { ?>
- <?php echo wpsg_hspc(__($this->arPayment[$o['type_payment']]['name']), 'wpsg'); ?>
- <?php } ?>
-
- <?php if ($o['basket']['sum']['preis_payment'] > 0) { ?>
- <br /><?php echo wpsg_ff($o['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>
- <?php } ?>
- </td>
- <td>
- <?php echo wpsg_hspc($o['oOrder']->getShippingTypName()); ?>
- <?php if ($o['basket']['sum']['preis_shipping'] > 0) { ?>
- <br /><?php echo wpsg_ff($o['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
- <?php } ?>
- </td>
- <td>
- <?php foreach ((array)$o['basket']['produkte'] as $p) { ?>
- <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> 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'))); ?><br />
- <?php } ?>
- </td>
- <td>
- <?php echo wpsg_ff($o['basket']['sum']['preis_gesamt'], $this->get_option('wpsg_currency')); ?>
- </td>
- <?php if ($this->hasMod('wpsg_mod_abo')) { ?>
- <td>
- <?php if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 1) { ?>
- <?php echo $this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($o['id'])) ?>
- <?php } else if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 2) { ?>
- <?php
-
- $origin_order_id = $this->callMod('wpsg_mod_abo', 'getOriginOrder', array($o['id']));
- $origin_order_data = $this->cache->loadOrder($origin_order_id);
-
- ?>
- <?php echo $this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array(
- $origin_order_data['id']
- )) ?><br />
- <?php echo wpsg_translate(__('Verlängerung zu Bestellung <a href="#1#">#2#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$origin_order_id, $origin_order_data['onr']); ?>
- <?php } ?>
- </td>
- <?php } ?>
- <td>
- <?php echo wpsg_hspc($this->arStatus[$o['status']]); ?>
- </td>
- </tr>
- <?php $i++; } ?>
- </tbody>
- <tfoot>
- <tr>
- <th class="manage-column column-cb check-column" scope="col"><input type="checkbox" value="1" id="wpsg_check_all_order_2" onclick="wpsg_checkOrderCol(this);" name="" /></th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'nr')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('nr');">
- <span><?php echo __("Nr.", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'customer')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('customer');">
- <span><?php echo __("Kunde", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'payment')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('payment');">
- <span><?php echo __("Bezahlmethode", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'shipping')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('shipping');">
- <span><?php echo __("Versandart", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'produkte')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('produkte');">
- <span><?php echo __("Produkte", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'amount')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('amount');">
- <span><?php echo __("Bestellwert", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <?php if ($this->hasMod('wpsg_mod_abo')) { ?>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'abo')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('abo');">
- <span><?php echo __("Abo Ende", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <?php } ?>
- <th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'status')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('status');">
- <span><?php echo __("Status", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- </tr>
- </tfoot>
- </table>
-
- <div class="tablenav bottom">
- <div class="alignleft actions">
- <select name="wpsg_action" id="wpsg_action">
- <option value="-1"><?php echo __('Aktion wählen', 'wpsg'); ?></option>
- <?php foreach ($this->arStatus as $k => $status) { ?>
- <option value="<?php echo $k; ?>"><?php echo wpsg_translate(__('Status auf "#1#" setzen.', 'wpsg'), $status); ?></option>
- <?php } ?>
- <option value="multiDelete"><?php echo __('Bestellungen löschen', 'wpsg'); ?></option>
- <?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
- <option value="writeRechnung"><?php echo __('Rechnung schreiben', 'wpsg'); ?></option>
- <option value="showRechnung"><?php echo __('Rechnung ansehen', 'wpsg'); ?></option>
- <?php } ?>
- </select>
- <input onclick="if (jQuery('#wpsg_action').val() == 'multiDelete') { if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false; } jQuery('#wpsg_order_index_noheader').attr('name', 'noheader');" type="submit" value="<?php echo __('Ausführen', 'wpsg'); ?>" class="button-secondary action" id="doaction" name="wpsg_order_doaction" />
- </div>
-
- <div class="tablenav-pages"><span class="displaying-num"><?php echo wpsg_translate(__('#1# Elemente', 'wpsg'), $this->view['count']); ?></span>
- <div class="tablenav-pages">
- <span class="pagination-links">
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(1);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=1&s=<?php echo $_REQUEST['s']; ?>" title="<?php echo __('Zur ersten Seite gehen', 'wpsg'); ?>" class="first-page <?php echo (($this->view['seite'] == '1')?'disabled':''); ?>">«</a>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(<?php echo $this->view['seite'] - 1; ?>);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=<?php echo $this->view['seite'] - 1; ?>" title="<?php echo __('Zur vorherigen Seite gehen', 'wpsg'); ?>" class="prev-page <?php echo (($this->view['seite'] <= 1)?'disabled':''); ?>">‹</a>
- <span class="paging-input"><input onfocus="jQuery('#wpsg_mod_export_noheader').attr('name', '');" type="text" size="1" value="<?php echo $this->view['seite']; ?>" id="seite" name="seite" title="<?php echo __('Aktuelle Seite', 'wpsg'); ?>" class="current-page"> <?php echo __('von', 'wpsg'); ?> <span class="total-pages"><?php echo $this->view['pages']; ?></span></span>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(<?php echo $this->view['seite'] + 1; ?>);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=<?php echo $this->view['seite'] + 1; ?>" title="<?php echo __('Zur nächsten Seite gehen', 'wpsg'); ?>" class="next-page <?php echo (($this->view['seite'] >= $this->view['pages'])?'disabled':''); ?>">›</a>
- <a onclick="jQuery('#wpsg_mod_export_noheader').attr('name', ''); return goPage(<?php echo $this->view['pages']; ?>);" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&seite=<?php echo $this->view['pages']; ?>" title="<?php echo __('Zur letzten Seite gehen', 'wpsg'); ?>" class="last-page <?php echo (($this->view['seite'] == $this->view['pages'])?'disabled':''); ?>">»</a>
- </span>
- </div>
-
- <script type="text/javascript">
-
- jQuery('.tablenav-pages .disabled').bind('click', function() { return false; } );
-
- </script>
-
- <br class="clear">
- </div>
- </div>
-
- <?php $this->callMod('wpsg_mod_export', 'produkt_index_foot'); ?>
-
- </form>
- <?php } else { ?>
- <br /><br />
- <p><?php echo __('Keine Bestellungen in der Datenbank.', 'wpsg'); ?></p>
- <?php } ?>
-
-</div>
\ No newline at end of file diff --git a/views/order/index.phtml b/views/order/index.phtml index ac3efe8..7130de6 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -15,15 +15,27 @@ </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
- <li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __("Bestellübersicht", "wpsg"); ?></a></li>
- <li role="presentation" class="wpsg_showhide_filter <?php echo (($this->view['hasFilter'] === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
+ <li role="presentation" class="wpsg-order-tab-a active"><a href="#" onclick="return false;"><?php echo __("Bestellübersicht", "wpsg"); ?></a></li>
+ <li role="presentation" class="wpsg-order-tab-a" id="wpsg-order-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
+ <?php foreach ($this->view['tabs']['left'] as $k => $tab) { ?>
+ <li role="presentation" class="wpsg-order-tab-a" id="wpsg-order-tab-<?php echo $k; ?>"><a href="#" onclick="return false;"><span class="<?php echo $tab['tab_icon']; ?>"></span><?php echo $tab['tab_title']; ?></a></li>
+ <?php } ?>
</ul>
<ul class="nav navbar-nav navbar-right">
-
+ <?php foreach ($this->view['tabs']['right'] as $k => $tab) { ?>
+ <li role="presentation" class="wpsg-order-tab-a" id="wpsg-order-tab-<?php echo $k; ?>"><a href="#" onclick="return false;"><span class="<?php echo $tab['tab_icon']; ?>"></span><?php echo $tab['tab_title']; ?></a></li>
+ <?php } ?>
</ul>
</div>
</div>
- <div class="wpsg-filter container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
+
+ <?php foreach ($this->view['tabs'] as $tab_positions) { ?>
+ <?php foreach ($tab_positions as $k => $tab) { ?>
+ <div class="wpsg-filter wpsg-order-tab wpsg-order-tab-<?php echo $k ?>" style="display:none;"><?php echo $tab['tab_content']; ?></div>
+ <?php } ?>
+ <?php } ?>
+
+ <div class="wpsg-filter wpsg-order-tab wpsg-order-tab-0 container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
<div class="row">
<div class="col-lg-4">
<form method="post" id="filter_form">
@@ -115,181 +127,174 @@ <?php echo $this->writeBackendMessage(); ?>
- <?php $this->callMods('produkt_index_head'); ?>
- <?php $this->callMods('produkt_index_aftersearch'); ?>
-
<div class="content">
<?php if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) { ?>
- <form method="post" action="<?php echo WPSG_URL_WP ?>wp-admin/admin.php?page=wpsg-Order&noheader=1">
-
- <table class="table table-bordered table-hover table-striped wpsg-table-order">
- <thead>
- <tr>
- <th class="col_checkbox"><input type="checkbox" onclick="return wpsg_order_checkAll();" /></th>
- <th class="col_nr wpsg_order" data-order="cdate"><?php echo __('Nr', 'wpsg'); ?></th>
- <th class="col_customer wpsg_order" data-order="customer"><?php echo __('Kunde', 'wpsg'); ?></th>
- <th class="col_payment wpsg_order" data-order="payment"><?php echo __('Bezahlmethode', 'wpsg'); ?></th>
- <th class="col_shipping wpsg_order" data-order="shipping"><?php echo __('Versandart', 'wpsg'); ?></th>
- <th class="col_products wpsg_order" data-order="products"><?php echo __('Produkte', 'wpsg'); ?></th>
- <th class="col_sum wpsg_order" data-order="amount"><?php echo __('Bestellwert', 'wpsg'); ?></th>
- <th class="col_state wpsg_order" data-order="state"><?php echo __('Status', 'wpsg'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($this->view['arData'] as $oOrder) { ?>
- <tr>
- <td class="col_checkbox">
-
- <input class="col_set_checkbox" name="wpsg_multido[<?php echo $oOrder->id; ?>]" type="checkbox" />
-
- </td>
- <td class="col_nr">
-
- <?php echo $oOrder->getNr(); ?> <span class="wpsg_grey"><?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate), false); ?></span><br />
-
- <div class="actions">
- <span class="view"><a title="<?php echo __("Diese Bestellung ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>
- |
- <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung stornieren möchten?', 'wpsg'); ?>');" title="<?php echo __("Diese Bestellung stornieren", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Stornieren", "wpsg"); ?></a></span>
- |
- <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Bestellung löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
- </div>
+ <table class="table table-bordered table-hover table-striped wpsg-table-order">
+ <thead>
+ <tr>
+ <th class="col_checkbox"><input type="checkbox" onclick="return wpsg_order_checkAll();" /></th>
+ <th class="col_nr wpsg_order" data-order="cdate"><?php echo __('Nr', 'wpsg'); ?></th>
+ <th class="col_customer wpsg_order" data-order="customer"><?php echo __('Kunde', 'wpsg'); ?></th>
+ <th class="col_payment wpsg_order" data-order="payment"><?php echo __('Bezahlmethode', 'wpsg'); ?></th>
+ <th class="col_shipping wpsg_order" data-order="shipping"><?php echo __('Versandart', 'wpsg'); ?></th>
+ <th class="col_products wpsg_order" data-order="products"><?php echo __('Produkte', 'wpsg'); ?></th>
+ <th class="col_sum wpsg_order" data-order="amount"><?php echo __('Bestellwert', 'wpsg'); ?></th>
+ <th class="col_state wpsg_order" data-order="state"><?php echo __('Status', 'wpsg'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($this->view['arData'] as $oOrder) { ?>
+ <tr>
+ <td class="col_checkbox">
+
+ <input class="col_set_checkbox" name="wpsg_multido[<?php echo $oOrder->id; ?>]" type="checkbox" />
+
+ </td>
+ <td class="col_nr">
+
+ <?php echo $oOrder->getNr(); ?> <span class="wpsg_grey"><?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate), false); ?></span><br />
+
+ <div class="actions">
+ <span class="view"><a title="<?php echo __("Diese Bestellung ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>
+ |
+ <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung stornieren möchten?', 'wpsg'); ?>');" title="<?php echo __("Diese Bestellung stornieren", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Stornieren", "wpsg"); ?></a></span>
+ |
+ <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Bestellung löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
+ </div>
- <?php if (trim($oOrder->admincomment) != "") { ?>
- <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"></a>
- <?php } ?>
+ <?php if (trim($oOrder->admincomment) != "") { ?>
+ <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"></a>
+ <?php } ?>
- <?php if (trim($oOrder->comment) != "") { ?>
- <a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($oOrder->comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" href="#"></a>
- <?php } ?>
+ <?php if (trim($oOrder->comment) != "") { ?>
+ <a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($oOrder->comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" href="#"></a>
+ <?php } ?>
- <?php if ($oOrder->hasShippingAdress()) { ?>
- <a title="<?php echo __("Lieferadresse beachten", "wpsg"); ?>" onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"></a>
- <?php } ?>
+ <?php if ($oOrder->hasShippingAdress()) { ?>
+ <a title="<?php echo __("Lieferadresse beachten", "wpsg"); ?>" onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"></a>
+ <?php } ?>
- <?php if ($this->hasMod('wpsg_mod_abo')) { ?>
- <?php if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 1) { ?>
- <?php echo $this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id)) ?>
- <?php } else if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 2) { ?>
- <?php
+ <?php if ($this->hasMod('wpsg_mod_abo')) { ?>
+ <?php if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 1) { ?>
+ <?php echo $this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id)) ?>
+ <?php } else if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 2) { ?>
+ <?php
- $origin_order_id = $this->callMod('wpsg_mod_abo', 'getOriginOrder', array($oOrder->id));
- $origin_order_data = $this->cache->loadOrder($origin_order_id);
+ $origin_order_id = $this->callMod('wpsg_mod_abo', 'getOriginOrder', array($oOrder->id));
+ $origin_order_data = $this->cache->loadOrder($origin_order_id);
- ?>
- <?php echo $this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($origin_order_data['id'])) ?><br />
- <?php echo wpsg_translate(__('Verlängerung zu Bestellung <a href="#1#">#2#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$origin_order_id, $origin_order_data['onr']); ?>
- <?php } ?>
- </td>
+ ?>
+ <?php echo $this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($origin_order_data['id'])) ?><br />
+ <?php echo wpsg_translate(__('Verlängerung zu Bestellung <a href="#1#">#2#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$origin_order_id, $origin_order_data['onr']); ?>
<?php } ?>
-
</td>
- <td class="col_customer">
- <?php $firma = $oOrder->getCustomer()->firma; if (wpsg_isSizedString($firma)) { ?>
- <?php echo $firma; ?><br />
- <?php } ?>
- <?php echo $oOrder->getInvoiceTitle(); ?> <?php echo $oOrder->getCustomer()->vname; ?> <?php echo $oOrder->getCustomer()->name; ?>
+ <?php } ?>
+
+ </td>
+ <td class="col_customer">
+ <?php $firma = $oOrder->getCustomer()->firma; if (wpsg_isSizedString($firma)) { ?>
+ <?php echo $firma; ?><br />
+ <?php } ?>
+ <?php echo $oOrder->getInvoiceTitle(); ?> <?php echo $oOrder->getCustomer()->vname; ?> <?php echo $oOrder->getCustomer()->name; ?>
+ <br />
+ <span class="wpsg_grey"><?php echo $oOrder->getCustomer()->strasse; ?><br />
+ <?php echo ltrim($oOrder->getCustomer()->plz.' '.$oOrder->getCustomer()->ort); ?> <?php echo $oOrder->getCustomer()->getCountryKuerzel(); ?>
+ </span>
+ </td>
+ <td class="col_payment">
+
+ <?php /* Bei Crefopay wird die Darstellung der Zahlungsart über das Modul geregelt */ ?>
+ <?php if ($oOrder->getPaymentID() == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?>
+ <?php echo wpsg_hspc($this->callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($oOrder->id))); ?>
+ <?php } else { ?>
+ <?php echo $oOrder->getPaymentLabel(); ?>
+ <?php } ?>
+
+ <?php if ($oOrder->getPaymentAmount() > 0) { ?>
+ - <?php echo wpsg_ff($oOrder->getPaymentAmount(), $this->get_option('wpsg_currency')); ?>
+ <?php } ?>
+
+ </td>
+ <td class="col_shipping">
+
+ <?php echo $oOrder->getShippingLabel(); ?>
+
+ <?php if ($oOrder->getShippingAmount() > 0) { ?>
+ - <?php echo wpsg_ff($oOrder->getShippingAmount(), $this->get_option('wpsg_currency')); ?>
+ <?php } ?>
+
+ <?php if ($oOrder->hasShippingAdress()) { ?>
<br />
- <span class="wpsg_grey"><?php echo $oOrder->getCustomer()->strasse; ?><br />
- <?php echo ltrim($oOrder->getCustomer()->plz.' '.$oOrder->getCustomer()->ort); ?> <?php echo $oOrder->getCustomer()->getCountryKuerzel(); ?>
- </span>
- </td>
- <td class="col_payment">
-
- <?php /* Bei Crefopay wird die Darstellung der Zahlungsart über das Modul geregelt */ ?>
- <?php if ($oOrder->getPaymentID() == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?>
- <?php echo wpsg_hspc($this->callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($oOrder->id))); ?>
- <?php } else { ?>
- <?php echo $oOrder->getPaymentLabel(); ?>
- <?php } ?>
-
- <?php if ($oOrder->getPaymentAmount() > 0) { ?>
- - <?php echo wpsg_ff($oOrder->getPaymentAmount(), $this->get_option('wpsg_currency')); ?>
- <?php } ?>
-
- </td>
- <td class="col_shipping">
-
- <?php echo $oOrder->getShippingLabel(); ?>
-
- <?php if ($oOrder->getShippingAmount() > 0) { ?>
- - <?php echo wpsg_ff($oOrder->getShippingAmount(), $this->get_option('wpsg_currency')); ?>
- <?php } ?>
-
- <?php if ($oOrder->hasShippingAdress()) { ?>
- <br />
- <?php echo $oOrder->getShippingTitle(); ?><?php echo $oOrder->getShippingFirstName(); ?> <?php echo $oOrder->getShippingName(); ?><br />
- <span class="wpsg_grey">
- <?php echo $oOrder->getShippingStreet(); ?>
- <?php echo $oOrder->getShippingZip(); ?> <?php echo $oOrder->getShippingCity(); ?> <?php echo $oOrder->getShippingCountryKuerzel(); ?><br />
- </span
- <?php } ?>
-
- </td>
- <td class="col_products">
-
- <?php foreach ($oOrder->getOrderProducts() as $oOrderProduct) { ?>
- <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),
- $oOrderProduct->getCount(),
- WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(),
- $oOrderProduct->getProduct()->getProductName(),
- wpsg_ff($oOrderProduct->getAmount(), $this->get_option('wpsg_currency'))
- ); ?><br />
- <?php } ?>
-
- </td>
- <td class="col_sum">
- <?php echo wpsg_ff($oOrder->getAmount(), $this->get_option('wpsg_currency')); ?>
- </td>
- <td class="col_state">
- <?php echo $oOrder->getStateLabel(); ?>
- </td>
- </tr>
- <?php } ?>
- </tbody>
- </table>
-
- <div class="alignleft actions">
-
- <select name="wpsg_action" id="wpsg_action">
- <option value="-1"><?php echo __('Aktion wählen', 'wpsg'); ?></option>
- <?php foreach ($this->arStatus as $k => $status) { ?>
- <option value="<?php echo $k; ?>"><?php echo wpsg_translate(__('Status auf "#1#" setzen.', 'wpsg'), $status); ?></option>
- <?php } ?>
- <option value="multiDelete"><?php echo __('Bestellungen löschen', 'wpsg'); ?></option>
- <?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
- <option value="writeRechnung"><?php echo __('Rechnung schreiben', 'wpsg'); ?></option>
- <option value="showRechnung"><?php echo __('Rechnung ansehen', 'wpsg'); ?></option>
- <?php } ?>
- </select>
-
- <input onclick="if (jQuery('#wpsg_action').val() == 'multiDelete') { if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false; }" type="submit" value="<?php echo __('Ausführen', 'wpsg'); ?>" class="button-secondary action" id="doaction" name="wpsg_order_doaction" />
-
- </div>
-
- <?php if ($this->view['pages'] > 1) { ?>
- <nav class="pagination_wrap">
- <ul class="pagination">
- <?php if ($this->view['arFilter']['page'] > 1) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">«</span></a></li>
- <?php } ?>
- <?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
- <li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
- <?php } ?>
- <?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true">»</span></a></li>
- <?php } ?>
- </ul>
- </nav>
- <?php } ?>
-
- <div class="wpsg_clear"></div>
-
- <?php $this->callMod('wpsg_mod_export', 'produkt_index_foot'); ?>
-
- </form>
+ <?php echo $oOrder->getShippingTitle(); ?><?php echo $oOrder->getShippingFirstName(); ?> <?php echo $oOrder->getShippingName(); ?><br />
+ <span class="wpsg_grey">
+ <?php echo $oOrder->getShippingStreet(); ?>
+ <?php echo $oOrder->getShippingZip(); ?> <?php echo $oOrder->getShippingCity(); ?> <?php echo $oOrder->getShippingCountryKuerzel(); ?><br />
+ </span
+ <?php } ?>
+
+ </td>
+ <td class="col_products">
+
+ <?php foreach ($oOrder->getOrderProducts() as $oOrderProduct) { ?>
+ <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),
+ $oOrderProduct->getCount(),
+ WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(),
+ $oOrderProduct->getProduct()->getProductName(),
+ wpsg_ff($oOrderProduct->getAmount(), $this->get_option('wpsg_currency'))
+ ); ?><br />
+ <?php } ?>
+
+ </td>
+ <td class="col_sum">
+ <?php echo wpsg_ff($oOrder->getAmount(), $this->get_option('wpsg_currency')); ?>
+ </td>
+ <td class="col_state">
+ <?php echo $oOrder->getStateLabel(); ?>
+ </td>
+ </tr>
+ <?php } ?>
+ </tbody>
+ </table>
+
+ <div class="alignleft actions">
+
+ <select name="wpsg_action" id="wpsg_action">
+ <option value="-1"><?php echo __('Aktion wählen', 'wpsg'); ?></option>
+ <?php foreach ($this->arStatus as $k => $status) { ?>
+ <option value="<?php echo $k; ?>"><?php echo wpsg_translate(__('Status auf "#1#" setzen.', 'wpsg'), $status); ?></option>
+ <?php } ?>
+ <option value="multiDelete"><?php echo __('Bestellungen löschen', 'wpsg'); ?></option>
+ <?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
+ <option value="writeRechnung"><?php echo __('Rechnung schreiben', 'wpsg'); ?></option>
+ <option value="showRechnung"><?php echo __('Rechnung ansehen', 'wpsg'); ?></option>
+ <?php } ?>
+ </select>
+
+ <input onclick="if (jQuery('#wpsg_action').val() == 'multiDelete') { if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false; }" type="submit" value="<?php echo __('Ausführen', 'wpsg'); ?>" class="button-secondary action" id="doaction" name="wpsg_order_doaction" />
+
+ </div>
+
+ <?php if ($this->view['pages'] > 1) { ?>
+ <nav class="pagination_wrap pagination_wrap_bottom">
+ <ul class="pagination">
+ <?php if ($this->view['arFilter']['page'] > 1) { ?>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">«</span></a></li>
+ <?php } ?>
+ <?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
+ <li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
+ <?php } ?>
+ <?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true">»</span></a></li>
+ <?php } ?>
+ </ul>
+ </nav>
+ <?php } ?>
+
+ <div class="wpsg_clear"></div>
+
+ <?php $this->callMod('wpsg_mod_export', 'produkt_index_foot'); ?>
<?php } else { ?>
<p><?php echo __('Keine Bestellungen in der Datenbank.', 'wpsg'); ?></p>
@@ -334,4 +339,43 @@ } // function goPage(page)
+ jQuery(document).ready(function() {
+
+ jQuery('.wpsg-order-tab-a').bind('click', function() {
+
+ jQuery('.wpsg-order-tab-a').removeClass('active');
+ jQuery(this).addClass('active');
+
+ if (jQuery('.' + jQuery(this).attr("id")).length <= 0)
+ {
+
+ jQuery('.wpsg-order-tab').slideUp(250);
+
+ }
+ else
+ {
+
+ if (jQuery('.wpsg-order-tab:visible').length > 0)
+ {
+
+ jQuery('.wpsg-order-tab').hide(0);
+ jQuery('.' + jQuery(this).attr("id")).show(0);
+
+ }
+ else
+ {
+
+ jQuery('.wpsg-order-tab').hide(0);
+ jQuery('.' + jQuery(this).attr("id")).slideDown(250);
+
+ }
+
+ }
+
+ return false;
+
+ } );
+
+ } );
+
/* <![CDATA[ */</script>
\ No newline at end of file diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 953f358..9e0b34f 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -23,7 +23,7 @@ <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'import'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=import&noheader=1"><span class="glyphicon glyphicon-import"></span><?php echo __("Import", "wpsg"); ?></a></li>
<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'export'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=export&noheader=1"><span class="glyphicon glyphicon-export"></span><?php echo __("Export", "wpsg"); ?></a></li>
- <?php } ?>
+ <?php } ?>
</ul>
</div>
</div>
|