diff options
| -rw-r--r-- | views/admin/form/text.phtml | 5 | ||||
| -rw-r--r-- | views/css/admin.css | 30 | ||||
| -rw-r--r-- | views/js/admin.js | 17 | ||||
| -rw-r--r-- | views/mods/mod_rechnungen/rechnung_pdf.phtml | 2 | ||||
| -rw-r--r-- | views/order/index.phtml | 317 | ||||
| -rw-r--r-- | views/order/view.phtml | 2 | ||||
| -rw-r--r-- | views/produkt/index.phtml | 131 |
7 files changed, 318 insertions, 186 deletions
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml index cde674a..49591f9 100644 --- a/views/admin/form/text.phtml +++ b/views/admin/form/text.phtml @@ -4,7 +4,12 @@ <div class="col-sm-6 <?php echo wpsg_getStr($this->view['field_config']['class_content_wrap']); ?>">
<div class="wpsg_field_wrap">
+
+ <?php if (wpsg_isTrue($this->view['field_config']['noP'])) { ?>
+ <?php echo $this->view['field_value']; ?>
+ <?php } else { ?>
<p class="form-control-static" style="padding-left:0px;"><?php echo $this->view['field_value']; ?></p>
+ <?php } ?>
<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
diff --git a/views/css/admin.css b/views/css/admin.css index 69b814d..299c42b 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -31,6 +31,20 @@ #wpsg-bs .wpsg_admin_submenu .list-group-item.active { color:#FFFFFF; }
#wpsg-bs .list-group-head a { color:#FFFFFF; }
#wpsg-bs .modal-dialog { width:70%; }
+#wpsg-bs .table-bordered thead { background-color:#FFFFFF; }
+
+/* Allgemeine Klassen */
+.wpsg_grey { color:#999999; }
+
+/* Tabellensortierung */
+.wpsg-table-order .wpsg_order { position:relative; }
+.wpsg-table-order .wpsg_order:after { content:"\e150"; position:absolute; font-size:1em; font-weight:normal; bottom:8px; right:8px; display:block; font-family:'Glyphicons Halflings'; opacity:0.2; color:#337AB7; }
+.wpsg-table-order .wpsg_order:hover { cursor:pointer; }
+.wpsg-table-order .wpsg_order:hover:after { content:"\e155"; opacity:0.8; }
+.wpsg-table-order .wpsg_order.wpsg_order_asc:after { content:"\e155"; opacity:1; }
+.wpsg-table-order .wpsg_order.wpsg_order_desc:after { content:"\e156"; opacity:1; }
+.wpsg-table-order .wpsg_order.wpsg_order_asc:hover:after { content:"\e156"; }
+.wpsg-table-order .wpsg_order.wpsg_order_desc:hover:after { content:"\e155"; }
/* Inline Edit */
#wpsg-bs .editableform > .control-group > div { padding-left:15px; padding-right:15px; }
@@ -102,12 +116,16 @@ .wpsg_admin_submenu input[type="submit"], .wpsg_admin_submenu input[type="button"] { width:100%; margin-bottom:10px !important; }
/* Bestellverwaltung */
-.wpsg_order .wpsg_status_link_wrap ul li { list-style:none; float:left; }
-.wpsg_order .wpsg_status_link_wrap ul li:after { content:" | "; width:15px; text-align:center; display:inline-block; }
-.wpsg_order .wpsg_status_link_wrap ul li:last-child:after { content:""; width:auto; }
-.wpsg_order .wpsg-filter { max-width:800px; margin-left:0px; }
-
- /* Modulverwaltung */
+.wpsg_order .wpsg_status_link_wrap { min-height:50px; float:left; display:inline-block; }
+.wpsg_order .col_checkbox { width:20px; }
+.wpsg_order .col_checkbox input { margin-top:-2px; }
+.wpsg_order .col_nr { width:200px; }
+.wpsg_order .col_nr .actions a { font-size:0.9em; }
+.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; }
+
+/* Modulverwaltung */
.wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; }
.wpsg_admin_submenu .list-group-item.modul_akt .glyphicon { position:absolute; right:5px; top:5px; color:#3c763d; }
.wpsg_admin_submenu .list-group-item.active { color:#dff0d8; }
diff --git a/views/js/admin.js b/views/js/admin.js index a8b254d..c7e9276 100644 --- a/views/js/admin.js +++ b/views/js/admin.js @@ -148,7 +148,22 @@ function wpsg_in_array(needle, haystack) }
jQuery(document).ready(function() {
-
+
+ // Sortierung
+ jQuery('th.wpsg_order').bind('click', function() {
+
+ var direction = "ASC";
+ if (jQuery(this).hasClass('wpsg_order_asc') && jQuery('#wpsg_order').val() == jQuery(this).attr("data-order")) direction = "DESC";
+
+ jQuery('#wpsg_ascdesc').val(direction);
+ jQuery('#wpsg_order').val(jQuery(this).attr("data-order"));
+
+ jQuery('#filter_form').submit();
+
+ return false;
+
+ } );
+
// Hilfe Tooltips
jQuery('*[data-wpsg-tip]').bind('click', function() {
diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml index c9bbf15..768895d 100644 --- a/views/mods/mod_rechnungen/rechnung_pdf.phtml +++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml @@ -449,7 +449,7 @@ $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++;
$pdf->setXY($prod_left + 10, $prod_top + $offset);
- $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Versandkosten "#1#"', 'wpsg'), $this->view['oOrder']->getShippingTypName()), 1, 0, 'L');
+ $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Versandkosten "#1#"', 'wpsg'), $this->view['oOrder']->getShippingLabel()), 1, 0, 'L');
if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')
{
diff --git a/views/order/index.phtml b/views/order/index.phtml index 19a8928..ac3efe8 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -19,42 +19,65 @@ <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>
</ul>
<ul class="nav navbar-nav navbar-right">
- <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-Order&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-Order&action=export&noheader=1"><span class="glyphicon glyphicon-export"></span><?php echo __("Export", "wpsg"); ?></a></li>
- <?php } ?>
+
</ul>
</div>
</div>
<div class="wpsg-filter container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
<div class="row">
- <div class="col-lg-12">
+ <div class="col-lg-4">
<form method="post" id="filter_form">
- <input id="wpsg_seite" type="text" name="seite" value="<?php echo $this->view['seite']; ?>" class="current-page" />
- <input id="wpsg_order" type="text" name="filter[order]" value="<?php echo $this->view['arFilter']['order']; ?>" />
- <input id="wpsg_ascdesc" type="text" name="filter[ascdesc]" value="<?php echo $this->view['arFilter']['ascdesc']; ?>" />
-
- <div class="container-fluid">
- <div class="row">
- <div class="col-lg-6">
- <?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld', 'wpsg'), wpsg_getStr($_REQUEST['s'])); ?>
- </div>
- <div class="col-lg-6">
- <?php echo wpsg_drawForm_Select('filter[status]', __('Bestellstatus', 'wpsg'), $this->arStatus, wpsg_getStr($_REQUEST['s'])); ?>
- </div>
- </div>
- </div>
-
- <div class="container-fluid">
- <div class="row">
- <div class="col-lg-6">
- </div>
- <div class="col-lg-6">
- <?php echo wpsg_drawForm_SubmitButton(__('Bestellungen suchen')); ?>
- </div>
- </div>
- </div>
+ <input id="wpsg_seite" type="hidden" name="seite" value="<?php echo $this->view['arFilter']['page']; ?>" class="current-page" />
+ <input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo $this->view['arFilter']['order']; ?>" />
+ <input id="wpsg_ascdesc" type="hidden" name="filter[ascdesc]" value="<?php echo $this->view['arFilter']['ascdesc']; ?>" />
+
+ <?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld', 'wpsg'), wpsg_getStr($this->view['arFilter']['s'])); ?>
+ <?php echo wpsg_drawForm_Select('filter[status]', __('Bestellstatus', 'wpsg'), wpsg_array_merge(array('-1' => __('Alle', 'wpsg')), $this->arStatus), $this->view['arFilter']['status']); ?>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <div class="row">
+ <div class="col-lg-6">
+ <select name="filter[cdate_m]" class="form-control input-sm">
+ <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+ <?php for ($i = 1; $i <= 12; $i ++) { ?>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_m']) == $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>
+ </div>
+ <div class="col-lg-6">
+ <select name="filter[cdate_y]" class="form-control input-sm">
+ <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+ <?php foreach ($this->view['cdate_years'] as $y) { ?>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
+ <?php } ?>
+ </select>
+ </div>
+ </div>
+ <?php echo wpsg_drawForm_TextEnd(__('Bestelldatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <div class="row">
+ <div class="col-lg-6">
+ <select name="filter[invoicedate_m]" class="form-control input-sm">
+ <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+ <?php for ($i = 1; $i <= 12; $i ++) { ?>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_m']) == $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>
+ </div>
+ <div class="col-lg-6">
+ <select name="filter[invoicedate_y]" class="form-control input-sm">
+ <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+ <?php foreach ($this->view['invoicedate_years'] as $y) { ?>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
+ <?php } ?>
+ </select>
+ </div>
+ </div>
+ <?php echo wpsg_drawForm_TextEnd(__('Rechnungsdatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
+
+ <br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellungen suchen')); ?><br />
</form>
</div>
@@ -62,37 +85,211 @@ </div>
</nav>
- <?php if ($this->view['pages'] > 1) { ?>
- <div class="wpsg_status_link_wrap">
+ <div class="pagination_wrap wpsg_status_link_wrap">
- <ul>
+ <ul class="pagination">
<?php foreach ($this->view['arStatus'] as $status_key => $status_info) { ?>
- <li><a href="#"><?php echo wpsg_translate(__('#1# (#2#)', 'wpsg'), $status_info['label'], $status_info['count']); ?></a></li>
+ <li class="<?php echo ((wpsg_getStr($this->view['arFilter']['status']) == $status_key)?'active':''); ?>"><a href="#" onclick="return wpsg_setFilterStatus('<?php echo $status_key; ?>');"><?php echo wpsg_translate(__('#1# <span>(#2#)<span>', 'wpsg'), $status_info['label'], $status_info['count']); ?></a></li>
<?php } ?>
</ul>
</div>
+ <?php if ($this->view['pages'] > 1) { ?>
<nav class="pagination_wrap">
<ul class="pagination">
- <?php if ($this->view['seite'] > 1) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['seite'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">«</span></a></li>
+ <?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['seite'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
+ <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['seite'] + 1 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['seite'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true">»</span></a></li>
+ <?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 echo $this->writeBackendMessage(); ?>
+ <?php $this->callMods('produkt_index_head'); ?>
+ <?php $this->callMods('produkt_index_aftersearch'); ?>
+
<div class="content">
- <?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
+ <?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>
+
+ <?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 ($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
+
+ $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 } ?>
+
+ </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 />
+ <?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 } else { ?>
<p><?php echo __('Keine Bestellungen in der Datenbank.', 'wpsg'); ?></p>
@@ -102,45 +299,39 @@ <script type="text/javascript">/* <![CDATA[ */
- var wpsg_order = '<?php echo wpsg_getStr($this->view['search']['order']); ?>';
- var wpsg_ascdesc = '<?php echo wpsg_getStr($this->view['search']['ascdesc']); ?>';
+ <?php if (wpsg_isSizedString($this->view['arFilter']['order']) && wpsg_isSizedString($this->view['arFilter']['ascdesc'])) { ?>
+ jQuery('th[data-order="<?php echo $this->view['arFilter']['order']; ?>"]').addClass('wpsg_order_<?php echo strtolower($this->view['arFilter']['ascdesc']); ?>');
+ <?php } ?>
- function goPage(page)
+ function wpsg_order_checkAll()
+ {
+
+ jQuery('.col_set_checkbox').each(function() { jQuery(this).prop('checked', !jQuery(this).prop('checked')); } );
+
+ }
+
+ function wpsg_setFilterStatus(state)
{
- if (page <= 0 || page == <?php echo $this->view['seite']; ?> || page > <?php echo wpsg_getStr($this->view['pages'], '0'); ?>) return;
+ jQuery('#filterstatus').val(state);
- jQuery('#wpsg_seite').val(page);
+ jQuery('#seite').val(1);
jQuery('#filter_form').submit();
return false;
- } // function goPage(page)
+ }
- function wpsg_setOrder(order)
+ function goPage(page)
{
- if (order == wpsg_order)
- {
-
- // Nur Richtung ändern
- if (wpsg_ascdesc == 'asc') jQuery('#wpsg_ascdesc').val('desc');
- else jQuery('#wpsg_ascdesc').val('asc');
-
- }
- else
- {
+ if (page <= 0 || page == <?php echo $this->view['arFilter']['page']; ?> || page > <?php echo wpsg_getStr($this->view['pages'], '0'); ?>) return;
- jQuery('#wpsg_order').val(order);
- jQuery('#wpsg_ascdesc').val('asc');
-
- }
-
- jQuery('#seite').val(1);
+ jQuery('#wpsg_seite').val(page);
jQuery('#filter_form').submit();
return false;
- } // function wpsg_setOrder(order)
+ } // function goPage(page)
/* <![CDATA[ */</script>
\ No newline at end of file diff --git a/views/order/view.phtml b/views/order/view.phtml index 856e2ac..b96f42b 100644 --- a/views/order/view.phtml +++ b/views/order/view.phtml @@ -261,7 +261,7 @@ </div>
<div class="wpsg_form_right">
<p>
- <?php echo wpsg_hspc($this->view['oOrder']->getShippingTypName()); ?>
+ <?php echo wpsg_hspc($this->view['oOrder']->getShippingLabel()); ?>
<?php if (isset($this->view['basket']['sum']['preis_shipping']) && $this->view['basket']['sum']['preis_shipping'] > 0) { ?>
(<?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>)
<?php } ?>
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 67ab128..953f358 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -33,14 +33,15 @@ <form method="post" id="filter_form">
<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo $this->view['seite']; ?>" class="current-page" />
- <input id="wpsg_order" type="hidden" name="search[order]" value="<?php echo $this->view['search']['order']; ?>" />
+
+ <input id="wpsg_order" type="hidden" name="search[order]" value="<?php echo $this->view['search']['order']; ?>" />
<input id="wpsg_ascdesc" type="hidden" name="search[ascdesc]" value="<?php echo $this->view['search']['ascdesc']; ?>" />
<?php echo wpsg_drawForm_Input('s', __('Suchfeld', 'wpsg'), wpsg_getStr($_REQUEST['s'])); ?>
<?php echo $this->callMod('wpsg_mod_productgroups', 'produkt_index_filter'); ?>
- <?php echo wpsg_drawForm_SubmitButton(__('Produkte suchen')); ?>
+ <?php echo wpsg_drawForm_SubmitButton(__('Produkte suchen')); ?><br />
</form>
</div>
@@ -68,52 +69,26 @@ <div class="content">
<?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
- <table class="widefat post fixed">
+ <table class="table table-bordered table-hover table-striped wpsg-table-order">
<thead>
<tr>
<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>
<th class="manage-column column-title wpsg_pic_col"></th>
<?php } ?>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'name')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('name');">
- <span><?php echo __("Name", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'anr')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('anr');">
- <span><?php echo __("Artikelnummer", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
+ <th class="wpsg_order" data-order="name"><?php echo __("Name", 'wpsg'); ?></th>
+ <th class="wpsg_order" data-order="anr"><?php echo __("Artikelnummer", 'wpsg'); ?></th>
+
<?php if ($this->hasMod('wpsg_mod_productgroups')) { ?>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'pgruppe')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('pgruppe');">
- <span><?php echo __("Produktgruppe", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
+ <th class="wpsg_order" data-order="pgruppe"><?php echo __("Produktgruppe", 'wpsg'); ?></th>
<?php } ?>
+
<?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
- <th class="manage-column column-title wpsg_stock_col <?php echo (($this->view['search']['order'] == 'stock')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('stock');">
- <span><?php echo __('Lagerbestand', 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
+ <th class="wpsg_order" data-order="stock"><?php echo __("Lagerbestand", 'wpsg'); ?></th>
<?php } ?>
- <th class="manage-column column-title wpsg_mwst_col <?php echo (($this->view['search']['order'] == 'mwst')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('mwst');">
- <span><?php echo __("MwSt.", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'price')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('price');">
- <span><?php echo __("Preis", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
+
+ <th class="wpsg_order" data-order="mwst"><?php echo __("MwSt.", 'wpsg'); ?></th>
+
+ <th class="wpsg_order" data-order="price"><?php echo __("Preis", 'wpsg'); ?></th>
</tr>
</thead>
<tbody>
@@ -188,53 +163,6 @@ </tr>
<?php } ?>
</tbody>
- <tfoot>
- <tr>
- <?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>
- <th class="manage-column column-title wpsg_pic_col"></th>
- <?php } ?>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'name')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('name');">
- <span><?php echo __("Name", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'anr')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('anr');">
- <span><?php echo __("Artikelnummer", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <?php if ($this->hasMod('wpsg_mod_productgroups')) { ?>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'pgruppe')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('pgruppe');">
- <span><?php echo __("Produktgruppe", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <?php } ?>
- <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
- <th class="manage-column column-title wpsg_stock_col <?php echo (($this->view['search']['order'] == 'stock')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('stock');">
- <span><?php echo __('Lagerbestand', 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <?php } ?>
- <th class="manage-column column-title wpsg_mwst_col <?php echo (($this->view['search']['order'] == 'mwst')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('mwst');">
- <span><?php echo __("MwSt.", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- <th class="manage-column column-title <?php echo (($this->view['search']['order'] == 'price')?'sorted':'sortable'); ?> <?php echo (($this->view['search']['ascdesc'] == 'asc')?'asc':'desc'); ?>" scope="col">
- <a href="#" onclick="return wpsg_setOrder('price');">
- <span><?php echo __("Preis", 'wpsg'); ?></span>
- <span class="sorting-indicator"></span>
- </a>
- </th>
- </tr>
- </tfoot>
</table>
<?php } else { ?>
@@ -247,8 +175,9 @@ <script type="text/javascript">/* <![CDATA[ */
- var wpsg_order = '<?php echo $this->view['search']['order']; ?>';
- var wpsg_ascdesc = '<?php echo $this->view['search']['ascdesc']; ?>';
+ <?php if (wpsg_isSizedString($this->view['search']['order']) && wpsg_isSizedString($this->view['search']['ascdesc'])) { ?>
+ jQuery('th[data-order="<?php echo $this->view['search']['order']; ?>"]').addClass('wpsg_order_<?php echo strtolower($this->view['search']['ascdesc']); ?>');
+ <?php } ?>
function goPage(page)
{
@@ -262,30 +191,4 @@ } // 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)
-
/* ]]> */</script>
\ No newline at end of file |